Issue #22. JSON Schema support.

highsource · May 2, 2015 · 188fa8b · 188fa8b
1 parent d06dccc
commit 188fa8b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/...iler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonixJsonSchemaConstants.java b/...iler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonixJsonSchemaConstants.java
@@ -7,7 +7,7 @@ public class JsonixJsonSchemaConstants {
 	private JsonixJsonSchemaConstants() {
 	}
 
-	public static final String JSONIX_BASE_URI = "http://highsource.github.io/jsonix";
+	public static final String JSONIX_BASE_URI = "http://www.jsonix.org";
 	public static final String JSONIX_JSONSCHEMAS_BASE_URI = JSONIX_BASE_URI
 			+ "/jsonschemas";
 

diff --git a/demos/po-npm/bindings/bindings.xjb b/demos/po-npm/bindings/bindings.xjb
@@ -13,10 +13,10 @@
 		</jaxb:schemaBindings>
 
 		<jsonix:module name="PurchaseOrder">
-			<jsonix:mapping name="PO" package="org.hisrc.jsonix.demos.po" schemaId="https://cdn.rawgit.com/highsource/jsonix-schema-compiler/master/demos/po-npm/mappings/PurchaseOrder.jsonschema#"/>
+			<jsonix:mapping name="PO" package="org.hisrc.jsonix.demos.po" schemaId="PurchaseOrder.jsonschema#"/>
 			<jsonix:output naming="standard" fileName="${module.name}.standard.js"/>
 			<jsonix:output naming="compact" fileName="${module.name}.compact.js"/>
-			<jsonix:jsonSchema fileName="${module.name}.jsonschema"/>
+			<jsonix:jsonSchema/>
 		</jsonix:module>		
 	</jaxb:bindings>
 

diff --git a/demos/po-npm/mappings/PurchaseOrder.jsonschema b/demos/po-npm/mappings/PurchaseOrder.jsonschema
@@ -1,6 +1,6 @@
 
 {
-    "id":"https://cdn.rawgit.com/highsource/jsonix-schema-compiler/master/demos/po-npm/mappings/PurchaseOrder.jsonschema#",
+    "id":"PurchaseOrder.jsonschema#",
     "definitions":{
         "Items.Item":{
             "type":"object",

diff --git a/npm/package.json b/npm/package.json
@@ -7,7 +7,8 @@
 			"marshalling", "parse", "parsing", "serialize", "serializing",
 			"javascript objects", "dom", "util", "utility", "jaxb",
 			"jsonix", "jsonix-schema-compiler",
-			"xs", "xsd", "xml schema", "wsdl", "dtd", "relax ng", "relaxng", "relax ng compact", "relaxng compact"
+			"xs", "xsd", "xml schema", "wsdl", "dtd", "relax ng", "relaxng", "relax ng compact", "relaxng compact",
+			"jsonschema", "json schema"
 	],
 	"homepage" : "https://github.com/highsource/jsonix-schema-compiler",
 	"bugs" : {

diff --git a/npm/src/main/npm/package.json b/npm/src/main/npm/package.json
@@ -7,7 +7,8 @@
 			"marshalling", "parse", "parsing", "serialize", "serializing",
 			"javascript objects", "dom", "util", "utility", "jaxb",
 			"jsonix", "jsonix-schema-compiler",
-			"xs", "xsd", "xml schema", "wsdl", "dtd", "relax ng", "relaxng", "relax ng compact", "relaxng compact"
+			"xs", "xsd", "xml schema", "wsdl", "dtd", "relax ng", "relaxng", "relax ng compact", "relaxng compact",
+			"jsonschema", "json schema"
 	],
 	"homepage" : "https://github.com/highsource/jsonix-schema-compiler",
 	"bugs" : {