Fixed license headers on new merge

Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/94f7ea06
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/94f7ea06
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/94f7ea06

Branch: refs/heads/invalid_headers
Commit: 94f7ea06253c5e3fc9bdd0bceafbf0d65ec42618
Parents: b569cd4
Author: Matt Franklin <mfrank...@apache.org>
Authored: Wed Oct 12 14:12:28 2016 -0400
Committer: Matt Franklin <mfrank...@apache.org>
Committed: Wed Oct 12 14:12:28 2016 -0400

----------------------------------------------------------------------
 .../org/apache/streams/util/ComponentUtils.java |  1 -
 .../apache/streams/util/schema/FieldType.java   | 17 +++++++++
 .../apache/streams/util/schema/FieldUtil.java   | 17 +++++++++
 .../apache/streams/util/schema/FileUtil.java    | 17 +++++++++
 .../streams/util/schema/GenerationConfig.java   | 17 +++++++++
 .../org/apache/streams/util/schema/Schema.java  | 17 +++++++++
 .../apache/streams/util/schema/SchemaStore.java | 17 +++++++++
 .../streams/util/schema/SchemaStoreImpl.java    | 17 +++++++++
 .../apache/streams/util/schema/SchemaUtil.java  | 17 +++++++++
 .../org/apache/streams/util/schema/URIUtil.java | 17 +++++++++
 .../util/schema/test/SchemaOrderingTest.java    | 17 +++++++++
 .../util/schema/test/SchemaStoreTest.java       | 17 +++++++++
 .../src/test/resources/activities/post.json     | 10 +++--
 streams-util/src/test/resources/media_link.json | 14 ++++---
 .../src/test/resources/objects/event.json       | 40 ++++++++++++--------
 .../src/test/resources/objects/group.json       | 24 +++++++-----
 .../src/test/resources/objects/issue.json       | 18 +++++----
 .../src/test/resources/objects/note.json        | 16 +++++---
 .../src/test/resources/objects/permission.json  | 22 +++++++----
 .../src/test/resources/objects/place.json       | 10 +++--
 .../src/test/resources/objects/task.json        | 32 +++++++++-------
 .../src/test/resources/objects/video.json       | 16 +++++---
 22 files changed, 312 insertions(+), 78 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/main/java/org/apache/streams/util/ComponentUtils.java
----------------------------------------------------------------------
diff --git 
a/streams-util/src/main/java/org/apache/streams/util/ComponentUtils.java 
b/streams-util/src/main/java/org/apache/streams/util/ComponentUtils.java
index d62182f..6037f28 100644
--- a/streams-util/src/main/java/org/apache/streams/util/ComponentUtils.java
+++ b/streams-util/src/main/java/org/apache/streams/util/ComponentUtils.java
@@ -15,7 +15,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.streams.util;
 
 import org.apache.commons.lang3.StringUtils;

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/main/java/org/apache/streams/util/schema/FieldType.java
----------------------------------------------------------------------
diff --git 
a/streams-util/src/main/java/org/apache/streams/util/schema/FieldType.java 
b/streams-util/src/main/java/org/apache/streams/util/schema/FieldType.java
index 6a2290c..450851e 100644
--- a/streams-util/src/main/java/org/apache/streams/util/schema/FieldType.java
+++ b/streams-util/src/main/java/org/apache/streams/util/schema/FieldType.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.streams.util.schema;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/main/java/org/apache/streams/util/schema/FieldUtil.java
----------------------------------------------------------------------
diff --git 
a/streams-util/src/main/java/org/apache/streams/util/schema/FieldUtil.java 
b/streams-util/src/main/java/org/apache/streams/util/schema/FieldUtil.java
index 20435c9..6582565 100644
--- a/streams-util/src/main/java/org/apache/streams/util/schema/FieldUtil.java
+++ b/streams-util/src/main/java/org/apache/streams/util/schema/FieldUtil.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.streams.util.schema;
 
 import com.fasterxml.jackson.databind.JsonNode;

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/main/java/org/apache/streams/util/schema/FileUtil.java
----------------------------------------------------------------------
diff --git 
a/streams-util/src/main/java/org/apache/streams/util/schema/FileUtil.java 
b/streams-util/src/main/java/org/apache/streams/util/schema/FileUtil.java
index c025513..c51339a 100644
--- a/streams-util/src/main/java/org/apache/streams/util/schema/FileUtil.java
+++ b/streams-util/src/main/java/org/apache/streams/util/schema/FileUtil.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.streams.util.schema;
 
 import com.google.common.base.Preconditions;

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/main/java/org/apache/streams/util/schema/GenerationConfig.java
----------------------------------------------------------------------
diff --git 
a/streams-util/src/main/java/org/apache/streams/util/schema/GenerationConfig.java
 
