Skip to content

Commit a508c23

Browse files
committed
Preparing release 2.0.0.
1 parent ae13b15 commit a508c23

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+883
-1688
lines changed

LICENSE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2014, highsource
1+
Copyright (c) 2010-2014, Alexey Valikov, Highsource.org
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification,
@@ -11,7 +11,7 @@ are permitted provided that the following conditions are met:
1111
list of conditions and the following disclaimer in the documentation and/or
1212
other materials provided with the distribution.
1313

14-
* Neither the name of the {organization} nor the names of its
14+
* Neither the name of the copyright holder nor the names of its
1515
contributors may be used to endorse or promote products derived from
1616
this software without specific prior written permission.
1717

@@ -24,4 +24,4 @@ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
2424
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
2525
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2626
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ Here's a working example for the [purchase order schema](http://www.w3.org/TR/xm
1717
### Generate mappings
1818

1919
```
20-
java -jar jsonix-full.jar -d mappings -p PO purchaseorder.xsd
20+
java -jar node_modules/jsonix/lib/jsonix-schema-compiler-full.jar
21+
-d mappings -p PO purchaseorder.xsd
2122
```
2223

2324
Generates mappings for the `purchaseorder.xsd` schema in the `mappings\PO.js`; mappings will be placed in the variable `PO`.
@@ -38,10 +39,13 @@ var unmarshaller = context.createUnmarshaller();
3839

3940
// Unmarshal an object from the XML retrieved from the URL
4041
unmarshaller.unmarshalURL('po.xml',
41-
// This callback function will be provided with the result of the unmarshalling
42+
// This callback function will be provided
43+
// with the result of the unmarshalling
4244
function (unmarshalled) {
43-
console.log(unmarshalled.value.shipTo.name); // Alice Smith
44-
console.log(unmarshalled.value.items.item[1].productName); // Baby Monitor
45+
// Alice Smith
46+
console.log(unmarshalled.value.shipTo.name);
47+
// Baby Monitor
48+
console.log(unmarshalled.value.items.item[1].productName);
4549
});
4650
```
4751

@@ -75,4 +79,9 @@ var doc = marshaller.marshalDocument({
7579
});
7680
```
7781

78-
You can also ``marshalString``.
82+
You can also ``marshalString``.
83+
84+
## Documentation
85+
86+
* [Homepage](http://confluence.highsource.org/display/JSNX/Jsonix)
87+
* See the [User Guide](http://confluence.highsource.org/display/JSNX/User+Guide) for the extensive documentation ([PDF](https://github.com/highsource/jsonix/raw/master/docs/Jsonix.pdf))

demos/po/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.hisrc.jsonix</groupId>
88
<artifactId>jsonix-demos</artifactId>
9-
<version>1.3.0-SNAPSHOT</version>
9+
<version>2.0.0-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212
<dependencies>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/Jsonix-all.js
2+
/PO.js

0 commit comments

Comments
 (0)