Merge branch 'master' of https://github.com/highsource/jsonix-schema-compiler

Author: highsource

.gitignore

@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings/
+

README.md

@@ -6,18 +6,68 @@ Please refer to [Wiki](https://github.com/highsource/jsonix-schema-compiler/wiki
 
 ## Using in command-line
 
+Download `jsonix-schema-compiler-full-<VERSION>.jar` from [releases](https://github.com/highsource/jsonix-schema-compiler/releases) and run it with `java -jar` from the command line:
+
 ```
-java -jar jsonix-schema-compiler-full.jar
+java -jar jsonix-schema-compiler-full-<VERSION>.jar
   [-compact -logLevel TRACE]
   schema.xsd
   [-b bindings.xjb]
 ```
 
 See [Command-Line Usage](https://github.com/highsource/jsonix-schema-compiler/wiki/Command-Line-Usage).
 
+## Using with NPM
+
+From the command line:
+
+```
+npm install jsonix-schema-compiler
+java -jar node_modules/jsonix-schema-compiler/lib/jsonix-schema-compiler-full.jar schema.xsd
+```
+
+Or add `jsonix-schema-compiler` as dependency and invoke in `scripts/prepublish`.
+
+```json
+ {
+    "name": "mypackage",
+    ...
+    "dependencies": {
+        ...
+        "jsonix": "<VERSION>",
+        "jsonix-schema-compiler": "<VERSION>"
+    },
+    "scripts": {
+    	...
+        "prepublish" : "java -jar node_modules/jsonix/lib/jsonix-schema-compiler-full.jar schema.xsd"
+    }
+}
+```
+
+See [NPM Usage](https://github.com/highsource/jsonix-schema-compiler/wiki/NPM-Usage).
+
 ## Using with Ant
 
-TBD
+* Include `jsonix-schema-compiler-plugin-<VERSION>.jar` into `xjc/classpath`.
+* Include `-Xjsonix` and further `-Xjsonix-...` [[command-line options|Command-Line usage]] into `arg/@line`.
+
+```xml
+<xjc destdir="${basedir}/target/generated-sources/xjc" extension="true">
+  <arg line="-Xjsonix -Xjsonix-compact"/>
+  <binding dir="${basedir}/src/main/resources">
+     <include name="**/*.xjb"/>
+  </binding>
+  <schema dir="${basedir}/src/main/resources">
+     <include name="**/*.xsd"/>
+  </schema>
+  <!-- Plugins -->
+  <classpath>
+    <fileset dir="${basedir}/lib">
+      <include name="jsonix-*.jar"/>
+    </fileset>
+  </classpath>
+</xjc>
+```
 
 See [Ant Usage](https://github.com/highsource/jsonix-schema-compiler/wiki/Ant-Usage).
 
@@ -44,4 +94,4 @@ See [Ant Usage](https://github.com/highsource/jsonix-schema-compiler/wiki/Ant-Us
 </plugin>
 ```
 
-See [Maven Usage](https://github.com/highsource/jsonix-schema-compiler/wiki/Maven-Usage).
+See [Maven Usage](https://github.com/highsource/jsonix-schema-compiler/wiki/Maven-Usage).

compiler/src/test/java/org/hisrc/jsonix/xml/xsom/tests/MultiplicityCounterElementRef01Test.java

@@ -21,7 +21,7 @@ public class MultiplicityCounterElementRef01Test {
 	@Before
 	public void loadModel() throws Exception {
 		model = MModelInfoLoader.INSTANCE
-				.loadModel("jsonschema/minmaxoccurs/elementref01.xsd");
+				.loadModel("jsonschema/minmaxoccurs/elementRef01.xsd");
 	}
 
 	@Test

compiler/src/test/java/org/hisrc/jsonix/xml/xsom/tests/MultiplicityCounterElementRefs01Test.java

@@ -21,7 +21,7 @@ public class MultiplicityCounterElementRefs01Test {
 	@Before
 	public void loadModel() throws Exception {
 		model = MModelInfoLoader.INSTANCE
-				.loadModel("jsonschema/minmaxoccurs/elementrefs01.xsd");
+				.loadModel("jsonschema/minmaxoccurs/elementRefs01.xsd");
 	}
 
 	@Test