sync examples and ontoogies

[VladimirAlexiev]

• epcis-context-simple.jsonld: renamed certificationInfo to certification
• epcis-context.jsonld: simplified "bizTransaction": {"@id":"@id","@type":"@id"} to just "@id" like the terms id and eventID use
• Example-custom.jsonld: added (see README)
• SensorDataExample13.jsonld: made ex:feature a URL
• regenerated all turtles
• fixed DiffTurtleFiles_v2.pl a bit
• regenerated Turtle-diffs
• Ontology: regenerated jsonld
• Diagrams/certification-diagram.puml: minor tweak (Martin will regen all diagrams later)

Fixes #344. @mgh128 and @CraigRe please merge

[VladimirAlexiev]

@mgh128 @CraigRe Can you please accept this? The freshly regenerated examples are important, so we can resolve #307

[VladimirAlexiev]

@mgh128 @CraigRe Can you please accept this? I've just refreshed all examples in Turtle, Turtle-simple-context, Turtle-diff. And a couple of small fixes in my context and Mark's DiffTurtleFiles_v2.pl

[VladimirAlexiev]

@CraigRe I think you closed the MR but didn't merge it.

• Above it says "This pull request is closed, but the VladimirAlexiev:sync-examples-ontologies branch has unmerged commits."
• https://github.com/VladimirAlexiev/EPCIS/tree/sync-examples-ontologies says "This branch is 4 commits ahead behind gs1:master."
• And on top it shows there are a total of 4 commits

[CraigRe]

@CraigRe I think you closed the MR but didn't merge it.

• Above it says "This pull request is closed, but the VladimirAlexiev:sync-examples-ontologies branch has unmerged commits."
• https://github.com/VladimirAlexiev/EPCIS/tree/sync-examples-ontologies says "This branch is 4 commits ahead behind gs1:master."
• And on top it shows there are a total of 4 commits

@VladimirAlexiev it is also showing "This branch has conflicts that must be resolved".

Can you see these conflicts? How would you suggest resolving them (so that we can merge)?

Thanks!

[VladimirAlexiev]

@CraigRe yeah, the longer wait the more conflicts... Are there conflicts apart from the derived files (turtle, turtle diff)?

@mgh128 can you help Craig?

[mgh128]

@CraigRe yeah, the longer wait the more conflicts... Are there conflicts apart from the derived files (turtle, turtle diff)?

@mgh128 can you help Craig?

There are three conflicts in JSON-simple-context/Example_9.6.1-ObjectEvent-with-pseudo-SBDH-headers.jsonld JSON/WithSensorData/SensorDataExample1.jsonld Ontology/CBV.jsonld

I tried to resolve these manually via the command line. There are 73 other conflicts in the Turtle files and diffs. How do we simply drop the conflicting files and let your latest regenerated files take precedence?

[VladimirAlexiev]

@mgh128 Checked the differences above:

• JSON-simple-context/Example_9.6.1-ObjectEvent-with-pseudo-SBDH-headers.jsonld: ok (there is a change but it's intentional)
• JSON/WithSensorData/SensorDataExample1.jsonld: ok (there are changes but seem intentional)
• Ontology/CBV.jsonld: ok (regenerated from CBV.ttl, no changes)

You can reset all JSON-simple-context by:

• copy from JSON
• run simplify.sh

These fixes to DiffTurtleFiles_v2.pl are lost:

-       $diff = `/usr/bin/diff --ignore-space-change -U 0 --ignore-matching-lines=RE $pathA $pathB`;
+       $diff = `diff --ignore-space-change -U 0 $pathA $pathB`;

You can regen the Turtles like this:

cd Turtle
make clean
make
cd ../Turtle-simple-context
make clean
make
cd ../Turtle-diff
perl DiffTurtleFiles_v2.pl