Changeset 6664 for TI01-discovery-API


Ignore:
Timestamp:
03/03/10 11:40:37 (9 years ago)
Author:
mnagni
Message:

Includes the messages.properties file
Removed the postgresql driver

Location:
TI01-discovery-API/trunk/MEDINDiscoveryService
Files:
2 added
6 edited
1 moved

Legend:

Unmodified
Added
Removed
  • TI01-discovery-API/trunk/MEDINDiscoveryService/pom.xml

    r6622 r6664  
    44        <groupId>ndg.services.discovery</groupId> 
    55        <artifactId>MedinDiscoveryService</artifactId> 
    6         <version>0.0.1-SNAPSHOT</version> 
     6        <version>0.0.2-SNAPSHOT</version> 
    77        <packaging>aar</packaging> 
    88 
     
    2121                </dependency> 
    2222 
    23                 <dependency> 
    24                         <groupId>postgresql</groupId> 
    25                         <artifactId>postgresql</artifactId> 
    26                         <version>8.3-603.jdbc4</version> 
    27                 </dependency> 
     23                <!-- 
     24                        <dependency> <groupId>postgresql</groupId> 
     25                        <artifactId>postgresql</artifactId> <version>8.3-603.jdbc4</version> 
     26                        </dependency> 
     27                --> 
    2828 
    2929                <dependency> 
  • TI01-discovery-API/trunk/MEDINDiscoveryService/src/main/java/ndg/common/NdgDictionary.java

    r6599 r6664  
    1717        public final static String DISCOVERY_DB_JNDI = "jndi.discoveryDB"; 
    1818 
    19         /** The parameters related to a manual datasource connection */  
     19        /** The parameters related to a manual datasource connection */ 
     20        @Deprecated 
    2021        public final static String JDBC_URI = "jdbc.uri"; 
     22        @Deprecated 
    2123        public final static String JDBC_PSW = "jdbc.password"; 
     24        @Deprecated 
    2225        public final static String JDBC_USERNAME = "jdbc.username"; 
     26        @Deprecated 
    2327        public final static String JDBC_DRIVER = "jdbc.driver"; 
    2428         
  • TI01-discovery-API/trunk/MEDINDiscoveryService/src/main/java/ndg/common/db/NdgBasicDataSource.java

    r6599 r6664  
    4343         * @exception ResourceNotAvailable if the resource is not available 
    4444         **/ 
     45        @Deprecated      
    4546        public NdgBasicDataSource(String connectURI, String driver, 
    4647                        String username, String password) throws ResourceNotAvailable { 
  • TI01-discovery-API/trunk/MEDINDiscoveryService/src/main/java/ndg/services/discovery/DiscoveryServiceMEDINSkeleton.java

    r6659 r6664  
    66import java.util.List; 
    77 
     8import ndg.common.MessageFormatter; 
    89import ndg.common.NdgMessage; 
    910import ndg.common.exception.NdgSQLException; 
     
    1112import ndg.services.discovery.exception.DiscoveryDBException; 
    1213import ndg.services.discovery.exception.DiscoveryWSException; 
     14import ndg.services.discovery.medin.DiscoveryBasic; 
    1315import ndg.services.discovery.medin.DiscoveryDictionary; 
    1416import ndg.services.discovery.medin.DiscoveryDictionary.OrderByField; 
     
    5456public class DiscoveryServiceMEDINSkeleton implements DiscoveryServiceMEDINSkeletonInterface { 
    5557 
    56         private static Logger logger = Logger.getLogger(DiscoveryDBException.class.getName()); 
     58        private static Logger logger = Logger.getLogger(DiscoveryServiceMEDINSkeleton.class.getName()); 
    5759 
    5860        // NOTE - when specifying text relevance ranking further parsing is required 
     
    125127                SearchReturnType responseContent = response.addNewDoSearchReturn(); 
    126128                 
    127                 SearchAgent agent = new SearchAgent(doSearch.getDoSearch()); 
    128                 boolean status = false; 
    129                 String statusMessage = "Normal"; 
     129                SearchAgent agent = new SearchAgent(doSearch.getDoSearch());     
     130                boolean status = false;          
     131                String statusMessage = null; 
    130132                try { 
    131133                        List<OriginalDocument> result = agent.doSearch(); 
     
    143145                        status = (result != null && result.size() > 0 ? true : false); 
    144146                } catch (NdgSQLException e) { 
    145                         if (logger.isErrorEnabled()) 
    146                                 logger.error(e.getMessage()); 
     147                                logger.error(e.getMessage(), e); 
    147148                        statusMessage = e.getMessage(); 
    148                 } catch (ResourceNotAvailable e) { 
    149                         if (logger.isErrorEnabled()) 
    150                                 logger.error(e.getMessage()); 
     149                } catch (ResourceNotAvailable e) {                               
     150                                logger.error(e.getMessage(), e); 
    151151                        statusMessage = e.getMessage(); 
    152152                } finally { 
     153                        responseContent.setHits(agent.getHits()); 
     154                        if (statusMessage == null) { 
     155                                NdgMessage msg = null; 
     156                                if (responseContent.getHits() > 0) { 
     157                                        msg = new NdgMessage("search.successful", new Object[] {});      
     158                                } else { 
     159                                        msg = new NdgMessage("search.no.results", new Object[] {}); 
     160                                } 
     161                                statusMessage = DiscoveryBasic.getInstance().getFormatter().getFormattedText(msg); 
     162                        }                        
    153163                        responseContent.setStatus(status); 
    154164                        responseContent.setStatusMessage(statusMessage); 
    155165                        responseContent.setResultId(0); // not used at the moment 
    156                         responseContent.setHits(agent.getHits()); 
    157166                } 
    158167                 
     
    170179                PresentReturnType responseContent = response.addNewDoPresentReturn(); 
    171180                boolean status = false; 
    172                 String statusMessage = "Normal"; 
     181                String statusMessage = null; 
    173182                PresentAgent agent = new PresentAgent(); 
    174183                List<String> documentsId = new ArrayList<String>(); 
     
    188197                        statusMessage = e.getMessage(); 
    189198                } finally { 
     199                        if (statusMessage == null) { 
     200                                NdgMessage msg = new NdgMessage("present.successful", new Object[] {}); 
     201                                statusMessage = DiscoveryBasic.getInstance().getFormatter().getFormattedText(msg); 
     202                        }  
    190203                        responseContent.setStatus(status); 
    191204                        responseContent.setStatusMessage(statusMessage); 
     
    387400                        newOMT.setMetricName(order.fieldLabel()); 
    388401                        String value = "DataError"; 
    389                         NdgMessage msg = new NdgMessage("invocation.error", new Object[] { "Field.get(result)" });                       
     402                        NdgMessage msg = new NdgMessage("invocation.error", new Object[] { "Field.get(result)" }); 
     403                        MessageFormatter formatter = DiscoveryBasic.getInstance().getFormatter(); 
    390404                        try { 
    391405                                PropertyDescriptor field = DiscoveryDictionary.getOriginalDocumentProperty(order.getOdField()); 
     
    394408                                newOMT.setMetricValue(value); 
    395409                        } catch (IllegalArgumentException e) { 
    396                                 logger.error(msg, e); 
     410                                logger.error(formatter.getFormattedText(msg), e); 
    397411                        } catch (IllegalAccessException e) { 
    398                                 logger.error(msg, e); 
     412                                logger.error(formatter.getFormattedText(msg), e); 
    399413                        } catch (InvocationTargetException e) { 
    400                                 logger.error(msg, e); 
     414                                logger.error(formatter.getFormattedText(msg), e); 
    401415                        } 
    402416                } 
  • TI01-discovery-API/trunk/MEDINDiscoveryService/src/main/resources/META-INF/Discovery.wsdl

    r6653 r6664  
    107107                <wsdl:port name="Discovery" binding="tns:DiscoverySoapBinding"> 
    108108                        <wsdlsoap:address 
    109                                 location="http://130.246.189.180/axis2/services/DiscoveryServiceMEDIN" /> 
     109                                location="http://neptune.badc.rl.ac.uk:8080/axis2/services/DiscoveryServiceMEDIN" /> 
    110110                </wsdl:port> 
    111111        </wsdl:service> 
  • TI01-discovery-API/trunk/MEDINDiscoveryService/src/main/resources/ndg/common/messages.properties

    r6510 r6664  
    22config.not.found.error = The configuration file {0} has not been found 
    33datasource.not.available = The datasource {0} is not available 
    4 sql.execution.error = Error occurred during the execution of the following SQL: \n {0} 
    5 sql.resultset.parsing.error = Error occurred parsing the result from the following SQL: \n {0} 
     4sql.execution.error = Error occurred during the execution of the following SQL\: \n {0} 
     5sql.resultset.parsing.error = Error occurred parsing the result from the following SQL\: \n {0} 
    66sql.command = Executing \n {0} 
    77invocation.error = The command {0} generated an unexpected exception 
    88context.not.available = No context is available 
    9 datasource.not.available = The datasource {0} is not available 
     9seach.successful = Successful. 
     10present.successful = Successful. 
     11search.no.results = Search was successful but generated no results. 
  • TI01-discovery-API/trunk/MEDINDiscoveryService/src/test/resources/DiscoveryServiceMEDIN-soapui-project.xml

    r6599 r6664  
    2929  <con:entry key="Add Settings" value="false"/> 
    3030  <con:entry key="Endpoint" value="axis2/services/DiscoveryServiceMEDIN"/> 
    31 </xml-fragment>]]></con:setting></con:settings><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="DiscoverySoapBinding" type="wsdl" bindingName="{http://medin.discovery.services.ndg/}DiscoverySoapBinding" soapVersion="1_1" anonymous="optional" definition="file:/home/users/mnagni/workspace/MARINDiscoveryService/target/generated-sources/axis2/wsdl2code/resources/DiscoveryServiceMEDIN.wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="file:/home/users/mnagni/workspace/MARINDiscoveryService/src/main/resources/META-INF/Discovery.wsdl"><con:part><con:url>file:/home/users/mnagni/workspace/MARINDiscoveryService/src/main/resources/META-INF/Discovery.wsdl</con:url><con:content><![CDATA[<!--edited with XMLSPY v2004 rel. 4 U (http://www.xmlspy.com) by Matt 
    32                 Pritchard (NERC Earth Observation Data Centre)--> 
    33 <wsdl:definitions targetNamespace="http://medin.discovery.services.ndg/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:tns1="http://medin.discovery.services.ndg/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> 
     31</xml-fragment>]]></con:setting></con:settings><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="DiscoverySoapBinding" type="wsdl" bindingName="{http://medin.discovery.services.ndg}DiscoverySoapBinding" soapVersion="1_1" anonymous="optional" definition="http://130.246.188.102:8080/axis2/services/DiscoveryServiceMEDIN?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="file:/home/users/mnagni/workspace/MARINDiscoveryService/src/main/resources/META-INF/Discovery.wsdl"><con:part><con:url>file:/home/users/mnagni/workspace/MARINDiscoveryService/src/main/resources/META-INF/Discovery.wsdl</con:url><con:content><![CDATA[<!--Maurizio Nagni <maurizio.nagni@stcf.ac.uk> 
     32                (NERC Earth Observation Data Centre)--> 
     33<wsdl:definitions targetNamespace="http://medin.discovery.services.ndg" xmlns:sch="http://medin.discovery.services.ndg/schema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://medin.discovery.services.ndg"> 
    3434  <wsdl:types> 
    35     <xsd:schema> 
    36       <xsd:import namespace="http://medin.discovery.services.ndg/" schemaLocation="DiscoverySchema.xsd"/> 
    37     </xsd:schema> 
     35    <xs:schema targetNamespace="http://medin.discovery.services.ndg"> 
     36      <xs:import namespace="http://medin.discovery.services.ndg/schema" schemaLocation="DiscoverySchema.xsd"/> 
     37    </xs:schema> 
    3838  </wsdl:types> 
    3939  <wsdl:message name="doSearchRequest"> 
    40     <wsdl:part name="part" element="tns1:DoSearch"/> 
     40    <wsdl:part name="part" element="sch:DoSearch"/> 
    4141  </wsdl:message> 
    4242  <wsdl:message name="doSearchResponse"> 
    43     <wsdl:part name="part" element="tns1:DoSearchReturn"/> 
     43    <wsdl:part name="part" element="sch:DoSearchReturn"/> 
    4444  </wsdl:message> 
    4545  <wsdl:message name="getListNamesRequest"> 
    46     <wsdl:part name="part" element="tns1:GetListNames"/> 
     46    <wsdl:part name="part" element="sch:GetListNames"/> 
    4747  </wsdl:message> 
    4848  <wsdl:message name="getListRequest"> 
    49     <wsdl:part name="part" element="tns1:GetList"/> 
     49    <wsdl:part name="part" element="sch:GetList"/> 
    5050  </wsdl:message> 
    5151  <wsdl:message name="doPresentRequest"> 
    52     <wsdl:part name="part" element="tns1:DoPresent"/> 
     52    <wsdl:part name="part" element="sch:DoPresent"/> 
    5353  </wsdl:message> 
    5454  <wsdl:message name="doPresentResponse"> 
    55     <wsdl:part name="part" element="tns1:DoPresentReturn"/> 
     55    <wsdl:part name="part" element="sch:DoPresentReturn"/> 
    5656  </wsdl:message> 
    5757  <wsdl:message name="getListNamesResponse"> 
    58     <wsdl:part name="part" element="tns1:GetListNamesReturn"/> 
     58    <wsdl:part name="part" element="sch:GetListNamesReturn"/> 
    5959  </wsdl:message> 
    6060  <wsdl:message name="getListResponse"> 
    61     <wsdl:part name="part" element="tns1:GetListReturn"/> 
     61    <wsdl:part name="part" element="sch:GetListReturn"/> 
    6262  </wsdl:message> 
    6363  <wsdl:portType name="Discovery"> 
    6464    <wsdl:operation name="doSearch"> 
    65       <wsdl:input name="doSearchRequest" message="tns1:doSearchRequest"/> 
    66       <wsdl:output name="doSearchResponse" message="tns1:doSearchResponse"/> 
     65      <wsdl:input name="doSearchRequest" message="tns:doSearchRequest"/> 
     66      <wsdl:output name="doSearchResponse" message="tns:doSearchResponse"/> 
    6767    </wsdl:operation> 
    6868    <wsdl:operation name="doPresent"> 
    69       <wsdl:input name="doPresentRequest" message="tns1:doPresentRequest"/> 
    70       <wsdl:output name="doPresentResponse" message="tns1:doPresentResponse"/> 
     69      <wsdl:input name="doPresentRequest" message="tns:doPresentRequest"/> 
     70      <wsdl:output name="doPresentResponse" message="tns:doPresentResponse"/> 
    7171    </wsdl:operation> 
    7272    <wsdl:operation name="getListNames"> 
    73       <wsdl:input name="getListNamesRequest" message="tns1:getListNamesRequest"/> 
    74       <wsdl:output name="getListNamesResponse" message="tns1:getListNamesResponse"/> 
     73      <wsdl:input name="getListNamesRequest" message="tns:getListNamesRequest"/> 
     74      <wsdl:output name="getListNamesResponse" message="tns:getListNamesResponse"/> 
    7575    </wsdl:operation> 
    7676    <wsdl:operation name="getList"> 
    77       <wsdl:input name="getListRequest" message="tns1:getListRequest"/> 
    78       <wsdl:output name="getListResponse" message="tns1:getListResponse"/> 
     77      <wsdl:input name="getListRequest" message="tns:getListRequest"/> 
     78      <wsdl:output name="getListResponse" message="tns:getListResponse"/> 
    7979    </wsdl:operation> 
    8080  </wsdl:portType> 
    81   <wsdl:binding name="DiscoverySoapBinding" type="tns1:Discovery"> 
     81  <wsdl:binding name="DiscoverySoapBinding" type="tns:Discovery"> 
    8282    <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> 
    8383    <wsdl:operation name="doSearch"> 
     
    119119  </wsdl:binding> 
    120120  <wsdl:service name="DiscoveryServiceMEDIN"> 
    121     <wsdl:port name="Discovery" binding="tns1:DiscoverySoapBinding"> 
     121    <wsdl:port name="Discovery" binding="tns:DiscoverySoapBinding"> 
    122122      <wsdlsoap:address location="http://130.246.189.180/axis2/services/DiscoveryServiceMEDIN"/> 
    123123    </wsdl:port> 
    124124  </wsdl:service> 
    125125</wsdl:definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part><con:part><con:url>file:/home/users/mnagni/workspace/MARINDiscoveryService/src/main/resources/META-INF/DiscoverySchema.xsd</con:url><con:content><![CDATA[<!--edited with XMLSPY v2004 rel. 4 U (http://www.xmlspy.com) by Steve Donegan (NERC Earth Observation Data Centre)--> 
    126 <xs:schema targetNamespace="http://medin.discovery.services.ndg/" elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://medin.discovery.services.ndg/" xmlns:tns1="http://medin.discovery.services.ndg/" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> 
     126<!--Maurizio Nagni <maurizio.nagni@stcf.ac.uk> 
     127                (NERC Earth Observation Data Centre)--> 
     128<xs:schema targetNamespace="http://medin.discovery.services.ndg/schema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://medin.discovery.services.ndg/schema"> 
    127129  <!--Request elements--> 
    128130  <xs:element name="DoSearch" type="tns:SearchType"/> 
     
    144146  <xs:complexType name="PresentType"> 
    145147    <xs:sequence> 
    146       <xs:element name="Documents" minOccurs="0"> 
    147         <xs:complexType> 
    148           <xs:complexContent> 
    149             <xs:extension base="tns:DocumentsType"> 
    150               <xs:sequence> 
    151                 <xs:element ref="tns:DocumentId" maxOccurs="unbounded"/> 
    152               </xs:sequence> 
    153             </xs:extension> 
    154           </xs:complexContent> 
    155         </xs:complexType> 
    156       </xs:element> 
    157       <xs:element name="Format" type="xs:string" minOccurs="0"> 
    158         <xs:annotation> 
    159           <xs:documentation>Required presentation format, value taken from presentFormatList.</xs:documentation> 
    160         </xs:annotation> 
    161       </xs:element> 
     148      <xs:element name="Documents" type="tns:SimpleDocument" maxOccurs="unbounded"/> 
     149      <xs:element name="RetrieveCriteria" type="tns:RetrieveCriteriaType" minOccurs="0"> 
     150        <xs:annotation> 
     151          <xs:documentation>Comparison of a date dood  or date range to specified/default dates within metadata.</xs:documentation> 
     152        </xs:annotation> 
     153      </xs:element> 
     154    </xs:sequence> 
     155  </xs:complexType> 
     156  <xs:complexType name="RetrieveCriteriaType"> 
     157    <xs:sequence> 
     158      <xs:element name="OrderBy" type="tns:OrderByType" minOccurs="0" maxOccurs="unbounded"> 
     159        <xs:annotation> 
     160          <xs:documentation>Optional set of field(s) by which to order records in the result set and hence the search response. Direction can be specified alongside each field.</xs:documentation> 
     161        </xs:annotation> 
     162      </xs:element> 
     163      <xs:element name="RecordDetail" type="xs:string" minOccurs="0"> 
     164        <xs:annotation> 
     165          <xs:documentation>Level of detail to be used for each record in the search response (before initiating doPresent). Values taken from recordDetailList. Default = "id", i.e. just the document id.</xs:documentation> 
     166        </xs:annotation> 
     167      </xs:element> 
     168      <xs:element name="MetadataFormat" type="xs:string" minOccurs="0"/> 
    162169    </xs:sequence> 
    163170  </xs:complexType> 
     
    188195        </xs:complexType> 
    189196      </xs:element> 
     197      <xs:element name="RetrieveCriteria" type="tns:RetrieveCriteriaType" minOccurs="0"> 
     198        <xs:annotation> 
     199          <xs:documentation>Comparison of a date or date range to specified/default dates within metadata.</xs:documentation> 
     200        </xs:annotation> 
     201      </xs:element> 
    190202      <xs:element name="Start" type="xs:unsignedInt" minOccurs="0"> 
    191203        <xs:annotation> 
     
    198210        </xs:annotation> 
    199211      </xs:element> 
    200       <xs:element name="OrderBy" type="tns:OrderByType" minOccurs="0" maxOccurs="unbounded"> 
    201         <xs:annotation> 
    202           <xs:documentation>Optional set of field(s) by which to order records in the result set and hence the search response. Direction can be specified alongside each field.</xs:documentation> 
    203         </xs:annotation> 
    204       </xs:element> 
    205212      <xs:element name="Scope" type="xs:string" minOccurs="0" maxOccurs="unbounded"> 
    206213        <xs:annotation> 
     
    208215        </xs:annotation> 
    209216      </xs:element> 
    210       <xs:element name="Format" type="xs:string" minOccurs="0"> 
    211         <xs:annotation> 
    212           <xs:documentation>restrict records to specific original input formats.</xs:documentation> 
    213         </xs:annotation> 
    214       </xs:element> 
    215       <xs:element name="RecordDetail" type="xs:string" minOccurs="0"> 
    216         <xs:annotation> 
    217           <xs:documentation>Level of detail to be used for each record in the search response (before initiating doPresent). Values taken from recordDetailList. Default = "id", i.e. just the document id.</xs:documentation> 
     217      <xs:element name="OriginalFormat" type="xs:string" minOccurs="0"> 
     218        <xs:annotation> 
     219          <xs:documentation>Optional term used to restrict  search to records where original ingested xml format matches that in OriginalFormatList</xs:documentation> 
    218220        </xs:annotation> 
    219221      </xs:element> 
     
    230232      <xs:element name="Status" type="xs:boolean"/> 
    231233      <xs:element name="StatusMessage" type="xs:string"/> 
    232       <xs:element name="Documents" minOccurs="0"> 
    233         <xs:complexType> 
    234           <xs:complexContent> 
    235             <xs:extension base="tns:DocumentReturnType"> 
    236               <xs:sequence> 
    237                 <xs:element name="DocumentFull" type="tns:ReturnFullType" maxOccurs="unbounded"/> 
    238               </xs:sequence> 
    239             </xs:extension> 
    240           </xs:complexContent> 
    241         </xs:complexType> 
    242       </xs:element> 
     234      <xs:element name="Documents" type="tns:Documents" minOccurs="0"/> 
    243235    </xs:sequence> 
    244236  </xs:complexType> 
     
    249241      <xs:element name="ResultId" type="xs:int" minOccurs="0"/> 
    250242      <xs:element name="Hits" type="xs:int" minOccurs="0"/> 
    251       <xs:element name="Documents" minOccurs="0"> 
    252         <xs:complexType> 
    253           <xs:complexContent> 
    254             <xs:extension base="tns:DocumentsType"> 
    255               <xs:choice> 
    256                 <xs:sequence> 
    257                   <xs:element ref="tns:DocumentId" maxOccurs="unbounded"/> 
    258                 </xs:sequence> 
    259                 <xs:sequence> 
    260                   <xs:element name="DocumentFull" type="tns:ReturnFullType" maxOccurs="unbounded"/> 
    261                 </xs:sequence> 
    262                 <xs:sequence> 
    263                   <xs:element name="DocumentBrief" type="tns:ReturnBriefType" maxOccurs="unbounded"/> 
    264                 </xs:sequence> 
    265                 <xs:sequence> 
    266                   <xs:element name="DocumentSummary" type="tns:ReturnSummaryType" maxOccurs="unbounded"/> 
    267                 </xs:sequence> 
    268               </xs:choice> 
    269             </xs:extension> 
    270           </xs:complexContent> 
    271         </xs:complexType> 
    272       </xs:element> 
     243      <xs:element name="Documents" type="tns:Documents" minOccurs="0"/> 
    273244    </xs:sequence> 
    274245  </xs:complexType> 
     
    338309        </xs:annotation> 
    339310      </xs:element> 
    340       <xs:element name="SpatialReferenceSystem" minOccurs="0"> 
     311      <xs:element name="SpatialReferenceSystem" type="xs:string" minOccurs="0"> 
    341312        <xs:annotation> 
    342313          <xs:documentation>Spatial reference system used for search bounding box e.g. EPSG:4326, taken from list spatialReferenceSystemList</xs:documentation> 
     
    352323        </xs:annotation> 
    353324      </xs:element> 
    354       <xs:element name="TermTarget" type="xs:string" minOccurs="0" maxOccurs="1"> 
     325      <xs:element name="TermTarget" type="xs:string" minOccurs="0"> 
    355326        <xs:annotation> 
    356327          <xs:documentation>Metadata field used as target for search. From list termTargetList</xs:documentation> 
     
    371342  <xs:complexType name="OrderingMetricType"> 
    372343    <xs:annotation> 
    373       <xs:documentation>Intented to allow passing of ordering information at the present level</xs:documentation> 
     344      <xs:documentation>Intented to allow passing of ordering information 
     345                                at the present level</xs:documentation> 
    374346    </xs:annotation> 
    375347    <xs:sequence> 
     
    406378    </xs:sequence> 
    407379  </xs:complexType> 
    408   <xs:element name="DocumentId" type="xs:string"/> 
     380  <xs:complexType name="SimpleDocument"> 
     381    <xs:sequence> 
     382      <xs:element name="DocumentId" type="xs:string"/> 
     383    </xs:sequence> 
     384  </xs:complexType> 
     385  <xs:complexType name="ReturnSimpleType"> 
     386    <xs:complexContent> 
     387      <xs:extension base="tns:SimpleDocument"/> 
     388    </xs:complexContent> 
     389  </xs:complexType> 
    409390  <xs:complexType name="ReturnBriefType"> 
    410391    <xs:complexContent> 
    411       <xs:extension base="tns:DocumentsType"> 
     392      <xs:extension base="tns:ReturnSimpleType"> 
    412393        <xs:sequence> 
    413           <xs:element ref="tns:DocumentId"/> 
     394          <xs:element name="AdditionalInformation" type="tns:CustomInfo"/> 
    414395          <xs:element name="Title" type="xs:string" minOccurs="0"/> 
    415396          <xs:element name="OrderedField" type="tns:OrderingMetricType" minOccurs="0" maxOccurs="unbounded"> 
     
    424405  <xs:complexType name="ReturnSummaryType"> 
    425406    <xs:complexContent> 
    426       <xs:extension base="tns:DocumentsType"> 
     407      <xs:extension base="tns:ReturnSimpleType"> 
    427408        <xs:sequence> 
    428           <xs:element ref="tns:DocumentId"/> 
    429409          <xs:element name="Title" type="xs:string" minOccurs="0"/> 
    430           <xs:element name="Abstract" type="xs:string" minOccurs="0"/> 
    431410          <xs:element name="OrderedField" type="tns:OrderingMetricType" minOccurs="0" maxOccurs="unbounded"> 
    432411            <xs:annotation> 
     
    434413            </xs:annotation> 
    435414          </xs:element> 
     415          <xs:element name="Abstract" type="xs:string" minOccurs="0"/> 
    436416          <xs:element name="Temporal" type="tns:TemporalType" minOccurs="0" maxOccurs="unbounded"/> 
    437417          <xs:element name="Spatial" type="tns:SpatialType" minOccurs="0" maxOccurs="unbounded"/> 
     
    442422  <xs:complexType name="ReturnFullType"> 
    443423    <xs:complexContent> 
    444       <xs:extension base="tns:DocumentsType"> 
     424      <xs:extension base="tns:ReturnSimpleType"> 
    445425        <xs:sequence> 
    446           <xs:element ref="tns:DocumentId"/> 
     426          <xs:element name="AdditionalInformation" type="tns:CustomInfo"/> 
    447427          <xs:element name="Title" type="xs:string" minOccurs="0"/> 
    448           <xs:element name="Abstract" type="xs:string" minOccurs="0"/> 
    449428          <xs:element name="OrderedField" type="tns:OrderingMetricType" minOccurs="0" maxOccurs="unbounded"> 
    450429            <xs:annotation> 
     
    452431            </xs:annotation> 
    453432          </xs:element> 
     433          <xs:element name="Abstract" type="xs:string" minOccurs="0"/> 
    454434          <xs:element name="Temporal" type="tns:TemporalType" minOccurs="0" maxOccurs="unbounded"/> 
    455435          <xs:element name="Spatial" type="tns:SpatialType" minOccurs="0" maxOccurs="unbounded"/> 
     
    469449    </xs:sequence> 
    470450  </xs:complexType> 
    471 </xs:schema>]]></con:content><con:type>http://www.w3.org/2001/XMLSchema</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>http://130.246.188.102:8080/axis2/services/DiscoveryServiceMEDIN</con:endpoint><con:endpoint>http://juliet:8088/mockDiscoverySoapBinding</con:endpoint></con:endpoints><con:operation isOneWay="false" action="" name="doPresent" bindingOperationName="doPresent" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="SimpleRequestDoc1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://130.246.188.102:8080/axis2/services/DiscoveryServiceMEDIN</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:med="http://medin.discovery.services.ndg/"> 
     451  <xs:complexType name="Documents"> 
     452    <xs:complexContent> 
     453      <xs:extension base="tns:DocumentsType"> 
     454        <xs:choice> 
     455          <xs:sequence> 
     456            <xs:element name="DocumentSimple" type="tns:ReturnSimpleType" maxOccurs="unbounded"/> 
     457          </xs:sequence> 
     458          <xs:sequence> 
     459            <xs:element name="DocumentFull" type="tns:ReturnFullType" maxOccurs="unbounded"/> 
     460          </xs:sequence> 
     461          <xs:sequence> 
     462            <xs:element name="DocumentBrief" type="tns:ReturnBriefType" maxOccurs="unbounded"/> 
     463          </xs:sequence> 
     464          <xs:sequence> 
     465            <xs:element name="DocumentSummary" type="tns:ReturnSummaryType" maxOccurs="unbounded"/> 
     466          </xs:sequence> 
     467        </xs:choice> 
     468      </xs:extension> 
     469    </xs:complexContent> 
     470  </xs:complexType> 
     471  <xs:complexType name="CustomInfo"> 
     472    <xs:annotation> 
     473      <xs:documentation>Customizable part of the document</xs:documentation> 
     474    </xs:annotation> 
     475    <xs:sequence> 
     476      <xs:element name="Authors" type="xs:string"/> 
     477      <xs:element name="Parameters" type="xs:string"/> 
     478      <xs:element name="ResourceType" type="xs:string"/> 
     479      <xs:element name="TopicCategory" type="xs:string"/> 
     480      <xs:element name="Lineage" type="xs:string"/> 
     481      <xs:element name="LimitationsPublicAccess" type="xs:string"/> 
     482      <xs:element name="DataOriginator" type="xs:string"/> 
     483      <xs:element name="OriginalFormatName" type="xs:string"/> 
     484    </xs:sequence> 
     485  </xs:complexType> 
     486</xs:schema>]]></con:content><con:type>http://www.w3.org/2001/XMLSchema</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>http://130.246.188.102:8080/axis2/services/DiscoveryServiceMEDIN</con:endpoint><con:endpoint>http://juliet:8088/mockDiscoverySoapBinding</con:endpoint><con:endpoint>http://130.246.189.180/axis2/services/DiscoveryServiceMEDIN</con:endpoint><con:endpoint>http://130.246.188.102:8080/axis2/services/DiscoveryServiceMEDIN/</con:endpoint></con:endpoints><con:operation isOneWay="false" action="" name="doPresent" bindingOperationName="doPresent" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="SimpleRequestDoc1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://130.246.188.102:8080/axis2/services/DiscoveryServiceMEDIN/</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:med="http://medin.discovery.services.ndg/"> 
    472487   <soapenv:Header/> 
    473488   <soapenv:Body> 
     
    482497      </med:DoPresent> 
    483498   </soapenv:Body> 
    484 </soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://medin.discovery.services.ndg/Discovery/doPresentRequest"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="doSearch" bindingOperationName="doSearch" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://130.246.188.102:8080/axis2/services/DiscoveryServiceMEDIN</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:med="http://medin.discovery.services.ndg/"> 
     499</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://medin.discovery.services.ndg/Discovery/doPresentRequest"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="doSearch" bindingOperationName="doSearch" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://130.246.188.102:8080/axis2/services/DiscoveryServiceMEDIN/</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:med="http://medin.discovery.services.ndg/"> 
    485500   <soapenv:Header/> 
    486501   <soapenv:Body> 
     
    539554      </med:DoSearch> 
    540555   </soapenv:Body> 
    541 </soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://medin.discovery.services.ndg/Discovery/doSearchRequest"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="getList" bindingOperationName="getList" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="TermTargetListRequest"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://130.246.188.102:8080/axis2/services/DiscoveryServiceMEDIN</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:med="http://medin.discovery.services.ndg/"> 
    542    <soapenv:Header/> 
    543    <soapenv:Body> 
    544       <med:GetList> 
    545          <med:listName>TermTargetList</med:listName> 
    546       </med:GetList> 
    547    </soapenv:Body> 
    548 </soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://medin.discovery.services.ndg/Discovery/getListRequest"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="getListNames" bindingOperationName="getListNames" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://130.246.188.102:8080/axis2/services/DiscoveryServiceMEDIN</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:med="http://medin.discovery.services.ndg/"> 
    549    <soapenv:Header/> 
    550    <soapenv:Body> 
    551       <med:GetListNames>?</med:GetListNames> 
    552    </soapenv:Body> 
    553 </soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://medin.discovery.services.ndg/Discovery/getListNamesRequest"/><con:wsrmConfig version="1.2"/></con:call><con:call name="Request 2"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://130.246.188.102:8080/axis2/services/DiscoveryServiceMEDIN</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:med="http://medin.discovery.services.ndg/"> 
     556</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://medin.discovery.services.ndg/Discovery/doSearchRequest"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="getList" bindingOperationName="getList" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="TermTargetListRequest"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://130.246.188.102:8080/axis2/services/DiscoveryServiceMEDIN/</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:sch="http://medin.discovery.services.ndg/schema" xmlns:med="http://medin.discovery.services.ndg/"> 
     557   <soapenv:Header/> 
     558   <soapenv:Body> 
     559      <sch:GetList> 
     560         <sch:listName>?</sch:listName> 
     561      </sch:GetList> 
     562   </soapenv:Body> 
     563</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://medin.discovery.services.ndg/Discovery/getListRequest"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="getListNames" bindingOperationName="getListNames" type="Request-Response" inputName="" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://130.246.188.102:8080/axis2/services/DiscoveryServiceMEDIN/</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:med="http://medin.discovery.services.ndg/"> 
     564   <soapenv:Header/> 
     565   <soapenv:Body> 
     566      <med:GetListNames/> 
     567   </soapenv:Body> 
     568</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://medin.discovery.services.ndg/Discovery/getListNamesRequest"/><con:wsrmConfig version="1.2"/></con:call><con:call name="Request 2"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://130.246.188.102:8080/axis2/services/DiscoveryServiceMEDIN/</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:med="http://medin.discovery.services.ndg/"> 
    554569   <soapenv:Header/> 
    555570   <soapenv:Body> 
Note: See TracChangeset for help on using the changeset viewer.