[24/50] [abbrv] tinkerpop git commit: TINKERPOP-1427 Regenerated/renamed all data files

[sp...@apache.org]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b5f850f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v1d0.json
new file mode 100644
index 0000000..cb08148
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v1d0.json
@@ -0,0 +1,6 @@
+{"id":1,"label":"vertex","outE":{"created":[{"id":9,"inV":3,"properties":{"weight":0.4}}],"knows":[{"id":7,"inV":2,"properties":{"weight":0.5}},{"id":8,"inV":4,"properties":{"weight":1.0}}]},"properties":{"age":[{"id":2,"value":29}],"name":[{"id":0,"value":"marko"}]}}
+{"id":2,"label":"vertex","inE":{"knows":[{"id":7,"outV":1,"properties":{"weight":0.5}}]},"properties":{"age":[{"id":4,"value":27}],"name":[{"id":3,"value":"vadas"}]}}
+{"id":3,"label":"vertex","inE":{"created":[{"id":11,"outV":4,"properties":{"weight":0.4}},{"id":12,"outV":6,"properties":{"weight":0.2}},{"id":9,"outV":1,"properties":{"weight":0.4}}]},"properties":{"lang":[{"id":6,"value":"java"}],"name":[{"id":5,"value":"lop"}]}}
+{"id":4,"label":"vertex","inE":{"knows":[{"id":8,"outV":1,"properties":{"weight":1.0}}]},"outE":{"created":[{"id":10,"inV":5,"properties":{"weight":1.0}},{"id":11,"inV":3,"properties":{"weight":0.4}}]},"properties":{"age":[{"id":8,"value":32}],"name":[{"id":7,"value":"josh"}]}}
+{"id":5,"label":"vertex","inE":{"created":[{"id":10,"outV":4,"properties":{"weight":1.0}}]},"properties":{"lang":[{"id":10,"value":"java"}],"name":[{"id":9,"value":"ripple"}]}}
+{"id":6,"label":"vertex","outE":{"created":[{"id":12,"inV":3,"properties":{"weight":0.2}}]},"properties":{"age":[{"id":12,"value":35}],"name":[{"id":11,"value":"peter"}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b5f850f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v3d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v3d0.json
index 57d1777..8be3455 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v3d0.json
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized-v3d0.json
@@ -3,4 +3,4 @@
 {"id":{"@type":"g:Int32","@value":3},"label":"vertex","inE":{"created":[{"id":{"@type":"g:Int32","@value":11},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Float","@value":0.4}}},{"id":{"@type":"g:Int32","@value":12},"outV":{"@type":"g:Int32","@value":6},"properties":{"weight":{"@type":"g:Float","@value":0.2}}},{"id":{"@type":"g:Int32","@value":9},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Float","@value":0.4}}}]},"properties":{"lang":[{"id":{"@type":"g:Int32","@value":6},"value":"java"}],"name":[{"id":{"@type":"g:Int32","@value":5},"value":"lop"}]}}
 {"id":{"@type":"g:Int32","@value":4},"label":"vertex","inE":{"knows":[{"id":{"@type":"g:Int32","@value":8},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Float","@value":1.0}}}]},"outE":{"created":[{"id":{"@type":"g:Int32","@value":10},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Float","@value":1.0}}},{"id":{"@type":"g:Int32","@value":11},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Float","@value":0.4}}}]},"properties":{"age":[{"id":{"@type":"g:Int32","@value":8},"value":{"@type":"g:Int32","@value":32}}],"name":[{"id":{"@type":"g:Int32","@value":7},"value":"josh"}]}}
 {"id":{"@type":"g:Int32","@value":5},"label":"vertex","inE":{"created":[{"id":{"@type":"g:Int32","@value":10},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Float","@value":1.0}}}]},"properties":{"lang":[{"id":{"@type":"g:Int32","@value":10},"value":"java"}],"name":[{"id":{"@type":"g:Int32","@value":9},"value":"ripple"}]}}
-{"id":{"@type":"g:Int32","@value":6},"label":"vertex","outE":{"created":[{"id":{"@type":"g:Int32","@value":12},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Float","@value":0.2}}}]},"properties":{"age":[{"id":{"@type":"g:Int32","@value":12},"value":{"@type":"g:Int32","@value":35}}],"name":[{"id":{"@type":"g:Int32","@value":11},"value":"peter"}]}}
\ No newline at end of file
+{"id":{"@type":"g:Int32","@value":6},"label":"vertex","outE":{"created":[{"id":{"@type":"g:Int32","@value":12},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Float","@value":0.2}}}]},"properties":{"age":[{"id":{"@type":"g:Int32","@value":12},"value":{"@type":"g:Int32","@value":35}}],"name":[{"id":{"@type":"g:Int32","@value":11},"value":"peter"}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b5f850f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized.json
deleted file mode 100644
index cb08148..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"id":1,"label":"vertex","outE":{"created":[{"id":9,"inV":3,"properties":{"weight":0.4}}],"knows":[{"id":7,"inV":2,"properties":{"weight":0.5}},{"id":8,"inV":4,"properties":{"weight":1.0}}]},"properties":{"age":[{"id":2,"value":29}],"name":[{"id":0,"value":"marko"}]}}
-{"id":2,"label":"vertex","inE":{"knows":[{"id":7,"outV":1,"properties":{"weight":0.5}}]},"properties":{"age":[{"id":4,"value":27}],"name":[{"id":3,"value":"vadas"}]}}
-{"id":3,"label":"vertex","inE":{"created":[{"id":11,"outV":4,"properties":{"weight":0.4}},{"id":12,"outV":6,"properties":{"weight":0.2}},{"id":9,"outV":1,"properties":{"weight":0.4}}]},"properties":{"lang":[{"id":6,"value":"java"}],"name":[{"id":5,"value":"lop"}]}}
-{"id":4,"label":"vertex","inE":{"knows":[{"id":8,"outV":1,"properties":{"weight":1.0}}]},"outE":{"created":[{"id":10,"inV":5,"properties":{"weight":1.0}},{"id":11,"inV":3,"properties":{"weight":0.4}}]},"properties":{"age":[{"id":8,"value":32}],"name":[{"id":7,"value":"josh"}]}}
-{"id":5,"label":"vertex","inE":{"created":[{"id":10,"outV":4,"properties":{"weight":1.0}}]},"properties":{"lang":[{"id":10,"value":"java"}],"name":[{"id":9,"value":"ripple"}]}}
-{"id":6,"label":"vertex","outE":{"created":[{"id":12,"inV":3,"properties":{"weight":0.2}}]},"properties":{"age":[{"id":12,"value":35}],"name":[{"id":11,"value":"peter"}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b5f850f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed-v1d0.json
new file mode 100644
index 0000000..e1bfff0
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed-v1d0.json
@@ -0,0 +1,6 @@
+{"@class":"java.util.HashMap","id":1,"label":"vertex","outE":{"@class":"java.util.HashMap","created":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":9,"inV":3,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.4]}}]],"knows":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":7,"inV":2,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.5]}},{"@class":"java.util.HashMap","id":8,"inV":4,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",1.0]}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":0,"value":"marko"}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":2,"value":29}]]}}
+{"@class":"java.util.HashMap","id":2,"label":"vertex","inE":{"@class":"java.util.HashMap","knows":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":7,"outV":1,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.5]}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":3,"value":"vadas"}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":4,"value":27}]]}}
+{"@class":"java.util.HashMap","id":3,"label":"vertex","inE":{"@class":"java.util.HashMap","created":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":9,"outV":1,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.4]}},{"@class":"java.util.HashMap","id":11,"outV":4,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.4]}},{"@class":"java.util.HashMap","id":12,"outV":6,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.2]}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":5,"value":"lop"}]],"lang":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":6,"value":"java"}]]}}
+{"@class":"java.util.HashMap","id":4,"label":"vertex","inE":{"@class":"java.util.HashMap","knows":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":8,"outV":1,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",1.0]}}]]},"outE":{"@class":"java.util.HashMap","created":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":10,"inV":5,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",1.0]}},{"@class":"java.util.HashMap","id":11,"inV":3,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.4]}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":7,"value":"josh"}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":8,"value":32}]]}}
+{"@class":"java.util.HashMap","id":5,"label":"vertex","inE":{"@class":"java.util.HashMap","created":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":10,"outV":4,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",1.0]}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":9,"value":"ripple"}]],"lang":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":10,"value":"java"}]]}}
+{"@class":"java.util.HashMap","id":6,"label":"vertex","outE":{"@class":"java.util.HashMap","created":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":12,"inV":3,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.2]}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":11,"value":"peter"}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":12,"value":35}]]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b5f850f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed-v2d0.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed-v2d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed-v2d0.json
new file mode 100644
index 0000000..7401750
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed-v2d0.json
@@ -0,0 +1,6 @@
+{"id":{"@type":"g:Int32","@value":1},"label":"vertex","outE":{"created":[{"id":{"@type":"g:Int32","@value":9},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Float","@value":0.4}}}],"knows":[{"id":{"@type":"g:Int32","@value":7},"inV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Float","@value":0.5}}},{"id":{"@type":"g:Int32","@value":8},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Float","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":0},"value":"marko"}],"age":[{"id":{"@type":"g:Int32","@value":2},"value":{"@type":"g:Int32","@value":29}}]}}
+{"id":{"@type":"g:Int32","@value":2},"label":"vertex","inE":{"knows":[{"id":{"@type":"g:Int32","@value":7},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Float","@value":0.5}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":3},"value":"vadas"}],"age":[{"id":{"@type":"g:Int32","@value":4},"value":{"@type":"g:Int32","@value":27}}]}}
+{"id":{"@type":"g:Int32","@value":3},"label":"vertex","inE":{"created":[{"id":{"@type":"g:Int32","@value":9},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Float","@value":0.4}}},{"id":{"@type":"g:Int32","@value":11},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Float","@value":0.4}}},{"id":{"@type":"g:Int32","@value":12},"outV":{"@type":"g:Int32","@value":6},"properties":{"weight":{"@type":"g:Float","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":5},"value":"lop"}],"lang":[{"id":{"@type":"g:Int32","@value":6},"value":"java"}]}}
+{"id":{"@type":"g:Int32","@value":4},"label":"vertex","inE":{"knows":[{"id":{"@type":"g:Int32","@value":8},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Float","@value":1.0}}}]},"outE":{"created":[{"id":{"@type":"g:Int32","@value":10},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Float","@value":1.0}}},{"id":{"@type":"g:Int32","@value":11},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Float","@value":0.4}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":7},"value":"josh"}],"age":[{"id":{"@type":"g:Int32","@value":8},"value":{"@type":"g:Int32","@value":32}}]}}
+{"id":{"@type":"g:Int32","@value":5},"label":"vertex","inE":{"created":[{"id":{"@type":"g:Int32","@value":10},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Float","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":9},"value":"ripple"}],"lang":[{"id":{"@type":"g:Int32","@value":10},"value":"java"}]}}
+{"id":{"@type":"g:Int32","@value":6},"label":"vertex","outE":{"created":[{"id":{"@type":"g:Int32","@value":12},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Float","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":11},"value":"peter"}],"age":[{"id":{"@type":"g:Int32","@value":12},"value":{"@type":"g:Int32","@value":35}}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b5f850f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed.json
deleted file mode 100644
index e1bfff0..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-typed.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"@class":"java.util.HashMap","id":1,"label":"vertex","outE":{"@class":"java.util.HashMap","created":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":9,"inV":3,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.4]}}]],"knows":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":7,"inV":2,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.5]}},{"@class":"java.util.HashMap","id":8,"inV":4,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",1.0]}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":0,"value":"marko"}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":2,"value":29}]]}}
-{"@class":"java.util.HashMap","id":2,"label":"vertex","inE":{"@class":"java.util.HashMap","knows":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":7,"outV":1,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.5]}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":3,"value":"vadas"}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":4,"value":27}]]}}
-{"@class":"java.util.HashMap","id":3,"label":"vertex","inE":{"@class":"java.util.HashMap","created":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":9,"outV":1,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.4]}},{"@class":"java.util.HashMap","id":11,"outV":4,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.4]}},{"@class":"java.util.HashMap","id":12,"outV":6,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.2]}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":5,"value":"lop"}]],"lang":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":6,"value":"java"}]]}}
-{"@class":"java.util.HashMap","id":4,"label":"vertex","inE":{"@class":"java.util.HashMap","knows":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":8,"outV":1,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",1.0]}}]]},"outE":{"@class":"java.util.HashMap","created":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":10,"inV":5,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",1.0]}},{"@class":"java.util.HashMap","id":11,"inV":3,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.4]}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":7,"value":"josh"}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":8,"value":32}]]}}
-{"@class":"java.util.HashMap","id":5,"label":"vertex","inE":{"@class":"java.util.HashMap","created":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":10,"outV":4,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",1.0]}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":9,"value":"ripple"}]],"lang":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":10,"value":"java"}]]}}
-{"@class":"java.util.HashMap","id":6,"label":"vertex","outE":{"@class":"java.util.HashMap","created":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":12,"inV":3,"properties":{"@class":"java.util.HashMap","weight":["java.lang.Float",0.2]}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":11,"value":"peter"}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":12,"value":35}]]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b5f850f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v1d0.json
new file mode 100644
index 0000000..5ccfe05
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v1d0.json
@@ -0,0 +1,6 @@
+{"id":1,"label":"vertex","outE":{"created":[{"id":9,"inV":3,"properties":{"weight":0.4}}],"knows":[{"id":7,"inV":2,"properties":{"weight":0.5}},{"id":8,"inV":4,"properties":{"weight":1.0}}]},"properties":{"name":[{"id":0,"value":"marko"}],"age":[{"id":2,"value":29}]}}
+{"id":2,"label":"vertex","inE":{"knows":[{"id":7,"outV":1,"properties":{"weight":0.5}}]},"properties":{"name":[{"id":3,"value":"vadas"}],"age":[{"id":4,"value":27}]}}
+{"id":3,"label":"vertex","inE":{"created":[{"id":9,"outV":1,"properties":{"weight":0.4}},{"id":11,"outV":4,"properties":{"weight":0.4}},{"id":12,"outV":6,"properties":{"weight":0.2}}]},"properties":{"name":[{"id":5,"value":"lop"}],"lang":[{"id":6,"value":"java"}]}}
+{"id":4,"label":"vertex","inE":{"knows":[{"id":8,"outV":1,"properties":{"weight":1.0}}]},"outE":{"created":[{"id":10,"inV":5,"properties":{"weight":1.0}},{"id":11,"inV":3,"properties":{"weight":0.4}}]},"properties":{"name":[{"id":7,"value":"josh"}],"age":[{"id":8,"value":32}]}}
+{"id":5,"label":"vertex","inE":{"created":[{"id":10,"outV":4,"properties":{"weight":1.0}}]},"properties":{"name":[{"id":9,"value":"ripple"}],"lang":[{"id":10,"value":"java"}]}}
+{"id":6,"label":"vertex","outE":{"created":[{"id":12,"inV":3,"properties":{"weight":0.2}}]},"properties":{"name":[{"id":11,"value":"peter"}],"age":[{"id":12,"value":35}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b5f850f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v2d0-typed.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v2d0-typed.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v2d0-typed.json
deleted file mode 100644
index 7401750..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v2d0-typed.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"id":{"@type":"g:Int32","@value":1},"label":"vertex","outE":{"created":[{"id":{"@type":"g:Int32","@value":9},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Float","@value":0.4}}}],"knows":[{"id":{"@type":"g:Int32","@value":7},"inV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Float","@value":0.5}}},{"id":{"@type":"g:Int32","@value":8},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Float","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":0},"value":"marko"}],"age":[{"id":{"@type":"g:Int32","@value":2},"value":{"@type":"g:Int32","@value":29}}]}}
-{"id":{"@type":"g:Int32","@value":2},"label":"vertex","inE":{"knows":[{"id":{"@type":"g:Int32","@value":7},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Float","@value":0.5}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":3},"value":"vadas"}],"age":[{"id":{"@type":"g:Int32","@value":4},"value":{"@type":"g:Int32","@value":27}}]}}
-{"id":{"@type":"g:Int32","@value":3},"label":"vertex","inE":{"created":[{"id":{"@type":"g:Int32","@value":9},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Float","@value":0.4}}},{"id":{"@type":"g:Int32","@value":11},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Float","@value":0.4}}},{"id":{"@type":"g:Int32","@value":12},"outV":{"@type":"g:Int32","@value":6},"properties":{"weight":{"@type":"g:Float","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":5},"value":"lop"}],"lang":[{"id":{"@type":"g:Int32","@value":6},"value":"java"}]}}
-{"id":{"@type":"g:Int32","@value":4},"label":"vertex","inE":{"knows":[{"id":{"@type":"g:Int32","@value":8},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Float","@value":1.0}}}]},"outE":{"created":[{"id":{"@type":"g:Int32","@value":10},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Float","@value":1.0}}},{"id":{"@type":"g:Int32","@value":11},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Float","@value":0.4}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":7},"value":"josh"}],"age":[{"id":{"@type":"g:Int32","@value":8},"value":{"@type":"g:Int32","@value":32}}]}}
-{"id":{"@type":"g:Int32","@value":5},"label":"vertex","inE":{"created":[{"id":{"@type":"g:Int32","@value":10},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Float","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":9},"value":"ripple"}],"lang":[{"id":{"@type":"g:Int32","@value":10},"value":"java"}]}}
-{"id":{"@type":"g:Int32","@value":6},"label":"vertex","outE":{"created":[{"id":{"@type":"g:Int32","@value":12},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Float","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":11},"value":"peter"}],"age":[{"id":{"@type":"g:Int32","@value":12},"value":{"@type":"g:Int32","@value":35}}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b5f850f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v3d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v3d0.json
new file mode 100644
index 0000000..7401750
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-v3d0.json
@@ -0,0 +1,6 @@
+{"id":{"@type":"g:Int32","@value":1},"label":"vertex","outE":{"created":[{"id":{"@type":"g:Int32","@value":9},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Float","@value":0.4}}}],"knows":[{"id":{"@type":"g:Int32","@value":7},"inV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Float","@value":0.5}}},{"id":{"@type":"g:Int32","@value":8},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Float","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":0},"value":"marko"}],"age":[{"id":{"@type":"g:Int32","@value":2},"value":{"@type":"g:Int32","@value":29}}]}}
+{"id":{"@type":"g:Int32","@value":2},"label":"vertex","inE":{"knows":[{"id":{"@type":"g:Int32","@value":7},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Float","@value":0.5}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":3},"value":"vadas"}],"age":[{"id":{"@type":"g:Int32","@value":4},"value":{"@type":"g:Int32","@value":27}}]}}
+{"id":{"@type":"g:Int32","@value":3},"label":"vertex","inE":{"created":[{"id":{"@type":"g:Int32","@value":9},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Float","@value":0.4}}},{"id":{"@type":"g:Int32","@value":11},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Float","@value":0.4}}},{"id":{"@type":"g:Int32","@value":12},"outV":{"@type":"g:Int32","@value":6},"properties":{"weight":{"@type":"g:Float","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":5},"value":"lop"}],"lang":[{"id":{"@type":"g:Int32","@value":6},"value":"java"}]}}
+{"id":{"@type":"g:Int32","@value":4},"label":"vertex","inE":{"knows":[{"id":{"@type":"g:Int32","@value":8},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Float","@value":1.0}}}]},"outE":{"created":[{"id":{"@type":"g:Int32","@value":10},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Float","@value":1.0}}},{"id":{"@type":"g:Int32","@value":11},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Float","@value":0.4}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":7},"value":"josh"}],"age":[{"id":{"@type":"g:Int32","@value":8},"value":{"@type":"g:Int32","@value":32}}]}}
+{"id":{"@type":"g:Int32","@value":5},"label":"vertex","inE":{"created":[{"id":{"@type":"g:Int32","@value":10},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Float","@value":1.0}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":9},"value":"ripple"}],"lang":[{"id":{"@type":"g:Int32","@value":10},"value":"java"}]}}
+{"id":{"@type":"g:Int32","@value":6},"label":"vertex","outE":{"created":[{"id":{"@type":"g:Int32","@value":12},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Float","@value":0.2}}}]},"properties":{"name":[{"id":{"@type":"g:Int32","@value":11},"value":"peter"}],"age":[{"id":{"@type":"g:Int32","@value":12},"value":{"@type":"g:Int32","@value":35}}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b5f850f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic.json
deleted file mode 100644
index 5ccfe05..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"id":1,"label":"vertex","outE":{"created":[{"id":9,"inV":3,"properties":{"weight":0.4}}],"knows":[{"id":7,"inV":2,"properties":{"weight":0.5}},{"id":8,"inV":4,"properties":{"weight":1.0}}]},"properties":{"name":[{"id":0,"value":"marko"}],"age":[{"id":2,"value":29}]}}
-{"id":2,"label":"vertex","inE":{"knows":[{"id":7,"outV":1,"properties":{"weight":0.5}}]},"properties":{"name":[{"id":3,"value":"vadas"}],"age":[{"id":4,"value":27}]}}
-{"id":3,"label":"vertex","inE":{"created":[{"id":9,"outV":1,"properties":{"weight":0.4}},{"id":11,"outV":4,"properties":{"weight":0.4}},{"id":12,"outV":6,"properties":{"weight":0.2}}]},"properties":{"name":[{"id":5,"value":"lop"}],"lang":[{"id":6,"value":"java"}]}}
-{"id":4,"label":"vertex","inE":{"knows":[{"id":8,"outV":1,"properties":{"weight":1.0}}]},"outE":{"created":[{"id":10,"inV":5,"properties":{"weight":1.0}},{"id":11,"inV":3,"properties":{"weight":0.4}}]},"properties":{"name":[{"id":7,"value":"josh"}],"age":[{"id":8,"value":32}]}}
-{"id":5,"label":"vertex","inE":{"created":[{"id":10,"outV":4,"properties":{"weight":1.0}}]},"properties":{"name":[{"id":9,"value":"ripple"}],"lang":[{"id":10,"value":"java"}]}}
-{"id":6,"label":"vertex","outE":{"created":[{"id":12,"inV":3,"properties":{"weight":0.2}}]},"properties":{"name":[{"id":11,"value":"peter"}],"age":[{"id":12,"value":35}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b5f850f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed-v1d0.json
new file mode 100644
index 0000000..730449f
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed-v1d0.json
@@ -0,0 +1,6 @@
+{"@class":"java.util.HashMap","id":1,"label":"person","outE":{"@class":"java.util.HashMap","uses":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":16,"inV":11,"properties":{"@class":"java.util.HashMap","skill":5}},{"@class":"java.util.HashMap","id":15,"inV":10,"properties":{"@class":"java.util.HashMap","skill":4}}]],"develops":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":13,"inV":10,"properties":{"@class":"java.util.HashMap","since":2009}},{"@class":"java.util.HashMap","id":14,"inV":11,"properties":{"@class":"java.util.HashMap","since":2010}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",0],"value":"marko"}]],"location":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",6],"value":"san diego","properties":{"@class":"java.util.HashMap","startTime":1997,"endTime":2001}},{"@class":"java.util.HashMap","id":["java.lang.Long",7],"value":"santa cruz","proper
 ties":{"@class":"java.util.HashMap","startTime":2001,"endTime":2004}},{"@class":"java.util.HashMap","id":["java.lang.Long",8],"value":"brussels","properties":{"@class":"java.util.HashMap","startTime":2004,"endTime":2005}},{"@class":"java.util.HashMap","id":["java.lang.Long",9],"value":"santa fe","properties":{"@class":"java.util.HashMap","startTime":2005}}]]}}
+{"@class":"java.util.HashMap","id":7,"label":"person","outE":{"@class":"java.util.HashMap","uses":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":19,"inV":10,"properties":{"@class":"java.util.HashMap","skill":5}},{"@class":"java.util.HashMap","id":20,"inV":11,"properties":{"@class":"java.util.HashMap","skill":4}}]],"develops":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":17,"inV":10,"properties":{"@class":"java.util.HashMap","since":2010}},{"@class":"java.util.HashMap","id":18,"inV":11,"properties":{"@class":"java.util.HashMap","since":2011}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",1],"value":"stephen"}]],"location":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",10],"value":"centreville","properties":{"@class":"java.util.HashMap","startTime":1990,"endTime":2000}},{"@class":"java.util.HashMap","id":["java.lang.Long",11],"value":"dulles","prop
 erties":{"@class":"java.util.HashMap","startTime":2000,"endTime":2006}},{"@class":"java.util.HashMap","id":["java.lang.Long",12],"value":"purcellville","properties":{"@class":"java.util.HashMap","startTime":2006}}]]}}
+{"@class":"java.util.HashMap","id":8,"label":"person","outE":{"@class":"java.util.HashMap","uses":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":22,"inV":10,"properties":{"@class":"java.util.HashMap","skill":3}},{"@class":"java.util.HashMap","id":23,"inV":11,"properties":{"@class":"java.util.HashMap","skill":3}}]],"develops":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":21,"inV":10,"properties":{"@class":"java.util.HashMap","since":2012}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",2],"value":"matthias"}]],"location":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",13],"value":"bremen","properties":{"@class":"java.util.HashMap","startTime":2004,"endTime":2007}},{"@class":"java.util.HashMap","id":["java.lang.Long",14],"value":"baltimore","properties":{"@class":"java.util.HashMap","startTime":2007,"endTime":2011}},{"@class":"java.util.HashMap","id"
 :["java.lang.Long",15],"value":"oakland","properties":{"@class":"java.util.HashMap","startTime":2011,"endTime":2014}},{"@class":"java.util.HashMap","id":["java.lang.Long",16],"value":"seattle","properties":{"@class":"java.util.HashMap","startTime":2014}}]]}}
+{"@class":"java.util.HashMap","id":9,"label":"person","outE":{"@class":"java.util.HashMap","uses":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":24,"inV":10,"properties":{"@class":"java.util.HashMap","skill":5}},{"@class":"java.util.HashMap","id":25,"inV":11,"properties":{"@class":"java.util.HashMap","skill":3}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",3],"value":"daniel"}]],"location":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",17],"value":"spremberg","properties":{"@class":"java.util.HashMap","startTime":1982,"endTime":2005}},{"@class":"java.util.HashMap","id":["java.lang.Long",18],"value":"kaiserslautern","properties":{"@class":"java.util.HashMap","startTime":2005,"endTime":2009}},{"@class":"java.util.HashMap","id":["java.lang.Long",19],"value":"aachen","properties":{"@class":"java.util.HashMap","startTime":2009}}]]}}
+{"@class":"java.util.HashMap","id":10,"label":"software","inE":{"@class":"java.util.HashMap","uses":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":19,"outV":7,"properties":{"@class":"java.util.HashMap","skill":5}},{"@class":"java.util.HashMap","id":22,"outV":8,"properties":{"@class":"java.util.HashMap","skill":3}},{"@class":"java.util.HashMap","id":24,"outV":9,"properties":{"@class":"java.util.HashMap","skill":5}},{"@class":"java.util.HashMap","id":15,"outV":1,"properties":{"@class":"java.util.HashMap","skill":4}}]],"develops":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":17,"outV":7,"properties":{"@class":"java.util.HashMap","since":2010}},{"@class":"java.util.HashMap","id":21,"outV":8,"properties":{"@class":"java.util.HashMap","since":2012}},{"@class":"java.util.HashMap","id":13,"outV":1,"properties":{"@class":"java.util.HashMap","since":2009}}]]},"outE":{"@class":"java.util.HashMap","traverses":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":26
 ,"inV":11}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",4],"value":"gremlin"}]]}}
+{"@class":"java.util.HashMap","id":11,"label":"software","inE":{"@class":"java.util.HashMap","traverses":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":26,"outV":10}]],"uses":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":16,"outV":1,"properties":{"@class":"java.util.HashMap","skill":5}},{"@class":"java.util.HashMap","id":20,"outV":7,"properties":{"@class":"java.util.HashMap","skill":4}},{"@class":"java.util.HashMap","id":23,"outV":8,"properties":{"@class":"java.util.HashMap","skill":3}},{"@class":"java.util.HashMap","id":25,"outV":9,"properties":{"@class":"java.util.HashMap","skill":3}}]],"develops":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":18,"outV":7,"properties":{"@class":"java.util.HashMap","since":2011}},{"@class":"java.util.HashMap","id":14,"outV":1,"properties":{"@class":"java.util.HashMap","since":2010}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",5
 ],"value":"tinkergraph"}]]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b5f850f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed-v2d0.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed-v2d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed-v2d0.json
