From senger at pub.open-bio.org Thu Mar 3 18:18:36 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu Mar 3 18:04:49 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503032318.j23NIaRt005907@pub.open-bio.org> senger Thu Mar 3 18:18:36 EST 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/gui/serviceInstanceCreationTool In directory pub.open-bio.org:/tmp/cvs-serv5850/src/main/org/biomoby/client/gui/serviceInstanceCreationTool Modified Files: ServiceCreationTool.java Log Message: moby-live/Java/src/main/org/biomoby/client/gui/serviceInstanceCreationTool ServiceCreationTool.java,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/gui/serviceInstanceCreationTool/ServiceCreationTool.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/gui/serviceInstanceCreationTool/ServiceCreationTool.java 2004/11/17 17:15:26 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/gui/serviceInstanceCreationTool/ServiceCreationTool.java 2005/03/03 23:18:36 1.3 @@ -30,7 +30,7 @@ public class ServiceCreationTool extends JApplet { // set to false if creating a java application - private final boolean isApplet = true; + private static final boolean isApplet = true; private String newline = System.getProperty("line.separator"); /* private member variables */ From senger at pub.open-bio.org Thu Mar 3 18:18:36 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu Mar 3 18:05:19 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503032318.j23NIaVe005887@pub.open-bio.org> senger Thu Mar 3 18:18:36 EST 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client In directory pub.open-bio.org:/tmp/cvs-serv5850/src/main/org/biomoby/client Modified Files: ServicesEdge.java Log Message: moby-live/Java/src/main/org/biomoby/client ServicesEdge.java,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ServicesEdge.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/ServicesEdge.java 2004/10/18 14:35:06 1.3 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ServicesEdge.java 2005/03/03 23:18:35 1.4 @@ -31,7 +31,7 @@ // types of connections - private final int MIN_CONNECTION_TYPE = 0; + private static final int MIN_CONNECTION_TYPE = 0; /** Indicates that there is no information how the services are connected. */ public static final int NO_CONNECTION = 0; @@ -40,7 +40,7 @@ public static final int TAIL_COLLECTION_CONNECTION = 3; public static final int BOTH_COLLECTIONS_CONNECTION = 4; public static final int NO_OUTPUT = 5; - private final int MAX_CONNECTION_TYPE = 5; + private static final int MAX_CONNECTION_TYPE = 5; /** A divider used in {@link #getConnector connectors} to separate * namespace and data type name. */ From senger at pub.open-bio.org Thu Mar 3 18:18:36 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu Mar 3 18:06:53 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503032318.j23NIaOP005869@pub.open-bio.org> senger Thu Mar 3 18:18:35 EST 2005 Update of /home/repository/moby/moby-live/Java In directory pub.open-bio.org:/tmp/cvs-serv5850 Modified Files: build.xml Log Message: moby-live/Java build.xml,1.10,1.11 =================================================================== RCS file: /home/repository/moby/moby-live/Java/build.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- /home/repository/moby/moby-live/Java/build.xml 2004/12/05 22:28:01 1.10 +++ /home/repository/moby/moby-live/Java/build.xml 2005/03/03 23:18:35 1.11 @@ -355,9 +355,9 @@ public="true"> -
Generated: ${TODAY_LONG}]]>
- - Submit a bug or feature
+
Generated: ${TODAY_LONG}]]>
+ + Submit a bug or feature
Generated: ${TODAY_LONG}]]>
From mwilkinson at pub.open-bio.org Mon Mar 7 23:44:12 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Mon Mar 7 23:29:45 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503080444.j284iC0C030405@pub.open-bio.org> mwilkinson Mon Mar 7 23:44:12 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv30386 Modified Files: CommonSubs.pm Log Message: fixed error reported by Pieter. Thanks. moby-live/Perl/MOBY CommonSubs.pm,1.59,1.60 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/02/08 16:49:15 1.59 +++ /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/08 04:44:12 1.60 @@ -1280,7 +1280,7 @@ my $valuenode = $valuenodes->get_node( $_ ); foreach my $amount ( $valuenode->childNodes ) { next unless $amount->nodeType == TEXT_NODE; - $resp .= $amount->toString; + $resp .= $amount->nodeValue; } } push @contents, $resp; @@ -1288,7 +1288,7 @@ my $resp; foreach ( $child->childNodes ) { next unless $_->nodeType == TEXT_NODE; - $resp .= $_->toString; + $resp .= $_->nodeValue; } push @contents, $resp; } From yanwong at pub.open-bio.org Tue Mar 8 05:36:17 2005 From: yanwong at pub.open-bio.org (Yan Wong) Date: Tue Mar 8 05:22:50 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503081036.j28AaHDe031479@pub.open-bio.org> yanwong Tue Mar 8 05:36:17 EST 2005 Update of /home/repository/moby/moby-live/Python/bioMoby In directory pub.open-bio.org:/tmp/cvs-serv31454/bioMoby Modified Files: mobyDataTypes.py Log Message: A small bug prevented the servicenotes to be retrieved from the XML moby-live/Python/bioMoby mobyDataTypes.py,1.17,1.18 =================================================================== RCS file: /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/02/18 15:54:10 1.17 +++ /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/03/08 10:36:17 1.18 @@ -194,6 +194,7 @@ anObj=MobyObject() anObj.fromMoby(aCross) self.__cross__.append(anObj) + #deserializes the PIB elif child.localName=="ProvisionInformation": for aPIB in child.childNodes: self.__PIB__.append(aPIB.toxml()) @@ -297,13 +298,14 @@ """The class describes a Moby Content (for queries or answers) """ - def __init__(self, queryData={}, authority="", servicenotes=""): + def __init__(self, queryData={}, authority="", servicenotes="", marshall=True): """Optional parameters indicate the authority's URL and notes about the service """ self.authority=authority self.servicenotes=servicenotes self.queryData=queryData + self._marshall=marshall def __str__(self): """return the XML form of the Moby Content object @@ -337,16 +339,21 @@ result.append("") for aSimple in queryObject[1]: - result.append(''+m.dumps(aSimple)+'') + if self._marshall: + result.append('%s'%m.dumps(aSimple)) + else: + result.append('%s'%str(aSimple)) result.append("") #If it is a parameter elif queryObject.__class__ is Parameter: result.append(m.dumps(queryObject)) #Or a simple object - else: - result.append(""+m.dumps(queryObject)+"") - + else: + if self._marshall: + result.append("%s"%m.dumps(queryObject)) + else: + result.append("%s"%queryObject) result.append("") result.append('') @@ -511,4 +518,4 @@ def __repr__(self): """put the xml of the Content """ - return self.__str__() \ No newline at end of file + return self.__str__() From mwilkinson at pub.open-bio.org Tue Mar 8 19:56:15 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Tue Mar 8 19:41:49 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503090056.j290uFmq001340@pub.open-bio.org> mwilkinson Tue Mar 8 19:56:15 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi In directory pub.open-bio.org:/tmp/cvs-serv1321 Modified Files: mysql.pm Log Message: I think I have finally squashed that pesky bug that prevents Simples from being displayed as part of Collections in the findService output. It also requires a hand-modification of the database, unfortunately. If you need this, drop me a line and I'll tell you what to do moby-live/Perl/MOBY/Adaptor/moby/queryapi mysql.pm,1.8,1.9 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm 2005/01/11 22:17:11 1.8 +++ /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm 2005/03/09 00:56:15 1.9 @@ -124,7 +124,7 @@ sub insert_simple_input { my ($self, %args) = @_; my $dbh = $self->dbh; - my $si = $args{collection_input_id}?'':$args{service_instance_id}; + my $si = $args{collection_input_id}?undef:$args{service_instance_id}; $dbh->do("insert into simple_input (object_type_uri, @@ -148,7 +148,7 @@ sub insert_simple_output { my ($self, %args) = @_; my $dbh = $self->dbh; - my $si = $args{collection_output_id}?'':$args{service_instance_id}; + my $si = $args{collection_output_id}?undef:$args{service_instance_id}; $dbh->do("insert into simple_output (object_type_uri, From mwilkinson at pub.open-bio.org Fri Mar 11 17:22:58 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Fri Mar 11 17:08:39 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503112222.j2BMMwLo013724@pub.open-bio.org> mwilkinson Fri Mar 11 17:22:57 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv13705 Modified Files: CommonSubs.pm Log Message: getNodeContentWithArticle now recognizes CDATA content as well moby-live/Perl/MOBY CommonSubs.pm,1.60,1.61 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/08 04:44:12 1.60 +++ /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/11 22:22:57 1.61 @@ -1279,7 +1279,7 @@ for ( 1 .. $valuenodes->size() ) { my $valuenode = $valuenodes->get_node( $_ ); foreach my $amount ( $valuenode->childNodes ) { - next unless $amount->nodeType == TEXT_NODE; + next unless ($amount->nodeType == TEXT_NODE || $amount->nodeType == CDATA_SECTION_NODE); $resp .= $amount->nodeValue; } } @@ -1287,7 +1287,7 @@ } else { my $resp; foreach ( $child->childNodes ) { - next unless $_->nodeType == TEXT_NODE; + next unless ($_->nodeType == TEXT_NODE || $amount->nodeType == CDATA_SECTION_NODE); $resp .= $_->nodeValue; } push @contents, $resp; From mwilkinson at pub.open-bio.org Fri Mar 11 17:25:31 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Fri Mar 11 17:10:44 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503112225.j2BMPVYd013792@pub.open-bio.org> mwilkinson Fri Mar 11 17:25:31 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv13773 Modified Files: CommonSubs.pm Log Message: DOH...getNodeContentWithArticle now recognizes CDATA content as well moby-live/Perl/MOBY CommonSubs.pm,1.61,1.62 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/11 22:22:57 1.61 +++ /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/11 22:25:31 1.62 @@ -1287,7 +1287,7 @@ } else { my $resp; foreach ( $child->childNodes ) { - next unless ($_->nodeType == TEXT_NODE || $amount->nodeType == CDATA_SECTION_NODE); + next unless ($_->nodeType == TEXT_NODE || $_->nodeType == CDATA_SECTION_NODE); $resp .= $_->nodeValue; } push @contents, $resp; From mwilkinson at pub.open-bio.org Mon Mar 14 13:30:58 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Mon Mar 14 13:17:34 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503141830.j2EIUw9n032565@pub.open-bio.org> mwilkinson Mon Mar 14 13:30:57 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv32546 Modified Files: CommonSubs.pm Log Message: allow CDATA in the service notes block moby-live/Perl/MOBY CommonSubs.pm,1.62,1.63 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/11 22:25:31 1.62 +++ /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/14 18:30:57 1.63 @@ -1458,6 +1458,9 @@ # $content .= $response_component->toString; $content .= $response_component->nodeValue if ( $response_component->nodeType == TEXT_NODE ); + $content .= $response_component->nodeValue + if ( $response_component->nodeType == CDATA_SECTION_NODE ); + } } return ( $content ); From mwilkinson at pub.open-bio.org Wed Mar 16 12:32:07 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Wed Mar 16 12:16:50 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503161732.j2GHW7l3009815@pub.open-bio.org> mwilkinson Wed Mar 16 12:32:06 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Client In directory pub.open-bio.org:/tmp/cvs-serv9796 Modified Files: Central.pm Log Message: ugh. Noisy test suite moby-live/Perl/MOBY/Client Central.pm,1.90,1.91 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/02/08 23:43:06 1.90 +++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/03/16 17:32:06 1.91 @@ -1875,7 +1875,7 @@ my $id = &_nodeTextContent( $Object, 'id' ); my $success = &_nodeTextContent( $Object, 'success' ); my $message = &_nodeCDATAContent( $Object, 'message' ); -print STDERR "******$message******\n"; +#print STDERR "******$message******\n"; my $RDF = &_nodeRawContent( $Object, 'RDF' ); my $reg = MOBY::Client::Registration->new( success => $success, From mwilkinson at pub.open-bio.org Wed Mar 16 14:14:15 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Wed Mar 16 13:58:51 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503161914.j2GJEF8m010119@pub.open-bio.org> mwilkinson Wed Mar 16 14:14:15 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv10100/MOBY Modified Files: Central.pm Log Message: should correctly parse out the secondary parameter details without absurd restrictions. moby-live/Perl/MOBY Central.pm,1.149,1.150 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- /home/repository/moby/moby-live/Perl/MOBY/Central.pm 2005/02/10 00:17:45 1.149 +++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm 2005/03/16 19:14:14 1.150 @@ -1542,29 +1542,28 @@ if ( $types->get_node( 1 ) ) { foreach ( $types->get_node( 1 )->childNodes ) { # should only ever be one! - ( $_->nodeType == TEXT_NODE ) - && ( $datatype = $_->toString ); + ( $_->nodeType == TEXT_NODE ) && ( $datatype .= $_->nodeValue ); } } my $defs = $parameter->getElementsByTagName( 'default' ); if ( $defs->get_node( 1 ) ) { foreach ( $defs->get_node( 1 )->childNodes ) { # should only ever be one! - ( $_->nodeType == TEXT_NODE ) && ( $def = $_->toString ); + ( $_->nodeType == TEXT_NODE ) && ( $def .= $_->nodeValue ); } } my $maxs = $parameter->getElementsByTagName( 'max' ); if ( $maxs->get_node( 1 ) ) { foreach ( $maxs->get_node( 1 )->childNodes ) { # should only ever be one! - ( $_->nodeType == TEXT_NODE ) && ( $max = $_->toString ); + ( $_->nodeType == TEXT_NODE ) && ( $max .= $_->nodeValue ); } } my $mins = $parameter->getElementsByTagName( 'min' ); if ( $mins->get_node( 1 ) ) { foreach ( $mins->get_node( 1 )->childNodes ) { # should only ever be one! - ( $_->nodeType == TEXT_NODE ) && ( $min = $_->toString ); + ( $_->nodeType == TEXT_NODE ) && ( $min .= $_->nodeValue ); } } my $enums = $parameter->getElementsByTagName( 'enum' ); @@ -1573,11 +1572,15 @@ foreach ( $enums->get_node( $n )->childNodes ) { # should only ever be one! ( $_->nodeType == TEXT_NODE ) - && ( push @enums, $_->toString ); + && ( push @enums, $_->nodeValue ); } } my $enum_string = join "", ( map { $_ . "," } @enums ); chop $enum_string; # get rid of trailing comma + $datatype =~ s/^\s+//; $datatype =~ s/\s+$//; + $def =~ s/^\s+//; $def =~ s/\s+$//; + $max =~ s/^\s+//; $max =~ s/\s+$//; + $min =~ s/^\s+//; $min =~ s/\s+$//; my $sec = $SVC->add_secondary_input( default_value => $def, maximum_value => $max, From mwilkinson at pub.open-bio.org Wed Mar 16 14:14:15 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Wed Mar 16 13:58:52 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503161914.j2GJEF3C010138@pub.open-bio.org> mwilkinson Wed Mar 16 14:14:15 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Client In directory pub.open-bio.org:/tmp/cvs-serv10100/MOBY/Client Modified Files: Central.pm Log Message: should correctly parse out the secondary parameter details without absurd restrictions. moby-live/Perl/MOBY/Client Central.pm,1.91,1.92 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/03/16 17:32:06 1.91 +++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/03/16 19:14:15 1.92 @@ -913,18 +913,17 @@ $message .= "\n"; while ( my ( $param, $desc ) = each %SEC ) { unless ( ( ref( $desc ) ) =~ /hash/i ) { - return $self->errorRegXML( -"invalid structure of secondary article $param; expected hashref of limitations" + return $self->errorRegXML("invalid structure of secondary article $param; expected hashref of limitations" ); } my %data = %{$desc}; - my $default = $data{default}; - my $max = $data{max}; - my $min = $data{min}; - my $datatype = $data{datatype}; + my $default = $data{default}||""; + my $max = $data{max}||""; + my $min = $data{min}||""; + my $datatype = $data{datatype}||""; + my $enums = $data{enum}||[]; unless ( $datatype ) { - return $self->errorRegXML( -"a secondaryArticle must contain at least a datatype value in secondary article $param" + return $self->errorRegXML("a secondaryArticle must contain at least a datatype value in secondary article $param" ); } unless ( ( $datatype =~ /Integer/ ) @@ -932,16 +931,14 @@ || ( $datatype =~ /String/ ) || ( $datatype =~ /DateTime/ ) ) { - return $self->errorRegXML( -"a secondaryArticle must have a datatype of Integer, Float, String, or DateTime" + return $self->errorRegXML("a secondaryArticle must have a datatype of Integer, Float, String, or DateTime" ); } - unless ( ( ref( $data{enum} ) ) =~ /array/i ) { - return $self->errorRegXML( -"invalid structure of enum limits in secondary article $param; expected arrayref" + unless ( ( ref( $enums ) ) =~ /array/i ) { + return $self->errorRegXML("invalid structure of enum limits in secondary article $param; expected arrayref" ); } - my @enums = @{ $data{enum} }; + my @enums = @{ $enums }; $message .= "\n"; $message .= "$default\n"; $message .= "$datatype\n"; From mwilkinson at pub.open-bio.org Wed Mar 16 15:05:46 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Wed Mar 16 14:50:24 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503162005.j2GK5k0Q010412@pub.open-bio.org> mwilkinson Wed Mar 16 15:05:46 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Client In directory pub.open-bio.org:/tmp/cvs-serv10393/MOBY/Client Modified Files: Central.pm Log Message: removing the code that calls the RDF builder just for the moment. it needs to be parameterized first. moby-live/Perl/MOBY/Client Central.pm,1.92,1.93 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/03/16 19:14:15 1.92 +++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/03/16 20:05:46 1.93 @@ -980,16 +980,18 @@ # return ( $self->parseRegXML( $return ) ); #_______call a new version RDFbuilder (by Eddie Kawas) _________________________________________ my $reg = $self->parseRegXML( $return ); - if ($reg->success == 1){ - require LWP::UserAgent; - - my $ua = LWP::UserAgent->new; - my $url='http://mobycentral.cbr.nrc.ca:8090/DemoServlet/forms/getSignatureResponse?domain='.$authURI.'&serviceName='.$name; - - my $response = $ua->get($url); - my $rdf = $response->content; - print "$rdf\n"; -} + +# if ($reg->success == 1){ +# require LWP::UserAgent; +# +# my $ua = LWP::UserAgent->new; +# my $url='http://mobycentral.cbr.nrc.ca:8090/DemoServlet/forms/getSignatureResponse?domain='.$authURI.'&serviceName='.$name; +# +# my $response = $ua->get($url); +# my $rdf = $response->content; +# print "$rdf\n"; +#} + return $reg; #_______________________________________________________________________________________________ From mwilkinson at pub.open-bio.org Wed Mar 16 17:30:31 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Wed Mar 16 17:15:09 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503162230.j2GMUVii010922@pub.open-bio.org> mwilkinson Wed Mar 16 17:30:31 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv10903/MOBY Modified Files: CommonSubs.pm Log Message: altered getNodeContentWithArticle so that you can get the text content of the root node by leaving off the articleName argument. This is very useful... honest... moby-live/Perl/MOBY CommonSubs.pm,1.63,1.64 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/14 18:30:57 1.63 +++ /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/16 22:30:31 1.64 @@ -1158,11 +1158,15 @@ be the entire mobyData block. $tagname - the tagname (effectively from the Object type ontology), or "Parameter" if you are trying to get secondaries - $articleName - the articleName that we are searching for + $articleName - the articleName that we are searching for. + to get the content of the primary object, leave + this field blank! + + returns : an ARRAY of the stringified text content for each + node that matched the tagname/articleName specified; one + array element for each matching node. Newlines are NOT considered + new nodes (as they are in normal XML). - returns : an array of the stringified text content for each - node that matched the tagname/articleName specified. - note that each line of content is an element of the string. notes : This was written for the purpose of getting the values of String, Integer, Float, Date_Time, and other such primitives. For example, in the following XML: @@ -1221,9 +1225,9 @@ foreach my $article(@articles){ my ($type, $DOM) = @{$article}; if ($type == SECONDARY){ - $cutoff = getNodeContentsWithArticle($DOM, "Parameter", "cutoff"); + ($cutoff) = getNodeContentsWithArticle($DOM, "Parameter", "cutoff"); } else { - $sequences = getNodeContentWithArticle($DOM, "String", "SequenceString"); + @sequences = getNodeContentWithArticle($DOM, "String", "SequenceString"); } } } @@ -1245,11 +1249,24 @@ my @contents; return () unless ref( $node ) =~ /XML::LibXML/; return () unless $element; - return () unless $articleName; + + unless ($articleName){ # the request is for root node if no articleName + my $resp; + foreach my $child($node->childNodes){ + next unless ($child->nodeType == TEXT_NODE || $child->nodeType == CDATA_SECTION_NODE); + $resp .= $child->nodeValue; + } + push @contents, $resp; + return @contents; + } + my $nodes = $node->getElementsByTagName( $element ); unless ( $nodes->get_node( 1 ) ) { $nodes = $node->getElementsByTagName( "moby:$element" ); } + + + # if there is an articleName, then get that specific node for ( 1 .. $nodes->size() ) { my $child = $nodes->get_node( $_ ); if ( From gss at pub.open-bio.org Mon Mar 21 16:29:44 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:14:37 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212129.j2LLTiqW008258@pub.open-bio.org> gss Mon Mar 21 16:29:44 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph In directory pub.open-bio.org:/tmp/cvs-serv8173/src/org/semanticmoby/graph Modified Files: MOBYEnumeration.java MOBYCollection.java MOBYSingleElement.java MOBYFixedCollection.java MOBYProviderSet.java MOBYSubject.java MOBYDescriptor.java MOBYProvider.java MOBYDocument.java MOBYOntology.java MOBYGraphNode.java MOBYObject.java MOBYMappingElement.java MOBYOrderedCollection.java MOBYUnorderedCollection.java MOBYResizableCollection.java Log Message: Major cleanup of graph classes moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph MOBYEnumeration.java,1.1,1.2 MOBYCollection.java,1.1,1.2 MOBYSingleElement.java,1.1,1.2 MOBYFixedCollection.java,1.1,1.2 MOBYProviderSet.java,1.1,1.2 MOBYSubject.java,1.1,1.2 MOBYDescriptor.java,1.1,1.2 MOBYProvider.java,1.1,1.2 MOBYDocument.java,1.1,1.2 MOBYOntology.java,1.1,1.2 MOBYGraphNode.java,1.1,1.2 MOBYObject.java,1.1,1.2 MOBYMappingElement.java,1.1,1.2 MOBYOrderedCollection.java,1.1,1.2 MOBYUnorderedCollection.java,1.1,1.2 MOBYResizableCollection.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYEnumeration.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYEnumeration.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYEnumeration.java 2005/03/21 21:29:44 1.2 @@ -1,19 +1,38 @@ package org.semanticmoby.graph; import java.util.*; + import com.hp.hpl.jena.rdf.model.*; /** - * A class representing a resizable collection of objects, in - * which the order of the elements is not defined; the intention is - * for the elements to represent possible choices for a value. + * A class representing collections that can be resized (i.e. + * elements added to or removed from), in which the order of + * the elements is not defined; the intention is for the elements + * to represent possible choices for a value; corresponds to an + * RDF Alt. */ public class MOBYEnumeration extends MOBYUnorderedCollection { - public MOBYEnumeration(Resource resource, List elements, Model underlying) + /** + * Create an instance with no elements + * @param resource the resource node that represents this collection + * @param underlyingJenaModel the Jena model from which this is stored + */ + public MOBYEnumeration(Resource resource, + Model underlyingJenaModel) { - super(resource, elements, underlying); + super(null, resource, underlyingJenaModel); } - public boolean isEnumeration() { return true; } + /** + * Create an instance with the initial list of elements + * @param initialElements the initial elements + * @param resource the resource node that represents this collection + * @param underlyingJenaModel the Jena model from which this is stored + */ + public MOBYEnumeration(List initialElements, Resource resource, + Model underlyingJenaModel) + { + super(initialElements, resource, underlyingJenaModel); + } } \ No newline at end of file =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYCollection.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYCollection.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYCollection.java 2005/03/21 21:29:44 1.2 @@ -1,24 +1,34 @@ package org.semanticmoby.graph; -import com.hp.hpl.jena.rdf.model.*; import java.util.*; +import com.hp.hpl.jena.rdf.model.*; + /** - * A common abstract class for collections, both fixed sized and resizeable, - * of elements in MOBY graphs. + * A common abstract class for collections, both fixed sized and + * resizeable, of elements in MOBY graphs. */ public abstract class MOBYCollection extends MOBYGraphNode { + /** + * A list to hold the elements of the collection + */ protected List elements = new ArrayList(); - - public MOBYCollection(Resource resource, List elements, Model underlying) + + /** + * Create an instance with the initial list of elements + * @param initialElements the initial elements + */ + public MOBYCollection(List initialElements, Resource resource, + Model model) { - super(resource, underlying); - for (Iterator it = elements.iterator(); it.hasNext();) { - this.elements.add(it.next()); + super(resource, model); + + if (initialElements != null) { + elements.addAll(initialElements); } } - + /** * Return the size of the collection. */ @@ -36,15 +46,18 @@ } /** - * Return whether or not the collection is fixed in size + * Return whether or not this object is a collection. */ - public abstract boolean isFixedSized(); + public boolean isCollection() + { + return true; + } /** - * Return whether or not the collection is resizable + * Return whether or not this object is a singular element. */ - public abstract boolean isResizable(); - - public boolean isSingular() { return false; } - public boolean isCollection() { return true; } + public boolean isSingular() + { + return false; + } } \ No newline at end of file =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYSingleElement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYSingleElement.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYSingleElement.java 2005/03/21 21:29:44 1.2 @@ -18,6 +18,19 @@ super(resource, underlying); } - public boolean isSingular() { return true; } - public boolean isCollection() { return false; } + /** + * Return whether or not this object is a collection. + */ + public boolean isCollection() + { + return false; + } + + /** + * Return whether or not this object is a singular element. + */ + public boolean isSingular() + { + return true; + } } \ No newline at end of file =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYFixedCollection.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYFixedCollection.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYFixedCollection.java 2005/03/21 21:29:44 1.2 @@ -1,20 +1,34 @@ package org.semanticmoby.graph; import java.util.*; + import com.hp.hpl.jena.rdf.model.*; /** - * A class representing unordered, fixed sized collection - * of objects. + * A class for holding an ordered, fixed sized collection + * of objects; corresponds to an RDF List. */ public class MOBYFixedCollection extends MOBYCollection { + /** + * Create an instance with the initial list of elements + * @param initialElements the initial elements + * @param resource the resource node that represents this collection + * @param model the Jena model from which this is derived + */ + public MOBYFixedCollection(List initialElements, Resource resource, + Model model) + { + super(initialElements, resource, model); + } - public MOBYFixedCollection(Resource resource, List elements, Model underlying) + /** + * Return the element at the given index + * @param index the zero-based index of the element to retrieve + * @return the element + */ + public Object get(int index) { - super(resource, elements, underlying); + return elements.get(index); } - - public boolean isResizable() { return false; } - public boolean isFixedSized() { return true; } } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYProviderSet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYProviderSet.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYProviderSet.java 2005/03/21 21:29:44 1.2 @@ -46,7 +46,7 @@ for (Iterator it = providers.iterator(); it.hasNext();) { MOBYProvider provider = (MOBYProvider) it.next(); - Model underlying = provider.getUnderlying(); + Model underlying = provider.getModel(); merged.add(underlying); merged.setNsPrefixes(underlying.getNsPrefixMap()); } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYSubject.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYSubject.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYSubject.java 2005/03/21 21:29:44 1.2 @@ -15,7 +15,7 @@ * subject of one or more moby:mapsTo properties. The collection of * objects of each of these properties is returned by getDirectMappings(). *

