[x3d-public] X3DJSAIL updates: Patches to X3DJSAILandbuild.xml, plus test.bat and nashorn additions

[John Carlson]

Here is a straight diff between the XML generated from HelloWorldProgram.java and HelloWorldProgramOutput.java (should be the same, or at least close:

$ diff java/examples/HelloWorldProgramOutput.x3d nashorn/examples/HelloWorldProgramOutput.x3d                        76c76,77
<                         <MetadataString name='escapedQuotesTest2' value='"escaped quotation marks example 2: He said, &quot;Immel did it!&quot;"'/>
---
>                         <MetadataString name='escapedQuotesTest1' containerField='value' value='"escaped quotation marks example 1: He said, \\"Immel did it!\\""'/>
>                         <MetadataString name='escapedQuotesTest2' containerField='value' value='"escaped quotation marks example 2: He said, &quot;Immel did it!&quot;"'/>
83c84
<                 <Shape DEF='ProxyShape'>
---
>                 <Shape DEF='ProxyShape' containerField='proxy'>
87c88
<                     <Text string='"One, Two, Three" "" "He said, \"Immel did it!\""'/>
---
>                     <Text string='"One, Two, Three" "" "He said, \\"Immel did it!\\""'/>
104a106,107
>
>
111a115
>
148c152
<                 <ProtoInstance name='ArtDeco01Material' containerField='material'>
---
>                 <ProtoInstance name='ArtDeco01Material'>
158c162
<                 <ProtoInstance DEF='ArtDeco02MaterialDEF' name='ArtDeco02Material' containerField='material'>
---
>                 <ProtoInstance DEF='ArtDeco02MaterialDEF' name='ArtDeco02Material'>
168c172
<                 <ProtoInstance USE='ArtDeco02MaterialDEF' containerField='material'/>
---
>                 <ProtoInstance USE='ArtDeco02MaterialDEF'/>
206a211,212
>
>
229a236
>
240c247
<                     <ProtoInstance DEF='MyMaterialModulator' name='MaterialModulator' containerField='material'/>
---
>                     <ProtoInstance DEF='MyMaterialModulator' name='MaterialModulator'/>
247,251c254,258
<         <!-- Test success: x3dModel.findNodeByDEF(DeclarativeAppearanceExample) = <Appearance DEF='DeclarativeAppearanceExample'/> i.e.
< <Appearance DEF='DeclarativeAppearanceExample'>
<     <!- - DeclarativeMaterialExample gets overridden by subsequently added MaterialModulator ProtoInstance - ->
<     <ProtoInstance DEF='MyMaterialModulator' name='MaterialModulator' containerField='material'/>
< </Appearance> -->
---
>         <!-- Test success: x3dModel.findNodeByDEF(DeclarativeAppearanceExample) = <Appearance DEF='DeclarativeAppearanceExample'/> i.e. -->
>         <!-- <Appearance DEF='DeclarativeAppearanceExample'> -->
>         <!-- <!- - DeclarativeMaterialExample gets overridden by subsequently added MaterialModulator ProtoInstance - -> -->
>         <!-- <ProtoInstance DEF='MyMaterialModulator' name='MaterialModulator' containerField='material'/> -->
>         <!-- </Appearance> -->

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://web3d.org/pipermail/x3d-public_web3d.org/attachments/20171217/83fca5e6/attachment.html>