new file mode 100644
index 0000000..77344c0
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed-v2d0.json
@@ -0,0 +1,6 @@
+{"id":{"@type":"g:Int32","@value":1},"label":"person","outE":{"uses":[{"id":{"@type":"g:Int32","@value":16},"inV":{"@type":"g:Int32","@value":11},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":15},"inV":{"@type":"g:Int32","@value":10},"properties":{"skill":{"@type":"g:Int32","@value":4}}}],"develops":[{"id":{"@type":"g:Int32","@value":13},"inV":{"@type":"g:Int32","@value":10},"properties":{"since":{"@type":"g:Int32","@value":2009}}},{"id":{"@type":"g:Int32","@value":14},"inV":{"@type":"g:Int32","@value":11},"properties":{"since":{"@type":"g:Int32","@value":2010}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":0},"value":"marko"}],"location":[{"id":{"@type":"g:Int64","@value":6},"value":"san diego","properties":{"startTime":{"@type":"g:Int32","@value":1997},"endTime":{"@type":"g:Int32","@value":2001}}},{"id":{"@type":"g:Int64","@value":7},"value":"santa cruz","properties":{"startTime":{"@type":"g:Int32","@value":2001},"endTime":{"
 @type":"g:Int32","@value":2004}}},{"id":{"@type":"g:Int64","@value":8},"value":"brussels","properties":{"startTime":{"@type":"g:Int32","@value":2004},"endTime":{"@type":"g:Int32","@value":2005}}},{"id":{"@type":"g:Int64","@value":9},"value":"santa fe","properties":{"startTime":{"@type":"g:Int32","@value":2005}}}]}}
+{"id":{"@type":"g:Int32","@value":7},"label":"person","outE":{"uses":[{"id":{"@type":"g:Int32","@value":19},"inV":{"@type":"g:Int32","@value":10},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":20},"inV":{"@type":"g:Int32","@value":11},"properties":{"skill":{"@type":"g:Int32","@value":4}}}],"develops":[{"id":{"@type":"g:Int32","@value":17},"inV":{"@type":"g:Int32","@value":10},"properties":{"since":{"@type":"g:Int32","@value":2010}}},{"id":{"@type":"g:Int32","@value":18},"inV":{"@type":"g:Int32","@value":11},"properties":{"since":{"@type":"g:Int32","@value":2011}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1},"value":"stephen"}],"location":[{"id":{"@type":"g:Int64","@value":10},"value":"centreville","properties":{"startTime":{"@type":"g:Int32","@value":1990},"endTime":{"@type":"g:Int32","@value":2000}}},{"id":{"@type":"g:Int64","@value":11},"value":"dulles","properties":{"startTime":{"@type":"g:Int32","@value":2000},"endTime":
 {"@type":"g:Int32","@value":2006}}},{"id":{"@type":"g:Int64","@value":12},"value":"purcellville","properties":{"startTime":{"@type":"g:Int32","@value":2006}}}]}}
+{"id":{"@type":"g:Int32","@value":8},"label":"person","outE":{"uses":[{"id":{"@type":"g:Int32","@value":22},"inV":{"@type":"g:Int32","@value":10},"properties":{"skill":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":23},"inV":{"@type":"g:Int32","@value":11},"properties":{"skill":{"@type":"g:Int32","@value":3}}}],"develops":[{"id":{"@type":"g:Int32","@value":21},"inV":{"@type":"g:Int32","@value":10},"properties":{"since":{"@type":"g:Int32","@value":2012}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":2},"value":"matthias"}],"location":[{"id":{"@type":"g:Int64","@value":13},"value":"bremen","properties":{"startTime":{"@type":"g:Int32","@value":2004},"endTime":{"@type":"g:Int32","@value":2007}}},{"id":{"@type":"g:Int64","@value":14},"value":"baltimore","properties":{"startTime":{"@type":"g:Int32","@value":2007},"endTime":{"@type":"g:Int32","@value":2011}}},{"id":{"@type":"g:Int64","@value":15},"value":"oakland","properties":{"startTime":{"@type":"g:Int32
 ","@value":2011},"endTime":{"@type":"g:Int32","@value":2014}}},{"id":{"@type":"g:Int64","@value":16},"value":"seattle","properties":{"startTime":{"@type":"g:Int32","@value":2014}}}]}}
+{"id":{"@type":"g:Int32","@value":9},"label":"person","outE":{"uses":[{"id":{"@type":"g:Int32","@value":24},"inV":{"@type":"g:Int32","@value":10},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":25},"inV":{"@type":"g:Int32","@value":11},"properties":{"skill":{"@type":"g:Int32","@value":3}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":3},"value":"daniel"}],"location":[{"id":{"@type":"g:Int64","@value":17},"value":"spremberg","properties":{"startTime":{"@type":"g:Int32","@value":1982},"endTime":{"@type":"g:Int32","@value":2005}}},{"id":{"@type":"g:Int64","@value":18},"value":"kaiserslautern","properties":{"startTime":{"@type":"g:Int32","@value":2005},"endTime":{"@type":"g:Int32","@value":2009}}},{"id":{"@type":"g:Int64","@value":19},"value":"aachen","properties":{"startTime":{"@type":"g:Int32","@value":2009}}}]}}
+{"id":{"@type":"g:Int32","@value":10},"label":"software","inE":{"uses":[{"id":{"@type":"g:Int32","@value":19},"outV":{"@type":"g:Int32","@value":7},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":22},"outV":{"@type":"g:Int32","@value":8},"properties":{"skill":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":24},"outV":{"@type":"g:Int32","@value":9},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":15},"outV":{"@type":"g:Int32","@value":1},"properties":{"skill":{"@type":"g:Int32","@value":4}}}],"develops":[{"id":{"@type":"g:Int32","@value":17},"outV":{"@type":"g:Int32","@value":7},"properties":{"since":{"@type":"g:Int32","@value":2010}}},{"id":{"@type":"g:Int32","@value":21},"outV":{"@type":"g:Int32","@value":8},"properties":{"since":{"@type":"g:Int32","@value":2012}}},{"id":{"@type":"g:Int32","@value":13},"outV":{"@type":"g:Int32","@value":1},"properties":{"since":{"@type":"g:Int32","@v
 alue":2009}}}]},"outE":{"traverses":[{"id":{"@type":"g:Int32","@value":26},"inV":{"@type":"g:Int32","@value":11}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":4},"value":"gremlin"}]}}
+{"id":{"@type":"g:Int32","@value":11},"label":"software","inE":{"traverses":[{"id":{"@type":"g:Int32","@value":26},"outV":{"@type":"g:Int32","@value":10}}],"uses":[{"id":{"@type":"g:Int32","@value":16},"outV":{"@type":"g:Int32","@value":1},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":20},"outV":{"@type":"g:Int32","@value":7},"properties":{"skill":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":23},"outV":{"@type":"g:Int32","@value":8},"properties":{"skill":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":25},"outV":{"@type":"g:Int32","@value":9},"properties":{"skill":{"@type":"g:Int32","@value":3}}}],"develops":[{"id":{"@type":"g:Int32","@value":18},"outV":{"@type":"g:Int32","@value":7},"properties":{"since":{"@type":"g:Int32","@value":2011}}},{"id":{"@type":"g:Int32","@value":14},"outV":{"@type":"g:Int32","@value":1},"properties":{"since":{"@type":"g:Int32","@value":2010}}}]},"properties":{"name":[{"id
 ":{"@type":"g:Int64","@value":5},"value":"tinkergraph"}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b5f850f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed.json
deleted file mode 100644
index 730449f..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-typed.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"@class":"java.util.HashMap","id":1,"label":"person","outE":{"@class":"java.util.HashMap","uses":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":16,"inV":11,"properties":{"@class":"java.util.HashMap","skill":5}},{"@class":"java.util.HashMap","id":15,"inV":10,"properties":{"@class":"java.util.HashMap","skill":4}}]],"develops":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":13,"inV":10,"properties":{"@class":"java.util.HashMap","since":2009}},{"@class":"java.util.HashMap","id":14,"inV":11,"properties":{"@class":"java.util.HashMap","since":2010}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",0],"value":"marko"}]],"location":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",6],"value":"san diego","properties":{"@class":"java.util.HashMap","startTime":1997,"endTime":2001}},{"@class":"java.util.HashMap","id":["java.lang.Long",7],"value":"santa cruz","proper
 ties":{"@class":"java.util.HashMap","startTime":2001,"endTime":2004}},{"@class":"java.util.HashMap","id":["java.lang.Long",8],"value":"brussels","properties":{"@class":"java.util.HashMap","startTime":2004,"endTime":2005}},{"@class":"java.util.HashMap","id":["java.lang.Long",9],"value":"santa fe","properties":{"@class":"java.util.HashMap","startTime":2005}}]]}}
-{"@class":"java.util.HashMap","id":7,"label":"person","outE":{"@class":"java.util.HashMap","uses":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":19,"inV":10,"properties":{"@class":"java.util.HashMap","skill":5}},{"@class":"java.util.HashMap","id":20,"inV":11,"properties":{"@class":"java.util.HashMap","skill":4}}]],"develops":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":17,"inV":10,"properties":{"@class":"java.util.HashMap","since":2010}},{"@class":"java.util.HashMap","id":18,"inV":11,"properties":{"@class":"java.util.HashMap","since":2011}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",1],"value":"stephen"}]],"location":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",10],"value":"centreville","properties":{"@class":"java.util.HashMap","startTime":1990,"endTime":2000}},{"@class":"java.util.HashMap","id":["java.lang.Long",11],"value":"dulles","prop
 erties":{"@class":"java.util.HashMap","startTime":2000,"endTime":2006}},{"@class":"java.util.HashMap","id":["java.lang.Long",12],"value":"purcellville","properties":{"@class":"java.util.HashMap","startTime":2006}}]]}}
-{"@class":"java.util.HashMap","id":8,"label":"person","outE":{"@class":"java.util.HashMap","uses":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":22,"inV":10,"properties":{"@class":"java.util.HashMap","skill":3}},{"@class":"java.util.HashMap","id":23,"inV":11,"properties":{"@class":"java.util.HashMap","skill":3}}]],"develops":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":21,"inV":10,"properties":{"@class":"java.util.HashMap","since":2012}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",2],"value":"matthias"}]],"location":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",13],"value":"bremen","properties":{"@class":"java.util.HashMap","startTime":2004,"endTime":2007}},{"@class":"java.util.HashMap","id":["java.lang.Long",14],"value":"baltimore","properties":{"@class":"java.util.HashMap","startTime":2007,"endTime":2011}},{"@class":"java.util.HashMap","id"
 :["java.lang.Long",15],"value":"oakland","properties":{"@class":"java.util.HashMap","startTime":2011,"endTime":2014}},{"@class":"java.util.HashMap","id":["java.lang.Long",16],"value":"seattle","properties":{"@class":"java.util.HashMap","startTime":2014}}]]}}
-{"@class":"java.util.HashMap","id":9,"label":"person","outE":{"@class":"java.util.HashMap","uses":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":24,"inV":10,"properties":{"@class":"java.util.HashMap","skill":5}},{"@class":"java.util.HashMap","id":25,"inV":11,"properties":{"@class":"java.util.HashMap","skill":3}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",3],"value":"daniel"}]],"location":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",17],"value":"spremberg","properties":{"@class":"java.util.HashMap","startTime":1982,"endTime":2005}},{"@class":"java.util.HashMap","id":["java.lang.Long",18],"value":"kaiserslautern","properties":{"@class":"java.util.HashMap","startTime":2005,"endTime":2009}},{"@class":"java.util.HashMap","id":["java.lang.Long",19],"value":"aachen","properties":{"@class":"java.util.HashMap","startTime":2009}}]]}}
-{"@class":"java.util.HashMap","id":10,"label":"software","inE":{"@class":"java.util.HashMap","uses":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":19,"outV":7,"properties":{"@class":"java.util.HashMap","skill":5}},{"@class":"java.util.HashMap","id":22,"outV":8,"properties":{"@class":"java.util.HashMap","skill":3}},{"@class":"java.util.HashMap","id":24,"outV":9,"properties":{"@class":"java.util.HashMap","skill":5}},{"@class":"java.util.HashMap","id":15,"outV":1,"properties":{"@class":"java.util.HashMap","skill":4}}]],"develops":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":17,"outV":7,"properties":{"@class":"java.util.HashMap","since":2010}},{"@class":"java.util.HashMap","id":21,"outV":8,"properties":{"@class":"java.util.HashMap","since":2012}},{"@class":"java.util.HashMap","id":13,"outV":1,"properties":{"@class":"java.util.HashMap","since":2009}}]]},"outE":{"@class":"java.util.HashMap","traverses":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":26
 ,"inV":11}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",4],"value":"gremlin"}]]}}
-{"@class":"java.util.HashMap","id":11,"label":"software","inE":{"@class":"java.util.HashMap","traverses":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":26,"outV":10}]],"uses":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":16,"outV":1,"properties":{"@class":"java.util.HashMap","skill":5}},{"@class":"java.util.HashMap","id":20,"outV":7,"properties":{"@class":"java.util.HashMap","skill":4}},{"@class":"java.util.HashMap","id":23,"outV":8,"properties":{"@class":"java.util.HashMap","skill":3}},{"@class":"java.util.HashMap","id":25,"outV":9,"properties":{"@class":"java.util.HashMap","skill":3}}]],"develops":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":18,"outV":7,"properties":{"@class":"java.util.HashMap","since":2011}},{"@class":"java.util.HashMap","id":14,"outV":1,"properties":{"@class":"java.util.HashMap","since":2010}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",5
 ],"value":"tinkergraph"}]]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b5f850f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v1d0.json
