From 4e3c49067886e91d161bafd531492463d5539687 Mon Sep 17 00:00:00 2001
From: Dmytro_Bykov <dmytro_bykov@epam.com>
Date: Thu, 31 Aug 2023 12:15:22 +0500
Subject: [PATCH] EDGOAIPMH-101: Update to Java 17. remove useless samples.

---
 Jenkinsfile                                   |  2 +-
 pom.xml                                       |  1 -
 ramls/examples/bad_verb_error.sample          |  6 --
 .../examples/no_metadata_format_error.sample  |  9 ---
 ramls/examples/no_records_error.sample        |  9 ---
 ramls/examples/record.sample                  | 42 ----------
 ramls/examples/resumption_token_error.sample  |  9 ---
 ramls/schemas/oai_dc.xsd                      | 36 ---------
 ramls/schemas/simpledc20021212.xsd            | 78 -------------------
 ramls/traits/resps.raml                       | 15 ----
 10 files changed, 1 insertion(+), 206 deletions(-)
 delete mode 100644 ramls/examples/bad_verb_error.sample
 delete mode 100644 ramls/examples/no_metadata_format_error.sample
 delete mode 100644 ramls/examples/no_records_error.sample
 delete mode 100644 ramls/examples/record.sample
 delete mode 100644 ramls/examples/resumption_token_error.sample
 delete mode 100644 ramls/schemas/oai_dc.xsd
 delete mode 100644 ramls/schemas/simpledc20021212.xsd

diff --git a/Jenkinsfile b/Jenkinsfile
index d123116..d4cb2dc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,7 +7,7 @@ buildMvn {
     buildJavaDocker {
       publishMaster = 'yes'
       healthChk = 'yes'
-      healthChkCmd = 'curl -sS --fail -o /dev/null  http://localhost:8081/admin/health || exit 1'
+      healthChkCmd = 'wget --no-verbose --tries=1 --spider http://localhost:8081/admin/health || exit 1'
     }
   }
 }
diff --git a/pom.xml b/pom.xml
index 6216fc9..01e48e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,7 +213,6 @@
           <schemaDirectory>ramls/schemas</schemaDirectory>
           <schemaIncludes>
             <include>OAI-PMH.xsd</include>
-<!--            <include>oai_dc.xsd</include>-->
           </schemaIncludes>
           <bindingDirectory>ramls/schemas</bindingDirectory>
           <bindingIncludes>
