Skip to content

Commit 188fa8b

Browse files
committed
Issue #22. JSON Schema support.
1 parent d06dccc commit 188fa8b

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

Diff for: compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonixJsonSchemaConstants.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class JsonixJsonSchemaConstants {
77
private JsonixJsonSchemaConstants() {
88
}
99

10-
public static final String JSONIX_BASE_URI = "http://highsource.github.io/jsonix";
10+
public static final String JSONIX_BASE_URI = "http://www.jsonix.org";
1111
public static final String JSONIX_JSONSCHEMAS_BASE_URI = JSONIX_BASE_URI
1212
+ "/jsonschemas";
1313

Diff for: demos/po-npm/bindings/bindings.xjb

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
</jaxb:schemaBindings>
1414

1515
<jsonix:module name="PurchaseOrder">
16-
<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#"/>
16+
<jsonix:mapping name="PO" package="org.hisrc.jsonix.demos.po" schemaId="PurchaseOrder.jsonschema#"/>
1717
<jsonix:output naming="standard" fileName="${module.name}.standard.js"/>
1818
<jsonix:output naming="compact" fileName="${module.name}.compact.js"/>
19-
<jsonix:jsonSchema fileName="${module.name}.jsonschema"/>
19+
<jsonix:jsonSchema/>
2020
</jsonix:module>
2121
</jaxb:bindings>
2222

Diff for: demos/po-npm/mappings/PurchaseOrder.jsonschema

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
{
3-
"id":"https://cdn.rawgit.com/highsource/jsonix-schema-compiler/master/demos/po-npm/mappings/PurchaseOrder.jsonschema#",
3+
"id":"PurchaseOrder.jsonschema#",
44
"definitions":{
55
"Items.Item":{
66
"type":"object",

Diff for: npm/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"marshalling", "parse", "parsing", "serialize", "serializing",
88
"javascript objects", "dom", "util", "utility", "jaxb",
99
"jsonix", "jsonix-schema-compiler",
10-
"xs", "xsd", "xml schema", "wsdl", "dtd", "relax ng", "relaxng", "relax ng compact", "relaxng compact"
10+
"xs", "xsd", "xml schema", "wsdl", "dtd", "relax ng", "relaxng", "relax ng compact", "relaxng compact",
11+
"jsonschema", "json schema"
1112
],
1213
"homepage" : "https://github.com/highsource/jsonix-schema-compiler",
1314
"bugs" : {

Diff for: npm/src/main/npm/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"marshalling", "parse", "parsing", "serialize", "serializing",
88
"javascript objects", "dom", "util", "utility", "jaxb",
99
"jsonix", "jsonix-schema-compiler",
10-
"xs", "xsd", "xml schema", "wsdl", "dtd", "relax ng", "relaxng", "relax ng compact", "relaxng compact"
10+
"xs", "xsd", "xml schema", "wsdl", "dtd", "relax ng", "relaxng", "relax ng compact", "relaxng compact",
11+
"jsonschema", "json schema"
1112
],
1213
"homepage" : "https://github.com/highsource/jsonix-schema-compiler",
1314
"bugs" : {

0 commit comments

Comments
 (0)