- * As an RDF data structure, this can have one or more elements, each + * As an RDF data structure, it can have one or more elements, each * of which can itself be either a moby:Subject, an RDF data structure, * or both. This collection of elements is returned by getNestedMappings(). */ @@ -36,10 +36,11 @@ } /** - * Return a resizable, unordered collection of the MOBYNode instances, - * which are objects of mapsTo statements, whose subjects are this. + * Return the collection of direct mappings, i.e. moby:mapsTo statements + * whose subject is this. */ - public MOBYUnorderedCollection getDirectMappings() { + public MOBYUnorderedCollection getDirectMappings() + { return directMappings; } } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYDescriptor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYDescriptor.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYDescriptor.java 2005/03/21 21:29:44 1.2 @@ -3,18 +3,20 @@ import com.hp.hpl.jena.rdf.model.*; /** - * The MOBYDescriptor class represents things that are available - * at a URI. + * The MOBYDescriptor class represents things that are also + * represented as a Jena Model */ public abstract class MOBYDescriptor { - protected Model underlying; protected Resource resource; + protected Model model; - public MOBYDescriptor(Resource resource, Model underlying) + public MOBYDescriptor() {} + + public MOBYDescriptor(Resource resource, Model model) { this.resource = resource; - this.underlying = underlying; + this.model = model; } /** @@ -28,9 +30,9 @@ /** * Return the underlying Jena model */ - public Model getUnderlying() + public Model getModel() { - return underlying; + return model; } /** =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYProvider.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYProvider.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYProvider.java 2005/03/21 21:29:44 1.2 @@ -1,7 +1,12 @@ package org.semanticmoby.graph; import java.io.*; + +import org.semanticmoby.tools.Util; +import org.semanticmoby.vocabulary.MOBY; + import com.hp.hpl.jena.rdf.model.*; +import com.hp.hpl.jena.vocabulary.RDF; /** * The Provider class represents a resource that provides a @@ -9,19 +14,76 @@ */ public class MOBYProvider extends MOBYDocument { - private String name; - private String oneLineDescription; - private String moreInfoURI; + /** + * The statement that asserts this provider is a moby:Provider + */ + private Statement providerStmt; + + /** + * The name of the provider; stored in MOBY.name property + */ + private Statement nameStmt; + + /** + * A one line description of the provider; stored in the + * MOBY.oneLineDescription property + */ + private Statement oneLineDescriptionStmt; + + /** + * A URI at which more information can be retrieved about the + * provider; stored in the MOBY.moreInfoURI property + */ + private Statement aboutURIStmt; + + /** + * An unordered collection of operatesOn subgraphs. Each + * subgraph is itself either a MOBYGraph, or a MOBYCollection + */ private MOBYUnorderedCollection operatesOn; - public MOBYProvider(Resource resource, String name, String oneLineDescription, - String moreInfoURI, MOBYUnorderedCollection operatesOn, - Model underlying) + /** + * Constructor for building an instance from scratch (i.e. not one + * being parsed from a model). + */ + public MOBYProvider(String uri, String name, String oneLineDescription, + String aboutURI) + { + // Create a model and resource within the model to represent the + // URI at which the model is located + // + this.model = Util.newJenaModel(); + this.resource = model.createResource(uri); + + // Assert that the provider is a moby:Provider + // + model.add(providerStmt = model.createStatement( + resource, RDF.type, MOBY.Provider)); + + // Save the literal properties by creating the corresponding + // statements and adding them to the model + // + model.add(nameStmt = model.createStatement( + resource, MOBY.name, name)); + + model.add(oneLineDescriptionStmt = model.createStatement( + resource, MOBY.oneLineDescription, oneLineDescription)); + + model.add(aboutURIStmt = model.createStatement( + resource, MOBY.aboutURI, aboutURI)); + } + + public MOBYProvider(Resource resource, + Statement nameStmt, + Statement oneLineDescriptionStmt, + Statement aboutURIStmt, + MOBYUnorderedCollection operatesOn, + Model underlying) { super(resource, underlying); - this.name = name; - this.oneLineDescription = oneLineDescription; - this.moreInfoURI = moreInfoURI; + this.nameStmt = nameStmt; + this.oneLineDescriptionStmt = oneLineDescriptionStmt; + this.aboutURIStmt = aboutURIStmt; this.operatesOn = operatesOn; } @@ -30,7 +92,11 @@ */ public String getName() { - return name; + try { + return nameStmt.getObject().toString(); + } catch (NullPointerException e) { + return ""; + } } /** @@ -38,16 +104,24 @@ */ public String getOneLineDescription() { - return oneLineDescription; + try { + return oneLineDescriptionStmt.getObject().toString(); + } catch (NullPointerException e) { + return ""; + } } /** * Return a URI that can be accessed to obtain more information * about the provider. */ - public String getMoreInfoURI() + public String getAboutURI() { - return moreInfoURI; + try { + return aboutURIStmt.getObject().toString(); + } catch (NullPointerException e) { + return ""; + } } /** @@ -63,11 +137,11 @@ { StringBuffer sb = new StringBuffer(); sb.append("Provider [name=\""); - sb.append(name); + sb.append(getName()); sb.append("\", oneLineDescription=\""); - sb.append(oneLineDescription); - sb.append("\", moreInfoURI="); - sb.append(moreInfoURI); + sb.append(getOneLineDescription()); + sb.append("\", aboutURI="); + sb.append(getAboutURI()); sb.append("\"]"); return sb.toString(); @@ -79,6 +153,11 @@ */ public void serialize(OutputStream out) { - underlying.write(out); + model.write(out); + } + + public void serializeAsN3(OutputStream out) + { + model.write(out, "N3"); } } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYDocument.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYDocument.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYDocument.java 2005/03/21 21:29:44 1.2 @@ -8,8 +8,10 @@ */ public abstract class MOBYDocument extends MOBYDescriptor { - public MOBYDocument(Resource resource, Model underlying) + public MOBYDocument() {} + + public MOBYDocument(Resource resource, Model model) { - super(resource, underlying); + super(resource, model); } } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYOntology.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYOntology.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYOntology.java 2005/03/21 21:29:44 1.2 @@ -8,7 +8,7 @@ */ public class MOBYOntology extends MOBYDocument { - public MOBYOntology(Resource resource, Model underlying) { - super(resource, underlying); + public MOBYOntology(Resource resource, Model model) { + super(resource, model); } } \ No newline at end of file =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYGraphNode.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYGraphNode.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYGraphNode.java 2005/03/21 21:29:44 1.2 @@ -8,9 +8,9 @@ */ public abstract class MOBYGraphNode extends MOBYDescriptor { - public MOBYGraphNode(Resource resource, Model underlying) + public MOBYGraphNode(Resource resource, Model model) { - super(resource, underlying); + super(resource, model); } /** =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYObject.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYObject.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYObject.java 2005/03/21 21:29:44 1.2 @@ -1,5 +1,6 @@ package org.semanticmoby.graph; + import com.hp.hpl.jena.rdf.model.*; /** =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYMappingElement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYMappingElement.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYMappingElement.java 2005/03/21 21:29:44 1.2 @@ -1,5 +1,6 @@ package org.semanticmoby.graph; + import com.hp.hpl.jena.rdf.model.*; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYOrderedCollection.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYOrderedCollection.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYOrderedCollection.java 2005/03/21 21:29:44 1.2 @@ -1,22 +1,58 @@ package org.semanticmoby.graph; import java.util.*; + import com.hp.hpl.jena.rdf.model.*; +/** + * A class representing collections that can be resized (i.e. + * elements added to or removed from), in which the order of + * the elements is defined; corresponds to an RDF Seq + */ public class MOBYOrderedCollection extends MOBYResizableCollection { - public MOBYOrderedCollection(Resource resource, List elements, Model underlying) + /** + * Create an instance with no elements + * @param resource the resource node that represents this collection + * @param underlyingJenaModel the Jena model from which this is stored + */ + public MOBYOrderedCollection(Resource resource, + Model underlyingJenaModel) { - super(resource, elements, underlying); + super(null, resource, underlyingJenaModel); + } + + /** + * Create an instance with the initial list of elements + * @param initialElements the initial elements + * @param resource the resource node that represents this collection + * @param underlyingJenaModel the Jena model from which this is stored + */ + public MOBYOrderedCollection(List initialElements, Resource resource, + Model underlyingJenaModel) + { + super(initialElements, resource, underlyingJenaModel); } - public boolean isOrdered() { return true; } - /** - * Return the object at a given zero-based index. + * Return the element at the given index + * @param index the zero-based index of the element to retrieve + * @return the element */ public Object get(int index) { return elements.get(index); } + + /** + * Add the given element to the collection so that its new + * zero-based index is given index + * @param index the zero-based index at which the new element + * should be added + * @param elementToAdd the element to add + */ + public void add(int index, Object elementToAdd) + { + elements.add(index, elementToAdd); + } } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYUnorderedCollection.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYUnorderedCollection.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYUnorderedCollection.java 2005/03/21 21:29:44 1.2 @@ -2,27 +2,35 @@ import java.util.*; -import org.semanticmoby.graph.*; - -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Resource; +import com.hp.hpl.jena.rdf.model.*; /** - * A class representing resizable collection of objects, in - * which the order of the elements is not defined. + * A class representing collections that can be resized (i.e. + * elements added to or removed from), in which the order of + * the elements is not defined; corresponds to an RDF Bag */ public class MOBYUnorderedCollection extends MOBYResizableCollection { - public MOBYUnorderedCollection(Resource resource, List elements, Model underlying) + /** + * Create an instance with no elements + * @param resource the resource node that represents this collection + * @param underlyingJenaModel the Jena model from which this is stored + */ + public MOBYUnorderedCollection(Resource resource, + Model underlyingJenaModel) { - super(resource, elements, underlying); + super(null, resource, underlyingJenaModel); } - public boolean isOrdered() { return false; } - /** - * Return whether or not the elements of this collection represent - * choices (i.e. elements of an enumeration of possible values). + * Create an instance with the initial list of elements + * @param initialElements the initial elements + * @param resource the resource node that represents this collection + * @param underlyingJenaModel the Jena model from which this is stored */ - public boolean isEnumeration() { return false; } + public MOBYUnorderedCollection(List initialElements, Resource resource, + Model underlyingJenaModel) + { + super(initialElements, resource, underlyingJenaModel); + } } \ No newline at end of file =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYResizableCollection.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYResizableCollection.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYResizableCollection.java 2005/03/21 21:29:44 1.2 @@ -2,10 +2,7 @@ import java.util.*; -import org.semanticmoby.graph.*; - -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Resource; +import com.hp.hpl.jena.rdf.model.*; /** * A class representing collections that can be resized (i.e. @@ -14,16 +11,51 @@ */ public abstract class MOBYResizableCollection extends MOBYCollection { - public MOBYResizableCollection(Resource resource, List elements, Model underlying) + /** + * Create an instance with no elements + * @param resource the resource node that represents this collection + * @param model the Jena model from which this is derived + */ + public MOBYResizableCollection(Resource resource, Model model) { - super(resource, elements, underlying); + super(null, resource, model); } - + /** - * Return whether or not this collection is ordered. + * Create an instance with the initial list of elements + * @param initialElements the initial elements + * @param resource the resource node that represents this collection + * @param underlyingJenaModel the Jena model from which this is stored */ - public abstract boolean isOrdered(); + public MOBYResizableCollection(List initialElements, Resource resource, + Model underlyingJenaModel) + { + super(initialElements, resource, underlyingJenaModel); + } - public boolean isResizable() { return true; } - public boolean isFixedSized() { return false; } + /** + * Add an element to the collection + * @param elementToAdd the element to add to the collection + */ + public void add(Object elementToAdd) + { + elements.add(elementToAdd); + } + + /** + * Remove an element from the collection + * @param elementToRemove the element to remove + */ + public void remove(Object elementToRemove) + { + elements.remove(elementToRemove); + } + + /** + * Remove all the elements from the collection + */ + public void clear() + { + elements.clear(); + } } From gss at pub.open-bio.org Mon Mar 21 16:30:18 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:14:39 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212130.j2LLUIHF008307@pub.open-bio.org> gss Mon Mar 21 16:30:18 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools In directory pub.open-bio.org:/tmp/cvs-serv8280/src/org/semanticmoby/graph/tools Removed Files: package.html MOBYProviderTraverser.java MOBYProviderVisitor.java MOBYProviderXMLGenerator.java MOBYProviderTraversalException.java MOBYProviderVisitorAdapter.java Log Message: Package no longer needed moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools package.html,1.1,NONE MOBYProviderTraverser.java,1.1,NONE MOBYProviderVisitor.java,1.1,NONE MOBYProviderXMLGenerator.java,1.1,NONE MOBYProviderTraversalException.java,1.1,NONE MOBYProviderVisitorAdapter.java,1.1,NONE rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools/RCS/package.html,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools/RCS/MOBYProviderTraverser.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools/RCS/MOBYProviderVisitor.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools/RCS/MOBYProviderXMLGenerator.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools/RCS/MOBYProviderTraversalException.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools/RCS/MOBYProviderVisitorAdapter.java,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:31:14 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:15:23 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212131.j2LLVEDa008358@pub.open-bio.org> gss Mon Mar 21 16:31:14 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core In directory pub.open-bio.org:/tmp/cvs-serv8336 Removed Files: build.xml Log Message: Moved to build subdirectory moby-live/S-MOBY/ref-impl/core build.xml,1.4,NONE rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/RCS/build.xml,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:31:29 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:16:01 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212131.j2LLVTMe008387@pub.open-bio.org> gss Mon Mar 21 16:31:29 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core/build In directory pub.open-bio.org:/tmp/cvs-serv8363/build Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/core/build added to the repository moby-live/S-MOBY/ref-impl/core/build - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/build/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/build/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/build/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:31:31 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:16:01 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212131.j2LLVVTC008421@pub.open-bio.org> gss Mon Mar 21 16:31:31 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core/build In directory pub.open-bio.org:/tmp/cvs-serv8400/build Added Files: build.xml .cvsignore Log Message: New build subdirectory moby-live/S-MOBY/ref-impl/core/build build.xml,NONE,1.1 .cvsignore,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:32:02 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:16:10 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212132.j2LLW2LU008451@pub.open-bio.org> gss Mon Mar 21 16:32:01 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core In directory pub.open-bio.org:/tmp/cvs-serv8426 Modified Files: .cvsignore Log Message: Changed to reflect new build structure moby-live/S-MOBY/ref-impl/core .cvsignore,1.6,1.7 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/.cvsignore 2004/06/14 16:24:12 1.6 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/.cvsignore 2005/03/21 21:32:01 1.7 @@ -1,4 +1,3 @@ -build -smoby.jar +classes .classpath .project From gss at pub.open-bio.org Mon Mar 21 16:32:38 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:17:24 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212132.j2LLWc3v008490@pub.open-bio.org> gss Mon Mar 21 16:32:38 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/parser In directory pub.open-bio.org:/tmp/cvs-serv8465/src/org/semanticmoby/parser Modified Files: Parser.java Log Message: Fixed to use new org.semanticmoby.graph.* signatures moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/parser Parser.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/parser/Parser.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/parser/Parser.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/parser/Parser.java 2005/03/21 21:32:38 1.2 @@ -5,17 +5,16 @@ import java.util.*; import org.semanticmoby.graph.*; -import org.semanticmoby.parser.*; -import org.semanticmoby.tools.ModelRetriever; -import org.semanticmoby.tools.Util; +import org.semanticmoby.tools.*; import org.semanticmoby.vocabulary.*; import com.hp.hpl.jena.rdf.model.*; import com.hp.hpl.jena.vocabulary.*; /** - * This class is used to parse OWL models, stored as Jena2 models, into - * objects that implement interfaces from the org.semanticmoby.graph package. + * This class is used to parse RDF models, stored as Jena2 models, into + * objects that implement interfaces from the org.semanticmoby.graph + * package. */ public class Parser { @@ -186,7 +185,7 @@ // Create and return an unordered collection of the parsed providers // - return new MOBYUnorderedCollection(null, providers, null); + return new MOBYUnorderedCollection(providers, null, null); } /** @@ -199,9 +198,9 @@ // First parse the scalar properties name, oneLineDescription, and aboutURI // - String name = getDataPropertyValue(provider, MOBY.name); - String oneLiner = getDataPropertyValue(provider, MOBY.oneLineDescription); - String aboutURI = getDataPropertyValue(provider, MOBY.aboutURI); + Statement nameStmt = model.getProperty(provider, MOBY.name); + Statement oneLineDescriptionStmt = model.getProperty(provider, MOBY.oneLineDescription); + Statement aboutURIStmt = model.getProperty(provider, MOBY.aboutURI); // A provider can have multiple operatesOn properties, each of // which leads to a subgraph. Parse each of these subgraphs. @@ -219,8 +218,8 @@ // oneLineDescription, aboutURI, and collection of operatesOn subgraphs // return new MOBYProvider( - provider, name, oneLiner, aboutURI, - new MOBYUnorderedCollection(provider, operatesOn, model), + provider, nameStmt, oneLineDescriptionStmt, aboutURIStmt, + new MOBYUnorderedCollection(operatesOn, provider, model), model); } @@ -326,16 +325,16 @@ // Create and return a Subject to describe this hasMapping subgraph // return new MOBYSubject(res, - new MOBYFixedCollection(res, statements, model), - new MOBYUnorderedCollection(res, directMappings, model), + new MOBYFixedCollection(statements, res, model), + new MOBYUnorderedCollection(directMappings, res, model), collectionFor(res, nestedMappings), model); } /** - * Parse the object of a mapsTo statement, which should be a - * Subject, a data structure, or both. If the object is a data + * Parse the object of a mapsTo statement, which should be an + * Object, a data structure, or both. If the object is a data * structure, then each element of the data structure should * be a mapped subgraph. */ @@ -370,7 +369,7 @@ // Model model = res.getModel(); return new MOBYObject(res, - new MOBYFixedCollection(res, statements, model), + new MOBYFixedCollection(statements, res, model), collectionFor(res, nested), model); } @@ -462,12 +461,6 @@ model.contains(p, RDFS.subPropertyOf, MOBY.Property); } - private String getDataPropertyValue(Resource subject, Property property) - { - Statement s = subject.getModel().getProperty(subject, property); - return (s == null) ? null : s.getObject().toString(); - } - private Resource getResourcePropertyValue(Resource subject, Property property) { Statement s = subject.getModel().getProperty(subject, property); @@ -500,13 +493,13 @@ private MOBYCollection collectionFor(Resource res, List elements) { if (isList(res)) { - return new MOBYFixedCollection(res, elements, res.getModel()); + return new MOBYFixedCollection(elements, res, res.getModel()); } else if (isBag(res)) { - return new MOBYUnorderedCollection(res, elements, res.getModel()); + return new MOBYUnorderedCollection(elements, res, res.getModel()); } else if (isSeq(res)) { - return new MOBYOrderedCollection(res, elements, res.getModel()); + return new MOBYOrderedCollection(elements, res, res.getModel()); } else if (isAlt(res)) { - return new MOBYEnumeration(res, elements, res.getModel()); + return new MOBYEnumeration(elements, res, res.getModel()); } else { return null; } From gss at pub.open-bio.org Mon Mar 21 16:33:19 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:19:30 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXJJV008537@pub.open-bio.org> gss Mon Mar 21 16:33:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/WebRoot Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:33:24 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:19:31 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXOdN008750@pub.open-bio.org> gss Mon Mar 21 16:33:24 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting In directory pub.open-bio.org:/tmp/cvs-serv8729/archive/WebRoot/meeting Added Files: missing-fields.jsp registration-confirmation.jsp registration-form.html lodging.html index.html shuttles.html Log Message: Archived a few things moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting missing-fields.jsp,NONE,1.1 registration-confirmation.jsp,NONE,1.1 registration-form.html,NONE,1.1 lodging.html,NONE,1.1 index.html,NONE,1.1 shuttles.html,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:33:20 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:19:33 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXK26008637@pub.open-bio.org> gss Mon Mar 21 16:33:20 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/src/org/semanticmoby Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:33:24 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:19:33 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXOON008796@pub.open-bio.org> gss Mon Mar 21 16:33:24 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images In directory pub.open-bio.org:/tmp/cvs-serv8729/archive/WebRoot/meeting/images Added Files: moby.png ncgr.png Log Message: Archived a few things moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images moby.png,NONE,1.1 ncgr.png,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:33:24 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:19:34 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXOMM008765@pub.open-bio.org> gss Mon Mar 21 16:33:24 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools In directory pub.open-bio.org:/tmp/cvs-serv8729/archive/src/org/semanticmoby/graph/tools Added Files: MOBYProviderTraversalException.java MOBYProviderVisitor.java package.html MOBYProviderTraverser.java MOBYProviderVisitorAdapter.java MOBYProviderXMLGenerator.java Log Message: Archived a few things moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools MOBYProviderTraversalException.java,NONE,1.1 MOBYProviderVisitor.java,NONE,1.1 package.html,NONE,1.1 MOBYProviderTraverser.java,NONE,1.1 MOBYProviderVisitorAdapter.java,NONE,1.1 MOBYProviderXMLGenerator.java,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:33:24 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:19:34 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXORn008814@pub.open-bio.org> gss Mon Mar 21 16:33:24 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot In directory pub.open-bio.org:/tmp/cvs-serv8729/archive/WebRoot Added Files: index.html Log Message: Archived a few things moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot index.html,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:33:20 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:19:35 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXK2b008596@pub.open-bio.org> gss Mon Mar 21 16:33:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/src Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:33:20 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:19:36 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXKBQ008617@pub.open-bio.org> gss Mon Mar 21 16:33:20 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/src/org Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:33:24 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:19:37 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXOGc008781@pub.open-bio.org> gss Mon Mar 21 16:33:24 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting In directory pub.open-bio.org:/tmp/cvs-serv8729/archive/src/org/semanticmoby/meeting Added Files: MeetingRegistrationServlet.java Log Message: Archived a few things moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting MeetingRegistrationServlet.java,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:33:20 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:19:41 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXKWA008659@pub.open-bio.org> gss Mon Mar 21 16:33:20 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/src/org/semanticmoby/graph Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:33:19 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:21:33 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXJFL008519@pub.open-bio.org> gss Mon Mar 21 16:33:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive In directory pub.open-bio.org:/tmp/cvs-serv8495/archive Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:33:19 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:21:33 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXJqj008555@pub.open-bio.org> gss Mon Mar 21 16:33:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/WebRoot/meeting Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:33:20 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:21:35 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXKGC008575@pub.open-bio.org> gss Mon Mar 21 16:33:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/WebRoot/meeting/images Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:33:20 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:21:36 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXKHf008682@pub.open-bio.org> gss Mon Mar 21 16:33:20 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/src/org/semanticmoby/graph/tools Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:33:20 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:21:36 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXKmu008700@pub.open-bio.org> gss Mon Mar 21 16:33:20 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/src/org/semanticmoby/meeting Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:39:19 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:23:23 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212139.j2LLdJes008975@pub.open-bio.org> gss Mon Mar 21 16:39:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources In directory pub.open-bio.org:/tmp/cvs-serv8951/resources Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/resources - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:39:19 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:23:23 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212139.j2LLdJp1008994@pub.open-bio.org> gss Mon Mar 21 16:39:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop Files In directory pub.open-bio.org:/tmp/cvs-serv8951/resources/Photoshop Files Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop Files added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop Files - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop/RCS/Files,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:39:26 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:23:28 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212139.j2LLdQko009055@pub.open-bio.org> gss Mon Mar 21 16:39:26 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources In directory pub.open-bio.org:/tmp/cvs-serv9018/resources Added Files: moby_keyword.sql web.xml Log Message: Initial version moby-live/S-MOBY/ref-impl/semanticmoby.org/resources moby_keyword.sql,NONE,1.1 web.xml,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:39:26 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:23:29 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212139.j2LLdQsv009040@pub.open-bio.org> gss Mon Mar 21 16:39:25 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop Files In directory pub.open-bio.org:/tmp/cvs-serv9018/resources/Photoshop Files Added Files: smoby-medium.psd ncgr-logo.psd rdf-logo.png smoby-small.psd rdf-logo.psd nsf-logo.psd search.psd Log Message: Initial version moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop Files smoby-medium.psd,NONE,1.1 ncgr-logo.psd,NONE,1.1 rdf-logo.png,NONE,1.1 smoby-small.psd,NONE,1.1 rdf-logo.psd,NONE,1.1 nsf-logo.psd,NONE,1.1 search.psd,NONE,1.1 rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop/RCS/Files,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:39:58 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:24:02 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212139.j2LLdwfp009087@pub.open-bio.org> gss Mon Mar 21 16:39:58 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build In directory pub.open-bio.org:/tmp/cvs-serv9063/build Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/build - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:40:00 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:24:03 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212140.j2LLe0Sx009126@pub.open-bio.org> gss Mon Mar 21 16:40:00 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build In directory pub.open-bio.org:/tmp/cvs-serv9105/build Added Files: build.xml .cvsignore Log Message: Initial version moby-live/S-MOBY/ref-impl/semanticmoby.org/build build.xml,NONE,1.1 .cvsignore,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:40:31 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:24:35 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212140.j2LLeVr9009172@pub.open-bio.org> gss Mon Mar 21 16:40:31 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org In directory pub.open-bio.org:/tmp/cvs-serv9139 Modified Files: .classpath .project .mymetadata Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org .classpath,1.3,1.4 .project,1.2,1.3 .mymetadata,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.classpath,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.classpath 2004/11/23 00:20:01 1.3 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.classpath 2005/03/21 21:40:30 1.4 @@ -2,11 +2,11 @@ - + - + @@ -15,8 +15,7 @@ - - + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.project,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/.project 2004/11/04 22:31:36 1.2 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.project 2005/03/21 21:40:30 1.3 @@ -1,6 +1,6 @@ - www.semanticmoby.org + semanticmoby.org @@ -26,22 +26,17 @@ - de.bb.bje.eclipse.IncrementalJspBuilder - - - - - com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder + com.ibm.etools.validation.validationbuilder - com.ibm.etools.validation.validationbuilder + com.ibm.sse.model.structuredbuilder - com.ibm.sse.model.structuredbuilder + com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.mymetadata,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.mymetadata 2004/11/04 22:31:36 1.3 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.mymetadata 2005/03/21 21:40:30 1.4 @@ -1,11 +1,11 @@ + j2ee-spec="1.4" + archive="semanticmoby.org.war"> From gss at pub.open-bio.org Mon Mar 21 16:41:58 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:26:00 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212141.j2LLfw0I009218@pub.open-bio.org> gss Mon Mar 21 16:41:58 EST 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-serv9194/WebRoot/examples/proxies Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:42:01 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:26:09 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg19i009260@pub.open-bio.org> gss Mon Mar 21 16:42:01 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/images In directory pub.open-bio.org:/tmp/cvs-serv9239/WebRoot/images Added Files: search.gif rdf-logo.gif smoby-small.gif cshl-logo.gif help1.gif nsf-logo.gif smoby-medium.gif ncgr-logo.gif pinstripe.gif Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/images search.gif,NONE,1.1 rdf-logo.gif,NONE,1.1 smoby-small.gif,NONE,1.1 cshl-logo.gif,NONE,1.1 help1.gif,NONE,1.1 nsf-logo.gif,NONE,1.1 smoby-medium.gif,NONE,1.1 ncgr-logo.gif,NONE,1.1 pinstripe.gif,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:42:01 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:26:13 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg1ao009300@pub.open-bio.org> gss Mon Mar 21 16:42:01 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools In directory pub.open-bio.org:/tmp/cvs-serv9239/src/org/semanticmoby/ref/tools Modified Files: KeywordFinder.java MOBYProperties.java DiscoveryQuery.java InvocationBroker.java URIInvestigator.java KeywordQuery.java Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools KeywordFinder.java,1.1,1.2 MOBYProperties.java,1.1,1.2 DiscoveryQuery.java,1.1,1.2 InvocationBroker.java,1.1,1.2 URIInvestigator.java,1.1,1.2 KeywordQuery.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/KeywordFinder.java,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/src/org/semanticmoby/ref/tools/KeywordFinder.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/KeywordFinder.java 2005/03/21 21:42:01 1.2 @@ -7,9 +7,7 @@ import java.util.*; import com.hp.hpl.jena.rdf.model.*; import com.hp.hpl.jena.shared.*; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import com.hp.hpl.jena.vocabulary.*; public class KeywordFinder { =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/MOBYProperties.java,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/src/org/semanticmoby/ref/tools/MOBYProperties.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/MOBYProperties.java 2005/03/21 21:42:01 1.2 @@ -5,7 +5,6 @@ import javax.servlet.ServletContext; - /** * This abstract class contains a set of static methods for retrieving * properties that are stored in the S-MOBY properties file. @@ -13,10 +12,9 @@ public abstract class MOBYProperties { /** - * The name of the S-MOBY properties file. The file itself should - * exist in some directory in the Java class path. + * The path to the S-MOBY properties file. */ - private static String PROP_FILE_NAME = "smoby.properties"; + private static String PROP_FILE_NAME = "/WEB-INF/smoby.properties"; /** * A static Properties object for accessing the properties file. @@ -67,12 +65,12 @@ if (props == null) // Only try to read it once { props = new Properties(); - InputStream is = context.getResourceAsStream(PROP_FILE_NAME); - if (is == null) { + String path = context.getRealPath(PROP_FILE_NAME); + if (path == null) { throw new FileNotFoundException( "Properties file \"" + PROP_FILE_NAME + "\" not found"); } - props.load(is); + props.load(new FileInputStream(path)); } } } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/DiscoveryQuery.java,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/src/org/semanticmoby/ref/tools/DiscoveryQuery.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/DiscoveryQuery.java 2005/03/21 21:42:01 1.2 @@ -110,7 +110,7 @@ Model dbModel = null; try { - Model queryModel = ((MOBYProvider) queryProvider).getUnderlying(); + Model queryModel = ((MOBYProvider) queryProvider).getModel(); String queryString = buildQueryString(queryModel); StorageManager manager = new StorageManager(); dbModel = manager.openDBModel(); =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/InvocationBroker.java,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/src/org/semanticmoby/ref/tools/InvocationBroker.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/InvocationBroker.java 2005/03/21 21:42:01 1.2 @@ -7,7 +7,6 @@ import javax.servlet.http.*; import org.apache.commons.httpclient.*; import org.semanticmoby.graph.*; -import org.semanticmoby.graph.tools.*; import org.semanticmoby.http.*; import org.semanticmoby.parser.*; import org.semanticmoby.vocabulary.MOBY; @@ -59,14 +58,14 @@ private String rdfxmlString(MOBYProvider provider) { StringWriter writer = new StringWriter(); - provider.getUnderlying().write(writer); + provider.getModel().write(writer); return writer.toString(); } private String n3String(MOBYProvider provider) { StringWriter writer = new StringWriter(); - provider.getUnderlying().write(writer, "N3"); + provider.getModel().write(writer, "N3"); return writer.toString(); } @@ -247,7 +246,7 @@ private String getInputURI(MOBYProvider provider) { try { - Model model = provider.getUnderlying(); + Model model = provider.getModel(); Statement stmt = model.listStatements( provider.getResource(), MOBY.inputURI, (String) null).nextStatement(); @@ -260,7 +259,7 @@ private String getOutputURI(MOBYProvider provider) { try { - Model model = provider.getUnderlying(); + Model model = provider.getModel(); Statement stmt = model.listStatements( provider.getResource(), MOBY.outputURI, (String) null).nextStatement(); @@ -295,26 +294,6 @@ private boolean requiresInputs(MOBYProvider provider) { - MOBYProviderTraverser traverser = new MOBYProviderTraverser(); - try { - traverser.traverse(provider, - new MOBYProviderVisitorAdapter(){ - public void visitSubjectPropValStmtEnd( - MOBYPropertyValueStatement stmt) - throws MOBYProviderTraversalException - { - if (stmt.getValue().isResource()) { - MOBYResource res = (MOBYResource) stmt.getValue(); - if (res.isBlank()) { - throw new MOBYProviderTraversalException(); - } - } - } - }, - true); - } catch (MOBYProviderTraversalException e) { - return true; - } - return false; + return getInputURI(provider) != null; } } \ No newline at end of file =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/URIInvestigator.java,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/src/org/semanticmoby/ref/tools/URIInvestigator.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/URIInvestigator.java 2005/03/21 21:42:01 1.2 @@ -247,7 +247,9 @@ Parser parser = Parser.forInputStream(in, Parser.LANGUAGE_RDF_XML); provider = parser.parseProvider(); } - catch (Throwable t) {} + catch (Throwable t) { + System.err.println("Parse error: " + t); + } // De-register the provider, printing a removal message if // a provider couldn't be parsed =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/KeywordQuery.java,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/src/org/semanticmoby/ref/tools/KeywordQuery.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/KeywordQuery.java 2005/03/21 21:42:01 1.2 @@ -26,6 +26,7 @@ } public List findMatchingProviders() + throws Exception { List matching = new ArrayList(); @@ -53,10 +54,12 @@ catch (StorageException e) { System.err.println(e); + throw e; } catch (SQLException e) { System.err.println(e); + throw e; } return matching; From gss at pub.open-bio.org Mon Mar 21 16:42:02 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:26:14 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg2iw009371@pub.open-bio.org> gss Mon Mar 21 16:42:02 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/db In directory pub.open-bio.org:/tmp/cvs-serv9239/src/org/semanticmoby/ref/tools/db Modified Files: StorageManager.java Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/db StorageManager.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/db/StorageManager.java,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/src/org/semanticmoby/ref/tools/db/StorageManager.java 2004/11/22 22:58:41 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/db/StorageManager.java 2005/03/21 21:42:02 1.2 @@ -59,7 +59,7 @@ public void registerProvider(MOBYProvider provider, Date lastModifiedDate) throws StorageException { - Model model = ((MOBYProvider) provider).getUnderlying(); + Model model = ((MOBYProvider) provider).getModel(); Model dbModel = null; String uriString = provider.getResource().getURI(); Resource uri = model.createResource(uriString); From gss at pub.open-bio.org Mon Mar 21 16:42:02 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:26:16 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg2NM009349@pub.open-bio.org> gss Mon Mar 21 16:42:02 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot In directory pub.open-bio.org:/tmp/cvs-serv9239/WebRoot Modified Files: index.html help.html Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot index.html,1.5,1.6 help.html,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/index.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/index.html 2004/11/23 00:20:02 1.5 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/index.html 2005/03/21 21:42:01 1.6 @@ -3,118 +3,71 @@ Semantic MOBY - -

-

Semantic MOBY

-
-
- - -
- - - - -
- MOBY Autumn 2004 Meeting -
- November 20-21 — Santa Fe, New Mexico -
- Register Now! -
-
-

+
-
- -
-
+ 


- - - - - + + + - - -
ProviderSubjectObject + Service Provider transforms … + … from Subject + … to Object
-
-
- -
Type any terms into the boxes above and -press Search
-(for example type 'hello' (without quotes) into the Provider field,
-or to see all providers, type just an asterisk (*) into the
-Provider field and leave the other fields blank)
+ +
+ + +
+
+To find and engage services on the web, type any terms into the above +boxes and press the Search button. +
+
+ +Example: type "panel" in the Subject field and press Search to discover +the CSHL HapMap service. +
-
-
- -

-About Semantic MOBY   Help on Searching
+About Semantic MOBY   +Help on Searching +
+ +Developers: see the JavaDoc for the Semantic MOBY API!

-
-
-
- - + href="http://www.cshl.edu" target="_blank">CSHL - + href="http://www.ncgr.org" target="_blank">NCGR + href="http://www.nsf.gov" target="_blank">NSF - - - - - - -
CSHL NCGR NSF
CSHLNCGRNSF
- -

-
-
+
=================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/help.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/help.html 2004/07/21 22:35:25 1.3 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/help.html 2005/03/21 21:42:01 1.4 @@ -3,43 +3,44 @@ Semantic MOBY Search Help
+

-Semantic -MOBY Search Help

+ Semantic MOBY maintains a searchable repository of descriptions of -providers of services that are available on the web. At the heart -of these descriptions is the notion that providers map one type +Service Providers that are available on the web. At the heart +of these descriptions is the notion that providers transform one type of thing (the Subject) to another (the Object), or vice versa.

-Providers, as well as subjects and objects, are -classified using web-accessible definitions (ontologies), and these definitions +Providers, as well as subjects and objects, are classified using +web-accessible definitions (ontologies), and these definitions have keywords associated with them. For example, the following shows -a query for providers whose definitions include the keyword "hello": +a query for providers whose subjects are members of any class that +has the keyword "panel" associated with it:

-. +.

Search hints
    -
  • Keywords are not case sensitive, so HELLO means the -same thing as hello as does HeLlO. +
  • Keywords are not case sensitive, so PANEL means the +same thing as panel as does PaNeL.

  • The wildcard character (*) can be used at the end of a keyword to match keywords that start with the characters before the wildcard. -For example, he* will match hello as well -as help. +For example, pan* will match panel as well +as panini.

  • Multiple words enclosed in double quotes are considered to be a single keyword. For example, the quoted string "gene symbol" -is considered to be a single keyword composed of 11 characters, including a space. -The wildcard character is interpreted literally (i.e. as the '*' -character) if it appears within a quoted string. +is considered to be a single keyword composed of 11 characters, including +a space. The wildcard character is interpreted literally (i.e. as the +'*' character) if it appears within a quoted string.

  • Multiple keywords may be typed in one of the fields; this means to search for any of the keywords in that field. For example, @@ -50,7 +51,9 @@ match keywords for all the fields will match. For example, typing fat sugar into the Subject field, and "weight gain" into the Object field will search for -providers that map either fat or sugar to weight gain. +providers that map either fat or sugar to weight gain.

+
+ From gss at pub.open-bio.org Mon Mar 21 16:42:02 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:26:16 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg2tY009326@pub.open-bio.org> gss Mon Mar 21 16:42:01 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/WEB-INF In directory pub.open-bio.org:/tmp/cvs-serv9239/WebRoot/WEB-INF Modified Files: .cvsignore web.xml Added Files: log4j.properties smoby.example.properties Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/WEB-INF log4j.properties,NONE,1.1 smoby.example.properties,NONE,1.1 .cvsignore,1.1,1.2 web.xml,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/WEB-INF/.cvsignore,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/WEB-INF/.cvsignore 2004/07/15 20:27:14 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/WEB-INF/.cvsignore 2005/03/21 21:42:01 1.2 @@ -1 +1,2 @@ classes +smoby.properties =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/WEB-INF/web.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/WEB-INF/web.xml 2004/11/04 22:32:05 1.3 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/WEB-INF/web.xml 2005/03/21 21:42:01 1.4 @@ -6,84 +6,77 @@ ProviderInvestigationServlet investigate Provider investigation servlet - org.smoby.ref.servlets.ProviderInvestigationServlet + org.semanticmoby.ref.servlets.ProviderInvestigationServlet DiscoveryServlet find-providers Discovery servlet - org.smoby.ref.servlets.DiscoveryServlet + org.semanticmoby.ref.servlets.DiscoveryServlet KeywordSearchServlet keyword-search Keyword search servlet - org.smoby.ref.servlets.KeywordSearchServlet + org.semanticmoby.ref.servlets.KeywordSearchServlet ProviderEngagementServlet engage-provider Keyword search servlet - org.smoby.ref.servlets.ProviderEngagementServlet + org.semanticmoby.ref.servlets.ProviderEngagementServlet ResultsDisplayServlet display-results Results display servlet - org.smoby.ref.servlets.ResultsDisplayServlet + org.semanticmoby.ref.servlets.ResultsDisplayServlet HelloWorldServlet hello-world Hello World simple application - org.smoby.ref.servlets.example.HelloWorldServlet + org.semanticmoby.ref.servlets.example.HelloWorldServlet HelloWorldDisplayServlet hello-world-display Servlet to display results of invocation of hello-world application - org.smoby.ref.servlets.example.HelloWorldDisplayServlet + org.semanticmoby.ref.servlets.example.HelloWorldDisplayServlet GraphConversionServlet Graph Converter Convert between N-Triples and RDF/XML - org.smoby.ref.servlets.dev.GraphConversionServlet + org.semanticmoby.ref.servlets.dev.GraphConversionServlet RepositoryPrintServlet print-repository Print the contents of the metadata repository - org.smoby.ref.servlets.dev.RepositoryPrintServlet + org.semanticmoby.ref.servlets.dev.RepositoryPrintServlet OWLValidationServlet validate-owl-graph Validate that a graph is a valid OWL graph - org.smoby.ref.servlets.dev.OWLValidationServlet + org.semanticmoby.ref.servlets.dev.OWLValidationServlet MOBYGraphValidationServlet validate-canonical-graph Validate that a graph is in MOBY canonical form - org.smoby.ref.servlets.dev.MOBYGraphValidationServlet - - - - MeetingRegistrationServlet - Meeting Registration Servlet - Respond to registration form submission - org.smoby.meeting.MeetingRegistrationServlet + org.semanticmoby.ref.servlets.dev.MOBYGraphValidationServlet @@ -143,9 +136,4 @@ /dev/validate-canonical-graph - - MeetingRegistrationServlet - /meeting/register - - From gss at pub.open-bio.org Mon Mar 21 16:42:02 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:26:20 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg2FR009406@pub.open-bio.org> gss Mon Mar 21 16:42:02 EST 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-serv9239/WebRoot/examples/ontologies Added Files: ProxyProvider ProxyProvider.n3 Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/ontologies ProxyProvider,NONE,1.1 ProxyProvider.n3,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:42:02 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:26:21 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg2jx009389@pub.open-bio.org> gss Mon Mar 21 16:42:02 EST 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-serv9239/WebRoot/examples/proxies Added Files: ncbi-megablast.n3 pubmed.n3 pubmed ncbi-megablast Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies ncbi-megablast.n3,NONE,1.1 pubmed.n3,NONE,1.1 pubmed,NONE,1.1 ncbi-megablast,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:42:02 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon Mar 21 16:26:23 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg2YS009434@pub.open-bio.org> gss Mon Mar 21 16:42:02 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets In directory pub.open-bio.org:/tmp/cvs-serv9239/src/org/semanticmoby/ref/servlets Modified Files: BaseServlet.java KeywordSearchServlet.java Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets BaseServlet.java,1.1,1.2 KeywordSearchServlet.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/BaseServlet.java,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/src/org/semanticmoby/ref/servlets/BaseServlet.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/BaseServlet.java 2005/03/21 21:42:02 1.2 @@ -43,7 +43,7 @@ { if (! log4jInitialized) { - String path = ctx.getRealPath("/") + "log4j.properties"; + String path = ctx.getRealPath("/WEB-INF/log4j.properties"); PropertyConfigurator.configure(path); log4jInitialized = true; } @@ -67,17 +67,9 @@ out.print(title); out.println(""); out.println(""); - out.println("
"); - out.println("

"); - out.println(""); - out.println("Semantic"); - out.println("M" + - "OBY" + - ""); - out.println(""); - out.println("

"); - out.println("
"); - out.println(""); + out.println(""); + out.println(""); + out.println("

"); out.println(""); } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/KeywordSearchServlet.java,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/src/org/semanticmoby/ref/servlets/KeywordSearchServlet.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/KeywordSearchServlet.java 2005/03/21 21:42:02 1.2 @@ -43,20 +43,48 @@ if ((provider.isEmpty()) && (accepts.isEmpty()) && (returns.isEmpty())) { showResultCount(-1, out); + out.println(""); + out.println("Show All Providers"); } else { KeywordQuery q = new KeywordQuery(provider, accepts, returns); - List matching = q.findMatchingProviders(); - - showResultCount(matching.size(), out); - - for (Iterator it = matching.iterator(); it.hasNext();) - { - MOBYProvider p = (MOBYProvider) it.next(); - showProvider(p, out); - } + try + { + List matching = q.findMatchingProviders(); + + showResultCount(matching.size(), out); + + if (matching.size() > 0) + { + for (Iterator it = matching.iterator(); it.hasNext();) + { + MOBYProvider p = (MOBYProvider) it.next(); + showProvider(p, out); + } + } + else + { + // Show a link that displays all providers. This is only + // temporary, to keep searchers from getting discouraged. + // When there are more providers defined, showing them all + // won't make sense. + // + out.println(""); + out.println("Show All Providers"); + } + } + catch (Exception e) + { + // Something went wrong; let the user know + // + out.println(""); + out.println("A server error occurred - please contact"); + out.println("MOBY support"); + out.println("to report the error. Thank you!"); + out.println(""); + } } finishHTML(out); } @@ -116,22 +144,23 @@ { // A negative count indicates that no keywords were given. // - out.println("No keywords were entered, so no search was performed."); + out.println("No keywords were entered, so no search was performed. "); + out.println("To see all registered providers,
click the link below:"); } else if (count == 0) { // Indicate that no matching providers were found, and // give the user feedback as to why this might be expected. // - out.println("No matching providers were found. Note that"); - out.println("very few providers have yet been defined."); + out.println("No matching providers were found. To see all"); + out.println("registered providers, click the link below:"); } else { // Show how many providers were found // out.println(count + " matching provider" + - (count > 1 ? "s" : "") + " found"); + (count > 1 ? "s were" : " was") + " found:"); } out.println(""); out.println(""); @@ -147,7 +176,7 @@ String uri = provider.getResource().getURI(); String name = provider.getName(); String description = provider.getOneLineDescription(); - String moreInfo = provider.getMoreInfoURI(); + String moreInfo = provider.getAboutURI(); // Display a link to the Semantic MOBY engage-provider service // @@ -175,7 +204,7 @@ out.print(""); - out.print("\"View"); + out.print("\"View"); out.print(""); out.println("
"); From nopushneva at pub.open-bio.org Tue Mar 22 14:39:56 2005 From: nopushneva at pub.open-bio.org (Nina Opushneva) Date: Tue Mar 22 14:24:28 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503221939.j2MJduoB013744@pub.open-bio.org> nopushneva Tue Mar 22 14:39:56 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv13718 Modified Files: Central.pm Log Message: add a parameter for calling the rdfagent by mobycentral.config file moby-live/Perl/MOBY Central.pm,1.150,1.151 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- /home/repository/moby/moby-live/Perl/MOBY/Central.pm 2005/03/16 19:14:14 1.150 +++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm 2005/03/22 19:39:55 1.151 @@ -1247,8 +1247,11 @@ } if ($ch == 0){ - my $rez = system("/export/home/nina/rdfagent/run-RDFagent ".$signatureURL); - + + use MOBY::Config; + my $conf = MOBY::Config -> new(); + my $path = $conf->{mobycentral}->{rdfagent} ; + my $rez = system($path." ".$signatureURL); return &_error("The RDFagent call was successful. Report will send to you by E-mail","") if ($rez == 0); return &_error("Some problem with a connection or RDF model building","") if ($rez != 0); } From nopushneva at pub.open-bio.org Tue Mar 22 14:45:43 2005 From: nopushneva at pub.open-bio.org (Nina Opushneva) Date: Tue Mar 22 14:29:53 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503221945.j2MJjhuP013800@pub.open-bio.org> nopushneva Tue Mar 22 14:45:43 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Client In directory pub.open-bio.org:/tmp/cvs-serv13774 Modified Files: Central.pm Log Message: some changes in the check parameters procedure for the rdfagent moby-live/Perl/MOBY/Client Central.pm,1.93,1.94 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/03/16 20:05:46 1.93 +++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/03/22 19:45:43 1.94 @@ -780,7 +780,7 @@ $Category ||= ""; #____________call RDFagent__________________________________________________ -if (defined $signatureURL){ +if ($signatureURL ne ""){ my $ch = 0; my $sign_req; foreach $sign_req ($name, $type, $authURI, $email, $URL, $desc, $Category){ @@ -791,19 +791,19 @@ } if ($ch == 0){ print "call Agent\n"; - my $message = " - - - - - - $signatureURL - - - - "; - my ( $return ) = $self->_call( 'default', 'registerService', $message ); - return ( $self->parseRegXML( $return ) ); + my $message = " + + + + + + $signatureURL + + + + "; + my ( $return ) = $self->_call( 'default', 'registerService', $message ); + return ( $self->parseRegXML( $return ) ); } } From gss at pub.open-bio.org Tue Mar 22 17:35:08 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Tue Mar 22 17:19:31 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503222235.j2MMZ8uH014250@pub.open-bio.org> gss Tue Mar 22 17:35:08 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/images In directory pub.open-bio.org:/tmp/cvs-serv14227/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/images Removed Files: moby.png ncgr.png Log Message: moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/images moby.png,1.1,NONE ncgr.png,1.1,NONE rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/images/RCS/moby.png,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/images/RCS/ncgr.png,v: No such file or directory From gss at pub.open-bio.org Tue Mar 22 17:35:08 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Tue Mar 22 17:20:09 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503222235.j2MMZ8BO014272@pub.open-bio.org> gss Tue Mar 22 17:35:08 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting In directory pub.open-bio.org:/tmp/cvs-serv14227/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting Removed Files: index.html lodging.html missing-fields.jsp registration-confirmation.jsp registration-form.html shuttles.html Log Message: moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting index.html,1.2,NONE lodging.html,1.2,NONE missing-fields.jsp,1.1,NONE registration-confirmation.jsp,1.1,NONE registration-form.html,1.2,NONE shuttles.html,1.1,NONE rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/RCS/index.html,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/RCS/lodging.html,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/RCS/missing-fields.jsp,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/RCS/registration-confirmation.jsp,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/RCS/registration-form.html,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/RCS/shuttles.html,v: No such file or directory From gss at pub.open-bio.org Wed Mar 23 14:55:19 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Wed Mar 23 14:39:32 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503231955.j2NJtJOG017635@pub.open-bio.org> gss Wed Mar 23 14:55:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources In directory pub.open-bio.org:/tmp/cvs-serv17613/resources Removed Files: web.xml Log Message: Moved back to WebRoot/WEB-INF directory moby-live/S-MOBY/ref-impl/semanticmoby.org/resources web.xml,1.1,NONE rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/RCS/web.xml,v: No such file or directory From gss at pub.open-bio.org Wed Mar 23 14:56:12 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Wed Mar 23 14:40:04 2005 Subject: [MOBY-guts] biomoby commit Message-ID: <200503231956.j2NJuCPA017685@pub.open-bio.org> gss Wed Mar 23 14:56:12 EST 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-serv17664/WebRoot/examples/proxies Added Files: tair-seqviewer.n3 flybase-genesearch wormbase-query tair-seqviewer tair-mapviewer.n3 tair-mapviewer sgd-quicksearch gramene-query.n3 sgd-quicksearch.n3 gramene-query wormbase-query.n3 flybase-genequery.n3 Log Message: New wrapped providers moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies tair-seqviewer.n3,NONE,1.1 flybase-genesearch,NONE,1.1 wormbase-query,NONE,1.1 tair-seqviewer,NONE,1.1 tair-mapviewer.n3,NONE,1.1 tair-mapviewer,NONE,1.1 sgd-quicksearch,NONE,1.1 gramene-query.n3,NONE,1.1 sgd-quicksearch.n3,NONE,1.1 gramene-query,NONE,1.1 wormbase-query.n3,NONE,1.1 flybase-genequery.n3,NONE,1.1 From senger at pub.open-bio.org Thu Mar 3 18:18:36 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 3 Mar 2005 18:18:36 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503032318.j23NIaRt005907@pub.open-bio.org> senger Thu Mar 3 18:18:36 EST 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/gui/serviceInstanceCreationTool In directory pub.open-bio.org:/tmp/cvs-serv5850/src/main/org/biomoby/client/gui/serviceInstanceCreationTool Modified Files: ServiceCreationTool.java Log Message: moby-live/Java/src/main/org/biomoby/client/gui/serviceInstanceCreationTool ServiceCreationTool.java,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/gui/serviceInstanceCreationTool/ServiceCreationTool.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/gui/serviceInstanceCreationTool/ServiceCreationTool.java 2004/11/17 17:15:26 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/gui/serviceInstanceCreationTool/ServiceCreationTool.java 2005/03/03 23:18:36 1.3 @@ -30,7 +30,7 @@ public class ServiceCreationTool extends JApplet { // set to false if creating a java application - private final boolean isApplet = true; + private static final boolean isApplet = true; private String newline = System.getProperty("line.separator"); /* private member variables */ From senger at pub.open-bio.org Thu Mar 3 18:18:36 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 3 Mar 2005 18:18:36 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503032318.j23NIaVe005887@pub.open-bio.org> senger Thu Mar 3 18:18:36 EST 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client In directory pub.open-bio.org:/tmp/cvs-serv5850/src/main/org/biomoby/client Modified Files: ServicesEdge.java Log Message: moby-live/Java/src/main/org/biomoby/client ServicesEdge.java,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ServicesEdge.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/ServicesEdge.java 2004/10/18 14:35:06 1.3 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ServicesEdge.java 2005/03/03 23:18:35 1.4 @@ -31,7 +31,7 @@ // types of connections - private final int MIN_CONNECTION_TYPE = 0; + private static final int MIN_CONNECTION_TYPE = 0; /** Indicates that there is no information how the services are connected. */ public static final int NO_CONNECTION = 0; @@ -40,7 +40,7 @@ public static final int TAIL_COLLECTION_CONNECTION = 3; public static final int BOTH_COLLECTIONS_CONNECTION = 4; public static final int NO_OUTPUT = 5; - private final int MAX_CONNECTION_TYPE = 5; + private static final int MAX_CONNECTION_TYPE = 5; /** A divider used in {@link #getConnector connectors} to separate * namespace and data type name. */ From senger at pub.open-bio.org Thu Mar 3 18:18:36 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 3 Mar 2005 18:18:36 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503032318.j23NIaOP005869@pub.open-bio.org> senger Thu Mar 3 18:18:35 EST 2005 Update of /home/repository/moby/moby-live/Java In directory pub.open-bio.org:/tmp/cvs-serv5850 Modified Files: build.xml Log Message: moby-live/Java build.xml,1.10,1.11 =================================================================== RCS file: /home/repository/moby/moby-live/Java/build.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- /home/repository/moby/moby-live/Java/build.xml 2004/12/05 22:28:01 1.10 +++ /home/repository/moby/moby-live/Java/build.xml 2005/03/03 23:18:35 1.11 @@ -355,9 +355,9 @@ public="true"> -
Generated: ${TODAY_LONG}]]>
- - Submit a bug or feature
+
Generated: ${TODAY_LONG}]]>
+ + Submit a bug or feature
Generated: ${TODAY_LONG}]]>
From mwilkinson at pub.open-bio.org Mon Mar 7 23:44:12 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Mon, 7 Mar 2005 23:44:12 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503080444.j284iC0C030405@pub.open-bio.org> mwilkinson Mon Mar 7 23:44:12 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv30386 Modified Files: CommonSubs.pm Log Message: fixed error reported by Pieter. Thanks. moby-live/Perl/MOBY CommonSubs.pm,1.59,1.60 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/02/08 16:49:15 1.59 +++ /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/08 04:44:12 1.60 @@ -1280,7 +1280,7 @@ my $valuenode = $valuenodes->get_node( $_ ); foreach my $amount ( $valuenode->childNodes ) { next unless $amount->nodeType == TEXT_NODE; - $resp .= $amount->toString; + $resp .= $amount->nodeValue; } } push @contents, $resp; @@ -1288,7 +1288,7 @@ my $resp; foreach ( $child->childNodes ) { next unless $_->nodeType == TEXT_NODE; - $resp .= $_->toString; + $resp .= $_->nodeValue; } push @contents, $resp; } From yanwong at pub.open-bio.org Tue Mar 8 05:36:17 2005 From: yanwong at pub.open-bio.org (Yan Wong) Date: Tue, 8 Mar 2005 05:36:17 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503081036.j28AaHDe031479@pub.open-bio.org> yanwong Tue Mar 8 05:36:17 EST 2005 Update of /home/repository/moby/moby-live/Python/bioMoby In directory pub.open-bio.org:/tmp/cvs-serv31454/bioMoby Modified Files: mobyDataTypes.py Log Message: A small bug prevented the servicenotes to be retrieved from the XML moby-live/Python/bioMoby mobyDataTypes.py,1.17,1.18 =================================================================== RCS file: /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/02/18 15:54:10 1.17 +++ /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/03/08 10:36:17 1.18 @@ -194,6 +194,7 @@ anObj=MobyObject() anObj.fromMoby(aCross) self.__cross__.append(anObj) + #deserializes the PIB elif child.localName=="ProvisionInformation": for aPIB in child.childNodes: self.__PIB__.append(aPIB.toxml()) @@ -297,13 +298,14 @@ """The class describes a Moby Content (for queries or answers) """ - def __init__(self, queryData={}, authority="", servicenotes=""): + def __init__(self, queryData={}, authority="", servicenotes="", marshall=True): """Optional parameters indicate the authority's URL and notes about the service """ self.authority=authority self.servicenotes=servicenotes self.queryData=queryData + self._marshall=marshall def __str__(self): """return the XML form of the Moby Content object @@ -337,16 +339,21 @@ result.append("") for aSimple in queryObject[1]: - result.append(''+m.dumps(aSimple)+'') + if self._marshall: + result.append('%s'%m.dumps(aSimple)) + else: + result.append('%s'%str(aSimple)) result.append("") #If it is a parameter elif queryObject.__class__ is Parameter: result.append(m.dumps(queryObject)) #Or a simple object - else: - result.append(""+m.dumps(queryObject)+"") - + else: + if self._marshall: + result.append("%s"%m.dumps(queryObject)) + else: + result.append("%s"%queryObject) result.append("") result.append('') @@ -511,4 +518,4 @@ def __repr__(self): """put the xml of the Content """ - return self.__str__() \ No newline at end of file + return self.__str__() From mwilkinson at pub.open-bio.org Tue Mar 8 19:56:15 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Tue, 8 Mar 2005 19:56:15 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503090056.j290uFmq001340@pub.open-bio.org> mwilkinson Tue Mar 8 19:56:15 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi In directory pub.open-bio.org:/tmp/cvs-serv1321 Modified Files: mysql.pm Log Message: I think I have finally squashed that pesky bug that prevents Simples from being displayed as part of Collections in the findService output. It also requires a hand-modification of the database, unfortunately. If you need this, drop me a line and I'll tell you what to do moby-live/Perl/MOBY/Adaptor/moby/queryapi mysql.pm,1.8,1.9 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm 2005/01/11 22:17:11 1.8 +++ /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm 2005/03/09 00:56:15 1.9 @@ -124,7 +124,7 @@ sub insert_simple_input { my ($self, %args) = @_; my $dbh = $self->dbh; - my $si = $args{collection_input_id}?'':$args{service_instance_id}; + my $si = $args{collection_input_id}?undef:$args{service_instance_id}; $dbh->do("insert into simple_input (object_type_uri, @@ -148,7 +148,7 @@ sub insert_simple_output { my ($self, %args) = @_; my $dbh = $self->dbh; - my $si = $args{collection_output_id}?'':$args{service_instance_id}; + my $si = $args{collection_output_id}?undef:$args{service_instance_id}; $dbh->do("insert into simple_output (object_type_uri, From mwilkinson at pub.open-bio.org Fri Mar 11 17:22:58 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Fri, 11 Mar 2005 17:22:58 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503112222.j2BMMwLo013724@pub.open-bio.org> mwilkinson Fri Mar 11 17:22:57 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv13705 Modified Files: CommonSubs.pm Log Message: getNodeContentWithArticle now recognizes CDATA content as well moby-live/Perl/MOBY CommonSubs.pm,1.60,1.61 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/08 04:44:12 1.60 +++ /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/11 22:22:57 1.61 @@ -1279,7 +1279,7 @@ for ( 1 .. $valuenodes->size() ) { my $valuenode = $valuenodes->get_node( $_ ); foreach my $amount ( $valuenode->childNodes ) { - next unless $amount->nodeType == TEXT_NODE; + next unless ($amount->nodeType == TEXT_NODE || $amount->nodeType == CDATA_SECTION_NODE); $resp .= $amount->nodeValue; } } @@ -1287,7 +1287,7 @@ } else { my $resp; foreach ( $child->childNodes ) { - next unless $_->nodeType == TEXT_NODE; + next unless ($_->nodeType == TEXT_NODE || $amount->nodeType == CDATA_SECTION_NODE); $resp .= $_->nodeValue; } push @contents, $resp; From mwilkinson at pub.open-bio.org Fri Mar 11 17:25:31 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Fri, 11 Mar 2005 17:25:31 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503112225.j2BMPVYd013792@pub.open-bio.org> mwilkinson Fri Mar 11 17:25:31 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv13773 Modified Files: CommonSubs.pm Log Message: DOH...getNodeContentWithArticle now recognizes CDATA content as well moby-live/Perl/MOBY CommonSubs.pm,1.61,1.62 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/11 22:22:57 1.61 +++ /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/11 22:25:31 1.62 @@ -1287,7 +1287,7 @@ } else { my $resp; foreach ( $child->childNodes ) { - next unless ($_->nodeType == TEXT_NODE || $amount->nodeType == CDATA_SECTION_NODE); + next unless ($_->nodeType == TEXT_NODE || $_->nodeType == CDATA_SECTION_NODE); $resp .= $_->nodeValue; } push @contents, $resp; From mwilkinson at pub.open-bio.org Mon Mar 14 13:30:58 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Mon, 14 Mar 2005 13:30:58 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503141830.j2EIUw9n032565@pub.open-bio.org> mwilkinson Mon Mar 14 13:30:57 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv32546 Modified Files: CommonSubs.pm Log Message: allow CDATA in the service notes block moby-live/Perl/MOBY CommonSubs.pm,1.62,1.63 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/11 22:25:31 1.62 +++ /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/14 18:30:57 1.63 @@ -1458,6 +1458,9 @@ # $content .= $response_component->toString; $content .= $response_component->nodeValue if ( $response_component->nodeType == TEXT_NODE ); + $content .= $response_component->nodeValue + if ( $response_component->nodeType == CDATA_SECTION_NODE ); + } } return ( $content ); From mwilkinson at pub.open-bio.org Wed Mar 16 12:32:07 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Wed, 16 Mar 2005 12:32:07 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503161732.j2GHW7l3009815@pub.open-bio.org> mwilkinson Wed Mar 16 12:32:06 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Client In directory pub.open-bio.org:/tmp/cvs-serv9796 Modified Files: Central.pm Log Message: ugh. Noisy test suite moby-live/Perl/MOBY/Client Central.pm,1.90,1.91 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/02/08 23:43:06 1.90 +++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/03/16 17:32:06 1.91 @@ -1875,7 +1875,7 @@ my $id = &_nodeTextContent( $Object, 'id' ); my $success = &_nodeTextContent( $Object, 'success' ); my $message = &_nodeCDATAContent( $Object, 'message' ); -print STDERR "******$message******\n"; +#print STDERR "******$message******\n"; my $RDF = &_nodeRawContent( $Object, 'RDF' ); my $reg = MOBY::Client::Registration->new( success => $success, From mwilkinson at pub.open-bio.org Wed Mar 16 14:14:15 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Wed, 16 Mar 2005 14:14:15 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503161914.j2GJEF8m010119@pub.open-bio.org> mwilkinson Wed Mar 16 14:14:15 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv10100/MOBY Modified Files: Central.pm Log Message: should correctly parse out the secondary parameter details without absurd restrictions. moby-live/Perl/MOBY Central.pm,1.149,1.150 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- /home/repository/moby/moby-live/Perl/MOBY/Central.pm 2005/02/10 00:17:45 1.149 +++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm 2005/03/16 19:14:14 1.150 @@ -1542,29 +1542,28 @@ if ( $types->get_node( 1 ) ) { foreach ( $types->get_node( 1 )->childNodes ) { # should only ever be one! - ( $_->nodeType == TEXT_NODE ) - && ( $datatype = $_->toString ); + ( $_->nodeType == TEXT_NODE ) && ( $datatype .= $_->nodeValue ); } } my $defs = $parameter->getElementsByTagName( 'default' ); if ( $defs->get_node( 1 ) ) { foreach ( $defs->get_node( 1 )->childNodes ) { # should only ever be one! - ( $_->nodeType == TEXT_NODE ) && ( $def = $_->toString ); + ( $_->nodeType == TEXT_NODE ) && ( $def .= $_->nodeValue ); } } my $maxs = $parameter->getElementsByTagName( 'max' ); if ( $maxs->get_node( 1 ) ) { foreach ( $maxs->get_node( 1 )->childNodes ) { # should only ever be one! - ( $_->nodeType == TEXT_NODE ) && ( $max = $_->toString ); + ( $_->nodeType == TEXT_NODE ) && ( $max .= $_->nodeValue ); } } my $mins = $parameter->getElementsByTagName( 'min' ); if ( $mins->get_node( 1 ) ) { foreach ( $mins->get_node( 1 )->childNodes ) { # should only ever be one! - ( $_->nodeType == TEXT_NODE ) && ( $min = $_->toString ); + ( $_->nodeType == TEXT_NODE ) && ( $min .= $_->nodeValue ); } } my $enums = $parameter->getElementsByTagName( 'enum' ); @@ -1573,11 +1572,15 @@ foreach ( $enums->get_node( $n )->childNodes ) { # should only ever be one! ( $_->nodeType == TEXT_NODE ) - && ( push @enums, $_->toString ); + && ( push @enums, $_->nodeValue ); } } my $enum_string = join "", ( map { $_ . "," } @enums ); chop $enum_string; # get rid of trailing comma + $datatype =~ s/^\s+//; $datatype =~ s/\s+$//; + $def =~ s/^\s+//; $def =~ s/\s+$//; + $max =~ s/^\s+//; $max =~ s/\s+$//; + $min =~ s/^\s+//; $min =~ s/\s+$//; my $sec = $SVC->add_secondary_input( default_value => $def, maximum_value => $max, From mwilkinson at pub.open-bio.org Wed Mar 16 14:14:15 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Wed, 16 Mar 2005 14:14:15 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503161914.j2GJEF3C010138@pub.open-bio.org> mwilkinson Wed Mar 16 14:14:15 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Client In directory pub.open-bio.org:/tmp/cvs-serv10100/MOBY/Client Modified Files: Central.pm Log Message: should correctly parse out the secondary parameter details without absurd restrictions. moby-live/Perl/MOBY/Client Central.pm,1.91,1.92 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/03/16 17:32:06 1.91 +++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/03/16 19:14:15 1.92 @@ -913,18 +913,17 @@ $message .= "\n"; while ( my ( $param, $desc ) = each %SEC ) { unless ( ( ref( $desc ) ) =~ /hash/i ) { - return $self->errorRegXML( -"invalid structure of secondary article $param; expected hashref of limitations" + return $self->errorRegXML("invalid structure of secondary article $param; expected hashref of limitations" ); } my %data = %{$desc}; - my $default = $data{default}; - my $max = $data{max}; - my $min = $data{min}; - my $datatype = $data{datatype}; + my $default = $data{default}||""; + my $max = $data{max}||""; + my $min = $data{min}||""; + my $datatype = $data{datatype}||""; + my $enums = $data{enum}||[]; unless ( $datatype ) { - return $self->errorRegXML( -"a secondaryArticle must contain at least a datatype value in secondary article $param" + return $self->errorRegXML("a secondaryArticle must contain at least a datatype value in secondary article $param" ); } unless ( ( $datatype =~ /Integer/ ) @@ -932,16 +931,14 @@ || ( $datatype =~ /String/ ) || ( $datatype =~ /DateTime/ ) ) { - return $self->errorRegXML( -"a secondaryArticle must have a datatype of Integer, Float, String, or DateTime" + return $self->errorRegXML("a secondaryArticle must have a datatype of Integer, Float, String, or DateTime" ); } - unless ( ( ref( $data{enum} ) ) =~ /array/i ) { - return $self->errorRegXML( -"invalid structure of enum limits in secondary article $param; expected arrayref" + unless ( ( ref( $enums ) ) =~ /array/i ) { + return $self->errorRegXML("invalid structure of enum limits in secondary article $param; expected arrayref" ); } - my @enums = @{ $data{enum} }; + my @enums = @{ $enums }; $message .= "\n"; $message .= "$default\n"; $message .= "$datatype\n"; From mwilkinson at pub.open-bio.org Wed Mar 16 15:05:46 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Wed, 16 Mar 2005 15:05:46 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503162005.j2GK5k0Q010412@pub.open-bio.org> mwilkinson Wed Mar 16 15:05:46 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Client In directory pub.open-bio.org:/tmp/cvs-serv10393/MOBY/Client Modified Files: Central.pm Log Message: removing the code that calls the RDF builder just for the moment. it needs to be parameterized first. moby-live/Perl/MOBY/Client Central.pm,1.92,1.93 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/03/16 19:14:15 1.92 +++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/03/16 20:05:46 1.93 @@ -980,16 +980,18 @@ # return ( $self->parseRegXML( $return ) ); #_______call a new version RDFbuilder (by Eddie Kawas) _________________________________________ my $reg = $self->parseRegXML( $return ); - if ($reg->success == 1){ - require LWP::UserAgent; - - my $ua = LWP::UserAgent->new; - my $url='http://mobycentral.cbr.nrc.ca:8090/DemoServlet/forms/getSignatureResponse?domain='.$authURI.'&serviceName='.$name; - - my $response = $ua->get($url); - my $rdf = $response->content; - print "$rdf\n"; -} + +# if ($reg->success == 1){ +# require LWP::UserAgent; +# +# my $ua = LWP::UserAgent->new; +# my $url='http://mobycentral.cbr.nrc.ca:8090/DemoServlet/forms/getSignatureResponse?domain='.$authURI.'&serviceName='.$name; +# +# my $response = $ua->get($url); +# my $rdf = $response->content; +# print "$rdf\n"; +#} + return $reg; #_______________________________________________________________________________________________ From mwilkinson at pub.open-bio.org Wed Mar 16 17:30:31 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Wed, 16 Mar 2005 17:30:31 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503162230.j2GMUVii010922@pub.open-bio.org> mwilkinson Wed Mar 16 17:30:31 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv10903/MOBY Modified Files: CommonSubs.pm Log Message: altered getNodeContentWithArticle so that you can get the text content of the root node by leaving off the articleName argument. This is very useful... honest... moby-live/Perl/MOBY CommonSubs.pm,1.63,1.64 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/14 18:30:57 1.63 +++ /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/16 22:30:31 1.64 @@ -1158,11 +1158,15 @@ be the entire mobyData block. $tagname - the tagname (effectively from the Object type ontology), or "Parameter" if you are trying to get secondaries - $articleName - the articleName that we are searching for + $articleName - the articleName that we are searching for. + to get the content of the primary object, leave + this field blank! + + returns : an ARRAY of the stringified text content for each + node that matched the tagname/articleName specified; one + array element for each matching node. Newlines are NOT considered + new nodes (as they are in normal XML). - returns : an array of the stringified text content for each - node that matched the tagname/articleName specified. - note that each line of content is an element of the string. notes : This was written for the purpose of getting the values of String, Integer, Float, Date_Time, and other such primitives. For example, in the following XML: @@ -1221,9 +1225,9 @@ foreach my $article(@articles){ my ($type, $DOM) = @{$article}; if ($type == SECONDARY){ - $cutoff = getNodeContentsWithArticle($DOM, "Parameter", "cutoff"); + ($cutoff) = getNodeContentsWithArticle($DOM, "Parameter", "cutoff"); } else { - $sequences = getNodeContentWithArticle($DOM, "String", "SequenceString"); + @sequences = getNodeContentWithArticle($DOM, "String", "SequenceString"); } } } @@ -1245,11 +1249,24 @@ my @contents; return () unless ref( $node ) =~ /XML::LibXML/; return () unless $element; - return () unless $articleName; + + unless ($articleName){ # the request is for root node if no articleName + my $resp; + foreach my $child($node->childNodes){ + next unless ($child->nodeType == TEXT_NODE || $child->nodeType == CDATA_SECTION_NODE); + $resp .= $child->nodeValue; + } + push @contents, $resp; + return @contents; + } + my $nodes = $node->getElementsByTagName( $element ); unless ( $nodes->get_node( 1 ) ) { $nodes = $node->getElementsByTagName( "moby:$element" ); } + + + # if there is an articleName, then get that specific node for ( 1 .. $nodes->size() ) { my $child = $nodes->get_node( $_ ); if ( From gss at pub.open-bio.org Mon Mar 21 16:29:44 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:29:44 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212129.j2LLTiqW008258@pub.open-bio.org> gss Mon Mar 21 16:29:44 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph In directory pub.open-bio.org:/tmp/cvs-serv8173/src/org/semanticmoby/graph Modified Files: MOBYEnumeration.java MOBYCollection.java MOBYSingleElement.java MOBYFixedCollection.java MOBYProviderSet.java MOBYSubject.java MOBYDescriptor.java MOBYProvider.java MOBYDocument.java MOBYOntology.java MOBYGraphNode.java MOBYObject.java MOBYMappingElement.java MOBYOrderedCollection.java MOBYUnorderedCollection.java MOBYResizableCollection.java Log Message: Major cleanup of graph classes moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph MOBYEnumeration.java,1.1,1.2 MOBYCollection.java,1.1,1.2 MOBYSingleElement.java,1.1,1.2 MOBYFixedCollection.java,1.1,1.2 MOBYProviderSet.java,1.1,1.2 MOBYSubject.java,1.1,1.2 MOBYDescriptor.java,1.1,1.2 MOBYProvider.java,1.1,1.2 MOBYDocument.java,1.1,1.2 MOBYOntology.java,1.1,1.2 MOBYGraphNode.java,1.1,1.2 MOBYObject.java,1.1,1.2 MOBYMappingElement.java,1.1,1.2 MOBYOrderedCollection.java,1.1,1.2 MOBYUnorderedCollection.java,1.1,1.2 MOBYResizableCollection.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYEnumeration.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYEnumeration.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYEnumeration.java 2005/03/21 21:29:44 1.2 @@ -1,19 +1,38 @@ package org.semanticmoby.graph; import java.util.*; + import com.hp.hpl.jena.rdf.model.*; /** - * A class representing a resizable collection of objects, in - * which the order of the elements is not defined; the intention is - * for the elements to represent possible choices for a value. + * A class representing collections that can be resized (i.e. + * elements added to or removed from), in which the order of + * the elements is not defined; the intention is for the elements + * to represent possible choices for a value; corresponds to an + * RDF Alt. */ public class MOBYEnumeration extends MOBYUnorderedCollection { - public MOBYEnumeration(Resource resource, List elements, Model underlying) + /** + * Create an instance with no elements + * @param resource the resource node that represents this collection + * @param underlyingJenaModel the Jena model from which this is stored + */ + public MOBYEnumeration(Resource resource, + Model underlyingJenaModel) { - super(resource, elements, underlying); + super(null, resource, underlyingJenaModel); } - public boolean isEnumeration() { return true; } + /** + * Create an instance with the initial list of elements + * @param initialElements the initial elements + * @param resource the resource node that represents this collection + * @param underlyingJenaModel the Jena model from which this is stored + */ + public MOBYEnumeration(List initialElements, Resource resource, + Model underlyingJenaModel) + { + super(initialElements, resource, underlyingJenaModel); + } } \ No newline at end of file =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYCollection.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYCollection.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYCollection.java 2005/03/21 21:29:44 1.2 @@ -1,24 +1,34 @@ package org.semanticmoby.graph; -import com.hp.hpl.jena.rdf.model.*; import java.util.*; +import com.hp.hpl.jena.rdf.model.*; + /** - * A common abstract class for collections, both fixed sized and resizeable, - * of elements in MOBY graphs. + * A common abstract class for collections, both fixed sized and + * resizeable, of elements in MOBY graphs. */ public abstract class MOBYCollection extends MOBYGraphNode { + /** + * A list to hold the elements of the collection + */ protected List elements = new ArrayList(); - - public MOBYCollection(Resource resource, List elements, Model underlying) + + /** + * Create an instance with the initial list of elements + * @param initialElements the initial elements + */ + public MOBYCollection(List initialElements, Resource resource, + Model model) { - super(resource, underlying); - for (Iterator it = elements.iterator(); it.hasNext();) { - this.elements.add(it.next()); + super(resource, model); + + if (initialElements != null) { + elements.addAll(initialElements); } } - + /** * Return the size of the collection. */ @@ -36,15 +46,18 @@ } /** - * Return whether or not the collection is fixed in size + * Return whether or not this object is a collection. */ - public abstract boolean isFixedSized(); + public boolean isCollection() + { + return true; + } /** - * Return whether or not the collection is resizable + * Return whether or not this object is a singular element. */ - public abstract boolean isResizable(); - - public boolean isSingular() { return false; } - public boolean isCollection() { return true; } + public boolean isSingular() + { + return false; + } } \ No newline at end of file =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYSingleElement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYSingleElement.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYSingleElement.java 2005/03/21 21:29:44 1.2 @@ -18,6 +18,19 @@ super(resource, underlying); } - public boolean isSingular() { return true; } - public boolean isCollection() { return false; } + /** + * Return whether or not this object is a collection. + */ + public boolean isCollection() + { + return false; + } + + /** + * Return whether or not this object is a singular element. + */ + public boolean isSingular() + { + return true; + } } \ No newline at end of file =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYFixedCollection.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYFixedCollection.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYFixedCollection.java 2005/03/21 21:29:44 1.2 @@ -1,20 +1,34 @@ package org.semanticmoby.graph; import java.util.*; + import com.hp.hpl.jena.rdf.model.*; /** - * A class representing unordered, fixed sized collection - * of objects. + * A class for holding an ordered, fixed sized collection + * of objects; corresponds to an RDF List. */ public class MOBYFixedCollection extends MOBYCollection { + /** + * Create an instance with the initial list of elements + * @param initialElements the initial elements + * @param resource the resource node that represents this collection + * @param model the Jena model from which this is derived + */ + public MOBYFixedCollection(List initialElements, Resource resource, + Model model) + { + super(initialElements, resource, model); + } - public MOBYFixedCollection(Resource resource, List elements, Model underlying) + /** + * Return the element at the given index + * @param index the zero-based index of the element to retrieve + * @return the element + */ + public Object get(int index) { - super(resource, elements, underlying); + return elements.get(index); } - - public boolean isResizable() { return false; } - public boolean isFixedSized() { return true; } } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYProviderSet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYProviderSet.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYProviderSet.java 2005/03/21 21:29:44 1.2 @@ -46,7 +46,7 @@ for (Iterator it = providers.iterator(); it.hasNext();) { MOBYProvider provider = (MOBYProvider) it.next(); - Model underlying = provider.getUnderlying(); + Model underlying = provider.getModel(); merged.add(underlying); merged.setNsPrefixes(underlying.getNsPrefixMap()); } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYSubject.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYSubject.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYSubject.java 2005/03/21 21:29:44 1.2 @@ -15,7 +15,7 @@ * subject of one or more moby:mapsTo properties. The collection of * objects of each of these properties is returned by getDirectMappings(). *