diff --git a/ramls/examples/bad_verb_error.sample b/ramls/examples/bad_verb_error.sample
deleted file mode 100644
index 9edf214..0000000
--- a/ramls/examples/bad_verb_error.sample
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<OAI-PMH xmlns="http://www.openarchives.org/OAI/2.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/ http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd">
-    <responseDate>2020-05-14T07:49:29Z</responseDate>
-    <request set="all" metadataPrefix="oai_dc">http://localhost:9701/oai/eyJzIjoiblo1NkYzTGVBYSIsInQiOiJkaWt1IiwidSI6ImRpa3VfYWRtaW4ifQ</request>
-    <error code="badVerb">Bad verb. Verb 'WrongVerbName' is not implemented</error>
-</OAI-PMH>
diff --git a/ramls/examples/no_metadata_format_error.sample b/ramls/examples/no_metadata_format_error.sample
deleted file mode 100644
index a967f2e..0000000
--- a/ramls/examples/no_metadata_format_error.sample
+++ /dev/null
@@ -1,9 +0,0 @@
-<OAI-PMH xmlns="http://www.openarchives.org/OAI/2.0/"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/
-         http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd">
-  <responseDate>2002-02-08T08:55:46Z</responseDate>
-  <request verb="GetRecord" identifier="oai:arXiv.org:quant-ph/9901001"
-           metadataPrefix="oai_marc">http://arXiv.org/oai1</request>
-  <error code="noMetadataFormats"/>
-</OAI-PMH>
\ No newline at end of file
diff --git a/ramls/examples/no_records_error.sample b/ramls/examples/no_records_error.sample
deleted file mode 100644
index 7486c64..0000000
--- a/ramls/examples/no_records_error.sample
+++ /dev/null
@@ -1,9 +0,0 @@
-<OAI-PMH xmlns="http://www.openarchives.org/OAI/2.0/"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/
-         http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd">
-  <responseDate>2001-06-01T19:20:30Z</responseDate>
-  <request verb="ListSets">
-           http://purl.org/alcme/etdcat/servlet/OAIHandler</request>
-  <error code="noRecordsMatch"/>
-</OAI-PMH>
\ No newline at end of file
diff --git a/ramls/examples/record.sample b/ramls/examples/record.sample
deleted file mode 100644
index 485a133..0000000
--- a/ramls/examples/record.sample
+++ /dev/null
@@ -1,42 +0,0 @@
-<OAI-PMH xmlns="http://www.openarchives.org/OAI/2.0/"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/
-         http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd">
-  <responseDate>2002-02-08T08:55:46Z</responseDate>
-  <request verb="GetRecord" identifier="oai:arXiv.org:cs/0112017"
-           metadataPrefix="oai_dc">http://arXiv.org/oai2</request>
-  <GetRecord>
-   <record>
-    <header>
-      <identifier>oai:arXiv.org:cs/0112017</identifier>
-      <datestamp>2001-12-14</datestamp>
-      <setSpec>cs</setSpec>
-      <setSpec>math</setSpec>
-    </header>
-    <metadata>
-      <oai_dc:dc
-         xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
-         xmlns:dc="http://purl.org/dc/elements/1.1/"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/
-         http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-        <dc:title>Using Structural Metadata to Localize Experience of
-                  Digital Content</dc:title>
-        <dc:creator>Dushay, Naomi</dc:creator>
-        <dc:subject>Digital Libraries</dc:subject>
-        <dc:description>With the increasing technical sophistication of
-            both information consumers and providers, there is
-            increasing demand for more meaningful experiences of digital
-            information. We present a framework that separates digital
-            object experience, or rendering, from digital object storage
-            and manipulation, so the rendering can be tailored to
-            particular communities of users.
-        </dc:description>
-        <dc:description>Comment: 23 pages including 2 appendices,
-            8 figures</dc:description>
-        <dc:date>2001-12-14</dc:date>
-      </oai_dc:dc>
-    </metadata>
-  </record>
- </GetRecord>
-</OAI-PMH>
diff --git a/ramls/examples/resumption_token_error.sample b/ramls/examples/resumption_token_error.sample
deleted file mode 100644
index 30c909f..0000000
--- a/ramls/examples/resumption_token_error.sample
+++ /dev/null
@@ -1,9 +0,0 @@
-<OAI-PMH xmlns="http://www.openarchives.org/OAI/2.0/"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/
-         http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd">
-  <responseDate>2001-06-01T19:20:30Z</responseDate>
-  <request verb="ListSets">
-           http://purl.org/alcme/etdcat/servlet/OAIHandler</request>
-  <error code="badResumptionToken"/>
-</OAI-PMH>
\ No newline at end of file
diff --git a/ramls/schemas/oai_dc.xsd b/ramls/schemas/oai_dc.xsd
deleted file mode 100644
index 585fec0..0000000
--- a/ramls/schemas/oai_dc.xsd
+++ /dev/null
@@ -1,36 +0,0 @@
-<schema targetNamespace="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	
-<annotation>
-  <documentation> 
-      XML Schema 2002-03-18 by Pete Johnston.
-      Adjusted for usage in the OAI-PMH.
-      Schema imports the Dublin Core elements from the DCMI schema for unqualified Dublin Core.
-      2002-12-19 updated to use simpledc20021212.xsd (instead of simpledc20020312.xsd)
-  </documentation>
-</annotation>
-
-<import namespace="http://purl.org/dc/elements/1.1/" schemaLocation="simpledc20021212.xsd"/>
-
-<element name="dc" type="oai_dc:oai_dcType"/>
-
-<complexType name="oai_dcType">
-  <choice minOccurs="0" maxOccurs="unbounded">
-    <element ref="dc:title"/>
-    <element ref="dc:creator"/>
-    <element ref="dc:subject"/>
-    <element ref="dc:description"/>
-    <element ref="dc:publisher"/>
-    <element ref="dc:contributor"/>
-    <element ref="dc:date"/>
-    <element ref="dc:type"/>
-    <element ref="dc:format"/>
-    <element ref="dc:identifier"/>
-    <element ref="dc:source"/>
-    <element ref="dc:language"/>
-    <element ref="dc:relation"/>
-    <element ref="dc:coverage"/>
-    <element ref="dc:rights"/>
-  </choice>
-</complexType>
-
-</schema>
diff --git a/ramls/schemas/simpledc20021212.xsd b/ramls/schemas/simpledc20021212.xsd
deleted file mode 100644
index bea04f8..0000000
--- a/ramls/schemas/simpledc20021212.xsd
+++ /dev/null
@@ -1,78 +0,0 @@
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns="http://purl.org/dc/elements/1.1/"
-           targetNamespace="http://purl.org/dc/elements/1.1/"
-           elementFormDefault="qualified"
-           attributeFormDefault="unqualified">
-
-  <xs:annotation>
-    <xs:documentation xml:lang="en">
-      Simple DC XML Schema, 2002-10-09
-      by Pete Johnston (p.johnston@ukoln.ac.uk),
-      Carl Lagoze (lagoze@cs.cornell.edu), Andy Powell (a.powell@ukoln.ac.uk),
-      Herbert Van de Sompel (hvdsomp@yahoo.com).
-      This schema defines terms for Simple Dublin Core, i.e. the 15
-      elements from the http://purl.org/dc/elements/1.1/ namespace, with
-      no use of encoding schemes or element refinements.
-      Default content type for all elements is xs:string with xml:lang
-      attribute available.
-
-      Supercedes version of 2002-03-12. 
-      Amended to remove namespace declaration for http://www.w3.org/XML/1998/namespace namespace,
-      and to reference lang attribute via built-in xml: namespace prefix.
-      xs:appinfo also removed.
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:import namespace="http://www.w3.org/XML/1998/namespace"
-             schemaLocation="http://www.w3.org/2001/03/xml.xsd">
-  </xs:import>
-
-  <xs:element name="title" type="elementType"/>
-  <xs:element name="creator" type="elementType"/>
-  <xs:element name="subject" type="elementType"/>
-  <xs:element name="description" type="elementType"/>
-  <xs:element name="publisher" type="elementType"/>
-  <xs:element name="contributor" type="elementType"/>
-  <xs:element name="date" type="elementType"/>
-  <xs:element name="type" type="elementType"/>
-  <xs:element name="format" type="elementType"/>
-  <xs:element name="identifier" type="elementType"/>
-  <xs:element name="source" type="elementType"/>
-  <xs:element name="language" type="elementType"/>
-  <xs:element name="relation" type="elementType"/>
-  <xs:element name="coverage" type="elementType"/>
-  <xs:element name="rights" type="elementType"/>
-
-  <xs:group name="elementsGroup">
-  <xs:sequence>
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element ref="title"/>
-      <xs:element ref="creator"/>
-      <xs:element ref="subject"/>
-      <xs:element ref="description"/>
-      <xs:element ref="publisher"/>
-      <xs:element ref="contributor"/>
-      <xs:element ref="date"/>
-      <xs:element ref="type"/>
-      <xs:element ref="format"/>
-      <xs:element ref="identifier"/>
-      <xs:element ref="source"/>
-      <xs:element ref="language"/>
-      <xs:element ref="relation"/>
-      <xs:element ref="coverage"/>
-      <xs:element ref="rights"/>
-    </xs:choice>
-    </xs:sequence>
-  </xs:group>
-
-  <xs:complexType name="elementType">
-    <xs:simpleContent>
-      <xs:extension base="xs:string">
-        <xs:attribute ref="xml:lang" use="optional"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-</xs:schema>
-
-
diff --git a/ramls/traits/resps.raml b/ramls/traits/resps.raml
index 057f80f..5b5daa7 100644
--- a/ramls/traits/resps.raml
+++ b/ramls/traits/resps.raml
@@ -10,26 +10,17 @@
         body:
           text/xml:
             #schema: OAI-PMH
-            example:
-              strict: false
-              value: !include ../examples/bad_verb_error.sample
 
       '401':
         description: 'Access Denied'
         body:
           text/xml:
             #schema: OAI-PMH
-            example:
-              strict: false
-              value: !include ../examples/resumption_token_error.sample
       '404':
         description: 'Not found'
         body:
           text/xml:
             #schema: OAI-PMH
-            example:
-              strict: false
-              value: !include ../examples/no_records_error.sample
       '406':
         description: 'Not Acceptable'
         body:
@@ -39,9 +30,6 @@
         body:
           text/xml:
             #schema: OAI-PMH
-            example:
-              strict: false
-              value: !include ../examples/no_metadata_format_error.sample
       '500':
         description: 'Internal Server Error'
         body:
@@ -51,6 +39,3 @@
         body:
           text/xml:
             #schema: OAI-PMH
-            example:
-              strict: false
-              value: !include ../examples/bad_verb_error.sample