Merge pull request #11 from sosna/misc-2_1_1

Misc 2 1 1
sdmx-twg · Aug 29, 2014 · baecfe8 · baecfe8
2 parents af0a248 + ad94cdc
commit baecfe8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 147 deletions.
diff --git a/v2_1/ws/rest/src/README.txt b/v2_1/ws/rest/src/README.txt
@@ -3,18 +3,10 @@ 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.
+- sdmx-rest.wadl: The WADL file of the REST specifications  
 - 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/ws/rest/src/RestTestClient.java b/v2_1/ws/rest/src/RestTestClient.java
diff --git a/v2_1/ws/rest/src/sdmx-rest.wadl b/v2_1/ws/rest/src/sdmx-rest.wadl
@@ -138,8 +138,11 @@
     			<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"> 
-    				<representation mediaType="application/vnd.sdmx.error+xml;version=2.1" element="message:Error"/> 
+    			<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>
     	</resource>
@@ -166,8 +169,11 @@
     				<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"> 
-    				<representation mediaType="application/vnd.sdmx.error+xml;version=2.1" element="message:Error"/> 
+    			<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>
     	</resource>
@@ -187,8 +193,11 @@
     				<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"> 
-    				<representation mediaType="application/vnd.sdmx.error+xml;version=2.1" element="message:Error"/> 
+    			<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>
     	</resource>
@@ -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"> 
-				<representation mediaType="application/vnd.sdmx.error+xml;version=2.1" element="message:Error"/> 
+			<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>
 	</resource_type>