From d9396a868343e533dc68b9e061785f53c7c5b7fa Mon Sep 17 00:00:00 2001
From: Sami Airo <sami.airo@gmail.com>
Date: Fri, 27 Jun 2014 23:24:00 +0300
Subject: [PATCH] v2_1 2013-08 files

---
 v2_1/rest/README.txt            | 10 +---------
 v2_1/rest/src/SDMXRestTypes.xsd | 15 +++++++++------
 v2_1/rest/src/sdmx-rest.wadl    | 22 +++++++++++++++++-----
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/v2_1/rest/README.txt b/v2_1/rest/README.txt
index 5ff9234..dbdf933 100755
--- a/v2_1/rest/README.txt
+++ b/v2_1/rest/README.txt
@@ -4,17 +4,9 @@ WADL for the SDMX RESTful API specification.
 File listing
 - SDMXRestTypes.xsd: XSD for defining types of paramteres used in WADL. It is imported by the WADL file.
 - sdmx-rest.wadl: The WADL file of the REST specifications
-- RestTestClient.java sample client java code for the wadl2java tool.
 - wadl.xsd: The XSD of the WADL file. It can be used for validating WADL files.
 - xml.xsd: The XSD for the http://www.w3.org/XML/1998/namespace namespace. It is included so the schemas can be validated offline.
 
-Builiding a client from WADL
-Using the wadl2java it generates the appropriate client stubs in Java.
-Sample command:
-wadl2java -o src -p org.estat.rest -a sdmx-rest.wadl
-To call these client stubs see the sample code in RestTestClient.java.
-
 Resources
 http://www.w3.org/Submission/wadl/
-http://java.net/projects/wadl/
-http://java.net/downloads/wadl/latest/
+http://wadl.java.net/
diff --git a/v2_1/rest/src/SDMXRestTypes.xsd b/v2_1/rest/src/SDMXRestTypes.xsd
index dcd690d..2a3d406 100755
--- a/v2_1/rest/src/SDMXRestTypes.xsd
+++ b/v2_1/rest/src/SDMXRestTypes.xsd
@@ -16,30 +16,33 @@
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="([A-z0-9_@$\-]+)(\.(([A-z0-9_@$\-]+)(\+([A-z0-9_@$\-]+))*)?)*"/>
+            <!-- (common:IDType([+]common:IDType)*)?([.](common:IDType([+]common:IDType)*)?)* -->
+            <xs:pattern value="([A-Za-z0-9_@$\-]+([+][A-Za-z0-9_@$\-]+)*)?([.]([A-Za-z0-9_@$\-]+([+][A-Za-z0-9_@$\-]+)*)?)*"/>
         </xs:restriction>
     </xs:simpleType>
     
     <xs:simpleType name="ProviderRefType">
         <xs:annotation>
             <xs:documentation>A string identifying the provider. The syntax is agency id, provider id, separated by a “,”. For example: AGENCY_ID,PROVIDER_ID.
-                In case the string only contains one out of these 2 elements, it is considered to be the provider id, i.e. ALL,PROVIDER_ID.
+                In case the string only contains one out of these 2 elements, it is considered to be the provider id, i.e. all,PROVIDER_ID.
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="([A-z][A-z0-9_\-]*(\.[A-z][A-z0-9_\-]*)*\,)?([A-z0-9_@$\-]+)"/>
+            <!-- (common:NestedNCNameIDType\,)?(common:IDType) -->
+            <xs:pattern value="([A-Za-z][A-Za-z0-9_\-]*(\.[A-Za-z][A-Za-z0-9_\-]*)*\,)?([A-Za-z0-9_@$\-]+)"/>
         </xs:restriction>
     </xs:simpleType>
 
     <xs:simpleType name="FlowRefType">
         <xs:annotation>
             <xs:documentation>A string identifying the dataflow. The syntax is agency id, artefact id, version, separated by a “,”. For example: AGENCY_ID,FLOW_ID,VERSION