b/streams-util/src/main/java/org/apache/streams/util/schema/GenerationConfig.java
index d4b2c3f..c48d186 100644
--- 
a/streams-util/src/main/java/org/apache/streams/util/schema/GenerationConfig.java
+++ 
b/streams-util/src/main/java/org/apache/streams/util/schema/GenerationConfig.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.streams.util.schema;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/main/java/org/apache/streams/util/schema/Schema.java
----------------------------------------------------------------------
diff --git 
a/streams-util/src/main/java/org/apache/streams/util/schema/Schema.java 
b/streams-util/src/main/java/org/apache/streams/util/schema/Schema.java
index fc0a3f2..795bf98 100644
--- a/streams-util/src/main/java/org/apache/streams/util/schema/Schema.java
+++ b/streams-util/src/main/java/org/apache/streams/util/schema/Schema.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.streams.util.schema;
 
 import com.fasterxml.jackson.databind.JsonNode;

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/main/java/org/apache/streams/util/schema/SchemaStore.java
----------------------------------------------------------------------
diff --git 
a/streams-util/src/main/java/org/apache/streams/util/schema/SchemaStore.java 
b/streams-util/src/main/java/org/apache/streams/util/schema/SchemaStore.java
index 07e9bef..779df41 100644
--- a/streams-util/src/main/java/org/apache/streams/util/schema/SchemaStore.java
+++ b/streams-util/src/main/java/org/apache/streams/util/schema/SchemaStore.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.streams.util.schema;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/main/java/org/apache/streams/util/schema/SchemaStoreImpl.java
----------------------------------------------------------------------
diff --git 
a/streams-util/src/main/java/org/apache/streams/util/schema/SchemaStoreImpl.java
 
b/streams-util/src/main/java/org/apache/streams/util/schema/SchemaStoreImpl.java
index 9585742..7126c82 100644
--- 
a/streams-util/src/main/java/org/apache/streams/util/schema/SchemaStoreImpl.java
+++ 
b/streams-util/src/main/java/org/apache/streams/util/schema/SchemaStoreImpl.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.streams.util.schema;
 
 import com.fasterxml.jackson.databind.JsonNode;

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/main/java/org/apache/streams/util/schema/SchemaUtil.java
----------------------------------------------------------------------
diff --git 
a/streams-util/src/main/java/org/apache/streams/util/schema/SchemaUtil.java 
b/streams-util/src/main/java/org/apache/streams/util/schema/SchemaUtil.java
index f8b0070..785ec58 100644
--- a/streams-util/src/main/java/org/apache/streams/util/schema/SchemaUtil.java
+++ b/streams-util/src/main/java/org/apache/streams/util/schema/SchemaUtil.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.streams.util.schema;
 
 import com.fasterxml.jackson.databind.JsonNode;

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/main/java/org/apache/streams/util/schema/URIUtil.java
----------------------------------------------------------------------
diff --git 
a/streams-util/src/main/java/org/apache/streams/util/schema/URIUtil.java 
b/streams-util/src/main/java/org/apache/streams/util/schema/URIUtil.java
index af468e3..d645675 100644
--- a/streams-util/src/main/java/org/apache/streams/util/schema/URIUtil.java
+++ b/streams-util/src/main/java/org/apache/streams/util/schema/URIUtil.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.streams.util.schema;
 
 import com.google.common.base.Optional;

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaOrderingTest.java
----------------------------------------------------------------------
diff --git 
a/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaOrderingTest.java
 
b/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaOrderingTest.java
index 6deaa98..7f20024 100644
--- 
a/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaOrderingTest.java
+++ 
b/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaOrderingTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.streams.util.schema.test;
 
 import com.google.common.base.Optional;

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaStoreTest.java
----------------------------------------------------------------------
diff --git 
a/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaStoreTest.java
 
