move catalog-update to correct location

Author: rweigel

metadata/Example6.json

@@ -2,7 +2,8 @@
 	"server": {
 		"id": "Example6",
 		"contact": "[email protected]",
-		"HAPI": "2.0"
+		"HAPI": "2.0",
+		"catalog-update": 3
 	},
 	"data": {
 		"command": "\"$PYTHONEXE\" \"$HAPISERVERPATH/bin/Example.py\" --id ${id} --params ${parameters} --start ${start} --stop ${stop} --fmt ${format}",
@@ -16,6 +17,5 @@
 			{"url": "data/?id=dataset1&parameters=scalar&time.min=1970-12-31T23:50Z&time.max=1971-01-01Z", "Nlines": 10}
 		]
 	},
-	"catalog-update": 1,
 	"catalog_file": "$HAPISERVERPATH/metadata/Example5/catalog.json"
 }

test/metadata/Deprecated1.json

@@ -0,0 +1,20 @@
+{
+	"server": {
+		"id": "Deprecated1",
+		"contact": "[email protected]",
+		"HAPI": "2.0"
+	},
+	"data": {
+		"command": "\"$PYTHONEXE\" \"$HAPISERVERPATH/bin/Example.py\" --id ${id} --params ${parameters} --start ${start} --stop ${stop} --fmt ${format}",
+		"formats": ["csv","binary"],
+		"contact": "[email protected]",
+		"testcommands": [
+			{"command": "\"$PYTHONEXE\" \"$HAPISERVERPATH/bin/Example.py\" --params scalar --start 1970-01-01T00:00:00.000000000Z --stop 1970-01-01T00:10:00.000000000Z","Nlines": 10}
+		],
+		"testurls": [
+			{"url": "data/?id=dataset1&parameters=scalar&time.min=1970-01-01T00:00Z&time.max=1970-01-01T00:10Z", "Nlines": 10},
+			{"url": "data/?id=dataset1&parameters=scalar&time.min=1970-12-31T23:50Z&time.max=1971-01-01Z", "Nlines": 10}
+		]
+	},
+	"catalog": "cat $HAPISERVERPATH/test/metadata/Deprecated1/catalog.json"
+}

test/metadata/Deprecated1/catalog.json

@@ -0,0 +1,12 @@
+[
+  {
+    "id": "dataset1",
+    "title": "Simple dataset generated by Python",
+    "info": "cat $HAPISERVERPATH/metadata/Example4/dataset1_info.json"
+  },
+  {
+    "id": "dataset2",
+    "title": "Simple dataset generated by Python",
+    "info": "$HAPISERVERPATH/metadata/Example4/dataset1_info.json"
+  }
+]

test/metadata/Deprecated2.json

@@ -0,0 +1,20 @@
+{
+	"server": {
+		"id": "Deprecated2",
+		"contact": "[email protected]",
+		"HAPI": "2.0"
+	},
+	"data": {
+		"command": "\"$PYTHONEXE\" \"$HAPISERVERPATH/bin/Example.py\" --id ${id} --params ${parameters} --start ${start} --stop ${stop} --fmt ${format}",
+		"formats": ["csv","binary"],
+		"contact": "[email protected]",
+		"testcommands": [
+			{"command": "\"$PYTHONEXE\" \"$HAPISERVERPATH/bin/Example.py\" --params scalar --start 1970-01-01T00:00:00.000000000Z --stop 1970-01-01T00:10:00.000000000Z","Nlines": 10}
+		],
+		"testurls": [
+			{"url": "data/?id=dataset1&parameters=scalar&time.min=1970-01-01T00:00Z&time.max=1970-01-01T00:10Z", "Nlines": 10},
+			{"url": "data/?id=dataset1&parameters=scalar&time.min=1970-12-31T23:50Z&time.max=1971-01-01Z", "Nlines": 10}
+		]
+	},
+	"catalog": "$HAPISERVERPATH/test/metadata/Deprecated1/catalog.json"
+}