- * As an RDF data structure, this can have one or more elements, each + * As an RDF data structure, it can have one or more elements, each * of which can itself be either a moby:Subject, an RDF data structure, * or both. This collection of elements is returned by getNestedMappings(). */ @@ -36,10 +36,11 @@ } /** - * Return a resizable, unordered collection of the MOBYNode instances, - * which are objects of mapsTo statements, whose subjects are this. + * Return the collection of direct mappings, i.e. moby:mapsTo statements + * whose subject is this. */ - public MOBYUnorderedCollection getDirectMappings() { + public MOBYUnorderedCollection getDirectMappings() + { return directMappings; } } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYDescriptor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYDescriptor.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYDescriptor.java 2005/03/21 21:29:44 1.2 @@ -3,18 +3,20 @@ import com.hp.hpl.jena.rdf.model.*; /** - * The MOBYDescriptor class represents things that are available - * at a URI. + * The MOBYDescriptor class represents things that are also + * represented as a Jena Model */ public abstract class MOBYDescriptor { - protected Model underlying; protected Resource resource; + protected Model model; - public MOBYDescriptor(Resource resource, Model underlying) + public MOBYDescriptor() {} + + public MOBYDescriptor(Resource resource, Model model) { this.resource = resource; - this.underlying = underlying; + this.model = model; } /** @@ -28,9 +30,9 @@ /** * Return the underlying Jena model */ - public Model getUnderlying() + public Model getModel() { - return underlying; + return model; } /** =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYProvider.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYProvider.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYProvider.java 2005/03/21 21:29:44 1.2 @@ -1,7 +1,12 @@ package org.semanticmoby.graph; import java.io.*; + +import org.semanticmoby.tools.Util; +import org.semanticmoby.vocabulary.MOBY; + import com.hp.hpl.jena.rdf.model.*; +import com.hp.hpl.jena.vocabulary.RDF; /** * The Provider class represents a resource that provides a @@ -9,19 +14,76 @@ */ public class MOBYProvider extends MOBYDocument { - private String name; - private String oneLineDescription; - private String moreInfoURI; + /** + * The statement that asserts this provider is a moby:Provider + */ + private Statement providerStmt; + + /** + * The name of the provider; stored in MOBY.name property + */ + private Statement nameStmt; + + /** + * A one line description of the provider; stored in the + * MOBY.oneLineDescription property + */ + private Statement oneLineDescriptionStmt; + + /** + * A URI at which more information can be retrieved about the + * provider; stored in the MOBY.moreInfoURI property + */ + private Statement aboutURIStmt; + + /** + * An unordered collection of operatesOn subgraphs. Each + * subgraph is itself either a MOBYGraph, or a MOBYCollection + */ private MOBYUnorderedCollection operatesOn; - public MOBYProvider(Resource resource, String name, String oneLineDescription, - String moreInfoURI, MOBYUnorderedCollection operatesOn, - Model underlying) + /** + * Constructor for building an instance from scratch (i.e. not one + * being parsed from a model). + */ + public MOBYProvider(String uri, String name, String oneLineDescription, + String aboutURI) + { + // Create a model and resource within the model to represent the + // URI at which the model is located + // + this.model = Util.newJenaModel(); + this.resource = model.createResource(uri); + + // Assert that the provider is a moby:Provider + // + model.add(providerStmt = model.createStatement( + resource, RDF.type, MOBY.Provider)); + + // Save the literal properties by creating the corresponding + // statements and adding them to the model + // + model.add(nameStmt = model.createStatement( + resource, MOBY.name, name)); + + model.add(oneLineDescriptionStmt = model.createStatement( + resource, MOBY.oneLineDescription, oneLineDescription)); + + model.add(aboutURIStmt = model.createStatement( + resource, MOBY.aboutURI, aboutURI)); + } + + public MOBYProvider(Resource resource, + Statement nameStmt, + Statement oneLineDescriptionStmt, + Statement aboutURIStmt, + MOBYUnorderedCollection operatesOn, + Model underlying) { super(resource, underlying); - this.name = name; - this.oneLineDescription = oneLineDescription; - this.moreInfoURI = moreInfoURI; + this.nameStmt = nameStmt; + this.oneLineDescriptionStmt = oneLineDescriptionStmt; + this.aboutURIStmt = aboutURIStmt; this.operatesOn = operatesOn; } @@ -30,7 +92,11 @@ */ public String getName() { - return name; + try { + return nameStmt.getObject().toString(); + } catch (NullPointerException e) { + return ""; + } } /** @@ -38,16 +104,24 @@ */ public String getOneLineDescription() { - return oneLineDescription; + try { + return oneLineDescriptionStmt.getObject().toString(); + } catch (NullPointerException e) { + return ""; + } } /** * Return a URI that can be accessed to obtain more information * about the provider. */ - public String getMoreInfoURI() + public String getAboutURI() { - return moreInfoURI; + try { + return aboutURIStmt.getObject().toString(); + } catch (NullPointerException e) { + return ""; + } } /** @@ -63,11 +137,11 @@ { StringBuffer sb = new StringBuffer(); sb.append("Provider [name=\""); - sb.append(name); + sb.append(getName()); sb.append("\", oneLineDescription=\""); - sb.append(oneLineDescription); - sb.append("\", moreInfoURI="); - sb.append(moreInfoURI); + sb.append(getOneLineDescription()); + sb.append("\", aboutURI="); + sb.append(getAboutURI()); sb.append("\"]"); return sb.toString(); @@ -79,6 +153,11 @@ */ public void serialize(OutputStream out) { - underlying.write(out); + model.write(out); + } + + public void serializeAsN3(OutputStream out) + { + model.write(out, "N3"); } } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYDocument.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYDocument.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYDocument.java 2005/03/21 21:29:44 1.2 @@ -8,8 +8,10 @@ */ public abstract class MOBYDocument extends MOBYDescriptor { - public MOBYDocument(Resource resource, Model underlying) + public MOBYDocument() {} + + public MOBYDocument(Resource resource, Model model) { - super(resource, underlying); + super(resource, model); } } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYOntology.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYOntology.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYOntology.java 2005/03/21 21:29:44 1.2 @@ -8,7 +8,7 @@ */ public class MOBYOntology extends MOBYDocument { - public MOBYOntology(Resource resource, Model underlying) { - super(resource, underlying); + public MOBYOntology(Resource resource, Model model) { + super(resource, model); } } \ No newline at end of file =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYGraphNode.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYGraphNode.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYGraphNode.java 2005/03/21 21:29:44 1.2 @@ -8,9 +8,9 @@ */ public abstract class MOBYGraphNode extends MOBYDescriptor { - public MOBYGraphNode(Resource resource, Model underlying) + public MOBYGraphNode(Resource resource, Model model) { - super(resource, underlying); + super(resource, model); } /** =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYObject.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYObject.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYObject.java 2005/03/21 21:29:44 1.2 @@ -1,5 +1,6 @@ package org.semanticmoby.graph; + import com.hp.hpl.jena.rdf.model.*; /** =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYMappingElement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYMappingElement.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYMappingElement.java 2005/03/21 21:29:44 1.2 @@ -1,5 +1,6 @@ package org.semanticmoby.graph; + import com.hp.hpl.jena.rdf.model.*; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYOrderedCollection.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYOrderedCollection.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYOrderedCollection.java 2005/03/21 21:29:44 1.2 @@ -1,22 +1,58 @@ package org.semanticmoby.graph; import java.util.*; + import com.hp.hpl.jena.rdf.model.*; +/** + * A class representing collections that can be resized (i.e. + * elements added to or removed from), in which the order of + * the elements is defined; corresponds to an RDF Seq + */ public class MOBYOrderedCollection extends MOBYResizableCollection { - public MOBYOrderedCollection(Resource resource, List elements, Model underlying) + /** + * Create an instance with no elements + * @param resource the resource node that represents this collection + * @param underlyingJenaModel the Jena model from which this is stored + */ + public MOBYOrderedCollection(Resource resource, + Model underlyingJenaModel) { - super(resource, elements, underlying); + super(null, resource, underlyingJenaModel); + } + + /** + * Create an instance with the initial list of elements + * @param initialElements the initial elements + * @param resource the resource node that represents this collection + * @param underlyingJenaModel the Jena model from which this is stored + */ + public MOBYOrderedCollection(List initialElements, Resource resource, + Model underlyingJenaModel) + { + super(initialElements, resource, underlyingJenaModel); } - public boolean isOrdered() { return true; } - /** - * Return the object at a given zero-based index. + * Return the element at the given index + * @param index the zero-based index of the element to retrieve + * @return the element */ public Object get(int index) { return elements.get(index); } + + /** + * Add the given element to the collection so that its new + * zero-based index is given index + * @param index the zero-based index at which the new element + * should be added + * @param elementToAdd the element to add + */ + public void add(int index, Object elementToAdd) + { + elements.add(index, elementToAdd); + } } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYUnorderedCollection.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYUnorderedCollection.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYUnorderedCollection.java 2005/03/21 21:29:44 1.2 @@ -2,27 +2,35 @@ import java.util.*; -import org.semanticmoby.graph.*; - -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Resource; +import com.hp.hpl.jena.rdf.model.*; /** - * A class representing resizable collection of objects, in - * which the order of the elements is not defined. + * A class representing collections that can be resized (i.e. + * elements added to or removed from), in which the order of + * the elements is not defined; corresponds to an RDF Bag */ public class MOBYUnorderedCollection extends MOBYResizableCollection { - public MOBYUnorderedCollection(Resource resource, List elements, Model underlying) + /** + * Create an instance with no elements + * @param resource the resource node that represents this collection + * @param underlyingJenaModel the Jena model from which this is stored + */ + public MOBYUnorderedCollection(Resource resource, + Model underlyingJenaModel) { - super(resource, elements, underlying); + super(null, resource, underlyingJenaModel); } - public boolean isOrdered() { return false; } - /** - * Return whether or not the elements of this collection represent - * choices (i.e. elements of an enumeration of possible values). + * Create an instance with the initial list of elements + * @param initialElements the initial elements + * @param resource the resource node that represents this collection + * @param underlyingJenaModel the Jena model from which this is stored */ - public boolean isEnumeration() { return false; } + public MOBYUnorderedCollection(List initialElements, Resource resource, + Model underlyingJenaModel) + { + super(initialElements, resource, underlyingJenaModel); + } } \ No newline at end of file =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYResizableCollection.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYResizableCollection.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYResizableCollection.java 2005/03/21 21:29:44 1.2 @@ -2,10 +2,7 @@ import java.util.*; -import org.semanticmoby.graph.*; - -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Resource; +import com.hp.hpl.jena.rdf.model.*; /** * A class representing collections that can be resized (i.e. @@ -14,16 +11,51 @@ */ public abstract class MOBYResizableCollection extends MOBYCollection { - public MOBYResizableCollection(Resource resource, List elements, Model underlying) + /** + * Create an instance with no elements + * @param resource the resource node that represents this collection + * @param model the Jena model from which this is derived + */ + public MOBYResizableCollection(Resource resource, Model model) { - super(resource, elements, underlying); + super(null, resource, model); } - + /** - * Return whether or not this collection is ordered. + * Create an instance with the initial list of elements + * @param initialElements the initial elements + * @param resource the resource node that represents this collection + * @param underlyingJenaModel the Jena model from which this is stored */ - public abstract boolean isOrdered(); + public MOBYResizableCollection(List initialElements, Resource resource, + Model underlyingJenaModel) + { + super(initialElements, resource, underlyingJenaModel); + } - public boolean isResizable() { return true; } - public boolean isFixedSized() { return false; } + /** + * Add an element to the collection + * @param elementToAdd the element to add to the collection + */ + public void add(Object elementToAdd) + { + elements.add(elementToAdd); + } + + /** + * Remove an element from the collection + * @param elementToRemove the element to remove + */ + public void remove(Object elementToRemove) + { + elements.remove(elementToRemove); + } + + /** + * Remove all the elements from the collection + */ + public void clear() + { + elements.clear(); + } } From gss at pub.open-bio.org Mon Mar 21 16:30:18 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:30:18 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212130.j2LLUIHF008307@pub.open-bio.org> gss Mon Mar 21 16:30:18 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools In directory pub.open-bio.org:/tmp/cvs-serv8280/src/org/semanticmoby/graph/tools Removed Files: package.html MOBYProviderTraverser.java MOBYProviderVisitor.java MOBYProviderXMLGenerator.java MOBYProviderTraversalException.java MOBYProviderVisitorAdapter.java Log Message: Package no longer needed moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools package.html,1.1,NONE MOBYProviderTraverser.java,1.1,NONE MOBYProviderVisitor.java,1.1,NONE MOBYProviderXMLGenerator.java,1.1,NONE MOBYProviderTraversalException.java,1.1,NONE MOBYProviderVisitorAdapter.java,1.1,NONE rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools/RCS/package.html,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools/RCS/MOBYProviderTraverser.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools/RCS/MOBYProviderVisitor.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools/RCS/MOBYProviderXMLGenerator.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools/RCS/MOBYProviderTraversalException.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools/RCS/MOBYProviderVisitorAdapter.java,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:31:14 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:31:14 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212131.j2LLVEDa008358@pub.open-bio.org> gss Mon Mar 21 16:31:14 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core In directory pub.open-bio.org:/tmp/cvs-serv8336 Removed Files: build.xml Log Message: Moved to build subdirectory moby-live/S-MOBY/ref-impl/core build.xml,1.4,NONE rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/RCS/build.xml,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:31:29 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:31:29 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212131.j2LLVTMe008387@pub.open-bio.org> gss Mon Mar 21 16:31:29 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core/build In directory pub.open-bio.org:/tmp/cvs-serv8363/build Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/core/build added to the repository moby-live/S-MOBY/ref-impl/core/build - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/build/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/build/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/build/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:31:31 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:31:31 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212131.j2LLVVTC008421@pub.open-bio.org> gss Mon Mar 21 16:31:31 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core/build In directory pub.open-bio.org:/tmp/cvs-serv8400/build Added Files: build.xml .cvsignore Log Message: New build subdirectory moby-live/S-MOBY/ref-impl/core/build build.xml,NONE,1.1 .cvsignore,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:32:02 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:32:02 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212132.j2LLW2LU008451@pub.open-bio.org> gss Mon Mar 21 16:32:01 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core In directory pub.open-bio.org:/tmp/cvs-serv8426 Modified Files: .cvsignore Log Message: Changed to reflect new build structure moby-live/S-MOBY/ref-impl/core .cvsignore,1.6,1.7 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/.cvsignore 2004/06/14 16:24:12 1.6 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/.cvsignore 2005/03/21 21:32:01 1.7 @@ -1,4 +1,3 @@ -build -smoby.jar +classes .classpath .project From gss at pub.open-bio.org Mon Mar 21 16:32:38 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:32:38 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212132.j2LLWc3v008490@pub.open-bio.org> gss Mon Mar 21 16:32:38 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/parser In directory pub.open-bio.org:/tmp/cvs-serv8465/src/org/semanticmoby/parser Modified Files: Parser.java Log Message: Fixed to use new org.semanticmoby.graph.* signatures moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/parser Parser.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/parser/Parser.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/parser/Parser.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/parser/Parser.java 2005/03/21 21:32:38 1.2 @@ -5,17 +5,16 @@ import java.util.*; import org.semanticmoby.graph.*; -import org.semanticmoby.parser.*; -import org.semanticmoby.tools.ModelRetriever; -import org.semanticmoby.tools.Util; +import org.semanticmoby.tools.*; import org.semanticmoby.vocabulary.*; import com.hp.hpl.jena.rdf.model.*; import com.hp.hpl.jena.vocabulary.*; /** - * This class is used to parse OWL models, stored as Jena2 models, into - * objects that implement interfaces from the org.semanticmoby.graph package. + * This class is used to parse RDF models, stored as Jena2 models, into + * objects that implement interfaces from the org.semanticmoby.graph + * package. */ public class Parser { @@ -186,7 +185,7 @@ // Create and return an unordered collection of the parsed providers // - return new MOBYUnorderedCollection(null, providers, null); + return new MOBYUnorderedCollection(providers, null, null); } /** @@ -199,9 +198,9 @@ // First parse the scalar properties name, oneLineDescription, and aboutURI // - String name = getDataPropertyValue(provider, MOBY.name); - String oneLiner = getDataPropertyValue(provider, MOBY.oneLineDescription); - String aboutURI = getDataPropertyValue(provider, MOBY.aboutURI); + Statement nameStmt = model.getProperty(provider, MOBY.name); + Statement oneLineDescriptionStmt = model.getProperty(provider, MOBY.oneLineDescription); + Statement aboutURIStmt = model.getProperty(provider, MOBY.aboutURI); // A provider can have multiple operatesOn properties, each of // which leads to a subgraph. Parse each of these subgraphs. @@ -219,8 +218,8 @@ // oneLineDescription, aboutURI, and collection of operatesOn subgraphs // return new MOBYProvider( - provider, name, oneLiner, aboutURI, - new MOBYUnorderedCollection(provider, operatesOn, model), + provider, nameStmt, oneLineDescriptionStmt, aboutURIStmt, + new MOBYUnorderedCollection(operatesOn, provider, model), model); } @@ -326,16 +325,16 @@ // Create and return a Subject to describe this hasMapping subgraph // return new MOBYSubject(res, - new MOBYFixedCollection(res, statements, model), - new MOBYUnorderedCollection(res, directMappings, model), + new MOBYFixedCollection(statements, res, model), + new MOBYUnorderedCollection(directMappings, res, model), collectionFor(res, nestedMappings), model); } /** - * Parse the object of a mapsTo statement, which should be a - * Subject, a data structure, or both. If the object is a data + * Parse the object of a mapsTo statement, which should be an + * Object, a data structure, or both. If the object is a data * structure, then each element of the data structure should * be a mapped subgraph. */ @@ -370,7 +369,7 @@ // Model model = res.getModel(); return new MOBYObject(res, - new MOBYFixedCollection(res, statements, model), + new MOBYFixedCollection(statements, res, model), collectionFor(res, nested), model); } @@ -462,12 +461,6 @@ model.contains(p, RDFS.subPropertyOf, MOBY.Property); } - private String getDataPropertyValue(Resource subject, Property property) - { - Statement s = subject.getModel().getProperty(subject, property); - return (s == null) ? null : s.getObject().toString(); - } - private Resource getResourcePropertyValue(Resource subject, Property property) { Statement s = subject.getModel().getProperty(subject, property); @@ -500,13 +493,13 @@ private MOBYCollection collectionFor(Resource res, List elements) { if (isList(res)) { - return new MOBYFixedCollection(res, elements, res.getModel()); + return new MOBYFixedCollection(elements, res, res.getModel()); } else if (isBag(res)) { - return new MOBYUnorderedCollection(res, elements, res.getModel()); + return new MOBYUnorderedCollection(elements, res, res.getModel()); } else if (isSeq(res)) { - return new MOBYOrderedCollection(res, elements, res.getModel()); + return new MOBYOrderedCollection(elements, res, res.getModel()); } else if (isAlt(res)) { - return new MOBYEnumeration(res, elements, res.getModel()); + return new MOBYEnumeration(elements, res, res.getModel()); } else { return null; } From gss at pub.open-bio.org Mon Mar 21 16:33:19 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:19 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXJJV008537@pub.open-bio.org> gss Mon Mar 21 16:33:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/WebRoot Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:33:24 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:24 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXOdN008750@pub.open-bio.org> gss Mon Mar 21 16:33:24 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting In directory pub.open-bio.org:/tmp/cvs-serv8729/archive/WebRoot/meeting Added Files: missing-fields.jsp registration-confirmation.jsp registration-form.html lodging.html index.html shuttles.html Log Message: Archived a few things moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting missing-fields.jsp,NONE,1.1 registration-confirmation.jsp,NONE,1.1 registration-form.html,NONE,1.1 lodging.html,NONE,1.1 index.html,NONE,1.1 shuttles.html,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:33:20 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:20 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXK26008637@pub.open-bio.org> gss Mon Mar 21 16:33:20 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/src/org/semanticmoby Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:33:24 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:24 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXOON008796@pub.open-bio.org> gss Mon Mar 21 16:33:24 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images In directory pub.open-bio.org:/tmp/cvs-serv8729/archive/WebRoot/meeting/images Added Files: moby.png ncgr.png Log Message: Archived a few things moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images moby.png,NONE,1.1 ncgr.png,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:33:24 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:24 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXOMM008765@pub.open-bio.org> gss Mon Mar 21 16:33:24 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools In directory pub.open-bio.org:/tmp/cvs-serv8729/archive/src/org/semanticmoby/graph/tools Added Files: MOBYProviderTraversalException.java MOBYProviderVisitor.java package.html MOBYProviderTraverser.java MOBYProviderVisitorAdapter.java MOBYProviderXMLGenerator.java Log Message: Archived a few things moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools MOBYProviderTraversalException.java,NONE,1.1 MOBYProviderVisitor.java,NONE,1.1 package.html,NONE,1.1 MOBYProviderTraverser.java,NONE,1.1 MOBYProviderVisitorAdapter.java,NONE,1.1 MOBYProviderXMLGenerator.java,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:33:24 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:24 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXORn008814@pub.open-bio.org> gss Mon Mar 21 16:33:24 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot In directory pub.open-bio.org:/tmp/cvs-serv8729/archive/WebRoot Added Files: index.html Log Message: Archived a few things moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot index.html,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:33:20 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:20 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXK2b008596@pub.open-bio.org> gss Mon Mar 21 16:33:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/src Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:33:20 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:20 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXKBQ008617@pub.open-bio.org> gss Mon Mar 21 16:33:20 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/src/org Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:33:24 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:24 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXOGc008781@pub.open-bio.org> gss Mon Mar 21 16:33:24 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting In directory pub.open-bio.org:/tmp/cvs-serv8729/archive/src/org/semanticmoby/meeting Added Files: MeetingRegistrationServlet.java Log Message: Archived a few things moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting MeetingRegistrationServlet.java,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:33:20 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:20 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXKWA008659@pub.open-bio.org> gss Mon Mar 21 16:33:20 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/src/org/semanticmoby/graph Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:33:19 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:19 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXJFL008519@pub.open-bio.org> gss Mon Mar 21 16:33:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive In directory pub.open-bio.org:/tmp/cvs-serv8495/archive Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:33:19 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:19 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXJqj008555@pub.open-bio.org> gss Mon Mar 21 16:33:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/WebRoot/meeting Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:33:20 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:20 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXKGC008575@pub.open-bio.org> gss Mon Mar 21 16:33:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/WebRoot/meeting/images Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:33:20 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:20 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXKHf008682@pub.open-bio.org> gss Mon Mar 21 16:33:20 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/src/org/semanticmoby/graph/tools Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:33:20 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:20 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXKmu008700@pub.open-bio.org> gss Mon Mar 21 16:33:20 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/src/org/semanticmoby/meeting Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:39:19 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:39:19 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212139.j2LLdJes008975@pub.open-bio.org> gss Mon Mar 21 16:39:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources In directory pub.open-bio.org:/tmp/cvs-serv8951/resources Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/resources - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:39:19 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:39:19 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212139.j2LLdJp1008994@pub.open-bio.org> gss Mon Mar 21 16:39:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop Files In directory pub.open-bio.org:/tmp/cvs-serv8951/resources/Photoshop Files Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop Files added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop Files - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop/RCS/Files,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:39:26 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:39:26 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212139.j2LLdQko009055@pub.open-bio.org> gss Mon Mar 21 16:39:26 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources In directory pub.open-bio.org:/tmp/cvs-serv9018/resources Added Files: moby_keyword.sql web.xml Log Message: Initial version moby-live/S-MOBY/ref-impl/semanticmoby.org/resources moby_keyword.sql,NONE,1.1 web.xml,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:39:26 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:39:26 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212139.j2LLdQsv009040@pub.open-bio.org> gss Mon Mar 21 16:39:25 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop Files In directory pub.open-bio.org:/tmp/cvs-serv9018/resources/Photoshop Files Added Files: smoby-medium.psd ncgr-logo.psd rdf-logo.png smoby-small.psd rdf-logo.psd nsf-logo.psd search.psd Log Message: Initial version moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop Files smoby-medium.psd,NONE,1.1 ncgr-logo.psd,NONE,1.1 rdf-logo.png,NONE,1.1 smoby-small.psd,NONE,1.1 rdf-logo.psd,NONE,1.1 nsf-logo.psd,NONE,1.1 search.psd,NONE,1.1 rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop/RCS/Files,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:39:58 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:39:58 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212139.j2LLdwfp009087@pub.open-bio.org> gss Mon Mar 21 16:39:58 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build In directory pub.open-bio.org:/tmp/cvs-serv9063/build Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/build - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:40:00 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:40:00 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212140.j2LLe0Sx009126@pub.open-bio.org> gss Mon Mar 21 16:40:00 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build In directory pub.open-bio.org:/tmp/cvs-serv9105/build Added Files: build.xml .cvsignore Log Message: Initial version moby-live/S-MOBY/ref-impl/semanticmoby.org/build build.xml,NONE,1.1 .cvsignore,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:40:31 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:40:31 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212140.j2LLeVr9009172@pub.open-bio.org> gss Mon Mar 21 16:40:31 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org In directory pub.open-bio.org:/tmp/cvs-serv9139 Modified Files: .classpath .project .mymetadata Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org .classpath,1.3,1.4 .project,1.2,1.3 .mymetadata,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.classpath,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.classpath 2004/11/23 00:20:01 1.3 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.classpath 2005/03/21 21:40:30 1.4 @@ -2,11 +2,11 @@ - + - + @@ -15,8 +15,7 @@ - - + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.project,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/.project 2004/11/04 22:31:36 1.2 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.project 2005/03/21 21:40:30 1.3 @@ -1,6 +1,6 @@ - www.semanticmoby.org + semanticmoby.org @@ -26,22 +26,17 @@ - de.bb.bje.eclipse.IncrementalJspBuilder - - - - - com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder + com.ibm.etools.validation.validationbuilder - com.ibm.etools.validation.validationbuilder + com.ibm.sse.model.structuredbuilder - com.ibm.sse.model.structuredbuilder + com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.mymetadata,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.mymetadata 2004/11/04 22:31:36 1.3 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.mymetadata 2005/03/21 21:40:30 1.4 @@ -1,11 +1,11 @@ + j2ee-spec="1.4" + archive="semanticmoby.org.war"> From gss at pub.open-bio.org Mon Mar 21 16:41:58 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:41:58 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212141.j2LLfw0I009218@pub.open-bio.org> gss Mon Mar 21 16:41:58 EST 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-serv9194/WebRoot/examples/proxies Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 16:42:01 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:42:01 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg19i009260@pub.open-bio.org> gss Mon Mar 21 16:42:01 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/images In directory pub.open-bio.org:/tmp/cvs-serv9239/WebRoot/images Added Files: search.gif rdf-logo.gif smoby-small.gif cshl-logo.gif help1.gif nsf-logo.gif smoby-medium.gif ncgr-logo.gif pinstripe.gif Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/images search.gif,NONE,1.1 rdf-logo.gif,NONE,1.1 smoby-small.gif,NONE,1.1 cshl-logo.gif,NONE,1.1 help1.gif,NONE,1.1 nsf-logo.gif,NONE,1.1 smoby-medium.gif,NONE,1.1 ncgr-logo.gif,NONE,1.1 pinstripe.gif,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:42:01 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:42:01 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg1ao009300@pub.open-bio.org> gss Mon Mar 21 16:42:01 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools In directory pub.open-bio.org:/tmp/cvs-serv9239/src/org/semanticmoby/ref/tools Modified Files: KeywordFinder.java MOBYProperties.java DiscoveryQuery.java InvocationBroker.java URIInvestigator.java KeywordQuery.java Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools KeywordFinder.java,1.1,1.2 MOBYProperties.java,1.1,1.2 DiscoveryQuery.java,1.1,1.2 InvocationBroker.java,1.1,1.2 URIInvestigator.java,1.1,1.2 KeywordQuery.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/KeywordFinder.java,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/src/org/semanticmoby/ref/tools/KeywordFinder.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/KeywordFinder.java 2005/03/21 21:42:01 1.2 @@ -7,9 +7,7 @@ import java.util.*; import com.hp.hpl.jena.rdf.model.*; import com.hp.hpl.jena.shared.*; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import com.hp.hpl.jena.vocabulary.*; public class KeywordFinder { =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/MOBYProperties.java,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/src/org/semanticmoby/ref/tools/MOBYProperties.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/MOBYProperties.java 2005/03/21 21:42:01 1.2 @@ -5,7 +5,6 @@ import javax.servlet.ServletContext; - /** * This abstract class contains a set of static methods for retrieving * properties that are stored in the S-MOBY properties file. @@ -13,10 +12,9 @@ public abstract class MOBYProperties { /** - * The name of the S-MOBY properties file. The file itself should - * exist in some directory in the Java class path. + * The path to the S-MOBY properties file. */ - private static String PROP_FILE_NAME = "smoby.properties"; + private static String PROP_FILE_NAME = "/WEB-INF/smoby.properties"; /** * A static Properties object for accessing the properties file. @@ -67,12 +65,12 @@ if (props == null) // Only try to read it once { props = new Properties(); - InputStream is = context.getResourceAsStream(PROP_FILE_NAME); - if (is == null) { + String path = context.getRealPath(PROP_FILE_NAME); + if (path == null) { throw new FileNotFoundException( "Properties file \"" + PROP_FILE_NAME + "\" not found"); } - props.load(is); + props.load(new FileInputStream(path)); } } } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/DiscoveryQuery.java,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/src/org/semanticmoby/ref/tools/DiscoveryQuery.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/DiscoveryQuery.java 2005/03/21 21:42:01 1.2 @@ -110,7 +110,7 @@ Model dbModel = null; try { - Model queryModel = ((MOBYProvider) queryProvider).getUnderlying(); + Model queryModel = ((MOBYProvider) queryProvider).getModel(); String queryString = buildQueryString(queryModel); StorageManager manager = new StorageManager(); dbModel = manager.openDBModel(); =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/InvocationBroker.java,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/src/org/semanticmoby/ref/tools/InvocationBroker.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/InvocationBroker.java 2005/03/21 21:42:01 1.2 @@ -7,7 +7,6 @@ import javax.servlet.http.*; import org.apache.commons.httpclient.*; import org.semanticmoby.graph.*; -import org.semanticmoby.graph.tools.*; import org.semanticmoby.http.*; import org.semanticmoby.parser.*; import org.semanticmoby.vocabulary.MOBY; @@ -59,14 +58,14 @@ private String rdfxmlString(MOBYProvider provider) { StringWriter writer = new StringWriter(); - provider.getUnderlying().write(writer); + provider.getModel().write(writer); return writer.toString(); } private String n3String(MOBYProvider provider) { StringWriter writer = new StringWriter(); - provider.getUnderlying().write(writer, "N3"); + provider.getModel().write(writer, "N3"); return writer.toString(); } @@ -247,7 +246,7 @@ private String getInputURI(MOBYProvider provider) { try { - Model model = provider.getUnderlying(); + Model model = provider.getModel(); Statement stmt = model.listStatements( provider.getResource(), MOBY.inputURI, (String) null).nextStatement(); @@ -260,7 +259,7 @@ private String getOutputURI(MOBYProvider provider) { try { - Model model = provider.getUnderlying(); + Model model = provider.getModel(); Statement stmt = model.listStatements( provider.getResource(), MOBY.outputURI, (String) null).nextStatement(); @@ -295,26 +294,6 @@ private boolean requiresInputs(MOBYProvider provider) { - MOBYProviderTraverser traverser = new MOBYProviderTraverser(); - try { - traverser.traverse(provider, - new MOBYProviderVisitorAdapter(){ - public void visitSubjectPropValStmtEnd( - MOBYPropertyValueStatement stmt) - throws MOBYProviderTraversalException - { - if (stmt.getValue().isResource()) { - MOBYResource res = (MOBYResource) stmt.getValue(); - if (res.isBlank()) { - throw new MOBYProviderTraversalException(); - } - } - } - }, - true); - } catch (MOBYProviderTraversalException e) { - return true; - } - return false; + return getInputURI(provider) != null; } } \ No newline at end of file =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/URIInvestigator.java,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/src/org/semanticmoby/ref/tools/URIInvestigator.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/URIInvestigator.java 2005/03/21 21:42:01 1.2 @@ -247,7 +247,9 @@ Parser parser = Parser.forInputStream(in, Parser.LANGUAGE_RDF_XML); provider = parser.parseProvider(); } - catch (Throwable t) {} + catch (Throwable t) { + System.err.println("Parse error: " + t); + } // De-register the provider, printing a removal message if // a provider couldn't be parsed =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/KeywordQuery.java,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/src/org/semanticmoby/ref/tools/KeywordQuery.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/KeywordQuery.java 2005/03/21 21:42:01 1.2 @@ -26,6 +26,7 @@ } public List findMatchingProviders() + throws Exception { List matching = new ArrayList(); @@ -53,10 +54,12 @@ catch (StorageException e) { System.err.println(e); + throw e; } catch (SQLException e) { System.err.println(e); + throw e; } return matching; From gss at pub.open-bio.org Mon Mar 21 16:42:02 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:42:02 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg2iw009371@pub.open-bio.org> gss Mon Mar 21 16:42:02 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/db In directory pub.open-bio.org:/tmp/cvs-serv9239/src/org/semanticmoby/ref/tools/db Modified Files: StorageManager.java Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/db StorageManager.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/db/StorageManager.java,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/src/org/semanticmoby/ref/tools/db/StorageManager.java 2004/11/22 22:58:41 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/db/StorageManager.java 2005/03/21 21:42:02 1.2 @@ -59,7 +59,7 @@ public void registerProvider(MOBYProvider provider, Date lastModifiedDate) throws StorageException { - Model model = ((MOBYProvider) provider).getUnderlying(); + Model model = ((MOBYProvider) provider).getModel(); Model dbModel = null; String uriString = provider.getResource().getURI(); Resource uri = model.createResource(uriString); From gss at pub.open-bio.org Mon Mar 21 16:42:02 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:42:02 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg2NM009349@pub.open-bio.org> gss Mon Mar 21 16:42:02 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot In directory pub.open-bio.org:/tmp/cvs-serv9239/WebRoot Modified Files: index.html help.html Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot index.html,1.5,1.6 help.html,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/index.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/index.html 2004/11/23 00:20:02 1.5 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/index.html 2005/03/21 21:42:01 1.6 @@ -3,118 +3,71 @@ Semantic MOBY - -

-

Semantic MOBY

-
-
- - -
- - - - -
- MOBY Autumn 2004 Meeting -
- November 20-21 — Santa Fe, New Mexico -
- Register Now! -
-
-

+
-
- -
-
+ 


- - - - - + + + - - -
ProviderSubjectObject + Service Provider transforms … + … from Subject + … to Object
-
-
- -
Type any terms into the boxes above and -press Search
-(for example type 'hello' (without quotes) into the Provider field,
-or to see all providers, type just an asterisk (*) into the
-Provider field and leave the other fields blank)
+ +
+ + +
+
+To find and engage services on the web, type any terms into the above +boxes and press the Search button. +
+
+ +Example: type "panel" in the Subject field and press Search to discover +the CSHL HapMap service. +
-
-
- -

-About Semantic MOBY   Help on Searching
+About Semantic MOBY   +Help on Searching +
+ +Developers: see the JavaDoc for the Semantic MOBY API!

-
-
-
- - + href="http://www.cshl.edu" target="_blank">CSHL - + href="http://www.ncgr.org" target="_blank">NCGR + href="http://www.nsf.gov" target="_blank">NSF - - - - - - -
CSHL NCGR NSF
CSHLNCGRNSF
- -

-
-
+
=================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/help.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/help.html 2004/07/21 22:35:25 1.3 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/help.html 2005/03/21 21:42:01 1.4 @@ -3,43 +3,44 @@ Semantic MOBY Search Help
+

-Semantic -MOBY Search Help

+ Semantic MOBY maintains a searchable repository of descriptions of -providers of services that are available on the web. At the heart -of these descriptions is the notion that providers map one type +Service Providers that are available on the web. At the heart +of these descriptions is the notion that providers transform one type of thing (the Subject) to another (the Object), or vice versa.

-Providers, as well as subjects and objects, are -classified using web-accessible definitions (ontologies), and these definitions +Providers, as well as subjects and objects, are classified using +web-accessible definitions (ontologies), and these definitions have keywords associated with them. For example, the following shows -a query for providers whose definitions include the keyword "hello": +a query for providers whose subjects are members of any class that +has the keyword "panel" associated with it:

-. +.

Search hints
    -
  • Keywords are not case sensitive, so HELLO means the -same thing as hello as does HeLlO. +
  • Keywords are not case sensitive, so PANEL means the +same thing as panel as does PaNeL.

  • The wildcard character (*) can be used at the end of a keyword to match keywords that start with the characters before the wildcard. -For example, he* will match hello as well -as help. +For example, pan* will match panel as well +as panini.

  • Multiple words enclosed in double quotes are considered to be a single keyword. For example, the quoted string "gene symbol" -is considered to be a single keyword composed of 11 characters, including a space. -The wildcard character is interpreted literally (i.e. as the '*' -character) if it appears within a quoted string. +is considered to be a single keyword composed of 11 characters, including +a space. The wildcard character is interpreted literally (i.e. as the +'*' character) if it appears within a quoted string.

  • Multiple keywords may be typed in one of the fields; this means to search for any of the keywords in that field. For example, @@ -50,7 +51,9 @@ match keywords for all the fields will match. For example, typing fat sugar into the Subject field, and "weight gain" into the Object field will search for -providers that map either fat or sugar to weight gain. +providers that map either fat or sugar to weight gain.

+
+ From gss at pub.open-bio.org Mon Mar 21 16:42:02 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:42:02 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg2tY009326@pub.open-bio.org> gss Mon Mar 21 16:42:01 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/WEB-INF In directory pub.open-bio.org:/tmp/cvs-serv9239/WebRoot/WEB-INF Modified Files: .cvsignore web.xml Added Files: log4j.properties smoby.example.properties Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/WEB-INF log4j.properties,NONE,1.1 smoby.example.properties,NONE,1.1 .cvsignore,1.1,1.2 web.xml,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/WEB-INF/.cvsignore,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/WEB-INF/.cvsignore 2004/07/15 20:27:14 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/WEB-INF/.cvsignore 2005/03/21 21:42:01 1.2 @@ -1 +1,2 @@ classes +smoby.properties =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/WEB-INF/web.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/WEB-INF/web.xml 2004/11/04 22:32:05 1.3 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/WEB-INF/web.xml 2005/03/21 21:42:01 1.4 @@ -6,84 +6,77 @@ ProviderInvestigationServlet investigate Provider investigation servlet - org.smoby.ref.servlets.ProviderInvestigationServlet + org.semanticmoby.ref.servlets.ProviderInvestigationServlet DiscoveryServlet find-providers Discovery servlet - org.smoby.ref.servlets.DiscoveryServlet + org.semanticmoby.ref.servlets.DiscoveryServlet KeywordSearchServlet keyword-search Keyword search servlet - org.smoby.ref.servlets.KeywordSearchServlet + org.semanticmoby.ref.servlets.KeywordSearchServlet ProviderEngagementServlet engage-provider Keyword search servlet - org.smoby.ref.servlets.ProviderEngagementServlet + org.semanticmoby.ref.servlets.ProviderEngagementServlet ResultsDisplayServlet display-results Results display servlet - org.smoby.ref.servlets.ResultsDisplayServlet + org.semanticmoby.ref.servlets.ResultsDisplayServlet HelloWorldServlet hello-world Hello World simple application - org.smoby.ref.servlets.example.HelloWorldServlet + org.semanticmoby.ref.servlets.example.HelloWorldServlet HelloWorldDisplayServlet hello-world-display Servlet to display results of invocation of hello-world application - org.smoby.ref.servlets.example.HelloWorldDisplayServlet + org.semanticmoby.ref.servlets.example.HelloWorldDisplayServlet GraphConversionServlet Graph Converter Convert between N-Triples and RDF/XML - org.smoby.ref.servlets.dev.GraphConversionServlet + org.semanticmoby.ref.servlets.dev.GraphConversionServlet RepositoryPrintServlet print-repository Print the contents of the metadata repository - org.smoby.ref.servlets.dev.RepositoryPrintServlet + org.semanticmoby.ref.servlets.dev.RepositoryPrintServlet OWLValidationServlet validate-owl-graph Validate that a graph is a valid OWL graph - org.smoby.ref.servlets.dev.OWLValidationServlet + org.semanticmoby.ref.servlets.dev.OWLValidationServlet MOBYGraphValidationServlet validate-canonical-graph Validate that a graph is in MOBY canonical form - org.smoby.ref.servlets.dev.MOBYGraphValidationServlet - - - - MeetingRegistrationServlet - Meeting Registration Servlet - Respond to registration form submission - org.smoby.meeting.MeetingRegistrationServlet + org.semanticmoby.ref.servlets.dev.MOBYGraphValidationServlet @@ -143,9 +136,4 @@ /dev/validate-canonical-graph - - MeetingRegistrationServlet - /meeting/register - - From gss at pub.open-bio.org Mon Mar 21 16:42:02 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:42:02 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg2FR009406@pub.open-bio.org> gss Mon Mar 21 16:42:02 EST 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-serv9239/WebRoot/examples/ontologies Added Files: ProxyProvider ProxyProvider.n3 Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/ontologies ProxyProvider,NONE,1.1 ProxyProvider.n3,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:42:02 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:42:02 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg2jx009389@pub.open-bio.org> gss Mon Mar 21 16:42:02 EST 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-serv9239/WebRoot/examples/proxies Added Files: ncbi-megablast.n3 pubmed.n3 pubmed ncbi-megablast Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies ncbi-megablast.n3,NONE,1.1 pubmed.n3,NONE,1.1 pubmed,NONE,1.1 ncbi-megablast,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 16:42:02 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:42:02 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg2YS009434@pub.open-bio.org> gss Mon Mar 21 16:42:02 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets In directory pub.open-bio.org:/tmp/cvs-serv9239/src/org/semanticmoby/ref/servlets Modified Files: BaseServlet.java KeywordSearchServlet.java Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets BaseServlet.java,1.1,1.2 KeywordSearchServlet.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/BaseServlet.java,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/src/org/semanticmoby/ref/servlets/BaseServlet.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/BaseServlet.java 2005/03/21 21:42:02 1.2 @@ -43,7 +43,7 @@ { if (! log4jInitialized) { - String path = ctx.getRealPath("/") + "log4j.properties"; + String path = ctx.getRealPath("/WEB-INF/log4j.properties"); PropertyConfigurator.configure(path); log4jInitialized = true; } @@ -67,17 +67,9 @@ out.print(title); out.println(""); out.println(""); - out.println("
"); - out.println("

"); - out.println(""); - out.println("Semantic"); - out.println("M" + - "OBY" + - ""); - out.println(""); - out.println("

"); - out.println("
"); - out.println(""); + out.println(""); + out.println(""); + out.println("

"); out.println(""); } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/KeywordSearchServlet.java,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/src/org/semanticmoby/ref/servlets/KeywordSearchServlet.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/KeywordSearchServlet.java 2005/03/21 21:42:02 1.2 @@ -43,20 +43,48 @@ if ((provider.isEmpty()) && (accepts.isEmpty()) && (returns.isEmpty())) { showResultCount(-1, out); + out.println(""); + out.println("Show All Providers"); } else { KeywordQuery q = new KeywordQuery(provider, accepts, returns); - List matching = q.findMatchingProviders(); - - showResultCount(matching.size(), out); - - for (Iterator it = matching.iterator(); it.hasNext();) - { - MOBYProvider p = (MOBYProvider) it.next(); - showProvider(p, out); - } + try + { + List matching = q.findMatchingProviders(); + + showResultCount(matching.size(), out); + + if (matching.size() > 0) + { + for (Iterator it = matching.iterator(); it.hasNext();) + { + MOBYProvider p = (MOBYProvider) it.next(); + showProvider(p, out); + } + } + else + { + // Show a link that displays all providers. This is only + // temporary, to keep searchers from getting discouraged. + // When there are more providers defined, showing them all + // won't make sense. + // + out.println(""); + out.println("Show All Providers"); + } + } + catch (Exception e) + { + // Something went wrong; let the user know + // + out.println(""); + out.println("A server error occurred - please contact"); + out.println("MOBY support"); + out.println("to report the error. Thank you!"); + out.println(""); + } } finishHTML(out); } @@ -116,22 +144,23 @@ { // A negative count indicates that no keywords were given. // - out.println("No keywords were entered, so no search was performed."); + out.println("No keywords were entered, so no search was performed. "); + out.println("To see all registered providers,
click the link below:"); } else if (count == 0) { // Indicate that no matching providers were found, and // give the user feedback as to why this might be expected. // - out.println("No matching providers were found. Note that"); - out.println("very few providers have yet been defined."); + out.println("No matching providers were found. To see all"); + out.println("registered providers, click the link below:"); } else { // Show how many providers were found // out.println(count + " matching provider" + - (count > 1 ? "s" : "") + " found"); + (count > 1 ? "s were" : " was") + " found:"); } out.println(""); out.println(""); @@ -147,7 +176,7 @@ String uri = provider.getResource().getURI(); String name = provider.getName(); String description = provider.getOneLineDescription(); - String moreInfo = provider.getMoreInfoURI(); + String moreInfo = provider.getAboutURI(); // Display a link to the Semantic MOBY engage-provider service // @@ -175,7 +204,7 @@ out.print(""); - out.print("\"View"); + out.print("\"View"); out.print(""); out.println("
"); From nopushneva at pub.open-bio.org Tue Mar 22 14:39:56 2005 From: nopushneva at pub.open-bio.org (Nina Opushneva) Date: Tue, 22 Mar 2005 14:39:56 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503221939.j2MJduoB013744@pub.open-bio.org> nopushneva Tue Mar 22 14:39:56 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv13718 Modified Files: Central.pm Log Message: add a parameter for calling the rdfagent by mobycentral.config file moby-live/Perl/MOBY Central.pm,1.150,1.151 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- /home/repository/moby/moby-live/Perl/MOBY/Central.pm 2005/03/16 19:14:14 1.150 +++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm 2005/03/22 19:39:55 1.151 @@ -1247,8 +1247,11 @@ } if ($ch == 0){ - my $rez = system("/export/home/nina/rdfagent/run-RDFagent ".$signatureURL); - + + use MOBY::Config; + my $conf = MOBY::Config -> new(); + my $path = $conf->{mobycentral}->{rdfagent} ; + my $rez = system($path." ".$signatureURL); return &_error("The RDFagent call was successful. Report will send to you by E-mail","") if ($rez == 0); return &_error("Some problem with a connection or RDF model building","") if ($rez != 0); } From nopushneva at pub.open-bio.org Tue Mar 22 14:45:43 2005 From: nopushneva at pub.open-bio.org (Nina Opushneva) Date: Tue, 22 Mar 2005 14:45:43 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503221945.j2MJjhuP013800@pub.open-bio.org> nopushneva Tue Mar 22 14:45:43 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Client In directory pub.open-bio.org:/tmp/cvs-serv13774 Modified Files: Central.pm Log Message: some changes in the check parameters procedure for the rdfagent moby-live/Perl/MOBY/Client Central.pm,1.93,1.94 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/03/16 20:05:46 1.93 +++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/03/22 19:45:43 1.94 @@ -780,7 +780,7 @@ $Category ||= ""; #____________call RDFagent__________________________________________________ -if (defined $signatureURL){ +if ($signatureURL ne ""){ my $ch = 0; my $sign_req; foreach $sign_req ($name, $type, $authURI, $email, $URL, $desc, $Category){ @@ -791,19 +791,19 @@ } if ($ch == 0){ print "call Agent\n"; - my $message = " - - - - - - $signatureURL - - - - "; - my ( $return ) = $self->_call( 'default', 'registerService', $message ); - return ( $self->parseRegXML( $return ) ); + my $message = " + + + + + + $signatureURL + + + + "; + my ( $return ) = $self->_call( 'default', 'registerService', $message ); + return ( $self->parseRegXML( $return ) ); } } From gss at pub.open-bio.org Tue Mar 22 17:35:08 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Tue, 22 Mar 2005 17:35:08 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503222235.j2MMZ8uH014250@pub.open-bio.org> gss Tue Mar 22 17:35:08 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/images In directory pub.open-bio.org:/tmp/cvs-serv14227/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/images Removed Files: moby.png ncgr.png Log Message: moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/images moby.png,1.1,NONE ncgr.png,1.1,NONE rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/images/RCS/moby.png,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/images/RCS/ncgr.png,v: No such file or directory From gss at pub.open-bio.org Tue Mar 22 17:35:08 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Tue, 22 Mar 2005 17:35:08 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503222235.j2MMZ8BO014272@pub.open-bio.org> gss Tue Mar 22 17:35:08 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting In directory pub.open-bio.org:/tmp/cvs-serv14227/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting Removed Files: index.html lodging.html missing-fields.jsp registration-confirmation.jsp registration-form.html shuttles.html Log Message: moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting index.html,1.2,NONE lodging.html,1.2,NONE missing-fields.jsp,1.1,NONE registration-confirmation.jsp,1.1,NONE registration-form.html,1.2,NONE shuttles.html,1.1,NONE rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/RCS/index.html,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/RCS/lodging.html,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/RCS/missing-fields.jsp,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/RCS/registration-confirmation.jsp,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/RCS/registration-form.html,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/RCS/shuttles.html,v: No such file or directory From gss at pub.open-bio.org Wed Mar 23 14:55:19 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Wed, 23 Mar 2005 14:55:19 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503231955.j2NJtJOG017635@pub.open-bio.org> gss Wed Mar 23 14:55:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources In directory pub.open-bio.org:/tmp/cvs-serv17613/resources Removed Files: web.xml Log Message: Moved back to WebRoot/WEB-INF directory moby-live/S-MOBY/ref-impl/semanticmoby.org/resources web.xml,1.1,NONE rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/RCS/web.xml,v: No such file or directory From gss at pub.open-bio.org Wed Mar 23 14:56:12 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Wed, 23 Mar 2005 14:56:12 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503231956.j2NJuCPA017685@pub.open-bio.org> gss Wed Mar 23 14:56:12 EST 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-serv17664/WebRoot/examples/proxies Added Files: tair-seqviewer.n3 flybase-genesearch wormbase-query tair-seqviewer tair-mapviewer.n3 tair-mapviewer sgd-quicksearch gramene-query.n3 sgd-quicksearch.n3 gramene-query wormbase-query.n3 flybase-genequery.n3 Log Message: New wrapped providers moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies tair-seqviewer.n3,NONE,1.1 flybase-genesearch,NONE,1.1 wormbase-query,NONE,1.1 tair-seqviewer,NONE,1.1 tair-mapviewer.n3,NONE,1.1 tair-mapviewer,NONE,1.1 sgd-quicksearch,NONE,1.1 gramene-query.n3,NONE,1.1 sgd-quicksearch.n3,NONE,1.1 gramene-query,NONE,1.1 wormbase-query.n3,NONE,1.1 flybase-genequery.n3,NONE,1.1 From senger at pub.open-bio.org Thu Mar 3 23:18:36 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 3 Mar 2005 18:18:36 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503032318.j23NIaRt005907@pub.open-bio.org> senger Thu Mar 3 18:18:36 EST 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/gui/serviceInstanceCreationTool In directory pub.open-bio.org:/tmp/cvs-serv5850/src/main/org/biomoby/client/gui/serviceInstanceCreationTool Modified Files: ServiceCreationTool.java Log Message: moby-live/Java/src/main/org/biomoby/client/gui/serviceInstanceCreationTool ServiceCreationTool.java,1.2,1.3 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/gui/serviceInstanceCreationTool/ServiceCreationTool.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/gui/serviceInstanceCreationTool/ServiceCreationTool.java 2004/11/17 17:15:26 1.2 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/gui/serviceInstanceCreationTool/ServiceCreationTool.java 2005/03/03 23:18:36 1.3 @@ -30,7 +30,7 @@ public class ServiceCreationTool extends JApplet { // set to false if creating a java application - private final boolean isApplet = true; + private static final boolean isApplet = true; private String newline = System.getProperty("line.separator"); /* private member variables */ From senger at pub.open-bio.org Thu Mar 3 23:18:36 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 3 Mar 2005 18:18:36 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503032318.j23NIaVe005887@pub.open-bio.org> senger Thu Mar 3 18:18:36 EST 2005 Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client In directory pub.open-bio.org:/tmp/cvs-serv5850/src/main/org/biomoby/client Modified Files: ServicesEdge.java Log Message: moby-live/Java/src/main/org/biomoby/client ServicesEdge.java,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ServicesEdge.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/ServicesEdge.java 2004/10/18 14:35:06 1.3 +++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ServicesEdge.java 2005/03/03 23:18:35 1.4 @@ -31,7 +31,7 @@ // types of connections - private final int MIN_CONNECTION_TYPE = 0; + private static final int MIN_CONNECTION_TYPE = 0; /** Indicates that there is no information how the services are connected. */ public static final int NO_CONNECTION = 0; @@ -40,7 +40,7 @@ public static final int TAIL_COLLECTION_CONNECTION = 3; public static final int BOTH_COLLECTIONS_CONNECTION = 4; public static final int NO_OUTPUT = 5; - private final int MAX_CONNECTION_TYPE = 5; + private static final int MAX_CONNECTION_TYPE = 5; /** A divider used in {@link #getConnector connectors} to separate * namespace and data type name. */ From senger at pub.open-bio.org Thu Mar 3 23:18:36 2005 From: senger at pub.open-bio.org (Martin Senger) Date: Thu, 3 Mar 2005 18:18:36 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503032318.j23NIaOP005869@pub.open-bio.org> senger Thu Mar 3 18:18:35 EST 2005 Update of /home/repository/moby/moby-live/Java In directory pub.open-bio.org:/tmp/cvs-serv5850 Modified Files: build.xml Log Message: moby-live/Java build.xml,1.10,1.11 =================================================================== RCS file: /home/repository/moby/moby-live/Java/build.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- /home/repository/moby/moby-live/Java/build.xml 2004/12/05 22:28:01 1.10 +++ /home/repository/moby/moby-live/Java/build.xml 2005/03/03 23:18:35 1.11 @@ -355,9 +355,9 @@ public="true"> -
Generated: ${TODAY_LONG}]]>
- - Submit a bug or feature
+
Generated: ${TODAY_LONG}]]>
+ + Submit a bug or feature
Generated: ${TODAY_LONG}]]>
From mwilkinson at pub.open-bio.org Tue Mar 8 04:44:12 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Mon, 7 Mar 2005 23:44:12 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503080444.j284iC0C030405@pub.open-bio.org> mwilkinson Mon Mar 7 23:44:12 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv30386 Modified Files: CommonSubs.pm Log Message: fixed error reported by Pieter. Thanks. moby-live/Perl/MOBY CommonSubs.pm,1.59,1.60 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/02/08 16:49:15 1.59 +++ /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/08 04:44:12 1.60 @@ -1280,7 +1280,7 @@ my $valuenode = $valuenodes->get_node( $_ ); foreach my $amount ( $valuenode->childNodes ) { next unless $amount->nodeType == TEXT_NODE; - $resp .= $amount->toString; + $resp .= $amount->nodeValue; } } push @contents, $resp; @@ -1288,7 +1288,7 @@ my $resp; foreach ( $child->childNodes ) { next unless $_->nodeType == TEXT_NODE; - $resp .= $_->toString; + $resp .= $_->nodeValue; } push @contents, $resp; } From yanwong at pub.open-bio.org Tue Mar 8 10:36:17 2005 From: yanwong at pub.open-bio.org (Yan Wong) Date: Tue, 8 Mar 2005 05:36:17 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503081036.j28AaHDe031479@pub.open-bio.org> yanwong Tue Mar 8 05:36:17 EST 2005 Update of /home/repository/moby/moby-live/Python/bioMoby In directory pub.open-bio.org:/tmp/cvs-serv31454/bioMoby Modified Files: mobyDataTypes.py Log Message: A small bug prevented the servicenotes to be retrieved from the XML moby-live/Python/bioMoby mobyDataTypes.py,1.17,1.18 =================================================================== RCS file: /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/02/18 15:54:10 1.17 +++ /home/repository/moby/moby-live/Python/bioMoby/mobyDataTypes.py 2005/03/08 10:36:17 1.18 @@ -194,6 +194,7 @@ anObj=MobyObject() anObj.fromMoby(aCross) self.__cross__.append(anObj) + #deserializes the PIB elif child.localName=="ProvisionInformation": for aPIB in child.childNodes: self.__PIB__.append(aPIB.toxml()) @@ -297,13 +298,14 @@ """The class describes a Moby Content (for queries or answers) """ - def __init__(self, queryData={}, authority="", servicenotes=""): + def __init__(self, queryData={}, authority="", servicenotes="", marshall=True): """Optional parameters indicate the authority's URL and notes about the service """ self.authority=authority self.servicenotes=servicenotes self.queryData=queryData + self._marshall=marshall def __str__(self): """return the XML form of the Moby Content object @@ -337,16 +339,21 @@ result.append("") for aSimple in queryObject[1]: - result.append(''+m.dumps(aSimple)+'') + if self._marshall: + result.append('%s'%m.dumps(aSimple)) + else: + result.append('%s'%str(aSimple)) result.append("") #If it is a parameter elif queryObject.__class__ is Parameter: result.append(m.dumps(queryObject)) #Or a simple object - else: - result.append(""+m.dumps(queryObject)+"") - + else: + if self._marshall: + result.append("%s"%m.dumps(queryObject)) + else: + result.append("%s"%queryObject) result.append("") result.append('') @@ -511,4 +518,4 @@ def __repr__(self): """put the xml of the Content """ - return self.__str__() \ No newline at end of file + return self.__str__() From mwilkinson at pub.open-bio.org Wed Mar 9 00:56:15 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Tue, 8 Mar 2005 19:56:15 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503090056.j290uFmq001340@pub.open-bio.org> mwilkinson Tue Mar 8 19:56:15 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi In directory pub.open-bio.org:/tmp/cvs-serv1321 Modified Files: mysql.pm Log Message: I think I have finally squashed that pesky bug that prevents Simples from being displayed as part of Collections in the findService output. It also requires a hand-modification of the database, unfortunately. If you need this, drop me a line and I'll tell you what to do moby-live/Perl/MOBY/Adaptor/moby/queryapi mysql.pm,1.8,1.9 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm 2005/01/11 22:17:11 1.8 +++ /home/repository/moby/moby-live/Perl/MOBY/Adaptor/moby/queryapi/mysql.pm 2005/03/09 00:56:15 1.9 @@ -124,7 +124,7 @@ sub insert_simple_input { my ($self, %args) = @_; my $dbh = $self->dbh; - my $si = $args{collection_input_id}?'':$args{service_instance_id}; + my $si = $args{collection_input_id}?undef:$args{service_instance_id}; $dbh->do("insert into simple_input (object_type_uri, @@ -148,7 +148,7 @@ sub insert_simple_output { my ($self, %args) = @_; my $dbh = $self->dbh; - my $si = $args{collection_output_id}?'':$args{service_instance_id}; + my $si = $args{collection_output_id}?undef:$args{service_instance_id}; $dbh->do("insert into simple_output (object_type_uri, From mwilkinson at pub.open-bio.org Fri Mar 11 22:22:58 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Fri, 11 Mar 2005 17:22:58 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503112222.j2BMMwLo013724@pub.open-bio.org> mwilkinson Fri Mar 11 17:22:57 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv13705 Modified Files: CommonSubs.pm Log Message: getNodeContentWithArticle now recognizes CDATA content as well moby-live/Perl/MOBY CommonSubs.pm,1.60,1.61 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/08 04:44:12 1.60 +++ /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/11 22:22:57 1.61 @@ -1279,7 +1279,7 @@ for ( 1 .. $valuenodes->size() ) { my $valuenode = $valuenodes->get_node( $_ ); foreach my $amount ( $valuenode->childNodes ) { - next unless $amount->nodeType == TEXT_NODE; + next unless ($amount->nodeType == TEXT_NODE || $amount->nodeType == CDATA_SECTION_NODE); $resp .= $amount->nodeValue; } } @@ -1287,7 +1287,7 @@ } else { my $resp; foreach ( $child->childNodes ) { - next unless $_->nodeType == TEXT_NODE; + next unless ($_->nodeType == TEXT_NODE || $amount->nodeType == CDATA_SECTION_NODE); $resp .= $_->nodeValue; } push @contents, $resp; From mwilkinson at pub.open-bio.org Fri Mar 11 22:25:31 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Fri, 11 Mar 2005 17:25:31 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503112225.j2BMPVYd013792@pub.open-bio.org> mwilkinson Fri Mar 11 17:25:31 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv13773 Modified Files: CommonSubs.pm Log Message: DOH...getNodeContentWithArticle now recognizes CDATA content as well moby-live/Perl/MOBY CommonSubs.pm,1.61,1.62 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/11 22:22:57 1.61 +++ /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/11 22:25:31 1.62 @@ -1287,7 +1287,7 @@ } else { my $resp; foreach ( $child->childNodes ) { - next unless ($_->nodeType == TEXT_NODE || $amount->nodeType == CDATA_SECTION_NODE); + next unless ($_->nodeType == TEXT_NODE || $_->nodeType == CDATA_SECTION_NODE); $resp .= $_->nodeValue; } push @contents, $resp; From mwilkinson at pub.open-bio.org Mon Mar 14 18:30:58 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Mon, 14 Mar 2005 13:30:58 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503141830.j2EIUw9n032565@pub.open-bio.org> mwilkinson Mon Mar 14 13:30:57 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv32546 Modified Files: CommonSubs.pm Log Message: allow CDATA in the service notes block moby-live/Perl/MOBY CommonSubs.pm,1.62,1.63 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/11 22:25:31 1.62 +++ /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/14 18:30:57 1.63 @@ -1458,6 +1458,9 @@ # $content .= $response_component->toString; $content .= $response_component->nodeValue if ( $response_component->nodeType == TEXT_NODE ); + $content .= $response_component->nodeValue + if ( $response_component->nodeType == CDATA_SECTION_NODE ); + } } return ( $content ); From mwilkinson at pub.open-bio.org Wed Mar 16 17:32:07 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Wed, 16 Mar 2005 12:32:07 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503161732.j2GHW7l3009815@pub.open-bio.org> mwilkinson Wed Mar 16 12:32:06 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Client In directory pub.open-bio.org:/tmp/cvs-serv9796 Modified Files: Central.pm Log Message: ugh. Noisy test suite moby-live/Perl/MOBY/Client Central.pm,1.90,1.91 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/02/08 23:43:06 1.90 +++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/03/16 17:32:06 1.91 @@ -1875,7 +1875,7 @@ my $id = &_nodeTextContent( $Object, 'id' ); my $success = &_nodeTextContent( $Object, 'success' ); my $message = &_nodeCDATAContent( $Object, 'message' ); -print STDERR "******$message******\n"; +#print STDERR "******$message******\n"; my $RDF = &_nodeRawContent( $Object, 'RDF' ); my $reg = MOBY::Client::Registration->new( success => $success, From mwilkinson at pub.open-bio.org Wed Mar 16 19:14:15 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Wed, 16 Mar 2005 14:14:15 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503161914.j2GJEF8m010119@pub.open-bio.org> mwilkinson Wed Mar 16 14:14:15 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv10100/MOBY Modified Files: Central.pm Log Message: should correctly parse out the secondary parameter details without absurd restrictions. moby-live/Perl/MOBY Central.pm,1.149,1.150 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- /home/repository/moby/moby-live/Perl/MOBY/Central.pm 2005/02/10 00:17:45 1.149 +++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm 2005/03/16 19:14:14 1.150 @@ -1542,29 +1542,28 @@ if ( $types->get_node( 1 ) ) { foreach ( $types->get_node( 1 )->childNodes ) { # should only ever be one! - ( $_->nodeType == TEXT_NODE ) - && ( $datatype = $_->toString ); + ( $_->nodeType == TEXT_NODE ) && ( $datatype .= $_->nodeValue ); } } my $defs = $parameter->getElementsByTagName( 'default' ); if ( $defs->get_node( 1 ) ) { foreach ( $defs->get_node( 1 )->childNodes ) { # should only ever be one! - ( $_->nodeType == TEXT_NODE ) && ( $def = $_->toString ); + ( $_->nodeType == TEXT_NODE ) && ( $def .= $_->nodeValue ); } } my $maxs = $parameter->getElementsByTagName( 'max' ); if ( $maxs->get_node( 1 ) ) { foreach ( $maxs->get_node( 1 )->childNodes ) { # should only ever be one! - ( $_->nodeType == TEXT_NODE ) && ( $max = $_->toString ); + ( $_->nodeType == TEXT_NODE ) && ( $max .= $_->nodeValue ); } } my $mins = $parameter->getElementsByTagName( 'min' ); if ( $mins->get_node( 1 ) ) { foreach ( $mins->get_node( 1 )->childNodes ) { # should only ever be one! - ( $_->nodeType == TEXT_NODE ) && ( $min = $_->toString ); + ( $_->nodeType == TEXT_NODE ) && ( $min .= $_->nodeValue ); } } my $enums = $parameter->getElementsByTagName( 'enum' ); @@ -1573,11 +1572,15 @@ foreach ( $enums->get_node( $n )->childNodes ) { # should only ever be one! ( $_->nodeType == TEXT_NODE ) - && ( push @enums, $_->toString ); + && ( push @enums, $_->nodeValue ); } } my $enum_string = join "", ( map { $_ . "," } @enums ); chop $enum_string; # get rid of trailing comma + $datatype =~ s/^\s+//; $datatype =~ s/\s+$//; + $def =~ s/^\s+//; $def =~ s/\s+$//; + $max =~ s/^\s+//; $max =~ s/\s+$//; + $min =~ s/^\s+//; $min =~ s/\s+$//; my $sec = $SVC->add_secondary_input( default_value => $def, maximum_value => $max, From mwilkinson at pub.open-bio.org Wed Mar 16 19:14:15 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Wed, 16 Mar 2005 14:14:15 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503161914.j2GJEF3C010138@pub.open-bio.org> mwilkinson Wed Mar 16 14:14:15 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Client In directory pub.open-bio.org:/tmp/cvs-serv10100/MOBY/Client Modified Files: Central.pm Log Message: should correctly parse out the secondary parameter details without absurd restrictions. moby-live/Perl/MOBY/Client Central.pm,1.91,1.92 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/03/16 17:32:06 1.91 +++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/03/16 19:14:15 1.92 @@ -913,18 +913,17 @@ $message .= "\n"; while ( my ( $param, $desc ) = each %SEC ) { unless ( ( ref( $desc ) ) =~ /hash/i ) { - return $self->errorRegXML( -"invalid structure of secondary article $param; expected hashref of limitations" + return $self->errorRegXML("invalid structure of secondary article $param; expected hashref of limitations" ); } my %data = %{$desc}; - my $default = $data{default}; - my $max = $data{max}; - my $min = $data{min}; - my $datatype = $data{datatype}; + my $default = $data{default}||""; + my $max = $data{max}||""; + my $min = $data{min}||""; + my $datatype = $data{datatype}||""; + my $enums = $data{enum}||[]; unless ( $datatype ) { - return $self->errorRegXML( -"a secondaryArticle must contain at least a datatype value in secondary article $param" + return $self->errorRegXML("a secondaryArticle must contain at least a datatype value in secondary article $param" ); } unless ( ( $datatype =~ /Integer/ ) @@ -932,16 +931,14 @@ || ( $datatype =~ /String/ ) || ( $datatype =~ /DateTime/ ) ) { - return $self->errorRegXML( -"a secondaryArticle must have a datatype of Integer, Float, String, or DateTime" + return $self->errorRegXML("a secondaryArticle must have a datatype of Integer, Float, String, or DateTime" ); } - unless ( ( ref( $data{enum} ) ) =~ /array/i ) { - return $self->errorRegXML( -"invalid structure of enum limits in secondary article $param; expected arrayref" + unless ( ( ref( $enums ) ) =~ /array/i ) { + return $self->errorRegXML("invalid structure of enum limits in secondary article $param; expected arrayref" ); } - my @enums = @{ $data{enum} }; + my @enums = @{ $enums }; $message .= "\n"; $message .= "$default\n"; $message .= "$datatype\n"; From mwilkinson at pub.open-bio.org Wed Mar 16 20:05:46 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Wed, 16 Mar 2005 15:05:46 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503162005.j2GK5k0Q010412@pub.open-bio.org> mwilkinson Wed Mar 16 15:05:46 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Client In directory pub.open-bio.org:/tmp/cvs-serv10393/MOBY/Client Modified Files: Central.pm Log Message: removing the code that calls the RDF builder just for the moment. it needs to be parameterized first. moby-live/Perl/MOBY/Client Central.pm,1.92,1.93 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/03/16 19:14:15 1.92 +++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/03/16 20:05:46 1.93 @@ -980,16 +980,18 @@ # return ( $self->parseRegXML( $return ) ); #_______call a new version RDFbuilder (by Eddie Kawas) _________________________________________ my $reg = $self->parseRegXML( $return ); - if ($reg->success == 1){ - require LWP::UserAgent; - - my $ua = LWP::UserAgent->new; - my $url='http://mobycentral.cbr.nrc.ca:8090/DemoServlet/forms/getSignatureResponse?domain='.$authURI.'&serviceName='.$name; - - my $response = $ua->get($url); - my $rdf = $response->content; - print "$rdf\n"; -} + +# if ($reg->success == 1){ +# require LWP::UserAgent; +# +# my $ua = LWP::UserAgent->new; +# my $url='http://mobycentral.cbr.nrc.ca:8090/DemoServlet/forms/getSignatureResponse?domain='.$authURI.'&serviceName='.$name; +# +# my $response = $ua->get($url); +# my $rdf = $response->content; +# print "$rdf\n"; +#} + return $reg; #_______________________________________________________________________________________________ From mwilkinson at pub.open-bio.org Wed Mar 16 22:30:31 2005 From: mwilkinson at pub.open-bio.org (Mark Wilkinson) Date: Wed, 16 Mar 2005 17:30:31 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503162230.j2GMUVii010922@pub.open-bio.org> mwilkinson Wed Mar 16 17:30:31 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv10903/MOBY Modified Files: CommonSubs.pm Log Message: altered getNodeContentWithArticle so that you can get the text content of the root node by leaving off the articleName argument. This is very useful... honest... moby-live/Perl/MOBY CommonSubs.pm,1.63,1.64 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/14 18:30:57 1.63 +++ /home/repository/moby/moby-live/Perl/MOBY/CommonSubs.pm 2005/03/16 22:30:31 1.64 @@ -1158,11 +1158,15 @@ be the entire mobyData block. $tagname - the tagname (effectively from the Object type ontology), or "Parameter" if you are trying to get secondaries - $articleName - the articleName that we are searching for + $articleName - the articleName that we are searching for. + to get the content of the primary object, leave + this field blank! + + returns : an ARRAY of the stringified text content for each + node that matched the tagname/articleName specified; one + array element for each matching node. Newlines are NOT considered + new nodes (as they are in normal XML). - returns : an array of the stringified text content for each - node that matched the tagname/articleName specified. - note that each line of content is an element of the string. notes : This was written for the purpose of getting the values of String, Integer, Float, Date_Time, and other such primitives. For example, in the following XML: @@ -1221,9 +1225,9 @@ foreach my $article(@articles){ my ($type, $DOM) = @{$article}; if ($type == SECONDARY){ - $cutoff = getNodeContentsWithArticle($DOM, "Parameter", "cutoff"); + ($cutoff) = getNodeContentsWithArticle($DOM, "Parameter", "cutoff"); } else { - $sequences = getNodeContentWithArticle($DOM, "String", "SequenceString"); + @sequences = getNodeContentWithArticle($DOM, "String", "SequenceString"); } } } @@ -1245,11 +1249,24 @@ my @contents; return () unless ref( $node ) =~ /XML::LibXML/; return () unless $element; - return () unless $articleName; + + unless ($articleName){ # the request is for root node if no articleName + my $resp; + foreach my $child($node->childNodes){ + next unless ($child->nodeType == TEXT_NODE || $child->nodeType == CDATA_SECTION_NODE); + $resp .= $child->nodeValue; + } + push @contents, $resp; + return @contents; + } + my $nodes = $node->getElementsByTagName( $element ); unless ( $nodes->get_node( 1 ) ) { $nodes = $node->getElementsByTagName( "moby:$element" ); } + + + # if there is an articleName, then get that specific node for ( 1 .. $nodes->size() ) { my $child = $nodes->get_node( $_ ); if ( From gss at pub.open-bio.org Mon Mar 21 21:29:44 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:29:44 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212129.j2LLTiqW008258@pub.open-bio.org> gss Mon Mar 21 16:29:44 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph In directory pub.open-bio.org:/tmp/cvs-serv8173/src/org/semanticmoby/graph Modified Files: MOBYEnumeration.java MOBYCollection.java MOBYSingleElement.java MOBYFixedCollection.java MOBYProviderSet.java MOBYSubject.java MOBYDescriptor.java MOBYProvider.java MOBYDocument.java MOBYOntology.java MOBYGraphNode.java MOBYObject.java MOBYMappingElement.java MOBYOrderedCollection.java MOBYUnorderedCollection.java MOBYResizableCollection.java Log Message: Major cleanup of graph classes moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph MOBYEnumeration.java,1.1,1.2 MOBYCollection.java,1.1,1.2 MOBYSingleElement.java,1.1,1.2 MOBYFixedCollection.java,1.1,1.2 MOBYProviderSet.java,1.1,1.2 MOBYSubject.java,1.1,1.2 MOBYDescriptor.java,1.1,1.2 MOBYProvider.java,1.1,1.2 MOBYDocument.java,1.1,1.2 MOBYOntology.java,1.1,1.2 MOBYGraphNode.java,1.1,1.2 MOBYObject.java,1.1,1.2 MOBYMappingElement.java,1.1,1.2 MOBYOrderedCollection.java,1.1,1.2 MOBYUnorderedCollection.java,1.1,1.2 MOBYResizableCollection.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYEnumeration.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYEnumeration.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYEnumeration.java 2005/03/21 21:29:44 1.2 @@ -1,19 +1,38 @@ package org.semanticmoby.graph; import java.util.*; + import com.hp.hpl.jena.rdf.model.*; /** - * A class representing a resizable collection of objects, in - * which the order of the elements is not defined; the intention is - * for the elements to represent possible choices for a value. + * A class representing collections that can be resized (i.e. + * elements added to or removed from), in which the order of + * the elements is not defined; the intention is for the elements + * to represent possible choices for a value; corresponds to an + * RDF Alt. */ public class MOBYEnumeration extends MOBYUnorderedCollection { - public MOBYEnumeration(Resource resource, List elements, Model underlying) + /** + * Create an instance with no elements + * @param resource the resource node that represents this collection + * @param underlyingJenaModel the Jena model from which this is stored + */ + public MOBYEnumeration(Resource resource, + Model underlyingJenaModel) { - super(resource, elements, underlying); + super(null, resource, underlyingJenaModel); } - public boolean isEnumeration() { return true; } + /** + * Create an instance with the initial list of elements + * @param initialElements the initial elements + * @param resource the resource node that represents this collection + * @param underlyingJenaModel the Jena model from which this is stored + */ + public MOBYEnumeration(List initialElements, Resource resource, + Model underlyingJenaModel) + { + super(initialElements, resource, underlyingJenaModel); + } } \ No newline at end of file =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYCollection.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYCollection.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYCollection.java 2005/03/21 21:29:44 1.2 @@ -1,24 +1,34 @@ package org.semanticmoby.graph; -import com.hp.hpl.jena.rdf.model.*; import java.util.*; +import com.hp.hpl.jena.rdf.model.*; + /** - * A common abstract class for collections, both fixed sized and resizeable, - * of elements in MOBY graphs. + * A common abstract class for collections, both fixed sized and + * resizeable, of elements in MOBY graphs. */ public abstract class MOBYCollection extends MOBYGraphNode { + /** + * A list to hold the elements of the collection + */ protected List elements = new ArrayList(); - - public MOBYCollection(Resource resource, List elements, Model underlying) + + /** + * Create an instance with the initial list of elements + * @param initialElements the initial elements + */ + public MOBYCollection(List initialElements, Resource resource, + Model model) { - super(resource, underlying); - for (Iterator it = elements.iterator(); it.hasNext();) { - this.elements.add(it.next()); + super(resource, model); + + if (initialElements != null) { + elements.addAll(initialElements); } } - + /** * Return the size of the collection. */ @@ -36,15 +46,18 @@ } /** - * Return whether or not the collection is fixed in size + * Return whether or not this object is a collection. */ - public abstract boolean isFixedSized(); + public boolean isCollection() + { + return true; + } /** - * Return whether or not the collection is resizable + * Return whether or not this object is a singular element. */ - public abstract boolean isResizable(); - - public boolean isSingular() { return false; } - public boolean isCollection() { return true; } + public boolean isSingular() + { + return false; + } } \ No newline at end of file =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYSingleElement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYSingleElement.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYSingleElement.java 2005/03/21 21:29:44 1.2 @@ -18,6 +18,19 @@ super(resource, underlying); } - public boolean isSingular() { return true; } - public boolean isCollection() { return false; } + /** + * Return whether or not this object is a collection. + */ + public boolean isCollection() + { + return false; + } + + /** + * Return whether or not this object is a singular element. + */ + public boolean isSingular() + { + return true; + } } \ No newline at end of file =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYFixedCollection.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYFixedCollection.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYFixedCollection.java 2005/03/21 21:29:44 1.2 @@ -1,20 +1,34 @@ package org.semanticmoby.graph; import java.util.*; + import com.hp.hpl.jena.rdf.model.*; /** - * A class representing unordered, fixed sized collection - * of objects. + * A class for holding an ordered, fixed sized collection + * of objects; corresponds to an RDF List. */ public class MOBYFixedCollection extends MOBYCollection { + /** + * Create an instance with the initial list of elements + * @param initialElements the initial elements + * @param resource the resource node that represents this collection + * @param model the Jena model from which this is derived + */ + public MOBYFixedCollection(List initialElements, Resource resource, + Model model) + { + super(initialElements, resource, model); + } - public MOBYFixedCollection(Resource resource, List elements, Model underlying) + /** + * Return the element at the given index + * @param index the zero-based index of the element to retrieve + * @return the element + */ + public Object get(int index) { - super(resource, elements, underlying); + return elements.get(index); } - - public boolean isResizable() { return false; } - public boolean isFixedSized() { return true; } } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYProviderSet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYProviderSet.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYProviderSet.java 2005/03/21 21:29:44 1.2 @@ -46,7 +46,7 @@ for (Iterator it = providers.iterator(); it.hasNext();) { MOBYProvider provider = (MOBYProvider) it.next(); - Model underlying = provider.getUnderlying(); + Model underlying = provider.getModel(); merged.add(underlying); merged.setNsPrefixes(underlying.getNsPrefixMap()); } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYSubject.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYSubject.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYSubject.java 2005/03/21 21:29:44 1.2 @@ -15,7 +15,7 @@ * subject of one or more moby:mapsTo properties. The collection of * objects of each of these properties is returned by getDirectMappings(). *