b/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaStoreTest.java
index 6b5e598..1d28350 100644
--- 
a/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaStoreTest.java
+++ 
b/streams-util/src/test/java/org/apache/streams/util/schema/test/SchemaStoreTest.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.streams.util.schema.test;
 
 import org.apache.streams.util.schema.Schema;

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/test/resources/activities/post.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/activities/post.json 
b/streams-util/src/test/resources/activities/post.json
index 73cfff7..fbf2fa8 100644
--- a/streams-util/src/test/resources/activities/post.json
+++ b/streams-util/src/test/resources/activities/post.json
@@ -1,8 +1,12 @@
 {
+  "$license": [
+    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";,
+    "http://www.apache.org/licenses/LICENSE-2.0";
+  ],
   "published": "2011-02-10T15:04:55Z",
   "actor": {
     "url": "http://example.org/martin";,
-    "objectType" : "person",
+    "objectType": "person",
     "id": "tag:example.org,2011:martin",
     "image": {
       "url": "http://example.org/martin/image";,
@@ -12,11 +16,11 @@
     "displayName": "Martin Smith"
   },
   "verb": "post",
-  "object" : {
+  "object": {
     "url": "http://example.org/blog/2011/02/entry";,
     "id": "tag:example.org,2011:abc123/xyz"
   },
-  "target" : {
+  "target": {
     "url": "http://example.org/blog/";,
     "objectType": "blog",
     "id": "tag:example.org,2011:abc123",

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/test/resources/media_link.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/media_link.json 
b/streams-util/src/test/resources/media_link.json
index 739c66b..614be0d 100644
--- a/streams-util/src/test/resources/media_link.json
+++ b/streams-util/src/test/resources/media_link.json
@@ -1,7 +1,11 @@
 {
-    "$schema": 
"http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/media_link.json#";,
-    "duration": 30000,
-    "height": 480,
-    "width": 640,
-    "url": "http://youtube.com/s7hc30sb";
+  "$license": [
+    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";,
+    "http://www.apache.org/licenses/LICENSE-2.0";
+  ],
+  "$schema": 
"http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/media_link.json#";,
+  "duration": 30000,
+  "height": 480,
+  "width": 640,
+  "url": "http://youtube.com/s7hc30sb";
 }

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/test/resources/objects/event.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/objects/event.json 
b/streams-util/src/test/resources/objects/event.json
index ae1108e..3a90ca2 100644
--- a/streams-util/src/test/resources/objects/event.json
+++ b/streams-util/src/test/resources/objects/event.json
@@ -1,18 +1,26 @@
 {
-    "objectType": "event",
-    "displayName": "Meeting with Joe",
-    "startTime": "2012-12-12T12:00:00Z",
-    "endTime: "2012-12-12T13:00:00Z",
-    "invited": {
-      "items": [
-        {"objectType": "person",
-         "displayName": "Joe"}
-      ]
-    },
-    "attending": {
-      "items": [
-        {"objectType": "person",
-         "displayName": "Joe"}
-      ]
-    }
+  "$license": [
+    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";,
+    "http://www.apache.org/licenses/LICENSE-2.0";
+  ],
+  "objectType": "event",
+  "displayName": "Meeting with Joe",
+  "startTime": "2012-12-12T12:00:00Z",
+  "endTime": "2012-12-12T13:00:00Z",
+  "invited": {
+    "items": [
+      {
+        "objectType": "person",
+        "displayName": "Joe"
+      }
+    ]
+  },
+  "attending": {
+    "items": [
+      {
+        "objectType": "person",
+        "displayName": "Joe"
+      }
+    ]
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/test/resources/objects/group.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/objects/group.json 
b/streams-util/src/test/resources/objects/group.json
index 9721874..e25867b 100644
--- a/streams-util/src/test/resources/objects/group.json
+++ b/streams-util/src/test/resources/objects/group.json
@@ -1,16 +1,20 @@
 {
+  "$license": [
+    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";,
+    "http://www.apache.org/licenses/LICENSE-2.0";
+  ],
   "objectType": "group",
   "displayName": "My Work Group",
   "members": {
-       "items": [
-         {
-               "objectType": "person",
-               "displayName": "Laura"
-         },
-         {
-               "objectType": "person",
-               "displayName": "Mark"
-         }
-       ]
+    "items": [
+      {
+        "objectType": "person",
+        "displayName": "Laura"
+      },
+      {
+        "objectType": "person",
+        "displayName": "Mark"
+      }
+    ]
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/test/resources/objects/issue.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/objects/issue.json 
b/streams-util/src/test/resources/objects/issue.json
index 86bc6d2..4dd0226 100644
--- a/streams-util/src/test/resources/objects/issue.json
+++ b/streams-util/src/test/resources/objects/issue.json
@@ -1,9 +1,13 @@
 {
-   "objectType": "issue",
-   "displayName": "Terms of Use Violation",
-   "url": "http://.../terms-of-use";,
-   "types": [
-        "http://example.org/codes/inappropriateMaterial";,
-        "http://example.org/codes/copyrightViolation";
-   ]
+  "$license": [
+    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";,
+    "http://www.apache.org/licenses/LICENSE-2.0";
+  ],
+  "objectType": "issue",
+  "displayName": "Terms of Use Violation",
+  "url": "http://.../terms-of-use";,
+  "types": [
+    "http://example.org/codes/inappropriateMaterial";,
+    "http://example.org/codes/copyrightViolation";
+  ]
 }

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/test/resources/objects/note.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/objects/note.json 
b/streams-util/src/test/resources/objects/note.json
index 15a4495..1cca229 100644
--- a/streams-util/src/test/resources/objects/note.json
+++ b/streams-util/src/test/resources/objects/note.json
@@ -1,12 +1,16 @@
 {
+  "$license": [
+    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";,
+    "http://www.apache.org/licenses/LICENSE-2.0";
+  ],
   "objectType": "note",
   "displayName": "A note with a binary attachment",
   "attachments": [
-       {
-         "objectType": "binary",
-         "data": "dGhpcyBpcyB1bmNvbXByZXNzZWQgZGF0YQo=",
-         "md5": "827ae7e1ab45e4dd591d087c741e5770",
-         "length": 25
-       }
+    {
+      "objectType": "binary",
+      "data": "dGhpcyBpcyB1bmNvbXByZXNzZWQgZGF0YQo=",
+      "md5": "827ae7e1ab45e4dd591d087c741e5770",
+      "length": 25
+    }
   ]
 }

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/test/resources/objects/permission.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/objects/permission.json 
b/streams-util/src/test/resources/objects/permission.json
index 24b6fa2..cb1aab2 100644
--- a/streams-util/src/test/resources/objects/permission.json
+++ b/streams-util/src/test/resources/objects/permission.json
@@ -1,9 +1,17 @@
 {
-    "objectType": "permission",
-    "displayName": "Permission to Edit File: 2Q2014 Sales Forecast.xls",
-    "scope": {
-      "objectType": "file",
-      "displayName": "2Q2014 Sales Forecast.xls"
-    },
-    "actions": ["modify", "delete", "create"]
+  "$license": [
+    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";,
+    "http://www.apache.org/licenses/LICENSE-2.0";
+  ],
+  "objectType": "permission",
+  "displayName": "Permission to Edit File: 2Q2014 Sales Forecast.xls",
+  "scope": {
+    "objectType": "file",
+    "displayName": "2Q2014 Sales Forecast.xls"
+  },
+  "actions": [
+    "modify",
+    "delete",
+    "create"
+  ]
 }

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/test/resources/objects/place.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/objects/place.json 
b/streams-util/src/test/resources/objects/place.json
index 8e454be..ea1ca56 100644
--- a/streams-util/src/test/resources/objects/place.json
+++ b/streams-util/src/test/resources/objects/place.json
@@ -1,9 +1,13 @@
 {
+  "$license": [
+    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";,
+    "http://www.apache.org/licenses/LICENSE-2.0";
+  ],
   "objectType": "place",
   "displayName": "Some Random Location on Earth",
   "position": {
-       "latitude": 34.34,
-       "longitude": -127.23,
-       "altitude": 100.05
+    "latitude": 34.34,
+    "longitude": -127.23,
+    "altitude": 100.05
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/test/resources/objects/task.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/objects/task.json 
b/streams-util/src/test/resources/objects/task.json
index f4878dc..09adf70 100644
--- a/streams-util/src/test/resources/objects/task.json
+++ b/streams-util/src/test/resources/objects/task.json
@@ -1,16 +1,20 @@
 {
-    "objectType": "task",
-    "displayName": "James needs to read the spec",
-    "by": "2012-12-12T12:12:12Z",
-    "verb": "read",
-    "actor": {
-      "objectType": "person",
-      "displayName": "James"
-    },
-    "object": {
-      "objectType": "file",
-      "displayName": "A specification",
-      "url": "http://example.org/spec.html";
-    },
-    "required": true
+  "$license": [
+    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";,
+    "http://www.apache.org/licenses/LICENSE-2.0";
+  ],
+  "objectType": "task",
+  "displayName": "James needs to read the spec",
+  "by": "2012-12-12T12:12:12Z",
+  "verb": "read",
+  "actor": {
+    "objectType": "person",
+    "displayName": "James"
+  },
+  "object": {
+    "objectType": "file",
+    "displayName": "A specification",
+    "url": "http://example.org/spec.html";
+  },
+  "required": true
 }

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/94f7ea06/streams-util/src/test/resources/objects/video.json
----------------------------------------------------------------------
diff --git a/streams-util/src/test/resources/objects/video.json 
b/streams-util/src/test/resources/objects/video.json
index bc19e89..936c316 100644
--- a/streams-util/src/test/resources/objects/video.json
+++ b/streams-util/src/test/resources/objects/video.json
@@ -1,8 +1,12 @@
 {
-    "objectType": "video",
-    "displayName": "Cute little kittens",
-    "embedCode": "<video width="320" height="240" 
controls="controls">...</video>",
-    "stream": {
-      "url": "http://example.org/my_video.mpg";
-    }
+  "$license": [
+    "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0";,
+    "http://www.apache.org/licenses/LICENSE-2.0";
+  ],
+  "objectType": "video",
+  "displayName": "Cute little kittens",
+  "embedCode": "<video width=\"320\" height=\"240\" 
controls=\"controls\">...</video>",
+  "stream": {
+    "url": "http://example.org/my_video.mpg";
+  }
 }

Reply via email to