new file mode 100644
index 0000000..2165e4d
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v1d0.json
@@ -0,0 +1,6 @@
+{"id":1,"label":"person","outE":{"uses":[{"id":16,"inV":11,"properties":{"skill":5}},{"id":15,"inV":10,"properties":{"skill":4}}],"develops":[{"id":13,"inV":10,"properties":{"since":2009}},{"id":14,"inV":11,"properties":{"since":2010}}]},"properties":{"name":[{"id":0,"value":"marko"}],"location":[{"id":6,"value":"san diego","properties":{"startTime":1997,"endTime":2001}},{"id":7,"value":"santa cruz","properties":{"startTime":2001,"endTime":2004}},{"id":8,"value":"brussels","properties":{"startTime":2004,"endTime":2005}},{"id":9,"value":"santa fe","properties":{"startTime":2005}}]}}
+{"id":7,"label":"person","outE":{"uses":[{"id":19,"inV":10,"properties":{"skill":5}},{"id":20,"inV":11,"properties":{"skill":4}}],"develops":[{"id":17,"inV":10,"properties":{"since":2010}},{"id":18,"inV":11,"properties":{"since":2011}}]},"properties":{"name":[{"id":1,"value":"stephen"}],"location":[{"id":10,"value":"centreville","properties":{"startTime":1990,"endTime":2000}},{"id":11,"value":"dulles","properties":{"startTime":2000,"endTime":2006}},{"id":12,"value":"purcellville","properties":{"startTime":2006}}]}}
+{"id":8,"label":"person","outE":{"uses":[{"id":22,"inV":10,"properties":{"skill":3}},{"id":23,"inV":11,"properties":{"skill":3}}],"develops":[{"id":21,"inV":10,"properties":{"since":2012}}]},"properties":{"name":[{"id":2,"value":"matthias"}],"location":[{"id":13,"value":"bremen","properties":{"startTime":2004,"endTime":2007}},{"id":14,"value":"baltimore","properties":{"startTime":2007,"endTime":2011}},{"id":15,"value":"oakland","properties":{"startTime":2011,"endTime":2014}},{"id":16,"value":"seattle","properties":{"startTime":2014}}]}}
+{"id":9,"label":"person","outE":{"uses":[{"id":24,"inV":10,"properties":{"skill":5}},{"id":25,"inV":11,"properties":{"skill":3}}]},"properties":{"name":[{"id":3,"value":"daniel"}],"location":[{"id":17,"value":"spremberg","properties":{"startTime":1982,"endTime":2005}},{"id":18,"value":"kaiserslautern","properties":{"startTime":2005,"endTime":2009}},{"id":19,"value":"aachen","properties":{"startTime":2009}}]}}
+{"id":10,"label":"software","inE":{"uses":[{"id":19,"outV":7,"properties":{"skill":5}},{"id":22,"outV":8,"properties":{"skill":3}},{"id":24,"outV":9,"properties":{"skill":5}},{"id":15,"outV":1,"properties":{"skill":4}}],"develops":[{"id":17,"outV":7,"properties":{"since":2010}},{"id":21,"outV":8,"properties":{"since":2012}},{"id":13,"outV":1,"properties":{"since":2009}}]},"outE":{"traverses":[{"id":26,"inV":11}]},"properties":{"name":[{"id":4,"value":"gremlin"}]}}
+{"id":11,"label":"software","inE":{"traverses":[{"id":26,"outV":10}],"uses":[{"id":16,"outV":1,"properties":{"skill":5}},{"id":20,"outV":7,"properties":{"skill":4}},{"id":23,"outV":8,"properties":{"skill":3}},{"id":25,"outV":9,"properties":{"skill":3}}],"develops":[{"id":18,"outV":7,"properties":{"since":2011}},{"id":14,"outV":1,"properties":{"since":2010}}]},"properties":{"name":[{"id":5,"value":"tinkergraph"}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b5f850f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v2d0-typed.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v2d0-typed.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v2d0-typed.json
deleted file mode 100644
index 77344c0..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v2d0-typed.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"id":{"@type":"g:Int32","@value":1},"label":"person","outE":{"uses":[{"id":{"@type":"g:Int32","@value":16},"inV":{"@type":"g:Int32","@value":11},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":15},"inV":{"@type":"g:Int32","@value":10},"properties":{"skill":{"@type":"g:Int32","@value":4}}}],"develops":[{"id":{"@type":"g:Int32","@value":13},"inV":{"@type":"g:Int32","@value":10},"properties":{"since":{"@type":"g:Int32","@value":2009}}},{"id":{"@type":"g:Int32","@value":14},"inV":{"@type":"g:Int32","@value":11},"properties":{"since":{"@type":"g:Int32","@value":2010}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":0},"value":"marko"}],"location":[{"id":{"@type":"g:Int64","@value":6},"value":"san diego","properties":{"startTime":{"@type":"g:Int32","@value":1997},"endTime":{"@type":"g:Int32","@value":2001}}},{"id":{"@type":"g:Int64","@value":7},"value":"santa cruz","properties":{"startTime":{"@type":"g:Int32","@value":2001},"endTime":{"
 @type":"g:Int32","@value":2004}}},{"id":{"@type":"g:Int64","@value":8},"value":"brussels","properties":{"startTime":{"@type":"g:Int32","@value":2004},"endTime":{"@type":"g:Int32","@value":2005}}},{"id":{"@type":"g:Int64","@value":9},"value":"santa fe","properties":{"startTime":{"@type":"g:Int32","@value":2005}}}]}}
-{"id":{"@type":"g:Int32","@value":7},"label":"person","outE":{"uses":[{"id":{"@type":"g:Int32","@value":19},"inV":{"@type":"g:Int32","@value":10},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":20},"inV":{"@type":"g:Int32","@value":11},"properties":{"skill":{"@type":"g:Int32","@value":4}}}],"develops":[{"id":{"@type":"g:Int32","@value":17},"inV":{"@type":"g:Int32","@value":10},"properties":{"since":{"@type":"g:Int32","@value":2010}}},{"id":{"@type":"g:Int32","@value":18},"inV":{"@type":"g:Int32","@value":11},"properties":{"since":{"@type":"g:Int32","@value":2011}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1},"value":"stephen"}],"location":[{"id":{"@type":"g:Int64","@value":10},"value":"centreville","properties":{"startTime":{"@type":"g:Int32","@value":1990},"endTime":{"@type":"g:Int32","@value":2000}}},{"id":{"@type":"g:Int64","@value":11},"value":"dulles","properties":{"startTime":{"@type":"g:Int32","@value":2000},"endTime":
 {"@type":"g:Int32","@value":2006}}},{"id":{"@type":"g:Int64","@value":12},"value":"purcellville","properties":{"startTime":{"@type":"g:Int32","@value":2006}}}]}}
-{"id":{"@type":"g:Int32","@value":8},"label":"person","outE":{"uses":[{"id":{"@type":"g:Int32","@value":22},"inV":{"@type":"g:Int32","@value":10},"properties":{"skill":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":23},"inV":{"@type":"g:Int32","@value":11},"properties":{"skill":{"@type":"g:Int32","@value":3}}}],"develops":[{"id":{"@type":"g:Int32","@value":21},"inV":{"@type":"g:Int32","@value":10},"properties":{"since":{"@type":"g:Int32","@value":2012}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":2},"value":"matthias"}],"location":[{"id":{"@type":"g:Int64","@value":13},"value":"bremen","properties":{"startTime":{"@type":"g:Int32","@value":2004},"endTime":{"@type":"g:Int32","@value":2007}}},{"id":{"@type":"g:Int64","@value":14},"value":"baltimore","properties":{"startTime":{"@type":"g:Int32","@value":2007},"endTime":{"@type":"g:Int32","@value":2011}}},{"id":{"@type":"g:Int64","@value":15},"value":"oakland","properties":{"startTime":{"@type":"g:Int32
 ","@value":2011},"endTime":{"@type":"g:Int32","@value":2014}}},{"id":{"@type":"g:Int64","@value":16},"value":"seattle","properties":{"startTime":{"@type":"g:Int32","@value":2014}}}]}}
-{"id":{"@type":"g:Int32","@value":9},"label":"person","outE":{"uses":[{"id":{"@type":"g:Int32","@value":24},"inV":{"@type":"g:Int32","@value":10},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":25},"inV":{"@type":"g:Int32","@value":11},"properties":{"skill":{"@type":"g:Int32","@value":3}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":3},"value":"daniel"}],"location":[{"id":{"@type":"g:Int64","@value":17},"value":"spremberg","properties":{"startTime":{"@type":"g:Int32","@value":1982},"endTime":{"@type":"g:Int32","@value":2005}}},{"id":{"@type":"g:Int64","@value":18},"value":"kaiserslautern","properties":{"startTime":{"@type":"g:Int32","@value":2005},"endTime":{"@type":"g:Int32","@value":2009}}},{"id":{"@type":"g:Int64","@value":19},"value":"aachen","properties":{"startTime":{"@type":"g:Int32","@value":2009}}}]}}
-{"id":{"@type":"g:Int32","@value":10},"label":"software","inE":{"uses":[{"id":{"@type":"g:Int32","@value":19},"outV":{"@type":"g:Int32","@value":7},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":22},"outV":{"@type":"g:Int32","@value":8},"properties":{"skill":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":24},"outV":{"@type":"g:Int32","@value":9},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":15},"outV":{"@type":"g:Int32","@value":1},"properties":{"skill":{"@type":"g:Int32","@value":4}}}],"develops":[{"id":{"@type":"g:Int32","@value":17},"outV":{"@type":"g:Int32","@value":7},"properties":{"since":{"@type":"g:Int32","@value":2010}}},{"id":{"@type":"g:Int32","@value":21},"outV":{"@type":"g:Int32","@value":8},"properties":{"since":{"@type":"g:Int32","@value":2012}}},{"id":{"@type":"g:Int32","@value":13},"outV":{"@type":"g:Int32","@value":1},"properties":{"since":{"@type":"g:Int32","@v
 alue":2009}}}]},"outE":{"traverses":[{"id":{"@type":"g:Int32","@value":26},"inV":{"@type":"g:Int32","@value":11}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":4},"value":"gremlin"}]}}
-{"id":{"@type":"g:Int32","@value":11},"label":"software","inE":{"traverses":[{"id":{"@type":"g:Int32","@value":26},"outV":{"@type":"g:Int32","@value":10}}],"uses":[{"id":{"@type":"g:Int32","@value":16},"outV":{"@type":"g:Int32","@value":1},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":20},"outV":{"@type":"g:Int32","@value":7},"properties":{"skill":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":23},"outV":{"@type":"g:Int32","@value":8},"properties":{"skill":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":25},"outV":{"@type":"g:Int32","@value":9},"properties":{"skill":{"@type":"g:Int32","@value":3}}}],"develops":[{"id":{"@type":"g:Int32","@value":18},"outV":{"@type":"g:Int32","@value":7},"properties":{"since":{"@type":"g:Int32","@value":2011}}},{"id":{"@type":"g:Int32","@value":14},"outV":{"@type":"g:Int32","@value":1},"properties":{"since":{"@type":"g:Int32","@value":2010}}}]},"properties":{"name":[{"id
 ":{"@type":"g:Int64","@value":5},"value":"tinkergraph"}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b5f850f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v3d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v3d0.json
new file mode 100644
index 0000000..77344c0
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew-v3d0.json
@@ -0,0 +1,6 @@
+{"id":{"@type":"g:Int32","@value":1},"label":"person","outE":{"uses":[{"id":{"@type":"g:Int32","@value":16},"inV":{"@type":"g:Int32","@value":11},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":15},"inV":{"@type":"g:Int32","@value":10},"properties":{"skill":{"@type":"g:Int32","@value":4}}}],"develops":[{"id":{"@type":"g:Int32","@value":13},"inV":{"@type":"g:Int32","@value":10},"properties":{"since":{"@type":"g:Int32","@value":2009}}},{"id":{"@type":"g:Int32","@value":14},"inV":{"@type":"g:Int32","@value":11},"properties":{"since":{"@type":"g:Int32","@value":2010}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":0},"value":"marko"}],"location":[{"id":{"@type":"g:Int64","@value":6},"value":"san diego","properties":{"startTime":{"@type":"g:Int32","@value":1997},"endTime":{"@type":"g:Int32","@value":2001}}},{"id":{"@type":"g:Int64","@value":7},"value":"santa cruz","properties":{"startTime":{"@type":"g:Int32","@value":2001},"endTime":{"
 @type":"g:Int32","@value":2004}}},{"id":{"@type":"g:Int64","@value":8},"value":"brussels","properties":{"startTime":{"@type":"g:Int32","@value":2004},"endTime":{"@type":"g:Int32","@value":2005}}},{"id":{"@type":"g:Int64","@value":9},"value":"santa fe","properties":{"startTime":{"@type":"g:Int32","@value":2005}}}]}}
+{"id":{"@type":"g:Int32","@value":7},"label":"person","outE":{"uses":[{"id":{"@type":"g:Int32","@value":19},"inV":{"@type":"g:Int32","@value":10},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":20},"inV":{"@type":"g:Int32","@value":11},"properties":{"skill":{"@type":"g:Int32","@value":4}}}],"develops":[{"id":{"@type":"g:Int32","@value":17},"inV":{"@type":"g:Int32","@value":10},"properties":{"since":{"@type":"g:Int32","@value":2010}}},{"id":{"@type":"g:Int32","@value":18},"inV":{"@type":"g:Int32","@value":11},"properties":{"since":{"@type":"g:Int32","@value":2011}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":1},"value":"stephen"}],"location":[{"id":{"@type":"g:Int64","@value":10},"value":"centreville","properties":{"startTime":{"@type":"g:Int32","@value":1990},"endTime":{"@type":"g:Int32","@value":2000}}},{"id":{"@type":"g:Int64","@value":11},"value":"dulles","properties":{"startTime":{"@type":"g:Int32","@value":2000},"endTime":
 {"@type":"g:Int32","@value":2006}}},{"id":{"@type":"g:Int64","@value":12},"value":"purcellville","properties":{"startTime":{"@type":"g:Int32","@value":2006}}}]}}
+{"id":{"@type":"g:Int32","@value":8},"label":"person","outE":{"uses":[{"id":{"@type":"g:Int32","@value":22},"inV":{"@type":"g:Int32","@value":10},"properties":{"skill":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":23},"inV":{"@type":"g:Int32","@value":11},"properties":{"skill":{"@type":"g:Int32","@value":3}}}],"develops":[{"id":{"@type":"g:Int32","@value":21},"inV":{"@type":"g:Int32","@value":10},"properties":{"since":{"@type":"g:Int32","@value":2012}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":2},"value":"matthias"}],"location":[{"id":{"@type":"g:Int64","@value":13},"value":"bremen","properties":{"startTime":{"@type":"g:Int32","@value":2004},"endTime":{"@type":"g:Int32","@value":2007}}},{"id":{"@type":"g:Int64","@value":14},"value":"baltimore","properties":{"startTime":{"@type":"g:Int32","@value":2007},"endTime":{"@type":"g:Int32","@value":2011}}},{"id":{"@type":"g:Int64","@value":15},"value":"oakland","properties":{"startTime":{"@type":"g:Int32
 ","@value":2011},"endTime":{"@type":"g:Int32","@value":2014}}},{"id":{"@type":"g:Int64","@value":16},"value":"seattle","properties":{"startTime":{"@type":"g:Int32","@value":2014}}}]}}
+{"id":{"@type":"g:Int32","@value":9},"label":"person","outE":{"uses":[{"id":{"@type":"g:Int32","@value":24},"inV":{"@type":"g:Int32","@value":10},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":25},"inV":{"@type":"g:Int32","@value":11},"properties":{"skill":{"@type":"g:Int32","@value":3}}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":3},"value":"daniel"}],"location":[{"id":{"@type":"g:Int64","@value":17},"value":"spremberg","properties":{"startTime":{"@type":"g:Int32","@value":1982},"endTime":{"@type":"g:Int32","@value":2005}}},{"id":{"@type":"g:Int64","@value":18},"value":"kaiserslautern","properties":{"startTime":{"@type":"g:Int32","@value":2005},"endTime":{"@type":"g:Int32","@value":2009}}},{"id":{"@type":"g:Int64","@value":19},"value":"aachen","properties":{"startTime":{"@type":"g:Int32","@value":2009}}}]}}
+{"id":{"@type":"g:Int32","@value":10},"label":"software","inE":{"uses":[{"id":{"@type":"g:Int32","@value":19},"outV":{"@type":"g:Int32","@value":7},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":22},"outV":{"@type":"g:Int32","@value":8},"properties":{"skill":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":24},"outV":{"@type":"g:Int32","@value":9},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":15},"outV":{"@type":"g:Int32","@value":1},"properties":{"skill":{"@type":"g:Int32","@value":4}}}],"develops":[{"id":{"@type":"g:Int32","@value":17},"outV":{"@type":"g:Int32","@value":7},"properties":{"since":{"@type":"g:Int32","@value":2010}}},{"id":{"@type":"g:Int32","@value":21},"outV":{"@type":"g:Int32","@value":8},"properties":{"since":{"@type":"g:Int32","@value":2012}}},{"id":{"@type":"g:Int32","@value":13},"outV":{"@type":"g:Int32","@value":1},"properties":{"since":{"@type":"g:Int32","@v
 alue":2009}}}]},"outE":{"traverses":[{"id":{"@type":"g:Int32","@value":26},"inV":{"@type":"g:Int32","@value":11}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":4},"value":"gremlin"}]}}
+{"id":{"@type":"g:Int32","@value":11},"label":"software","inE":{"traverses":[{"id":{"@type":"g:Int32","@value":26},"outV":{"@type":"g:Int32","@value":10}}],"uses":[{"id":{"@type":"g:Int32","@value":16},"outV":{"@type":"g:Int32","@value":1},"properties":{"skill":{"@type":"g:Int32","@value":5}}},{"id":{"@type":"g:Int32","@value":20},"outV":{"@type":"g:Int32","@value":7},"properties":{"skill":{"@type":"g:Int32","@value":4}}},{"id":{"@type":"g:Int32","@value":23},"outV":{"@type":"g:Int32","@value":8},"properties":{"skill":{"@type":"g:Int32","@value":3}}},{"id":{"@type":"g:Int32","@value":25},"outV":{"@type":"g:Int32","@value":9},"properties":{"skill":{"@type":"g:Int32","@value":3}}}],"develops":[{"id":{"@type":"g:Int32","@value":18},"outV":{"@type":"g:Int32","@value":7},"properties":{"since":{"@type":"g:Int32","@value":2011}}},{"id":{"@type":"g:Int32","@value":14},"outV":{"@type":"g:Int32","@value":1},"properties":{"since":{"@type":"g:Int32","@value":2010}}}]},"properties":{"name":[{"id
 ":{"@type":"g:Int64","@value":5},"value":"tinkergraph"}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b5f850f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew.json
deleted file mode 100644
index 2165e4d..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-crew.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"id":1,"label":"person","outE":{"uses":[{"id":16,"inV":11,"properties":{"skill":5}},{"id":15,"inV":10,"properties":{"skill":4}}],"develops":[{"id":13,"inV":10,"properties":{"since":2009}},{"id":14,"inV":11,"properties":{"since":2010}}]},"properties":{"name":[{"id":0,"value":"marko"}],"location":[{"id":6,"value":"san diego","properties":{"startTime":1997,"endTime":2001}},{"id":7,"value":"santa cruz","properties":{"startTime":2001,"endTime":2004}},{"id":8,"value":"brussels","properties":{"startTime":2004,"endTime":2005}},{"id":9,"value":"santa fe","properties":{"startTime":2005}}]}}
-{"id":7,"label":"person","outE":{"uses":[{"id":19,"inV":10,"properties":{"skill":5}},{"id":20,"inV":11,"properties":{"skill":4}}],"develops":[{"id":17,"inV":10,"properties":{"since":2010}},{"id":18,"inV":11,"properties":{"since":2011}}]},"properties":{"name":[{"id":1,"value":"stephen"}],"location":[{"id":10,"value":"centreville","properties":{"startTime":1990,"endTime":2000}},{"id":11,"value":"dulles","properties":{"startTime":2000,"endTime":2006}},{"id":12,"value":"purcellville","properties":{"startTime":2006}}]}}
-{"id":8,"label":"person","outE":{"uses":[{"id":22,"inV":10,"properties":{"skill":3}},{"id":23,"inV":11,"properties":{"skill":3}}],"develops":[{"id":21,"inV":10,"properties":{"since":2012}}]},"properties":{"name":[{"id":2,"value":"matthias"}],"location":[{"id":13,"value":"bremen","properties":{"startTime":2004,"endTime":2007}},{"id":14,"value":"baltimore","properties":{"startTime":2007,"endTime":2011}},{"id":15,"value":"oakland","properties":{"startTime":2011,"endTime":2014}},{"id":16,"value":"seattle","properties":{"startTime":2014}}]}}
-{"id":9,"label":"person","outE":{"uses":[{"id":24,"inV":10,"properties":{"skill":5}},{"id":25,"inV":11,"properties":{"skill":3}}]},"properties":{"name":[{"id":3,"value":"daniel"}],"location":[{"id":17,"value":"spremberg","properties":{"startTime":1982,"endTime":2005}},{"id":18,"value":"kaiserslautern","properties":{"startTime":2005,"endTime":2009}},{"id":19,"value":"aachen","properties":{"startTime":2009}}]}}
-{"id":10,"label":"software","inE":{"uses":[{"id":19,"outV":7,"properties":{"skill":5}},{"id":22,"outV":8,"properties":{"skill":3}},{"id":24,"outV":9,"properties":{"skill":5}},{"id":15,"outV":1,"properties":{"skill":4}}],"develops":[{"id":17,"outV":7,"properties":{"since":2010}},{"id":21,"outV":8,"properties":{"since":2012}},{"id":13,"outV":1,"properties":{"since":2009}}]},"outE":{"traverses":[{"id":26,"inV":11}]},"properties":{"name":[{"id":4,"value":"gremlin"}]}}
-{"id":11,"label":"software","inE":{"traverses":[{"id":26,"outV":10}],"uses":[{"id":16,"outV":1,"properties":{"skill":5}},{"id":20,"outV":7,"properties":{"skill":4}},{"id":23,"outV":8,"properties":{"skill":3}},{"id":25,"outV":9,"properties":{"skill":3}}],"develops":[{"id":18,"outV":7,"properties":{"since":2011}},{"id":14,"outV":1,"properties":{"since":2010}}]},"properties":{"name":[{"id":5,"value":"tinkergraph"}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b5f850f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v1d0.json
new file mode 100644
index 0000000..8c259ea
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v1d0.json
@@ -0,0 +1,6 @@
+{"id":1,"label":"person","outE":{"created":[{"id":9,"inV":3,"properties":{"weight":0.4}}],"knows":[{"id":7,"inV":2,"properties":{"weight":0.5}},{"id":8,"inV":4,"properties":{"weight":1.0}}]},"properties":{"age":[{"id":1,"value":29}],"name":[{"id":0,"value":"marko"}]}}
+{"id":2,"label":"person","inE":{"knows":[{"id":7,"outV":1,"properties":{"weight":0.5}}]},"properties":{"age":[{"id":3,"value":27}],"name":[{"id":2,"value":"vadas"}]}}
+{"id":3,"label":"software","inE":{"created":[{"id":11,"outV":4,"properties":{"weight":0.4}},{"id":12,"outV":6,"properties":{"weight":0.2}},{"id":9,"outV":1,"properties":{"weight":0.4}}]},"properties":{"lang":[{"id":5,"value":"java"}],"name":[{"id":4,"value":"lop"}]}}
+{"id":4,"label":"person","inE":{"knows":[{"id":8,"outV":1,"properties":{"weight":1.0}}]},"outE":{"created":[{"id":10,"inV":5,"properties":{"weight":1.0}},{"id":11,"inV":3,"properties":{"weight":0.4}}]},"properties":{"age":[{"id":7,"value":32}],"name":[{"id":6,"value":"josh"}]}}
+{"id":5,"label":"software","inE":{"created":[{"id":10,"outV":4,"properties":{"weight":1.0}}]},"properties":{"lang":[{"id":9,"value":"java"}],"name":[{"id":8,"value":"ripple"}]}}
+{"id":6,"label":"person","outE":{"created":[{"id":12,"inV":3,"properties":{"weight":0.2}}]},"properties":{"age":[{"id":11,"value":35}],"name":[{"id":10,"value":"peter"}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b5f850f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v3d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v3d0.json
new file mode 100644
index 0000000..e11ed02
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized-v3d0.json
@@ -0,0 +1,6 @@
+{"id":{"@type":"g:Int32","@value":1},"label":"person","outE":{"created":[{"id":{"@type":"g:Int32","@value":9},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.4}}}],"knows":[{"id":{"@type":"g:Int32","@value":7},"inV":{"@type":"g:Int32","@value":2},"properties":{"weight":{"@type":"g:Double","@value":0.5}}},{"id":{"@type":"g:Int32","@value":8},"inV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"properties":{"age":[{"id":{"@type":"g:Int64","@value":1},"value":{"@type":"g:Int32","@value":29}}],"name":[{"id":{"@type":"g:Int64","@value":0},"value":"marko"}]}}
+{"id":{"@type":"g:Int32","@value":2},"label":"person","inE":{"knows":[{"id":{"@type":"g:Int32","@value":7},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":0.5}}}]},"properties":{"age":[{"id":{"@type":"g:Int64","@value":3},"value":{"@type":"g:Int32","@value":27}}],"name":[{"id":{"@type":"g:Int64","@value":2},"value":"vadas"}]}}
+{"id":{"@type":"g:Int32","@value":3},"label":"software","inE":{"created":[{"id":{"@type":"g:Int32","@value":11},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":0.4}}},{"id":{"@type":"g:Int32","@value":12},"outV":{"@type":"g:Int32","@value":6},"properties":{"weight":{"@type":"g:Double","@value":0.2}}},{"id":{"@type":"g:Int32","@value":9},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":0.4}}}]},"properties":{"lang":[{"id":{"@type":"g:Int64","@value":5},"value":"java"}],"name":[{"id":{"@type":"g:Int64","@value":4},"value":"lop"}]}}
+{"id":{"@type":"g:Int32","@value":4},"label":"person","inE":{"knows":[{"id":{"@type":"g:Int32","@value":8},"outV":{"@type":"g:Int32","@value":1},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"outE":{"created":[{"id":{"@type":"g:Int32","@value":10},"inV":{"@type":"g:Int32","@value":5},"properties":{"weight":{"@type":"g:Double","@value":1.0}}},{"id":{"@type":"g:Int32","@value":11},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.4}}}]},"properties":{"age":[{"id":{"@type":"g:Int64","@value":7},"value":{"@type":"g:Int32","@value":32}}],"name":[{"id":{"@type":"g:Int64","@value":6},"value":"josh"}]}}
+{"id":{"@type":"g:Int32","@value":5},"label":"software","inE":{"created":[{"id":{"@type":"g:Int32","@value":10},"outV":{"@type":"g:Int32","@value":4},"properties":{"weight":{"@type":"g:Double","@value":1.0}}}]},"properties":{"lang":[{"id":{"@type":"g:Int64","@value":9},"value":"java"}],"name":[{"id":{"@type":"g:Int64","@value":8},"value":"ripple"}]}}
+{"id":{"@type":"g:Int32","@value":6},"label":"person","outE":{"created":[{"id":{"@type":"g:Int32","@value":12},"inV":{"@type":"g:Int32","@value":3},"properties":{"weight":{"@type":"g:Double","@value":0.2}}}]},"properties":{"age":[{"id":{"@type":"g:Int64","@value":11},"value":{"@type":"g:Int32","@value":35}}],"name":[{"id":{"@type":"g:Int64","@value":10},"value":"peter"}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b5f850f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized.json
deleted file mode 100644
index 8c259ea..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"id":1,"label":"person","outE":{"created":[{"id":9,"inV":3,"properties":{"weight":0.4}}],"knows":[{"id":7,"inV":2,"properties":{"weight":0.5}},{"id":8,"inV":4,"properties":{"weight":1.0}}]},"properties":{"age":[{"id":1,"value":29}],"name":[{"id":0,"value":"marko"}]}}
-{"id":2,"label":"person","inE":{"knows":[{"id":7,"outV":1,"properties":{"weight":0.5}}]},"properties":{"age":[{"id":3,"value":27}],"name":[{"id":2,"value":"vadas"}]}}
-{"id":3,"label":"software","inE":{"created":[{"id":11,"outV":4,"properties":{"weight":0.4}},{"id":12,"outV":6,"properties":{"weight":0.2}},{"id":9,"outV":1,"properties":{"weight":0.4}}]},"properties":{"lang":[{"id":5,"value":"java"}],"name":[{"id":4,"value":"lop"}]}}
-{"id":4,"label":"person","inE":{"knows":[{"id":8,"outV":1,"properties":{"weight":1.0}}]},"outE":{"created":[{"id":10,"inV":5,"properties":{"weight":1.0}},{"id":11,"inV":3,"properties":{"weight":0.4}}]},"properties":{"age":[{"id":7,"value":32}],"name":[{"id":6,"value":"josh"}]}}
-{"id":5,"label":"software","inE":{"created":[{"id":10,"outV":4,"properties":{"weight":1.0}}]},"properties":{"lang":[{"id":9,"value":"java"}],"name":[{"id":8,"value":"ripple"}]}}
-{"id":6,"label":"person","outE":{"created":[{"id":12,"inV":3,"properties":{"weight":0.2}}]},"properties":{"age":[{"id":11,"value":35}],"name":[{"id":10,"value":"peter"}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5b5f850f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed-v1d0.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed-v1d0.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed-v1d0.json
new file mode 100644
index 0000000..7539020
--- /dev/null
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-typed-v1d0.json
@@ -0,0 +1,6 @@
+{"@class":"java.util.HashMap","id":1,"label":"person","outE":{"@class":"java.util.HashMap","created":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":9,"inV":3,"properties":{"@class":"java.util.HashMap","weight":0.4}}]],"knows":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":7,"inV":2,"properties":{"@class":"java.util.HashMap","weight":0.5}},{"@class":"java.util.HashMap","id":8,"inV":4,"properties":{"@class":"java.util.HashMap","weight":1.0}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",0],"value":"marko"}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",1],"value":29}]]}}
+{"@class":"java.util.HashMap","id":2,"label":"person","inE":{"@class":"java.util.HashMap","knows":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":7,"outV":1,"properties":{"@class":"java.util.HashMap","weight":0.5}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",2],"value":"vadas"}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",3],"value":27}]]}}
+{"@class":"java.util.HashMap","id":3,"label":"software","inE":{"@class":"java.util.HashMap","created":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":9,"outV":1,"properties":{"@class":"java.util.HashMap","weight":0.4}},{"@class":"java.util.HashMap","id":11,"outV":4,"properties":{"@class":"java.util.HashMap","weight":0.4}},{"@class":"java.util.HashMap","id":12,"outV":6,"properties":{"@class":"java.util.HashMap","weight":0.2}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",4],"value":"lop"}]],"lang":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",5],"value":"java"}]]}}
+{"@class":"java.util.HashMap","id":4,"label":"person","inE":{"@class":"java.util.HashMap","knows":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":8,"outV":1,"properties":{"@class":"java.util.HashMap","weight":1.0}}]]},"outE":{"@class":"java.util.HashMap","created":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":10,"inV":5,"properties":{"@class":"java.util.HashMap","weight":1.0}},{"@class":"java.util.HashMap","id":11,"inV":3,"properties":{"@class":"java.util.HashMap","weight":0.4}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",6],"value":"josh"}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",7],"value":32}]]}}
+{"@class":"java.util.HashMap","id":5,"label":"software","inE":{"@class":"java.util.HashMap","created":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":10,"outV":4,"properties":{"@class":"java.util.HashMap","weight":1.0}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",8],"value":"ripple"}]],"lang":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",9],"value":"java"}]]}}
+{"@class":"java.util.HashMap","id":6,"label":"person","outE":{"@class":"java.util.HashMap","created":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":12,"inV":3,"properties":{"@class":"java.util.HashMap","weight":0.2}}]]},"properties":{"@class":"java.util.HashMap","name":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",10],"value":"peter"}]],"age":["java.util.ArrayList",[{"@class":"java.util.HashMap","id":["java.lang.Long",11],"value":35}]]}}