-                In case the string only contains one out of these 3 elements, it is considered to be the flow id, i.e. ALL,FLOW_ID,LATEST
-                In case the string only contains two out of these 3 elements, they are considered to be the agency id and the flow id, i.e. AGENCY_ID,FLOW_ID,LATEST
+                In case the string only contains one out of these 3 elements, it is considered to be the flow id, i.e. all,FLOW_ID,latest
+                In case the string only contains two out of these 3 elements, they are considered to be the agency id and the flow id, i.e. AGENCY_ID,FLOW_ID,latest
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="([A-z0-9_@$\-]+)|(([A-z][A-z0-9_\-]*(\.[A-z][A-z0-9_\-]*)*)(\,[A-z0-9_@$\-]+)(\,(latest|([0-9]+(\.[0-9]+)*)))?)"/>
+            <!-- (common:IDType)|((common:NestedNCNameIDType)(\,common:IDType)(\,(latest|(common:VersionType)))?) -->
+            <xs:pattern value="([A-Za-z0-9_@$\-]+)|(([A-Za-z][A-Za-z0-9_\-]*(\.[A-Za-z][A-Za-z0-9_\-]*)*)(\,[A-Za-z0-9_@$\-]+)(\,(latest|([0-9]+(\.[0-9]+)*)))?)"/>
         </xs:restriction>
     </xs:simpleType>
     
diff --git a/v2_1/rest/src/sdmx-rest.wadl b/v2_1/rest/src/sdmx-rest.wadl
index 5fa535e..b6757ed 100755
--- a/v2_1/rest/src/sdmx-rest.wadl
+++ b/v2_1/rest/src/sdmx-rest.wadl
@@ -138,7 +138,10 @@
     			<response status="200">
     				<representation mediaType="application/vnd.sdmx.schema+xml;version=2.1" element="xsd:schema"/>
     			</response> 
-    			<response status="400 401 404 413 500 501 503"> 
+    			<response status="400 401 404 500 501 503"> 
+    				<representation mediaType="*/*" /> 
+    			</response>
+    			<response status="413"> 
     				<representation mediaType="application/vnd.sdmx.error+xml;version=2.1" element="message:Error"/> 
     			</response>
     		</method>
@@ -166,7 +169,10 @@
     				<representation mediaType="application/vnd.sdmx.generictimeseriesdata+xml;version=2.1" element="message:GenericTimeSeriesData"/>
     				<representation mediaType="application/vnd.sdmx.structurespecifictimeseriesdata+xml;version=2.1" element="message:StructureSpecificTimeSeriesData"/>
     			</response> 
-    			<response status="400 401 404 413 500 501 503"> 
+    			<response status="400 401 404 500 501 503"> 
+    				<representation mediaType="*/*" /> 
+    			</response>
+    			<response status="413"> 
     				<representation mediaType="application/vnd.sdmx.error+xml;version=2.1" element="message:Error"/> 
     			</response>
     		</method>
@@ -187,7 +193,10 @@
     				<representation mediaType="application/vnd.sdmx.genericmetadata+xml;version=2.1" element="message:GenericMetadata"/>
     				<representation mediaType="application/vnd.sdmx.structurespecificmetadata+xml;version=2.1" element="message:StructureSpecificMetadata"/>
     			</response> 
-    			<response status="400 401 404 413 500 501 503"> 
+    			<response status="400 401 404 500 501 503"> 
+    				<representation mediaType="*/*" /> 
+    			</response>
+    			<response status="413"> 
     				<representation mediaType="application/vnd.sdmx.error+xml;version=2.1" element="message:Error"/> 
     			</response>
     		</method>
@@ -205,9 +214,12 @@
 			<response status="200"> 
 				<representation mediaType="application/vnd.sdmx.structure+xml;version=2.1" element="message:Structure"/>
 			</response> 
-			<response status="400 401 404 413 500 501 503"> 
+			<response status="400 401 404 500 501 503"> 
+				<representation mediaType="*/*" /> 
+			</response>
+			<response status="413"> 
 				<representation mediaType="application/vnd.sdmx.error+xml;version=2.1" element="message:Error"/> 
-			</response> 
+			</response>
 		</method>
 	</resource_type>