- * As an RDF data structure, this can have one or more elements, each + * As an RDF data structure, it can have one or more elements, each * of which can itself be either a moby:Subject, an RDF data structure, * or both. This collection of elements is returned by getNestedMappings(). */ @@ -36,10 +36,11 @@ } /** - * Return a resizable, unordered collection of the MOBYNode instances, - * which are objects of mapsTo statements, whose subjects are this. + * Return the collection of direct mappings, i.e. moby:mapsTo statements + * whose subject is this. */ - public MOBYUnorderedCollection getDirectMappings() { + public MOBYUnorderedCollection getDirectMappings() + { return directMappings; } } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYDescriptor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYDescriptor.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYDescriptor.java 2005/03/21 21:29:44 1.2 @@ -3,18 +3,20 @@ import com.hp.hpl.jena.rdf.model.*; /** - * The MOBYDescriptor class represents things that are available - * at a URI. + * The MOBYDescriptor class represents things that are also + * represented as a Jena Model */ public abstract class MOBYDescriptor { - protected Model underlying; protected Resource resource; + protected Model model; - public MOBYDescriptor(Resource resource, Model underlying) + public MOBYDescriptor() {} + + public MOBYDescriptor(Resource resource, Model model) { this.resource = resource; - this.underlying = underlying; + this.model = model; } /** @@ -28,9 +30,9 @@ /** * Return the underlying Jena model */ - public Model getUnderlying() + public Model getModel() { - return underlying; + return model; } /** =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYProvider.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYProvider.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYProvider.java 2005/03/21 21:29:44 1.2 @@ -1,7 +1,12 @@ package org.semanticmoby.graph; import java.io.*; + +import org.semanticmoby.tools.Util; +import org.semanticmoby.vocabulary.MOBY; + import com.hp.hpl.jena.rdf.model.*; +import com.hp.hpl.jena.vocabulary.RDF; /** * The Provider class represents a resource that provides a @@ -9,19 +14,76 @@ */ public class MOBYProvider extends MOBYDocument { - private String name; - private String oneLineDescription; - private String moreInfoURI; + /** + * The statement that asserts this provider is a moby:Provider + */ + private Statement providerStmt; + + /** + * The name of the provider; stored in MOBY.name property + */ + private Statement nameStmt; + + /** + * A one line description of the provider; stored in the + * MOBY.oneLineDescription property + */ + private Statement oneLineDescriptionStmt; + + /** + * A URI at which more information can be retrieved about the + * provider; stored in the MOBY.moreInfoURI property + */ + private Statement aboutURIStmt; + + /** + * An unordered collection of operatesOn subgraphs. Each + * subgraph is itself either a MOBYGraph, or a MOBYCollection + */ private MOBYUnorderedCollection operatesOn; - public MOBYProvider(Resource resource, String name, String oneLineDescription, - String moreInfoURI, MOBYUnorderedCollection operatesOn, - Model underlying) + /** + * Constructor for building an instance from scratch (i.e. not one + * being parsed from a model). + */ + public MOBYProvider(String uri, String name, String oneLineDescription, + String aboutURI) + { + // Create a model and resource within the model to represent the + // URI at which the model is located + // + this.model = Util.newJenaModel(); + this.resource = model.createResource(uri); + + // Assert that the provider is a moby:Provider + // + model.add(providerStmt = model.createStatement( + resource, RDF.type, MOBY.Provider)); + + // Save the literal properties by creating the corresponding + // statements and adding them to the model + // + model.add(nameStmt = model.createStatement( + resource, MOBY.name, name)); + + model.add(oneLineDescriptionStmt = model.createStatement( + resource, MOBY.oneLineDescription, oneLineDescription)); + + model.add(aboutURIStmt = model.createStatement( + resource, MOBY.aboutURI, aboutURI)); + } + + public MOBYProvider(Resource resource, + Statement nameStmt, + Statement oneLineDescriptionStmt, + Statement aboutURIStmt, + MOBYUnorderedCollection operatesOn, + Model underlying) { super(resource, underlying); - this.name = name; - this.oneLineDescription = oneLineDescription; - this.moreInfoURI = moreInfoURI; + this.nameStmt = nameStmt; + this.oneLineDescriptionStmt = oneLineDescriptionStmt; + this.aboutURIStmt = aboutURIStmt; this.operatesOn = operatesOn; } @@ -30,7 +92,11 @@ */ public String getName() { - return name; + try { + return nameStmt.getObject().toString(); + } catch (NullPointerException e) { + return ""; + } } /** @@ -38,16 +104,24 @@ */ public String getOneLineDescription() { - return oneLineDescription; + try { + return oneLineDescriptionStmt.getObject().toString(); + } catch (NullPointerException e) { + return ""; + } } /** * Return a URI that can be accessed to obtain more information * about the provider. */ - public String getMoreInfoURI() + public String getAboutURI() { - return moreInfoURI; + try { + return aboutURIStmt.getObject().toString(); + } catch (NullPointerException e) { + return ""; + } } /** @@ -63,11 +137,11 @@ { StringBuffer sb = new StringBuffer(); sb.append("Provider [name=\""); - sb.append(name); + sb.append(getName()); sb.append("\", oneLineDescription=\""); - sb.append(oneLineDescription); - sb.append("\", moreInfoURI="); - sb.append(moreInfoURI); + sb.append(getOneLineDescription()); + sb.append("\", aboutURI="); + sb.append(getAboutURI()); sb.append("\"]"); return sb.toString(); @@ -79,6 +153,11 @@ */ public void serialize(OutputStream out) { - underlying.write(out); + model.write(out); + } + + public void serializeAsN3(OutputStream out) + { + model.write(out, "N3"); } } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYDocument.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYDocument.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYDocument.java 2005/03/21 21:29:44 1.2 @@ -8,8 +8,10 @@ */ public abstract class MOBYDocument extends MOBYDescriptor { - public MOBYDocument(Resource resource, Model underlying) + public MOBYDocument() {} + + public MOBYDocument(Resource resource, Model model) { - super(resource, underlying); + super(resource, model); } } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYOntology.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYOntology.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYOntology.java 2005/03/21 21:29:44 1.2 @@ -8,7 +8,7 @@ */ public class MOBYOntology extends MOBYDocument { - public MOBYOntology(Resource resource, Model underlying) { - super(resource, underlying); + public MOBYOntology(Resource resource, Model model) { + super(resource, model); } } \ No newline at end of file =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYGraphNode.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYGraphNode.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYGraphNode.java 2005/03/21 21:29:44 1.2 @@ -8,9 +8,9 @@ */ public abstract class MOBYGraphNode extends MOBYDescriptor { - public MOBYGraphNode(Resource resource, Model underlying) + public MOBYGraphNode(Resource resource, Model model) { - super(resource, underlying); + super(resource, model); } /** =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYObject.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYObject.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYObject.java 2005/03/21 21:29:44 1.2 @@ -1,5 +1,6 @@ package org.semanticmoby.graph; + import com.hp.hpl.jena.rdf.model.*; /** =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYMappingElement.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYMappingElement.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYMappingElement.java 2005/03/21 21:29:44 1.2 @@ -1,5 +1,6 @@ package org.semanticmoby.graph; + import com.hp.hpl.jena.rdf.model.*; =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYOrderedCollection.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYOrderedCollection.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYOrderedCollection.java 2005/03/21 21:29:44 1.2 @@ -1,22 +1,58 @@ package org.semanticmoby.graph; import java.util.*; + import com.hp.hpl.jena.rdf.model.*; +/** + * A class representing collections that can be resized (i.e. + * elements added to or removed from), in which the order of + * the elements is defined; corresponds to an RDF Seq + */ public class MOBYOrderedCollection extends MOBYResizableCollection { - public MOBYOrderedCollection(Resource resource, List elements, Model underlying) + /** + * Create an instance with no elements + * @param resource the resource node that represents this collection + * @param underlyingJenaModel the Jena model from which this is stored + */ + public MOBYOrderedCollection(Resource resource, + Model underlyingJenaModel) { - super(resource, elements, underlying); + super(null, resource, underlyingJenaModel); + } + + /** + * Create an instance with the initial list of elements + * @param initialElements the initial elements + * @param resource the resource node that represents this collection + * @param underlyingJenaModel the Jena model from which this is stored + */ + public MOBYOrderedCollection(List initialElements, Resource resource, + Model underlyingJenaModel) + { + super(initialElements, resource, underlyingJenaModel); } - public boolean isOrdered() { return true; } - /** - * Return the object at a given zero-based index. + * Return the element at the given index + * @param index the zero-based index of the element to retrieve + * @return the element */ public Object get(int index) { return elements.get(index); } + + /** + * Add the given element to the collection so that its new + * zero-based index is given index + * @param index the zero-based index at which the new element + * should be added + * @param elementToAdd the element to add + */ + public void add(int index, Object elementToAdd) + { + elements.add(index, elementToAdd); + } } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYUnorderedCollection.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYUnorderedCollection.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYUnorderedCollection.java 2005/03/21 21:29:44 1.2 @@ -2,27 +2,35 @@ import java.util.*; -import org.semanticmoby.graph.*; - -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Resource; +import com.hp.hpl.jena.rdf.model.*; /** - * A class representing resizable collection of objects, in - * which the order of the elements is not defined. + * A class representing collections that can be resized (i.e. + * elements added to or removed from), in which the order of + * the elements is not defined; corresponds to an RDF Bag */ public class MOBYUnorderedCollection extends MOBYResizableCollection { - public MOBYUnorderedCollection(Resource resource, List elements, Model underlying) + /** + * Create an instance with no elements + * @param resource the resource node that represents this collection + * @param underlyingJenaModel the Jena model from which this is stored + */ + public MOBYUnorderedCollection(Resource resource, + Model underlyingJenaModel) { - super(resource, elements, underlying); + super(null, resource, underlyingJenaModel); } - public boolean isOrdered() { return false; } - /** - * Return whether or not the elements of this collection represent - * choices (i.e. elements of an enumeration of possible values). + * Create an instance with the initial list of elements + * @param initialElements the initial elements + * @param resource the resource node that represents this collection + * @param underlyingJenaModel the Jena model from which this is stored */ - public boolean isEnumeration() { return false; } + public MOBYUnorderedCollection(List initialElements, Resource resource, + Model underlyingJenaModel) + { + super(initialElements, resource, underlyingJenaModel); + } } \ No newline at end of file =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYResizableCollection.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYResizableCollection.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/MOBYResizableCollection.java 2005/03/21 21:29:44 1.2 @@ -2,10 +2,7 @@ import java.util.*; -import org.semanticmoby.graph.*; - -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.Resource; +import com.hp.hpl.jena.rdf.model.*; /** * A class representing collections that can be resized (i.e. @@ -14,16 +11,51 @@ */ public abstract class MOBYResizableCollection extends MOBYCollection { - public MOBYResizableCollection(Resource resource, List elements, Model underlying) + /** + * Create an instance with no elements + * @param resource the resource node that represents this collection + * @param model the Jena model from which this is derived + */ + public MOBYResizableCollection(Resource resource, Model model) { - super(resource, elements, underlying); + super(null, resource, model); } - + /** - * Return whether or not this collection is ordered. + * Create an instance with the initial list of elements + * @param initialElements the initial elements + * @param resource the resource node that represents this collection + * @param underlyingJenaModel the Jena model from which this is stored */ - public abstract boolean isOrdered(); + public MOBYResizableCollection(List initialElements, Resource resource, + Model underlyingJenaModel) + { + super(initialElements, resource, underlyingJenaModel); + } - public boolean isResizable() { return true; } - public boolean isFixedSized() { return false; } + /** + * Add an element to the collection + * @param elementToAdd the element to add to the collection + */ + public void add(Object elementToAdd) + { + elements.add(elementToAdd); + } + + /** + * Remove an element from the collection + * @param elementToRemove the element to remove + */ + public void remove(Object elementToRemove) + { + elements.remove(elementToRemove); + } + + /** + * Remove all the elements from the collection + */ + public void clear() + { + elements.clear(); + } } From gss at pub.open-bio.org Mon Mar 21 21:30:18 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:30:18 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212130.j2LLUIHF008307@pub.open-bio.org> gss Mon Mar 21 16:30:18 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools In directory pub.open-bio.org:/tmp/cvs-serv8280/src/org/semanticmoby/graph/tools Removed Files: package.html MOBYProviderTraverser.java MOBYProviderVisitor.java MOBYProviderXMLGenerator.java MOBYProviderTraversalException.java MOBYProviderVisitorAdapter.java Log Message: Package no longer needed moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools package.html,1.1,NONE MOBYProviderTraverser.java,1.1,NONE MOBYProviderVisitor.java,1.1,NONE MOBYProviderXMLGenerator.java,1.1,NONE MOBYProviderTraversalException.java,1.1,NONE MOBYProviderVisitorAdapter.java,1.1,NONE rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools/RCS/package.html,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools/RCS/MOBYProviderTraverser.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools/RCS/MOBYProviderVisitor.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools/RCS/MOBYProviderXMLGenerator.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools/RCS/MOBYProviderTraversalException.java,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/graph/tools/RCS/MOBYProviderVisitorAdapter.java,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 21:31:14 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:31:14 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212131.j2LLVEDa008358@pub.open-bio.org> gss Mon Mar 21 16:31:14 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core In directory pub.open-bio.org:/tmp/cvs-serv8336 Removed Files: build.xml Log Message: Moved to build subdirectory moby-live/S-MOBY/ref-impl/core build.xml,1.4,NONE rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/RCS/build.xml,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 21:31:29 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:31:29 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212131.j2LLVTMe008387@pub.open-bio.org> gss Mon Mar 21 16:31:29 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core/build In directory pub.open-bio.org:/tmp/cvs-serv8363/build Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/core/build added to the repository moby-live/S-MOBY/ref-impl/core/build - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/build/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/build/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/build/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 21:31:31 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:31:31 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212131.j2LLVVTC008421@pub.open-bio.org> gss Mon Mar 21 16:31:31 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core/build In directory pub.open-bio.org:/tmp/cvs-serv8400/build Added Files: build.xml .cvsignore Log Message: New build subdirectory moby-live/S-MOBY/ref-impl/core/build build.xml,NONE,1.1 .cvsignore,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 21:32:02 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:32:02 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212132.j2LLW2LU008451@pub.open-bio.org> gss Mon Mar 21 16:32:01 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core In directory pub.open-bio.org:/tmp/cvs-serv8426 Modified Files: .cvsignore Log Message: Changed to reflect new build structure moby-live/S-MOBY/ref-impl/core .cvsignore,1.6,1.7 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/.cvsignore 2004/06/14 16:24:12 1.6 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/.cvsignore 2005/03/21 21:32:01 1.7 @@ -1,4 +1,3 @@ -build -smoby.jar +classes .classpath .project From gss at pub.open-bio.org Mon Mar 21 21:32:38 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:32:38 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212132.j2LLWc3v008490@pub.open-bio.org> gss Mon Mar 21 16:32:38 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/parser In directory pub.open-bio.org:/tmp/cvs-serv8465/src/org/semanticmoby/parser Modified Files: Parser.java Log Message: Fixed to use new org.semanticmoby.graph.* signatures moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/parser Parser.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/parser/Parser.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/parser/Parser.java 2004/11/23 00:18:46 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/semanticmoby/parser/Parser.java 2005/03/21 21:32:38 1.2 @@ -5,17 +5,16 @@ import java.util.*; import org.semanticmoby.graph.*; -import org.semanticmoby.parser.*; -import org.semanticmoby.tools.ModelRetriever; -import org.semanticmoby.tools.Util; +import org.semanticmoby.tools.*; import org.semanticmoby.vocabulary.*; import com.hp.hpl.jena.rdf.model.*; import com.hp.hpl.jena.vocabulary.*; /** - * This class is used to parse OWL models, stored as Jena2 models, into - * objects that implement interfaces from the org.semanticmoby.graph package. + * This class is used to parse RDF models, stored as Jena2 models, into + * objects that implement interfaces from the org.semanticmoby.graph + * package. */ public class Parser { @@ -186,7 +185,7 @@ // Create and return an unordered collection of the parsed providers // - return new MOBYUnorderedCollection(null, providers, null); + return new MOBYUnorderedCollection(providers, null, null); } /** @@ -199,9 +198,9 @@ // First parse the scalar properties name, oneLineDescription, and aboutURI // - String name = getDataPropertyValue(provider, MOBY.name); - String oneLiner = getDataPropertyValue(provider, MOBY.oneLineDescription); - String aboutURI = getDataPropertyValue(provider, MOBY.aboutURI); + Statement nameStmt = model.getProperty(provider, MOBY.name); + Statement oneLineDescriptionStmt = model.getProperty(provider, MOBY.oneLineDescription); + Statement aboutURIStmt = model.getProperty(provider, MOBY.aboutURI); // A provider can have multiple operatesOn properties, each of // which leads to a subgraph. Parse each of these subgraphs. @@ -219,8 +218,8 @@ // oneLineDescription, aboutURI, and collection of operatesOn subgraphs // return new MOBYProvider( - provider, name, oneLiner, aboutURI, - new MOBYUnorderedCollection(provider, operatesOn, model), + provider, nameStmt, oneLineDescriptionStmt, aboutURIStmt, + new MOBYUnorderedCollection(operatesOn, provider, model), model); } @@ -326,16 +325,16 @@ // Create and return a Subject to describe this hasMapping subgraph // return new MOBYSubject(res, - new MOBYFixedCollection(res, statements, model), - new MOBYUnorderedCollection(res, directMappings, model), + new MOBYFixedCollection(statements, res, model), + new MOBYUnorderedCollection(directMappings, res, model), collectionFor(res, nestedMappings), model); } /** - * Parse the object of a mapsTo statement, which should be a - * Subject, a data structure, or both. If the object is a data + * Parse the object of a mapsTo statement, which should be an + * Object, a data structure, or both. If the object is a data * structure, then each element of the data structure should * be a mapped subgraph. */ @@ -370,7 +369,7 @@ // Model model = res.getModel(); return new MOBYObject(res, - new MOBYFixedCollection(res, statements, model), + new MOBYFixedCollection(statements, res, model), collectionFor(res, nested), model); } @@ -462,12 +461,6 @@ model.contains(p, RDFS.subPropertyOf, MOBY.Property); } - private String getDataPropertyValue(Resource subject, Property property) - { - Statement s = subject.getModel().getProperty(subject, property); - return (s == null) ? null : s.getObject().toString(); - } - private Resource getResourcePropertyValue(Resource subject, Property property) { Statement s = subject.getModel().getProperty(subject, property); @@ -500,13 +493,13 @@ private MOBYCollection collectionFor(Resource res, List elements) { if (isList(res)) { - return new MOBYFixedCollection(res, elements, res.getModel()); + return new MOBYFixedCollection(elements, res, res.getModel()); } else if (isBag(res)) { - return new MOBYUnorderedCollection(res, elements, res.getModel()); + return new MOBYUnorderedCollection(elements, res, res.getModel()); } else if (isSeq(res)) { - return new MOBYOrderedCollection(res, elements, res.getModel()); + return new MOBYOrderedCollection(elements, res, res.getModel()); } else if (isAlt(res)) { - return new MOBYEnumeration(res, elements, res.getModel()); + return new MOBYEnumeration(elements, res, res.getModel()); } else { return null; } From gss at pub.open-bio.org Mon Mar 21 21:33:19 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:19 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXJJV008537@pub.open-bio.org> gss Mon Mar 21 16:33:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/WebRoot Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 21:33:24 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:24 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXOdN008750@pub.open-bio.org> gss Mon Mar 21 16:33:24 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting In directory pub.open-bio.org:/tmp/cvs-serv8729/archive/WebRoot/meeting Added Files: missing-fields.jsp registration-confirmation.jsp registration-form.html lodging.html index.html shuttles.html Log Message: Archived a few things moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting missing-fields.jsp,NONE,1.1 registration-confirmation.jsp,NONE,1.1 registration-form.html,NONE,1.1 lodging.html,NONE,1.1 index.html,NONE,1.1 shuttles.html,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 21:33:20 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:20 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXK26008637@pub.open-bio.org> gss Mon Mar 21 16:33:20 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/src/org/semanticmoby Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 21:33:24 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:24 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXOON008796@pub.open-bio.org> gss Mon Mar 21 16:33:24 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images In directory pub.open-bio.org:/tmp/cvs-serv8729/archive/WebRoot/meeting/images Added Files: moby.png ncgr.png Log Message: Archived a few things moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images moby.png,NONE,1.1 ncgr.png,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 21:33:24 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:24 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXOMM008765@pub.open-bio.org> gss Mon Mar 21 16:33:24 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools In directory pub.open-bio.org:/tmp/cvs-serv8729/archive/src/org/semanticmoby/graph/tools Added Files: MOBYProviderTraversalException.java MOBYProviderVisitor.java package.html MOBYProviderTraverser.java MOBYProviderVisitorAdapter.java MOBYProviderXMLGenerator.java Log Message: Archived a few things moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools MOBYProviderTraversalException.java,NONE,1.1 MOBYProviderVisitor.java,NONE,1.1 package.html,NONE,1.1 MOBYProviderTraverser.java,NONE,1.1 MOBYProviderVisitorAdapter.java,NONE,1.1 MOBYProviderXMLGenerator.java,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 21:33:24 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:24 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXORn008814@pub.open-bio.org> gss Mon Mar 21 16:33:24 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot In directory pub.open-bio.org:/tmp/cvs-serv8729/archive/WebRoot Added Files: index.html Log Message: Archived a few things moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot index.html,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 21:33:20 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:20 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXK2b008596@pub.open-bio.org> gss Mon Mar 21 16:33:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/src Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 21:33:20 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:20 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXKBQ008617@pub.open-bio.org> gss Mon Mar 21 16:33:20 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/src/org Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 21:33:24 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:24 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXOGc008781@pub.open-bio.org> gss Mon Mar 21 16:33:24 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting In directory pub.open-bio.org:/tmp/cvs-serv8729/archive/src/org/semanticmoby/meeting Added Files: MeetingRegistrationServlet.java Log Message: Archived a few things moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting MeetingRegistrationServlet.java,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 21:33:20 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:20 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXKWA008659@pub.open-bio.org> gss Mon Mar 21 16:33:20 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/src/org/semanticmoby/graph Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 21:33:19 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:19 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXJFL008519@pub.open-bio.org> gss Mon Mar 21 16:33:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive In directory pub.open-bio.org:/tmp/cvs-serv8495/archive Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 21:33:19 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:19 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXJqj008555@pub.open-bio.org> gss Mon Mar 21 16:33:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/WebRoot/meeting Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 21:33:20 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:20 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXKGC008575@pub.open-bio.org> gss Mon Mar 21 16:33:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/WebRoot/meeting/images Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/WebRoot/meeting/images/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 21:33:20 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:20 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXKHf008682@pub.open-bio.org> gss Mon Mar 21 16:33:20 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/src/org/semanticmoby/graph/tools Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/graph/tools/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 21:33:20 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:33:20 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212133.j2LLXKmu008700@pub.open-bio.org> gss Mon Mar 21 16:33:20 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting In directory pub.open-bio.org:/tmp/cvs-serv8495/archive/src/org/semanticmoby/meeting Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/archive/src/org/semanticmoby/meeting/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 21:39:19 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:39:19 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212139.j2LLdJes008975@pub.open-bio.org> gss Mon Mar 21 16:39:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources In directory pub.open-bio.org:/tmp/cvs-serv8951/resources Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/resources - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 21:39:19 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:39:19 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212139.j2LLdJp1008994@pub.open-bio.org> gss Mon Mar 21 16:39:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop Files In directory pub.open-bio.org:/tmp/cvs-serv8951/resources/Photoshop Files Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop Files added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop Files - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop/RCS/Files,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 21:39:26 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:39:26 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212139.j2LLdQko009055@pub.open-bio.org> gss Mon Mar 21 16:39:26 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources In directory pub.open-bio.org:/tmp/cvs-serv9018/resources Added Files: moby_keyword.sql web.xml Log Message: Initial version moby-live/S-MOBY/ref-impl/semanticmoby.org/resources moby_keyword.sql,NONE,1.1 web.xml,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 21:39:26 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:39:26 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212139.j2LLdQsv009040@pub.open-bio.org> gss Mon Mar 21 16:39:25 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop Files In directory pub.open-bio.org:/tmp/cvs-serv9018/resources/Photoshop Files Added Files: smoby-medium.psd ncgr-logo.psd rdf-logo.png smoby-small.psd rdf-logo.psd nsf-logo.psd search.psd Log Message: Initial version moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop Files smoby-medium.psd,NONE,1.1 ncgr-logo.psd,NONE,1.1 rdf-logo.png,NONE,1.1 smoby-small.psd,NONE,1.1 rdf-logo.psd,NONE,1.1 nsf-logo.psd,NONE,1.1 search.psd,NONE,1.1 rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/Photoshop/RCS/Files,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 21:39:58 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:39:58 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212139.j2LLdwfp009087@pub.open-bio.org> gss Mon Mar 21 16:39:58 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build In directory pub.open-bio.org:/tmp/cvs-serv9063/build Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/build - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 21:40:00 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:40:00 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212140.j2LLe0Sx009126@pub.open-bio.org> gss Mon Mar 21 16:40:00 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build In directory pub.open-bio.org:/tmp/cvs-serv9105/build Added Files: build.xml .cvsignore Log Message: Initial version moby-live/S-MOBY/ref-impl/semanticmoby.org/build build.xml,NONE,1.1 .cvsignore,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 21:40:31 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:40:31 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212140.j2LLeVr9009172@pub.open-bio.org> gss Mon Mar 21 16:40:31 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org In directory pub.open-bio.org:/tmp/cvs-serv9139 Modified Files: .classpath .project .mymetadata Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org .classpath,1.3,1.4 .project,1.2,1.3 .mymetadata,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.classpath,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.classpath 2004/11/23 00:20:01 1.3 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.classpath 2005/03/21 21:40:30 1.4 @@ -2,11 +2,11 @@ - + - + @@ -15,8 +15,7 @@ - - + =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.project,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/.project 2004/11/04 22:31:36 1.2 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.project 2005/03/21 21:40:30 1.3 @@ -1,6 +1,6 @@ - www.semanticmoby.org + semanticmoby.org @@ -26,22 +26,17 @@ - de.bb.bje.eclipse.IncrementalJspBuilder - - - - - com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder + com.ibm.etools.validation.validationbuilder - com.ibm.etools.validation.validationbuilder + com.ibm.sse.model.structuredbuilder - com.ibm.sse.model.structuredbuilder + com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.mymetadata,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.mymetadata 2004/11/04 22:31:36 1.3 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/.mymetadata 2005/03/21 21:40:30 1.4 @@ -1,11 +1,11 @@ + j2ee-spec="1.4" + archive="semanticmoby.org.war"> From gss at pub.open-bio.org Mon Mar 21 21:41:58 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:41:58 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212141.j2LLfw0I009218@pub.open-bio.org> gss Mon Mar 21 16:41:58 EST 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-serv9194/WebRoot/examples/proxies Log Message: Directory /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies added to the repository moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies - New directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/RCS/-,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/RCS/New,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies/RCS/directory,v: No such file or directory From gss at pub.open-bio.org Mon Mar 21 21:42:01 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:42:01 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg19i009260@pub.open-bio.org> gss Mon Mar 21 16:42:01 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/images In directory pub.open-bio.org:/tmp/cvs-serv9239/WebRoot/images Added Files: search.gif rdf-logo.gif smoby-small.gif cshl-logo.gif help1.gif nsf-logo.gif smoby-medium.gif ncgr-logo.gif pinstripe.gif Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/images search.gif,NONE,1.1 rdf-logo.gif,NONE,1.1 smoby-small.gif,NONE,1.1 cshl-logo.gif,NONE,1.1 help1.gif,NONE,1.1 nsf-logo.gif,NONE,1.1 smoby-medium.gif,NONE,1.1 ncgr-logo.gif,NONE,1.1 pinstripe.gif,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 21:42:01 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:42:01 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg1ao009300@pub.open-bio.org> gss Mon Mar 21 16:42:01 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools In directory pub.open-bio.org:/tmp/cvs-serv9239/src/org/semanticmoby/ref/tools Modified Files: KeywordFinder.java MOBYProperties.java DiscoveryQuery.java InvocationBroker.java URIInvestigator.java KeywordQuery.java Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools KeywordFinder.java,1.1,1.2 MOBYProperties.java,1.1,1.2 DiscoveryQuery.java,1.1,1.2 InvocationBroker.java,1.1,1.2 URIInvestigator.java,1.1,1.2 KeywordQuery.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/KeywordFinder.java,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/src/org/semanticmoby/ref/tools/KeywordFinder.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/KeywordFinder.java 2005/03/21 21:42:01 1.2 @@ -7,9 +7,7 @@ import java.util.*; import com.hp.hpl.jena.rdf.model.*; import com.hp.hpl.jena.shared.*; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDF; -import com.hp.hpl.jena.vocabulary.RDFS; +import com.hp.hpl.jena.vocabulary.*; public class KeywordFinder { =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/MOBYProperties.java,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/src/org/semanticmoby/ref/tools/MOBYProperties.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/MOBYProperties.java 2005/03/21 21:42:01 1.2 @@ -5,7 +5,6 @@ import javax.servlet.ServletContext; - /** * This abstract class contains a set of static methods for retrieving * properties that are stored in the S-MOBY properties file. @@ -13,10 +12,9 @@ public abstract class MOBYProperties { /** - * The name of the S-MOBY properties file. The file itself should - * exist in some directory in the Java class path. + * The path to the S-MOBY properties file. */ - private static String PROP_FILE_NAME = "smoby.properties"; + private static String PROP_FILE_NAME = "/WEB-INF/smoby.properties"; /** * A static Properties object for accessing the properties file. @@ -67,12 +65,12 @@ if (props == null) // Only try to read it once { props = new Properties(); - InputStream is = context.getResourceAsStream(PROP_FILE_NAME); - if (is == null) { + String path = context.getRealPath(PROP_FILE_NAME); + if (path == null) { throw new FileNotFoundException( "Properties file \"" + PROP_FILE_NAME + "\" not found"); } - props.load(is); + props.load(new FileInputStream(path)); } } } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/DiscoveryQuery.java,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/src/org/semanticmoby/ref/tools/DiscoveryQuery.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/DiscoveryQuery.java 2005/03/21 21:42:01 1.2 @@ -110,7 +110,7 @@ Model dbModel = null; try { - Model queryModel = ((MOBYProvider) queryProvider).getUnderlying(); + Model queryModel = ((MOBYProvider) queryProvider).getModel(); String queryString = buildQueryString(queryModel); StorageManager manager = new StorageManager(); dbModel = manager.openDBModel(); =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/InvocationBroker.java,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/src/org/semanticmoby/ref/tools/InvocationBroker.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/InvocationBroker.java 2005/03/21 21:42:01 1.2 @@ -7,7 +7,6 @@ import javax.servlet.http.*; import org.apache.commons.httpclient.*; import org.semanticmoby.graph.*; -import org.semanticmoby.graph.tools.*; import org.semanticmoby.http.*; import org.semanticmoby.parser.*; import org.semanticmoby.vocabulary.MOBY; @@ -59,14 +58,14 @@ private String rdfxmlString(MOBYProvider provider) { StringWriter writer = new StringWriter(); - provider.getUnderlying().write(writer); + provider.getModel().write(writer); return writer.toString(); } private String n3String(MOBYProvider provider) { StringWriter writer = new StringWriter(); - provider.getUnderlying().write(writer, "N3"); + provider.getModel().write(writer, "N3"); return writer.toString(); } @@ -247,7 +246,7 @@ private String getInputURI(MOBYProvider provider) { try { - Model model = provider.getUnderlying(); + Model model = provider.getModel(); Statement stmt = model.listStatements( provider.getResource(), MOBY.inputURI, (String) null).nextStatement(); @@ -260,7 +259,7 @@ private String getOutputURI(MOBYProvider provider) { try { - Model model = provider.getUnderlying(); + Model model = provider.getModel(); Statement stmt = model.listStatements( provider.getResource(), MOBY.outputURI, (String) null).nextStatement(); @@ -295,26 +294,6 @@ private boolean requiresInputs(MOBYProvider provider) { - MOBYProviderTraverser traverser = new MOBYProviderTraverser(); - try { - traverser.traverse(provider, - new MOBYProviderVisitorAdapter(){ - public void visitSubjectPropValStmtEnd( - MOBYPropertyValueStatement stmt) - throws MOBYProviderTraversalException - { - if (stmt.getValue().isResource()) { - MOBYResource res = (MOBYResource) stmt.getValue(); - if (res.isBlank()) { - throw new MOBYProviderTraversalException(); - } - } - } - }, - true); - } catch (MOBYProviderTraversalException e) { - return true; - } - return false; + return getInputURI(provider) != null; } } \ No newline at end of file =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/URIInvestigator.java,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/src/org/semanticmoby/ref/tools/URIInvestigator.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/URIInvestigator.java 2005/03/21 21:42:01 1.2 @@ -247,7 +247,9 @@ Parser parser = Parser.forInputStream(in, Parser.LANGUAGE_RDF_XML); provider = parser.parseProvider(); } - catch (Throwable t) {} + catch (Throwable t) { + System.err.println("Parse error: " + t); + } // De-register the provider, printing a removal message if // a provider couldn't be parsed =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/KeywordQuery.java,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/src/org/semanticmoby/ref/tools/KeywordQuery.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/KeywordQuery.java 2005/03/21 21:42:01 1.2 @@ -26,6 +26,7 @@ } public List findMatchingProviders() + throws Exception { List matching = new ArrayList(); @@ -53,10 +54,12 @@ catch (StorageException e) { System.err.println(e); + throw e; } catch (SQLException e) { System.err.println(e); + throw e; } return matching; From gss at pub.open-bio.org Mon Mar 21 21:42:02 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:42:02 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg2iw009371@pub.open-bio.org> gss Mon Mar 21 16:42:02 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/db In directory pub.open-bio.org:/tmp/cvs-serv9239/src/org/semanticmoby/ref/tools/db Modified Files: StorageManager.java Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/db StorageManager.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/db/StorageManager.java,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/src/org/semanticmoby/ref/tools/db/StorageManager.java 2004/11/22 22:58:41 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/tools/db/StorageManager.java 2005/03/21 21:42:02 1.2 @@ -59,7 +59,7 @@ public void registerProvider(MOBYProvider provider, Date lastModifiedDate) throws StorageException { - Model model = ((MOBYProvider) provider).getUnderlying(); + Model model = ((MOBYProvider) provider).getModel(); Model dbModel = null; String uriString = provider.getResource().getURI(); Resource uri = model.createResource(uriString); From gss at pub.open-bio.org Mon Mar 21 21:42:02 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:42:02 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg2NM009349@pub.open-bio.org> gss Mon Mar 21 16:42:02 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot In directory pub.open-bio.org:/tmp/cvs-serv9239/WebRoot Modified Files: index.html help.html Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot index.html,1.5,1.6 help.html,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/index.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/index.html 2004/11/23 00:20:02 1.5 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/index.html 2005/03/21 21:42:01 1.6 @@ -3,118 +3,71 @@ Semantic MOBY - -

-

Semantic MOBY

-
-
- - -
- - - - -
- MOBY Autumn 2004 Meeting -
- November 20-21 — Santa Fe, New Mexico -
- Register Now! -
-
-

+
-
- -
-
+ 


- - - - - + + + - - -
ProviderSubjectObject + Service Provider transforms … + … from Subject + … to Object
-
-
- -
Type any terms into the boxes above and -press Search
-(for example type 'hello' (without quotes) into the Provider field,
-or to see all providers, type just an asterisk (*) into the
-Provider field and leave the other fields blank)
+ +
+ + +
+
+To find and engage services on the web, type any terms into the above +boxes and press the Search button. +
+
+ +Example: type "panel" in the Subject field and press Search to discover +the CSHL HapMap service. +
-
-
- -

-About Semantic MOBY   Help on Searching
+About Semantic MOBY   +Help on Searching +
+ +Developers: see the JavaDoc for the Semantic MOBY API!

-
-
-
- - + href="http://www.cshl.edu" target="_blank">CSHL - + href="http://www.ncgr.org" target="_blank">NCGR + href="http://www.nsf.gov" target="_blank">NSF - - - - - - -
CSHL NCGR NSF
CSHLNCGRNSF
- -

-
-
+
=================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/help.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/help.html 2004/07/21 22:35:25 1.3 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/help.html 2005/03/21 21:42:01 1.4 @@ -3,43 +3,44 @@ Semantic MOBY Search Help
+

-Semantic -MOBY Search Help

+ Semantic MOBY maintains a searchable repository of descriptions of -providers of services that are available on the web. At the heart -of these descriptions is the notion that providers map one type +Service Providers that are available on the web. At the heart +of these descriptions is the notion that providers transform one type of thing (the Subject) to another (the Object), or vice versa.

-Providers, as well as subjects and objects, are -classified using web-accessible definitions (ontologies), and these definitions +Providers, as well as subjects and objects, are classified using +web-accessible definitions (ontologies), and these definitions have keywords associated with them. For example, the following shows -a query for providers whose definitions include the keyword "hello": +a query for providers whose subjects are members of any class that +has the keyword "panel" associated with it:

-. +.

Search hints
    -
  • Keywords are not case sensitive, so HELLO means the -same thing as hello as does HeLlO. +
  • Keywords are not case sensitive, so PANEL means the +same thing as panel as does PaNeL.

  • The wildcard character (*) can be used at the end of a keyword to match keywords that start with the characters before the wildcard. -For example, he* will match hello as well -as help. +For example, pan* will match panel as well +as panini.

  • Multiple words enclosed in double quotes are considered to be a single keyword. For example, the quoted string "gene symbol" -is considered to be a single keyword composed of 11 characters, including a space. -The wildcard character is interpreted literally (i.e. as the '*' -character) if it appears within a quoted string. +is considered to be a single keyword composed of 11 characters, including +a space. The wildcard character is interpreted literally (i.e. as the +'*' character) if it appears within a quoted string.

  • Multiple keywords may be typed in one of the fields; this means to search for any of the keywords in that field. For example, @@ -50,7 +51,9 @@ match keywords for all the fields will match. For example, typing fat sugar into the Subject field, and "weight gain" into the Object field will search for -providers that map either fat or sugar to weight gain. +providers that map either fat or sugar to weight gain.

+
+ From gss at pub.open-bio.org Mon Mar 21 21:42:02 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:42:02 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg2tY009326@pub.open-bio.org> gss Mon Mar 21 16:42:01 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/WEB-INF In directory pub.open-bio.org:/tmp/cvs-serv9239/WebRoot/WEB-INF Modified Files: .cvsignore web.xml Added Files: log4j.properties smoby.example.properties Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/WEB-INF log4j.properties,NONE,1.1 smoby.example.properties,NONE,1.1 .cvsignore,1.1,1.2 web.xml,1.3,1.4 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/WEB-INF/.cvsignore,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/WEB-INF/.cvsignore 2004/07/15 20:27:14 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/WEB-INF/.cvsignore 2005/03/21 21:42:01 1.2 @@ -1 +1,2 @@ classes +smoby.properties =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/WEB-INF/web.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/WEB-INF/web.xml 2004/11/04 22:32:05 1.3 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/WEB-INF/web.xml 2005/03/21 21:42:01 1.4 @@ -6,84 +6,77 @@ ProviderInvestigationServlet investigate Provider investigation servlet - org.smoby.ref.servlets.ProviderInvestigationServlet + org.semanticmoby.ref.servlets.ProviderInvestigationServlet DiscoveryServlet find-providers Discovery servlet - org.smoby.ref.servlets.DiscoveryServlet + org.semanticmoby.ref.servlets.DiscoveryServlet KeywordSearchServlet keyword-search Keyword search servlet - org.smoby.ref.servlets.KeywordSearchServlet + org.semanticmoby.ref.servlets.KeywordSearchServlet ProviderEngagementServlet engage-provider Keyword search servlet - org.smoby.ref.servlets.ProviderEngagementServlet + org.semanticmoby.ref.servlets.ProviderEngagementServlet ResultsDisplayServlet display-results Results display servlet - org.smoby.ref.servlets.ResultsDisplayServlet + org.semanticmoby.ref.servlets.ResultsDisplayServlet HelloWorldServlet hello-world Hello World simple application - org.smoby.ref.servlets.example.HelloWorldServlet + org.semanticmoby.ref.servlets.example.HelloWorldServlet HelloWorldDisplayServlet hello-world-display Servlet to display results of invocation of hello-world application - org.smoby.ref.servlets.example.HelloWorldDisplayServlet + org.semanticmoby.ref.servlets.example.HelloWorldDisplayServlet GraphConversionServlet Graph Converter Convert between N-Triples and RDF/XML - org.smoby.ref.servlets.dev.GraphConversionServlet + org.semanticmoby.ref.servlets.dev.GraphConversionServlet RepositoryPrintServlet print-repository Print the contents of the metadata repository - org.smoby.ref.servlets.dev.RepositoryPrintServlet + org.semanticmoby.ref.servlets.dev.RepositoryPrintServlet OWLValidationServlet validate-owl-graph Validate that a graph is a valid OWL graph - org.smoby.ref.servlets.dev.OWLValidationServlet + org.semanticmoby.ref.servlets.dev.OWLValidationServlet MOBYGraphValidationServlet validate-canonical-graph Validate that a graph is in MOBY canonical form - org.smoby.ref.servlets.dev.MOBYGraphValidationServlet - - - - MeetingRegistrationServlet - Meeting Registration Servlet - Respond to registration form submission - org.smoby.meeting.MeetingRegistrationServlet + org.semanticmoby.ref.servlets.dev.MOBYGraphValidationServlet @@ -143,9 +136,4 @@ /dev/validate-canonical-graph - - MeetingRegistrationServlet - /meeting/register - - From gss at pub.open-bio.org Mon Mar 21 21:42:02 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:42:02 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg2FR009406@pub.open-bio.org> gss Mon Mar 21 16:42:02 EST 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-serv9239/WebRoot/examples/ontologies Added Files: ProxyProvider ProxyProvider.n3 Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/ontologies ProxyProvider,NONE,1.1 ProxyProvider.n3,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 21:42:02 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:42:02 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg2jx009389@pub.open-bio.org> gss Mon Mar 21 16:42:02 EST 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-serv9239/WebRoot/examples/proxies Added Files: ncbi-megablast.n3 pubmed.n3 pubmed ncbi-megablast Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies ncbi-megablast.n3,NONE,1.1 pubmed.n3,NONE,1.1 pubmed,NONE,1.1 ncbi-megablast,NONE,1.1 From gss at pub.open-bio.org Mon Mar 21 21:42:02 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Mon, 21 Mar 2005 16:42:02 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503212142.j2LLg2YS009434@pub.open-bio.org> gss Mon Mar 21 16:42:02 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets In directory pub.open-bio.org:/tmp/cvs-serv9239/src/org/semanticmoby/ref/servlets Modified Files: BaseServlet.java KeywordSearchServlet.java Log Message: Misc moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets BaseServlet.java,1.1,1.2 KeywordSearchServlet.java,1.1,1.2 =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/BaseServlet.java,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/src/org/semanticmoby/ref/servlets/BaseServlet.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/BaseServlet.java 2005/03/21 21:42:02 1.2 @@ -43,7 +43,7 @@ { if (! log4jInitialized) { - String path = ctx.getRealPath("/") + "log4j.properties"; + String path = ctx.getRealPath("/WEB-INF/log4j.properties"); PropertyConfigurator.configure(path); log4jInitialized = true; } @@ -67,17 +67,9 @@ out.print(title); out.println(""); out.println(""); - out.println("
"); - out.println("

"); - out.println(""); - out.println("Semantic"); - out.println("M" + - "OBY" + - ""); - out.println(""); - out.println("

"); - out.println("
"); - out.println(""); + out.println(""); + out.println(""); + out.println("

"); out.println(""); } =================================================================== RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/KeywordSearchServlet.java,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/src/org/semanticmoby/ref/servlets/KeywordSearchServlet.java 2004/11/22 22:58:40 1.1 +++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/src/org/semanticmoby/ref/servlets/KeywordSearchServlet.java 2005/03/21 21:42:02 1.2 @@ -43,20 +43,48 @@ if ((provider.isEmpty()) && (accepts.isEmpty()) && (returns.isEmpty())) { showResultCount(-1, out); + out.println(""); + out.println("Show All Providers"); } else { KeywordQuery q = new KeywordQuery(provider, accepts, returns); - List matching = q.findMatchingProviders(); - - showResultCount(matching.size(), out); - - for (Iterator it = matching.iterator(); it.hasNext();) - { - MOBYProvider p = (MOBYProvider) it.next(); - showProvider(p, out); - } + try + { + List matching = q.findMatchingProviders(); + + showResultCount(matching.size(), out); + + if (matching.size() > 0) + { + for (Iterator it = matching.iterator(); it.hasNext();) + { + MOBYProvider p = (MOBYProvider) it.next(); + showProvider(p, out); + } + } + else + { + // Show a link that displays all providers. This is only + // temporary, to keep searchers from getting discouraged. + // When there are more providers defined, showing them all + // won't make sense. + // + out.println(""); + out.println("Show All Providers"); + } + } + catch (Exception e) + { + // Something went wrong; let the user know + // + out.println(""); + out.println("A server error occurred - please contact"); + out.println("MOBY support"); + out.println("to report the error. Thank you!"); + out.println(""); + } } finishHTML(out); } @@ -116,22 +144,23 @@ { // A negative count indicates that no keywords were given. // - out.println("No keywords were entered, so no search was performed."); + out.println("No keywords were entered, so no search was performed. "); + out.println("To see all registered providers,
click the link below:"); } else if (count == 0) { // Indicate that no matching providers were found, and // give the user feedback as to why this might be expected. // - out.println("No matching providers were found. Note that"); - out.println("very few providers have yet been defined."); + out.println("No matching providers were found. To see all"); + out.println("registered providers, click the link below:"); } else { // Show how many providers were found // out.println(count + " matching provider" + - (count > 1 ? "s" : "") + " found"); + (count > 1 ? "s were" : " was") + " found:"); } out.println(""); out.println(""); @@ -147,7 +176,7 @@ String uri = provider.getResource().getURI(); String name = provider.getName(); String description = provider.getOneLineDescription(); - String moreInfo = provider.getMoreInfoURI(); + String moreInfo = provider.getAboutURI(); // Display a link to the Semantic MOBY engage-provider service // @@ -175,7 +204,7 @@ out.print(""); - out.print("\"View"); + out.print("\"View"); out.print(""); out.println("
"); From nopushneva at pub.open-bio.org Tue Mar 22 19:39:56 2005 From: nopushneva at pub.open-bio.org (Nina Opushneva) Date: Tue, 22 Mar 2005 14:39:56 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503221939.j2MJduoB013744@pub.open-bio.org> nopushneva Tue Mar 22 14:39:56 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY In directory pub.open-bio.org:/tmp/cvs-serv13718 Modified Files: Central.pm Log Message: add a parameter for calling the rdfagent by mobycentral.config file moby-live/Perl/MOBY Central.pm,1.150,1.151 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Central.pm,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- /home/repository/moby/moby-live/Perl/MOBY/Central.pm 2005/03/16 19:14:14 1.150 +++ /home/repository/moby/moby-live/Perl/MOBY/Central.pm 2005/03/22 19:39:55 1.151 @@ -1247,8 +1247,11 @@ } if ($ch == 0){ - my $rez = system("/export/home/nina/rdfagent/run-RDFagent ".$signatureURL); - + + use MOBY::Config; + my $conf = MOBY::Config -> new(); + my $path = $conf->{mobycentral}->{rdfagent} ; + my $rez = system($path." ".$signatureURL); return &_error("The RDFagent call was successful. Report will send to you by E-mail","") if ($rez == 0); return &_error("Some problem with a connection or RDF model building","") if ($rez != 0); } From nopushneva at pub.open-bio.org Tue Mar 22 19:45:43 2005 From: nopushneva at pub.open-bio.org (Nina Opushneva) Date: Tue, 22 Mar 2005 14:45:43 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503221945.j2MJjhuP013800@pub.open-bio.org> nopushneva Tue Mar 22 14:45:43 EST 2005 Update of /home/repository/moby/moby-live/Perl/MOBY/Client In directory pub.open-bio.org:/tmp/cvs-serv13774 Modified Files: Central.pm Log Message: some changes in the check parameters procedure for the rdfagent moby-live/Perl/MOBY/Client Central.pm,1.93,1.94 =================================================================== RCS file: /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/03/16 20:05:46 1.93 +++ /home/repository/moby/moby-live/Perl/MOBY/Client/Central.pm 2005/03/22 19:45:43 1.94 @@ -780,7 +780,7 @@ $Category ||= ""; #____________call RDFagent__________________________________________________ -if (defined $signatureURL){ +if ($signatureURL ne ""){ my $ch = 0; my $sign_req; foreach $sign_req ($name, $type, $authURI, $email, $URL, $desc, $Category){ @@ -791,19 +791,19 @@ } if ($ch == 0){ print "call Agent\n"; - my $message = " - - - - - - $signatureURL - - - - "; - my ( $return ) = $self->_call( 'default', 'registerService', $message ); - return ( $self->parseRegXML( $return ) ); + my $message = " + + + + + + $signatureURL + + + + "; + my ( $return ) = $self->_call( 'default', 'registerService', $message ); + return ( $self->parseRegXML( $return ) ); } } From gss at pub.open-bio.org Tue Mar 22 22:35:08 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Tue, 22 Mar 2005 17:35:08 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503222235.j2MMZ8uH014250@pub.open-bio.org> gss Tue Mar 22 17:35:08 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/images In directory pub.open-bio.org:/tmp/cvs-serv14227/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/images Removed Files: moby.png ncgr.png Log Message: moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/images moby.png,1.1,NONE ncgr.png,1.1,NONE rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/images/RCS/moby.png,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/images/RCS/ncgr.png,v: No such file or directory From gss at pub.open-bio.org Tue Mar 22 22:35:08 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Tue, 22 Mar 2005 17:35:08 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503222235.j2MMZ8BO014272@pub.open-bio.org> gss Tue Mar 22 17:35:08 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting In directory pub.open-bio.org:/tmp/cvs-serv14227/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting Removed Files: index.html lodging.html missing-fields.jsp registration-confirmation.jsp registration-form.html shuttles.html Log Message: moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting index.html,1.2,NONE lodging.html,1.2,NONE missing-fields.jsp,1.1,NONE registration-confirmation.jsp,1.1,NONE registration-form.html,1.2,NONE shuttles.html,1.1,NONE rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/RCS/index.html,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/RCS/lodging.html,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/RCS/missing-fields.jsp,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/RCS/registration-confirmation.jsp,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/RCS/registration-form.html,v: No such file or directory rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/meeting/RCS/shuttles.html,v: No such file or directory From gss at pub.open-bio.org Wed Mar 23 19:55:19 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Wed, 23 Mar 2005 14:55:19 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503231955.j2NJtJOG017635@pub.open-bio.org> gss Wed Mar 23 14:55:19 EST 2005 Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources In directory pub.open-bio.org:/tmp/cvs-serv17613/resources Removed Files: web.xml Log Message: Moved back to WebRoot/WEB-INF directory moby-live/S-MOBY/ref-impl/semanticmoby.org/resources web.xml,1.1,NONE rcsdiff: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/resources/RCS/web.xml,v: No such file or directory From gss at pub.open-bio.org Wed Mar 23 19:56:12 2005 From: gss at pub.open-bio.org (Gary Schiltz) Date: Wed, 23 Mar 2005 14:56:12 -0500 Subject: [MOBY-guts] biomoby commit Message-ID: <200503231956.j2NJuCPA017685@pub.open-bio.org> gss Wed Mar 23 14:56:12 EST 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-serv17664/WebRoot/examples/proxies Added Files: tair-seqviewer.n3 flybase-genesearch wormbase-query tair-seqviewer tair-mapviewer.n3 tair-mapviewer sgd-quicksearch gramene-query.n3 sgd-quicksearch.n3 gramene-query wormbase-query.n3 flybase-genequery.n3 Log Message: New wrapped providers moby-live/S-MOBY/ref-impl/semanticmoby.org/WebRoot/examples/proxies tair-seqviewer.n3,NONE,1.1 flybase-genesearch,NONE,1.1 wormbase-query,NONE,1.1 tair-seqviewer,NONE,1.1 tair-mapviewer.n3,NONE,1.1 tair-mapviewer,NONE,1.1 sgd-quicksearch,NONE,1.1 gramene-query.n3,NONE,1.1 sgd-quicksearch.n3,NONE,1.1 gramene-query,NONE,1.1 wormbase-query.n3,NONE,1.1 flybase-genequery.n3,NONE,1.1