You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2016/11/11 18:38:16 UTC
[1/7] incubator-streams git commit: Squashed commit of STREAMS-443:
use org.apache.streams.plugins:streams-plugin-pojo instead of
org.jsonschema2pojo
Repository: incubator-streams
Updated Branches:
refs/heads/master 348963471 -> 4f100f3a2
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/test/java/org/w3c/activitystreams/test/SchemaValidationTest.java
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/test/java/org/w3c/activitystreams/test/SchemaValidationTest.java b/streams-schemas/streams-schema-activitystreams/src/test/java/org/w3c/activitystreams/test/SchemaValidationTest.java
new file mode 100644
index 0000000..8f22450
--- /dev/null
+++ b/streams-schemas/streams-schema-activitystreams/src/test/java/org/w3c/activitystreams/test/SchemaValidationTest.java
@@ -0,0 +1,86 @@
+/*
+ * 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
+ * with the License. You may obtain a copy of the License at
+ *
+ * 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.w3c.activitystreams.test;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.networknt.schema.JsonSchema;
+import com.networknt.schema.JsonSchemaFactory;
+import com.networknt.schema.ValidationMessage;
+import org.apache.commons.io.Charsets;
+import org.apache.commons.io.IOUtils;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Set;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+
+public class SchemaValidationTest {
+
+ private final static Logger LOGGER = LoggerFactory.getLogger(SchemaValidationTest.class);
+
+ private final static ObjectMapper MAPPER = new ObjectMapper();
+
+ /**
+ * Tests that activities matching core-ex* can be parsed by apache streams
+ *
+ * @throws Exception
+ */
+ @Test
+ public void validateToSchema() throws Exception {
+
+ JsonSchemaFactory factory = new JsonSchemaFactory();
+
+ InputStream testActivityFolderStream = SchemaValidationTest.class.getClassLoader()
+ .getResourceAsStream("activities");
+ List<String> files = IOUtils.readLines(testActivityFolderStream, Charsets.UTF_8);
+
+ for (String file : files) {
+ if( !file.startsWith(".") ) {
+
+ LOGGER.info("Test File: activities/" + file);
+ String testFileString = new String(Files.readAllBytes(Paths.get("target/test-classes/activities/" + file)));
+ LOGGER.info("Test Document JSON: " + testFileString);
+ JsonNode testNode = MAPPER.readValue(testFileString, ObjectNode.class);
+ LOGGER.info("Test Document Object:" + testNode);
+ LOGGER.info("Test Schema File: " + "target/classes/verbs/" + file);
+ String testSchemaString = new String(Files.readAllBytes(Paths.get("target/classes/verbs/" + file)));
+ LOGGER.info("Test Schema JSON: " + testSchemaString);
+ JsonNode testSchemaNode = MAPPER.readValue(testFileString, ObjectNode.class);
+ LOGGER.info("Test Schema Object:" + testSchemaNode);
+ JsonSchema testSchema = factory.getSchema(testSchemaNode);
+ LOGGER.info("Test Schema:" + testSchema);
+
+ Set<ValidationMessage> errors = testSchema.validate(testNode);
+ assertThat(errors.size(), is(0));
+
+ }
+ }
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-util/pom.xml
----------------------------------------------------------------------
diff --git a/streams-util/pom.xml b/streams-util/pom.xml
index 4e1c849..ecf7dc3 100644
--- a/streams-util/pom.xml
+++ b/streams-util/pom.xml
@@ -54,16 +54,6 @@
<artifactId>joda-time</artifactId>
</dependency>
<dependency>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
@@ -73,18 +63,22 @@
<version>2.1.2</version>
</dependency>
<dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-schema-activitystreams</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>jar</type>
+ <groupId>org.jsonschema2pojo</groupId>
+ <artifactId>jsonschema2pojo-core</artifactId>
+ <version>${jsonschema2pojo.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.streams</groupId>
<artifactId>streams-schema-activitystreams</artifactId>
<version>${project.version}</version>
<scope>test</scope>
- <type>test-jar</type>
+ <type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.streams</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/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 a030bd5..1dce654 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
@@ -60,9 +60,6 @@ public class SchemaStoreTest {
assert( schemaStore.getById(schemaStore.getByUri(file.toURI()).get().getId()).isPresent());
Schema collection = schemaStore.getByUri(file.toURI()).get();
assert( collection.getParent() == null );
- assert( schemaStore.getById(
- URI.create("http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/object.json#"
- )).isPresent());
}
@Test
@@ -75,10 +72,10 @@ public class SchemaStoreTest {
assert( schemaStore.getById(schemaStore.getByUri(file.toURI()).get().getId()).isPresent());
Schema update = schemaStore.getByUri(file.toURI()).get();
assert( update.getParent() != null );
- assert( update.getParent().getId().getScheme().equals("http"));
- assert( update.getParent().getId().getHost().equals("streams.incubator.apache.org"));
- assert( update.getParent().getId().getPath().startsWith("/site/latest/streams-project/streams-schemas"));
- assert( update.getParent().getId().getPath().endsWith("activity.json"));
+ File parentFile = new File("target/test-classes/activitystreams-schemas/activity.json");
+ Schema parent = schemaStore.getByUri(parentFile.toURI()).get();
+ assert( parent != null );
+ assert( update.getParentURI().equals(parent.getURI()));
}
// test create from messed up URI
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-verbs/pom.xml
----------------------------------------------------------------------
diff --git a/streams-verbs/pom.xml b/streams-verbs/pom.xml
index 26d2860..c8f2865 100644
--- a/streams-verbs/pom.xml
+++ b/streams-verbs/pom.xml
@@ -33,13 +33,6 @@
<dependencies>
<dependency>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-core</artifactId>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.streams</groupId>
<artifactId>streams-pojo</artifactId>
</dependency>
@@ -135,6 +128,25 @@
</testResources>
<plugins>
<plugin>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <sourcePaths>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.verbs</targetPackage>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
@@ -146,35 +158,13 @@
</goals>
<configuration>
<sources>
- <source>target/generated-sources/jsonschema2pojo</source>
+ <source>target/generated-sources/pojo</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.verbs</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-verbs/src/test/java/org/apache/streams/verbs/ObjectCombinationSpecificOrderingTest.java
----------------------------------------------------------------------
diff --git a/streams-verbs/src/test/java/org/apache/streams/verbs/ObjectCombinationSpecificOrderingTest.java b/streams-verbs/src/test/java/org/apache/streams/verbs/ObjectCombinationSpecificOrderingTest.java
index 81adc59..3162aa0 100644
--- a/streams-verbs/src/test/java/org/apache/streams/verbs/ObjectCombinationSpecificOrderingTest.java
+++ b/streams-verbs/src/test/java/org/apache/streams/verbs/ObjectCombinationSpecificOrderingTest.java
@@ -20,7 +20,7 @@
package org.apache.streams.verbs;
import org.apache.streams.pojo.json.Activity;
-import org.apache.streams.pojo.json.Actor;
+import org.apache.streams.pojo.json.ActivityObject;
import org.apache.streams.pojo.json.Provider;
import org.junit.Test;
@@ -32,7 +32,7 @@ public class ObjectCombinationSpecificOrderingTest {
@Test
public void compareMatchCountTest() {
- Actor actor = new Actor();
+ ActivityObject actor = new ActivityObject();
actor.setObjectType("actor");
Activity activity = new Activity().withActor(actor);
ObjectCombination combination1 = new ObjectCombination();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTemplateTest.java
----------------------------------------------------------------------
diff --git a/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTemplateTest.java b/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTemplateTest.java
index f59cc36..eeb61f7 100644
--- a/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTemplateTest.java
+++ b/streams-verbs/src/test/java/org/apache/streams/verbs/VerbDefinitionTemplateTest.java
@@ -22,7 +22,6 @@ package org.apache.streams.verbs;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
-import org.apache.streams.pojo.json.Actor;
import org.apache.streams.pojo.json.Provider;
import org.junit.Test;
@@ -50,7 +49,7 @@ public class VerbDefinitionTemplateTest {
*/
@Test
public void testTopField() throws Exception {
- Actor actor = new Actor();
+ ActivityObject actor = new ActivityObject();
actor.setObjectType("page");
actor.setDisplayName("Paige");
Provider provider = new Provider();
[2/7] incubator-streams git commit: Squashed commit of STREAMS-443:
use org.apache.streams.plugins:streams-plugin-pojo instead of
org.jsonschema2pojo
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/at.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/at.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/at.json
index 5086942..649bd28 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/at.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/at.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/at.json#",
+ "id":"#",
"type": "object",
"title": "At",
"description": "Indicates that the actor is currently located at the object. For instance, a person being at a specific physical location.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/attach.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/attach.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/attach.json
index 1bc578c..efc04de 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/attach.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/attach.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/attach.json#",
+ "id":"#",
"type": "object",
"title": "Attach",
"description": "Indicates that the actor has attached the object to the target.For instance, a person attaching a file to a wiki page or an email.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/attend.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/attend.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/attend.json
index b691beb..7b2f32f 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/attend.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/attend.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/attend.json#",
+ "id":"#",
"type": "object",
"title": "Attend",
"description": "Indicates that the actor has attended the object. For instance, a person attending a meeting.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/author.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/author.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/author.json
index 73e1825..60616e5 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/author.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/author.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/author.json#",
+ "id":"#",
"type": "object",
"title": "Author",
"description": "Indicates that the actor has authored the object. Note that this is a more specific form of the verb \"create\".",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/authorize.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/authorize.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/authorize.json
index 5f98fb2..13ebe60 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/authorize.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/authorize.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/authorize.json#",
+ "id":"#",
"type": "object",
"title": "Authorize",
"description": "Indicates that the actor has authorized the object. If a target is specified, it means that the authorization is specifically in regards to the target. For instance, a service can authorize a person to access a given application; in which case the actor is the service, the object is the person, and the target is the application. In contrast, a person can authorize a request; in which case the actor is the person and the object is the request and there might be no explicit target.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/borrow.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/borrow.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/borrow.json
index f43e7cb..59e437e 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/borrow.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/borrow.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/borrow.json#",
+ "id":"#",
"type": "object",
"title": "Borrow",
"description": "Indicates that the actor has borrowed the object. If a target is specified, it identifies the entity from which the object was borrowed. For instance, if a person borrows a book from a library, the person is the actor, the book is the object and the library is the target.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/build.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/build.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/build.json
index da57314..9e6279d 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/build.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/build.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/build.json#",
+ "id":"#",
"type": "object",
"title": "Build",
"description": "Indicates that the actor has built the object. For example, if a person builds a model or compiles code.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/cancel.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/cancel.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/cancel.json
index 90db9df..31290cd 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/cancel.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/cancel.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/cancel.json#",
+ "id":"#",
"type": "object",
"title": "Cancel",
"description": "Indicates that the actor has canceled the object. For instance, canceling a calendar event.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/checkin.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/checkin.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/checkin.json
index 2695b54..f4d1c8f 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/checkin.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/checkin.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/checkin.json#",
+ "id":"#",
"type": "object",
"title": "checkin",
"description": "Indicates that the actor has checked-in to the object. For instance, a person checking-in to a Place.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/close.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/close.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/close.json
index fa97fb8..7726572 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/close.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/close.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/close.json#",
+ "id":"#",
"type": "object",
"title": "Close",
"description": "Indicates that the actor has closed the object. For instance, the object could represent a ticket being tracked in an issue management system.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/complete.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/complete.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/complete.json
index f7a704d..a360f93 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/complete.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/complete.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/complete.json#",
+ "id":"#",
"type": "object",
"title": "Complete",
"description": "Indicates that the actor has completed the object",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/confirm.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/confirm.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/confirm.json
index 0af2167..28975d9 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/confirm.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/confirm.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/confirm.json#",
+ "id":"#",
"type": "object",
"title": "Confirm",
"description": "Indicates that the actor has confirmed or agrees with the object. For instance, a software developer might confirm an issue reported against a product.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/consume.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/consume.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/consume.json
index fd4ede5..89890af 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/consume.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/consume.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/consume.json#",
+ "id":"#",
"type": "object",
"title": "Consume",
"description": "Indicates that the actor has consumed the object. The specific meaning is dependent largely on the object's type. For instance, an actor may \"consume\" an audio object, indicating that the actor has listened to it; or an actor may \"consume\" a book, indicating that the book has been read. As such, the \"consume\" verb is a more generic form of other more specific verbs such as \"read\" and \"play\".",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/create.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/create.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/create.json
index 14ac78f..f7b7e4d 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/create.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/create.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/create.json#",
+ "id":"#",
"type": "object",
"title": "Create",
"description": "Indicates that the actor has created the object.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/delete.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/delete.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/delete.json
index 7545781..6bbf2ae 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/delete.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/delete.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/delete.json#",
+ "id":"#",
"type": "object",
"title": "Delete",
"description": "Indicates that the actor has deleted the object.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/deliver.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/deliver.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/deliver.json
index 282c2a3..d0266fd 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/deliver.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/deliver.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/deliver.json#",
+ "id":"#",
"type": "object",
"title": "Deliver",
"description": "Indicates that the actor has delivered the object. For example, delivering a package.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/deny.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/deny.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/deny.json
index b79dfd8..20b0255 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/deny.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/deny.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/deny.json#",
+ "id":"#",
"type": "object",
"title": "Deny",
"description": "Indicates that the actor has denied the object. For example, a manager may deny a travel request.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/disagree.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/disagree.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/disagree.json
index 292fdb2..84a006a 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/disagree.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/disagree.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/disagree.json#",
+ "id":"#",
"type": "object",
"title": "Disagree",
"description": "Indicates that the actor disagrees with the object.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/dislike.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/dislike.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/dislike.json
index 2a1038d..dc7859d 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/dislike.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/dislike.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/dislike.json#",
+ "id":"#",
"type": "object",
"title": "Dislike",
"description": "Indicates that the actor dislikes the object. Note that the \"dislike\" verb is distinct from the \"unlike\" verb which assumes that the object had been previously \"liked\".",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/experience.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/experience.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/experience.json
index d35e75b..0423cc0 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/experience.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/experience.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/experience.json#",
+ "id":"#",
"type": "object",
"title": "Experience",
"description": "Indicates that the actor has experienced the object in some manner. Note that, depending on the specific object types used for both the actor and object, the meaning of this verb can overlap that of the \"consume\" and \"play\" verbs. For instance, a person might \"experience\" a movie; or \"play\" the movie; or \"consume\" the movie. The \"experience\" verb can be considered a more generic form of other more specific verbs as \"consume\", \"play\", \"watch\", \"listen\", and \"read\"",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/favorite.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/favorite.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/favorite.json
index 12385a4..96d2d16 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/favorite.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/favorite.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/favorite.json#",
+ "id":"#",
"type": "object",
"title": "Favorite",
"description": "Indicates that the actor marked the object as an item of special interest.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/find.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/find.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/find.json
index e1e4937..341162f 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/find.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/find.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/find.json#",
+ "id":"#",
"type": "object",
"title": "Find",
"description": "Indicates that the actor has found the object.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/flag-as-inappropriate.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/flag-as-inappropriate.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/flag-as-inappropriate.json
index 550a8d6..dfb0233 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/flag-as-inappropriate.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/flag-as-inappropriate.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/flag-as-inappropriate.json#",
+ "id":"#",
"type": "object",
"title": "Flag-As-Inappropriate",
"description": "Indicates that the actor has flagged the object as being inappropriate for some reason. When using this verb, the context property can be used to provide additional detail about why the object has been flagged.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/follow.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/follow.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/follow.json
index e84332f..6e68039 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/follow.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/follow.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/follow.json#",
+ "id":"#",
"type": "object",
"title": "Follow",
"description": "Indicates that the actor began following the activity of the object. In most cases, the objectType will be a \"person\", but it can potentially be of any type that can sensibly generate activity. Processors MAY ignore (silently drop) successive identical \"follow\" activities.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/give.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/give.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/give.json
index 6db134c..93da44c 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/give.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/give.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/give.json#",
+ "id":"#",
"type": "object",
"title": "Give",
"description": "Indicates that the actor is giving an object to the target. Examples include one person giving a badge object to another person. The object identifies the object being given. The target identifies the receiver.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/host.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/host.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/host.json
index fe47e77..165a8d5 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/host.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/host.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/host.json#",
+ "id":"#",
"type": "object",
"title": "Host",
"description": "Indicates that the actor is hosting the object. As in hosting an event, or hosting a service.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/ignore.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/ignore.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/ignore.json
index ccb5bbc..f023e7a 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/ignore.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/ignore.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/ignore.json#",
+ "id":"#",
"type": "object",
"title": "Ignore",
"description": "Indicates that the actor has ignored the object. For instance, this verb may be used when an actor has ignored a friend request, in which case the object may be the request-friend activity.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/insert.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/insert.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/insert.json
index d083c5d..407bdaa 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/insert.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/insert.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/insert.json#",
+ "id":"#",
"type": "object",
"title": "Insert",
"description": "Indicates that the actor has inserted the object into the target.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/install.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/install.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/install.json
index 9748f2d..01827e3 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/install.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/install.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/install.json#",
+ "id":"#",
"type": "object",
"title": "Install",
"description": "Indicates that the actor has installed the object, as in installing an application.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/interact.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/interact.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/interact.json
index a042a03..2e74e40 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/interact.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/interact.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/interact.json#",
+ "id":"#",
"type": "object",
"title": "Interact",
"description": "Indicates that the actor has interacted with the object. For instance, when one person interacts with another.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/invite.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/invite.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/invite.json
index 2fba0ba..825920e 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/invite.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/invite.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/invite.json#",
+ "id":"#",
"type": "object",
"title": "Invite",
"description": "Indicates that the actor has invited the object, typically a person object, to join or participate in the object described by the target. The target could, for instance, be an event, group or a service.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/join.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/join.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/join.json
index 4e09653..347bb41 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/join.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/join.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/join.json#",
+ "id":"#",
"type": "object",
"title": "Join",
"description": "Indicates that the actor has become a member of the object.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/leave.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/leave.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/leave.json
index 65e1a7b..78311fb 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/leave.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/leave.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/leave.json#",
+ "id":"#",
"type": "object",
"title": "Leave",
"description": "Indicates that the actor has left the object. For instance, a Person leaving a Group or checking-out of a Place.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/like.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/like.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/like.json
index 1bd009f..056bd0e 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/like.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/like.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/like.json#",
+ "id":"#",
"type": "object",
"title": "Like",
"description": "Indicates that the actor marked the object as an item of special interest.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/listen.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/listen.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/listen.json
index 589eefe..121e3c9 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/listen.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/listen.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/listen.json#",
+ "id":"#",
"type": "object",
"title": "Listen",
"description": "Indicates that the actor has listened to the object. This is typically only applicable for objects representing audio content, such as music, an audio-book, or a radio broadcast.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/lose.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/lose.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/lose.json
index 3f4d2ba..7b36c11 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/lose.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/lose.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/lose.json#",
+ "id":"#",
"type": "object",
"title": "Lose",
"description": "Indicates that the actor has lost the object. For instance, if a person loses a game.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/make-friend.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/make-friend.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/make-friend.json
index dcc10c0..ec9fca9 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/make-friend.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/make-friend.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/make-friend.json#",
+ "id":"#",
"type": "object",
"title": "Befriend",
"description": "Indicates the creation of a friendship that is reciprocated by the object.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/open.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/open.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/open.json
index d92d96f..77945aa 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/open.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/open.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/open.json#",
+ "id":"#",
"type": "object",
"title": "Open",
"description": "Indicates that the actor has opened the object. For instance, the object could represent a ticket being tracked in an issue management system.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/play.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/play.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/play.json
index 94a7aba..f4c9c6a 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/play.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/play.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/play.json#",
+ "id":"#",
"type": "object",
"title": "Play",
"description": "Indicates that the actor spent some time enjoying the object. For example, if the object is a video this indicates that the subject watched all or part of the video.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/post.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/post.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/post.json
index 03eb33e..44f9f6c 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/post.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/post.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/post.json#",
+ "id":"#",
"type": "object",
"title": "Post",
"description": "To publish an object",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/present.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/present.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/present.json
index b0f968e..266d228 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/present.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/present.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/present.json#",
+ "id":"#",
"type": "object",
"title": "Present",
"description": "Indicates that the actor has presented the object. For instance, when a person gives a presentation at a conference.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/purchase.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/purchase.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/purchase.json
index d31db8b..3d68273 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/purchase.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/purchase.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/purchase.json#",
+ "id":"#",
"type": "object",
"title": "Purchase",
"description": "Indicates that the actor has purchased the object. If a target is specified, in indicates the entity from which the object was purchased.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/qualify.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/qualify.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/qualify.json
index 6a135d3..b23b851 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/qualify.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/qualify.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/qualify.json#",
+ "id":"#",
"type": "object",
"title": "Qualify",
"description": "Indicates that the actor has qualified for the object. If a target is specified, it indicates the context within which the qualification applies.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/read.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/read.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/read.json
index 95aee49..1e2b30a 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/read.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/read.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/read.json#",
+ "id":"#",
"type": "object",
"title": "Read",
"description": "Indicates that the actor read the object. This is typically only applicable for objects representing printed or written content, such as a book, a message or a comment.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/receive.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/receive.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/receive.json
index 3837619..b636d97 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/receive.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/receive.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/receive.json#",
+ "id":"#",
"type": "object",
"title": "Receive",
"description": "Indicates that the actor is receiving an object. Examples include a person receiving a badge object. The object identifies the object being received.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/reject.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/reject.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/reject.json
index 4ccca93..dae5409 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/reject.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/reject.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/reject.json#",
+ "id":"#",
"type": "object",
"title": "Reject",
"description": "Indicates that the actor has rejected the object.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/remove-friend.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/remove-friend.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/remove-friend.json
index 41d0966..7eaff1c 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/remove-friend.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/remove-friend.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/remove-friend.json#",
+ "id":"#",
"type": "object",
"title": "UnFriend",
"description": "Indicates that the actor has removed the object from the collection of friends.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/remove.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/remove.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/remove.json
index 49e3fd3..affbb3c 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/remove.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/remove.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/remove.json#",
+ "id":"#",
"type": "object",
"title": "Remove",
"description": "Indicates that the actor has removed the object from the target.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/replace.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/replace.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/replace.json
index e324d0d..2df0da5 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/replace.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/replace.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/replace.json#",
+ "id":"#",
"type": "object",
"title": "Replace",
"description": "Indicates that the actor has replaced the target with the object.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/request-friend.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/request-friend.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/request-friend.json
index c0af949..fd6b870 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/request-friend.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/request-friend.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/request-friend.json#",
+ "id":"#",
"type": "object",
"title": "RequestFriend",
"description": "Indicates the creation of a friendship that has not yet been reciprocated by the object.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/request.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/request.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/request.json
index 6d22d96..e03f0fe 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/request.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/request.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/request.json#",
+ "id":"#",
"type": "object",
"title": "Request",
"description": "Indicates that the actor has requested the object. If a target is specified, it indicates the entity from which the object is being requested.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/resolve.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/resolve.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/resolve.json
index 06c54c6..db93a36 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/resolve.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/resolve.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/resolve.json#",
+ "id":"#",
"type": "object",
"title": "Resolve",
"description": "Indicates that the actor has resolved the object. For instance, the object could represent a ticket being tracked in an issue management system.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/retract.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/retract.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/retract.json
index d369bad..c41d7ad 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/retract.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/retract.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/retract.json#",
+ "id":"#",
"type": "object",
"title": "Retract",
"description": "Indicates that the actor has retracted the object. For instance, if an actor wishes to retract a previously published activity, the object would be the previously published activity that is being retracted.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/return.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/return.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/return.json
index ce28b48..77cb31e 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/return.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/return.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/return.json#",
+ "id":"#",
"type": "object",
"title": "Return",
"description": "Indicates that the actor has returned the object. If a target is specified, it indicates the entity to which the object was returned.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/rsvp-maybe.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/rsvp-maybe.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/rsvp-maybe.json
index 42999b0..c7219d1 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/rsvp-maybe.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/rsvp-maybe.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/rsvp-maybe.json#",
+ "id":"#",
"type": "object",
"title": "Rsvp Maybe",
"description": "To indicate that the actor may attend an event",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/rsvp-no.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/rsvp-no.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/rsvp-no.json
index 4f798f5..c06537f 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/rsvp-no.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/rsvp-no.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/rsvp-no.json#",
+ "id":"#",
"type": "object",
"title": "Rsvp No",
"description": "To indicate that the actor will not attend an event",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/rsvp-yes.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/rsvp-yes.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/rsvp-yes.json
index 51cf299..f1a57a1 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/rsvp-yes.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/rsvp-yes.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/rsvp-yes.json#",
+ "id":"#",
"type": "object",
"title": "Rsvp Yes",
"description": "To indicate that the actor will attend an event",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/satisfy.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/satisfy.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/satisfy.json
index a7e811f..8d141e1 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/satisfy.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/satisfy.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/satisfy.json#",
+ "id":"#",
"type": "object",
"title": "Satisfy",
"description": "Indicates that the actor has satisfied the object. If a target is specified, it indicate the context within which the object was satisfied. For instance, if a person satisfies the requirements for a particular challenge, the person is the actor; the requirement is the object; and the challenge is the target.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/save.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/save.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/save.json
index a7f7eaa..9d22cb9 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/save.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/save.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/save.json#",
+ "id":"#",
"type": "object",
"title": "Save",
"description": "Indicates that the actor has called out the object as being of interest primarily to him- or herself. Though this action MAY be shared publicly, the implication is that the object has been saved primarily for the actor's own benefit rather than to show it to others as would be indicated by the \"share\" verb.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/schedule.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/schedule.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/schedule.json
index 603ba7d..dd97a1d 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/schedule.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/schedule.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/schedule.json#",
+ "id":"#",
"type": "object",
"title": "Schedule",
"description": "Indicates that the actor has scheduled the object. For instance, scheduling a meeting.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/search.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/search.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/search.json
index 979f89c..a88296a 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/search.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/search.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/search.json#",
+ "id":"#",
"type": "object",
"title": "Search",
"description": "Indicates that the actor is or has searched for the object. If a target is specified, it indicates the context within which the search is or has been conducted.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/sell.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/sell.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/sell.json
index e43e7e3..1863c8f 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/sell.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/sell.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/sell.json#",
+ "id":"#",
"type": "object",
"title": "Sell",
"description": "Indicates that the actor has sold the object. If a target is specified, it indicates the entity to which the object was sold.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/send.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/send.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/send.json
index 9977571..915e32c 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/send.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/send.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/send.json#",
+ "id":"#",
"type": "object",
"title": "Send",
"description": "Indicates that the actor has sent the object to the target.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/share.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/share.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/share.json
index 7f5930f..6452858 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/share.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/share.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/share.json#",
+ "id":"#",
"type": "object",
"title": "Share",
"description": "To share an object.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/sponsor.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/sponsor.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/sponsor.json
index a9fead9..0ed2a75 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/sponsor.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/sponsor.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/sponsor.json#",
+ "id":"#",
"type": "object",
"title": "Sponsor",
"description": "Indicates that the actor has sponsored the object. If a target is specified, it indicates the context within which the sponsorship is offered. For instance, a company can sponsor an event; or an individual can sponsor a project; etc.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/start.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/start.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/start.json
index bf93396..64c5321 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/start.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/start.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/start.json#",
+ "id":"#",
"type": "object",
"title": "Start",
"description": "Indicates that the actor has started the object. For instance, when a person starts a project.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/stop-following.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/stop-following.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/stop-following.json
index 5989aca..da3e607 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/stop-following.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/stop-following.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/stop-following.json#",
+ "id":"#",
"type": "object",
"title": "UnFollow",
"description": "Indicates that the actor has stopped following the object.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/submit.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/submit.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/submit.json
index 1fef2e0..66d7f8d 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/submit.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/submit.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/submit.json#",
+ "id":"#",
"type": "object",
"title": "Submit",
"description": "Indicates that the actor has submitted the object. If a target is specified, it indicates the entity to which the object was submitted.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/tag.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/tag.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/tag.json
index 914fca4..b2bda80 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/tag.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/tag.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/tag.json#",
+ "id":"#",
"type": "object",
"title": "Tag",
"description": "Indicates that the actor has associated the object with the target. For example, if the actor specifies that a particular user appears in a photo. the object is the user and the target is the photo.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/terminate.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/terminate.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/terminate.json
index 53af5c6..10cfc12 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/terminate.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/terminate.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/terminate.json#",
+ "id":"#",
"type": "object",
"title": "Terminate",
"description": "Indicates that the actor has terminated the object.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/tie.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/tie.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/tie.json
index 0e22af9..2346a8b 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/tie.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/tie.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/tie.json#",
+ "id":"#",
"type": "object",
"title": "Tie",
"description": "Indicates that the actor has neither won or lost the object. This verb is generally only applicable when the object represents some form of competition, such as a game.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unfavorite.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unfavorite.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unfavorite.json
index 3a66f18..d5b2546 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unfavorite.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unfavorite.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/unfavorite.json#",
+ "id":"#",
"type": "object",
"title": "UnFavorite",
"description": "Indicates that the actor has removed the object from the collection of favorited items.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unlike.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unlike.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unlike.json
index 288673a..2533378 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unlike.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unlike.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/unlike.json#",
+ "id":"#",
"type": "object",
"title": "UnLike",
"description": "Indicates that the actor has removed the object from the collection of liked items.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unsatisfy.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unsatisfy.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unsatisfy.json
index d0a3f05..51fb82b 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unsatisfy.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unsatisfy.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/unsatisfy.json#",
+ "id":"#",
"type": "object",
"title": "UnSatisfy",
"description": "Indicates that the actor has not satisfied the object. If a target is specified, it indicates the context within which the object was not satisfied. For instance, if a person fails to satisfy the requirements of some particular challenge, the person is the actor; the requirement is the object and the challenge is the target.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unsave.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unsave.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unsave.json
index 1519023..d5086cb 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unsave.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unsave.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/unsave.json#",
+ "id":"#",
"type": "object",
"title": "UnSave",
"description": "Indicates that the actor has removed the object from the collection of saved items.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unshare.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unshare.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unshare.json
index 018c4fd..a2b853d 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unshare.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/unshare.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/unshare.json#",
+ "id":"#",
"type": "object",
"title": "UnSave",
"description": "Indicates that the actor is no longer sharing the object. If a target is specified, it indicates the entity with whom the object is no longer being shared.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/update.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/update.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/update.json
index bc6b828..bba9368 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/update.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/update.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/update.json#",
+ "id":"#",
"type": "object",
"title": "Update",
"description": "The \"update\" verb indicates that the actor has modified the object. Use of the \"update\" verb is generally reserved to indicate modifications to existing objects or data such as changing an existing user's profile information.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/use.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/use.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/use.json
index eff4113..69201f2 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/use.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/use.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/use.json#",
+ "id":"#",
"type": "object",
"title": "Use",
"description": "Indicates that the actor has used the object in some manner.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/watch.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/watch.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/watch.json
index bf49609..b8c4f34 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/watch.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/watch.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/watch.json#",
+ "id":"#",
"type": "object",
"title": "Watch",
"description": "Indicates that the actor has watched the object. This verb is typically applicable only when the object represents dynamic, visible content such as a movie, a television show or a public performance.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/win.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/win.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/win.json
index dc182ec..57ef70b 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/win.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/win.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/win.json#",
+ "id":"#",
"type": "object",
"title": "Win",
"description": "Indicates that the actor has won the object. For instance, if a person wins a game.",
[7/7] incubator-streams git commit: Squashed commit of STREAMS-443:
use org.apache.streams.plugins:streams-plugin-pojo instead of
org.jsonschema2pojo
Posted by sb...@apache.org.
Squashed commit of STREAMS-443: use org.apache.streams.plugins:streams-plugin-pojo instead of org.jsonschema2pojo
commit a4b762d846d6fccdd54854b55a928b9dc0787d49
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
Date: Sat Nov 5 16:25:11 2016 -0500
STREAMS-443: re-enable streams-runtime-dropwizard
commit 137cbef42caeb49ddfbb006dce5089e203fecf4a
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
Date: Sat Nov 5 15:09:34 2016 -0500
STREAMS-443: use org.apache.streams.plugins:streams-plugin-pojo instead of org.jsonschema2pojo
Adapt to loss of Actor object using new plugin
Actor should not really be a distinct class from ActivityObject, because it doesn\u2019t have any differentiated fields or validation rules.
A few tests needed a bit more attention - all still pass and apply the original material criteria.
commit dc109b8d7432e406c288fc95228915153453453e
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
Date: Sat Nov 5 15:01:57 2016 -0500
STREAMS-443: changes to project poms and json schemas
commit 77d4990ec098226f15d73b1bc5018f7808265346
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
Date: Sat Nov 5 15:00:25 2016 -0500
STREAMS-443: streams-plugin-pojo working as expected
commit 09bfe75feefe4dd966357270e2dec2c233fc3437
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
Date: Sat Nov 5 15:00:07 2016 -0500
STREAMS-443: confirm test data matches official jsonschemas
commit f61b768bd468a13b7b32a318a1995c116ae7da52
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
Date: Sat Nov 5 14:55:51 2016 -0500
STREAMS-443: configure underlying plugin
commit f29e4c1d22c9dedb66ee448de4a3fc8dad9ee985
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
Date: Sat Nov 5 14:54:24 2016 -0500
remove full URL from schema id
they are unnecessary and complicate testing SchemaStore and code gen plugins
commit 3c8254b7ec8277ced0b27b0ede361578bfbfaefd
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
Date: Sat Nov 5 14:52:47 2016 -0500
STREAMS-443: also remove unused AS 1.0 XML schemas
commit 7269dffd7eb8a269b60d816f2fc4e157ae013bb5
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
Date: Sat Nov 5 14:52:23 2016 -0500
STREAMS-443: remove duplicate json schemas from streams-pojo
remove now duplicated json schemas from streams-pojo
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/4f100f3a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/4f100f3a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/4f100f3a
Branch: refs/heads/master
Commit: 4f100f3a2e97ddc512a9d745b999625602ad274e
Parents: 3489634
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
Authored: Fri Nov 11 12:37:56 2016 -0600
Committer: Steve Blackmon @steveblackmon <sb...@apache.org>
Committed: Fri Nov 11 12:37:56 2016 -0600
----------------------------------------------------------------------
pom.xml | 2 +-
streams-components/streams-converters/pom.xml | 68 +++++----
.../converter/ActivityObjectConverterUtil.java | 72 ++++++----
...ActivityConverterProcessorConfiguration.json | 8 +-
streams-components/streams-http/pom.xml | 69 ++++-----
streams-config/pom.xml | 69 +++++----
.../streams-persist-kinesis/pom.xml | 43 +++---
.../streams-persist-s3/pom.xml | 46 +++---
.../streams-persist-elasticsearch/pom.xml | 62 +++------
.../test/ElasticsearchPersistUpdaterIT.java | 4 +-
.../streams-persist-filebuffer/pom.xml | 43 +++---
streams-contrib/streams-persist-graph/pom.xml | 50 ++++---
.../streams/graph/GraphHttpPersistWriter.java | 3 +-
.../graph/test/TestCypherQueryGraphHelper.java | 13 +-
streams-contrib/streams-persist-hbase/pom.xml | 43 +++---
streams-contrib/streams-persist-hdfs/pom.xml | 51 ++++---
streams-contrib/streams-persist-kafka/pom.xml | 43 +++---
streams-contrib/streams-persist-mongo/pom.xml | 43 +++---
.../streams-processor-peoplepattern/pom.xml | 7 +-
.../peoplepattern/AccountTypeProcessor.java | 6 +-
.../peoplepattern/DemographicsProcessor.java | 6 +-
streams-contrib/streams-processor-urls/pom.xml | 57 +++-----
.../streams-provider-facebook/pom.xml | 69 +++------
.../serializer/FacebookActivityUtil.java | 17 ++-
.../FacebookStreamsPostSerializer.java | 6 +-
.../google-gmail/pom.xml | 47 +++----
.../GMailMessageActivitySerializer.java | 3 +-
.../google-gplus/pom.xml | 47 +++----
.../serializer/util/GooglePlusActivityUtil.java | 13 +-
.../google/gplus/GooglePlusPersonSerDeIT.java | 4 +-
.../processor/GooglePlusActivitySerDeIT.java | 4 +-
.../streams-provider-instagram/pom.xml | 48 +++----
.../serializer/util/InstagramActivityUtil.java | 9 +-
.../streams-provider-moreover/pom.xml | 74 ++++------
.../apache/streams/moreover/MoreoverUtils.java | 5 +-
streams-contrib/streams-provider-rss/pom.xml | 47 +++----
.../serializer/SyndEntryActivitySerializer.java | 7 +-
.../rss/test/SyndEntryActivitySerializerIT.java | 4 +-
.../streams-provider-sysomos/pom.xml | 77 +++++-----
.../SysomosBeatActivityConverter.java | 5 +-
.../streams-provider-twitter/pom.xml | 47 +++----
...terJsonUserstreameventActivityConverter.java | 5 +-
.../converter/util/TwitterActivityUtil.java | 17 ++-
.../TwitterActivityObjectsConvertersTest.java | 13 +-
.../streams-provider-youtube/pom.xml | 41 ++++--
.../youtube/serializer/YoutubeActivityUtil.java | 11 +-
.../serializer/YoutubeVideoSerDeTest.java | 3 +-
streams-monitoring/pom.xml | 50 +++++--
.../jackson/MemoryUsageDeserializerTest.java | 2 +-
streams-plugins/pom.xml | 1 +
.../streams-plugin-cassandra/pom.xml | 7 +-
.../streams-plugin-elasticsearch/pom.xml | 7 +-
streams-plugins/streams-plugin-hbase/pom.xml | 7 +-
streams-plugins/streams-plugin-hive/pom.xml | 7 +-
streams-plugins/streams-plugin-pig/pom.xml | 7 +-
streams-plugins/streams-plugin-pojo/pom.xml | 31 +----
.../plugins/StreamsPojoGenerationConfig.java | 35 +++++
.../test/StreamsPojoSourceGeneratorTest.java | 1 -
.../test/resources/streams-plugin-pojo/pom.xml | 12 +-
streams-plugins/streams-plugin-scala/pom.xml | 11 +-
.../test/StreamsScalaSourceGeneratorTest.java | 36 ++---
streams-pojo/pom.xml | 139 ++++++++++---------
streams-pojo/src/main/jsonschema/activity.json | 119 ----------------
.../src/main/jsonschema/collection.json | 48 -------
.../src/main/jsonschema/media_link.json | 35 -----
streams-pojo/src/main/jsonschema/object.json | 100 -------------
.../src/main/jsonschema/objectTypes/alert.json | 19 ---
.../jsonschema/objectTypes/application.json | 19 ---
.../main/jsonschema/objectTypes/article.json | 19 ---
.../src/main/jsonschema/objectTypes/audio.json | 19 ---
.../src/main/jsonschema/objectTypes/badge.json | 19 ---
.../src/main/jsonschema/objectTypes/binary.json | 19 ---
.../main/jsonschema/objectTypes/bookmark.json | 19 ---
.../main/jsonschema/objectTypes/comment.json | 19 ---
.../src/main/jsonschema/objectTypes/device.json | 19 ---
.../src/main/jsonschema/objectTypes/event.json | 51 -------
.../src/main/jsonschema/objectTypes/file.json | 25 ----
.../src/main/jsonschema/objectTypes/folder.json | 19 ---
.../src/main/jsonschema/objectTypes/game.json | 19 ---
.../src/main/jsonschema/objectTypes/group.json | 19 ---
.../src/main/jsonschema/objectTypes/image.json | 22 ---
.../src/main/jsonschema/objectTypes/issue.json | 25 ----
.../src/main/jsonschema/objectTypes/job.json | 19 ---
.../src/main/jsonschema/objectTypes/list.json | 28 ----
.../src/main/jsonschema/objectTypes/note.json | 19 ---
.../src/main/jsonschema/objectTypes/offer.json | 19 ---
.../jsonschema/objectTypes/organization.json | 19 ---
.../src/main/jsonschema/objectTypes/page.json | 19 ---
.../main/jsonschema/objectTypes/permission.json | 36 -----
.../src/main/jsonschema/objectTypes/person.json | 25 ----
.../jsonschema/objectTypes/photo-album.json | 19 ---
.../src/main/jsonschema/objectTypes/photo.json | 23 ---
.../src/main/jsonschema/objectTypes/place.json | 43 ------
.../main/jsonschema/objectTypes/playlist.json | 19 ---
.../main/jsonschema/objectTypes/process.json | 19 ---
.../main/jsonschema/objectTypes/product.json | 25 ----
.../main/jsonschema/objectTypes/property.json | 48 -------
.../main/jsonschema/objectTypes/question.json | 28 ----
.../src/main/jsonschema/objectTypes/review.json | 22 ---
.../src/main/jsonschema/objectTypes/role.json | 25 ----
.../main/jsonschema/objectTypes/service.json | 19 ---
.../src/main/jsonschema/objectTypes/song.json | 19 ---
.../src/main/jsonschema/objectTypes/status.json | 19 ---
.../src/main/jsonschema/objectTypes/task.json | 44 ------
.../src/main/jsonschema/objectTypes/team.json | 19 ---
.../src/main/jsonschema/objectTypes/video.json | 19 ---
.../src/main/jsonschema/verbs/accept.json | 24 ----
.../src/main/jsonschema/verbs/access.json | 24 ----
.../src/main/jsonschema/verbs/acknowledge.json | 24 ----
streams-pojo/src/main/jsonschema/verbs/add.json | 24 ----
.../src/main/jsonschema/verbs/agree.json | 24 ----
.../src/main/jsonschema/verbs/append.json | 24 ----
.../src/main/jsonschema/verbs/approve.json | 24 ----
.../src/main/jsonschema/verbs/archive.json | 24 ----
.../src/main/jsonschema/verbs/assign.json | 24 ----
streams-pojo/src/main/jsonschema/verbs/at.json | 24 ----
.../src/main/jsonschema/verbs/attach.json | 24 ----
.../src/main/jsonschema/verbs/attend.json | 24 ----
.../src/main/jsonschema/verbs/author.json | 24 ----
.../src/main/jsonschema/verbs/authorize.json | 24 ----
.../src/main/jsonschema/verbs/borrow.json | 24 ----
.../src/main/jsonschema/verbs/build.json | 24 ----
.../src/main/jsonschema/verbs/cancel.json | 24 ----
.../src/main/jsonschema/verbs/checkin.json | 24 ----
.../src/main/jsonschema/verbs/close.json | 24 ----
.../src/main/jsonschema/verbs/complete.json | 24 ----
.../src/main/jsonschema/verbs/confirm.json | 24 ----
.../src/main/jsonschema/verbs/consume.json | 24 ----
.../src/main/jsonschema/verbs/create.json | 24 ----
.../src/main/jsonschema/verbs/delete.json | 24 ----
.../src/main/jsonschema/verbs/deliver.json | 24 ----
.../src/main/jsonschema/verbs/deny.json | 24 ----
.../src/main/jsonschema/verbs/disagree.json | 24 ----
.../src/main/jsonschema/verbs/dislike.json | 24 ----
.../src/main/jsonschema/verbs/experience.json | 24 ----
.../src/main/jsonschema/verbs/favorite.json | 24 ----
.../src/main/jsonschema/verbs/find.json | 24 ----
.../jsonschema/verbs/flag-as-inappropriate.json | 24 ----
.../src/main/jsonschema/verbs/follow.json | 24 ----
.../src/main/jsonschema/verbs/give.json | 24 ----
.../src/main/jsonschema/verbs/host.json | 24 ----
.../src/main/jsonschema/verbs/ignore.json | 24 ----
.../src/main/jsonschema/verbs/insert.json | 24 ----
.../src/main/jsonschema/verbs/install.json | 24 ----
.../src/main/jsonschema/verbs/interact.json | 24 ----
.../src/main/jsonschema/verbs/invite.json | 24 ----
.../src/main/jsonschema/verbs/join.json | 24 ----
.../src/main/jsonschema/verbs/leave.json | 24 ----
.../src/main/jsonschema/verbs/like.json | 24 ----
.../src/main/jsonschema/verbs/listen.json | 24 ----
.../src/main/jsonschema/verbs/lose.json | 24 ----
.../src/main/jsonschema/verbs/make-friend.json | 24 ----
.../src/main/jsonschema/verbs/open.json | 24 ----
.../src/main/jsonschema/verbs/play.json | 24 ----
.../src/main/jsonschema/verbs/post.json | 24 ----
.../src/main/jsonschema/verbs/present.json | 24 ----
.../src/main/jsonschema/verbs/purchase.json | 24 ----
.../src/main/jsonschema/verbs/qualify.json | 24 ----
.../src/main/jsonschema/verbs/read.json | 24 ----
.../src/main/jsonschema/verbs/receive.json | 24 ----
.../src/main/jsonschema/verbs/reject.json | 24 ----
.../main/jsonschema/verbs/remove-friend.json | 24 ----
.../src/main/jsonschema/verbs/remove.json | 24 ----
.../src/main/jsonschema/verbs/replace.json | 24 ----
.../main/jsonschema/verbs/request-friend.json | 24 ----
.../src/main/jsonschema/verbs/request.json | 24 ----
.../src/main/jsonschema/verbs/resolve.json | 24 ----
.../src/main/jsonschema/verbs/retract.json | 24 ----
.../src/main/jsonschema/verbs/return.json | 24 ----
.../src/main/jsonschema/verbs/rsvp-maybe.json | 24 ----
.../src/main/jsonschema/verbs/rsvp-no.json | 24 ----
.../src/main/jsonschema/verbs/rsvp-yes.json | 24 ----
.../src/main/jsonschema/verbs/satisfy.json | 24 ----
.../src/main/jsonschema/verbs/save.json | 24 ----
.../src/main/jsonschema/verbs/schedule.json | 24 ----
.../src/main/jsonschema/verbs/search.json | 24 ----
.../src/main/jsonschema/verbs/sell.json | 24 ----
.../src/main/jsonschema/verbs/send.json | 24 ----
.../src/main/jsonschema/verbs/share.json | 24 ----
.../src/main/jsonschema/verbs/sponsor.json | 24 ----
.../src/main/jsonschema/verbs/start.json | 24 ----
.../main/jsonschema/verbs/stop-following.json | 24 ----
.../src/main/jsonschema/verbs/submit.json | 24 ----
streams-pojo/src/main/jsonschema/verbs/tag.json | 24 ----
.../src/main/jsonschema/verbs/terminate.json | 24 ----
streams-pojo/src/main/jsonschema/verbs/tie.json | 24 ----
.../src/main/jsonschema/verbs/unfavorite.json | 24 ----
.../src/main/jsonschema/verbs/unlike.json | 24 ----
.../src/main/jsonschema/verbs/unsatisfy.json | 24 ----
.../src/main/jsonschema/verbs/unsave.json | 24 ----
.../src/main/jsonschema/verbs/unshare.json | 24 ----
.../src/main/jsonschema/verbs/update.json | 34 -----
streams-pojo/src/main/jsonschema/verbs/use.json | 24 ----
.../src/main/jsonschema/verbs/watch.json | 24 ----
streams-pojo/src/main/jsonschema/verbs/win.json | 24 ----
streams-pojo/src/main/xmlschema/activity.xsd | 94 -------------
.../streams-runtime-dropwizard/pom.xml | 78 ++++++-----
streams-runtimes/streams-runtime-local/pom.xml | 50 +++----
.../jsonschema/LocalRuntimeConfiguration.json | 2 +-
.../streams-schema-activitystreams/pom.xml | 28 ++++
.../src/main/jsonschema/activity.json | 2 +-
.../src/main/jsonschema/collection.json | 2 +-
.../src/main/jsonschema/media_link.json | 2 +-
.../src/main/jsonschema/object.json | 3 +-
.../src/main/jsonschema/objectTypes/alert.json | 2 +-
.../jsonschema/objectTypes/application.json | 2 +-
.../main/jsonschema/objectTypes/article.json | 2 +-
.../src/main/jsonschema/objectTypes/audio.json | 2 +-
.../src/main/jsonschema/objectTypes/badge.json | 2 +-
.../src/main/jsonschema/objectTypes/binary.json | 2 +-
.../main/jsonschema/objectTypes/bookmark.json | 2 +-
.../main/jsonschema/objectTypes/comment.json | 2 +-
.../src/main/jsonschema/objectTypes/device.json | 2 +-
.../src/main/jsonschema/objectTypes/event.json | 2 +-
.../src/main/jsonschema/objectTypes/file.json | 2 +-
.../src/main/jsonschema/objectTypes/folder.json | 2 +-
.../src/main/jsonschema/objectTypes/game.json | 2 +-
.../src/main/jsonschema/objectTypes/group.json | 2 +-
.../src/main/jsonschema/objectTypes/image.json | 2 +-
.../src/main/jsonschema/objectTypes/issue.json | 2 +-
.../src/main/jsonschema/objectTypes/job.json | 2 +-
.../src/main/jsonschema/objectTypes/list.json | 2 +-
.../src/main/jsonschema/objectTypes/note.json | 2 +-
.../src/main/jsonschema/objectTypes/offer.json | 2 +-
.../jsonschema/objectTypes/organization.json | 2 +-
.../src/main/jsonschema/objectTypes/page.json | 2 +-
.../main/jsonschema/objectTypes/permission.json | 2 +-
.../src/main/jsonschema/objectTypes/person.json | 2 +-
.../jsonschema/objectTypes/photo-album.json | 2 +-
.../src/main/jsonschema/objectTypes/photo.json | 2 +-
.../src/main/jsonschema/objectTypes/place.json | 2 +-
.../main/jsonschema/objectTypes/playlist.json | 2 +-
.../main/jsonschema/objectTypes/process.json | 2 +-
.../main/jsonschema/objectTypes/product.json | 2 +-
.../main/jsonschema/objectTypes/property.json | 2 +-
.../main/jsonschema/objectTypes/question.json | 2 +-
.../src/main/jsonschema/objectTypes/review.json | 2 +-
.../src/main/jsonschema/objectTypes/role.json | 2 +-
.../main/jsonschema/objectTypes/service.json | 2 +-
.../src/main/jsonschema/objectTypes/song.json | 2 +-
.../src/main/jsonschema/objectTypes/status.json | 2 +-
.../src/main/jsonschema/objectTypes/task.json | 2 +-
.../src/main/jsonschema/objectTypes/team.json | 2 +-
.../src/main/jsonschema/objectTypes/video.json | 2 +-
.../src/main/jsonschema/verbs/accept.json | 2 +-
.../src/main/jsonschema/verbs/access.json | 2 +-
.../src/main/jsonschema/verbs/acknowledge.json | 2 +-
.../src/main/jsonschema/verbs/add.json | 2 +-
.../src/main/jsonschema/verbs/agree.json | 2 +-
.../src/main/jsonschema/verbs/append.json | 2 +-
.../src/main/jsonschema/verbs/approve.json | 2 +-
.../src/main/jsonschema/verbs/archive.json | 2 +-
.../src/main/jsonschema/verbs/assign.json | 2 +-
.../src/main/jsonschema/verbs/at.json | 2 +-
.../src/main/jsonschema/verbs/attach.json | 2 +-
.../src/main/jsonschema/verbs/attend.json | 2 +-
.../src/main/jsonschema/verbs/author.json | 2 +-
.../src/main/jsonschema/verbs/authorize.json | 2 +-
.../src/main/jsonschema/verbs/borrow.json | 2 +-
.../src/main/jsonschema/verbs/build.json | 2 +-
.../src/main/jsonschema/verbs/cancel.json | 2 +-
.../src/main/jsonschema/verbs/checkin.json | 2 +-
.../src/main/jsonschema/verbs/close.json | 2 +-
.../src/main/jsonschema/verbs/complete.json | 2 +-
.../src/main/jsonschema/verbs/confirm.json | 2 +-
.../src/main/jsonschema/verbs/consume.json | 2 +-
.../src/main/jsonschema/verbs/create.json | 2 +-
.../src/main/jsonschema/verbs/delete.json | 2 +-
.../src/main/jsonschema/verbs/deliver.json | 2 +-
.../src/main/jsonschema/verbs/deny.json | 2 +-
.../src/main/jsonschema/verbs/disagree.json | 2 +-
.../src/main/jsonschema/verbs/dislike.json | 2 +-
.../src/main/jsonschema/verbs/experience.json | 2 +-
.../src/main/jsonschema/verbs/favorite.json | 2 +-
.../src/main/jsonschema/verbs/find.json | 2 +-
.../jsonschema/verbs/flag-as-inappropriate.json | 2 +-
.../src/main/jsonschema/verbs/follow.json | 2 +-
.../src/main/jsonschema/verbs/give.json | 2 +-
.../src/main/jsonschema/verbs/host.json | 2 +-
.../src/main/jsonschema/verbs/ignore.json | 2 +-
.../src/main/jsonschema/verbs/insert.json | 2 +-
.../src/main/jsonschema/verbs/install.json | 2 +-
.../src/main/jsonschema/verbs/interact.json | 2 +-
.../src/main/jsonschema/verbs/invite.json | 2 +-
.../src/main/jsonschema/verbs/join.json | 2 +-
.../src/main/jsonschema/verbs/leave.json | 2 +-
.../src/main/jsonschema/verbs/like.json | 2 +-
.../src/main/jsonschema/verbs/listen.json | 2 +-
.../src/main/jsonschema/verbs/lose.json | 2 +-
.../src/main/jsonschema/verbs/make-friend.json | 2 +-
.../src/main/jsonschema/verbs/open.json | 2 +-
.../src/main/jsonschema/verbs/play.json | 2 +-
.../src/main/jsonschema/verbs/post.json | 2 +-
.../src/main/jsonschema/verbs/present.json | 2 +-
.../src/main/jsonschema/verbs/purchase.json | 2 +-
.../src/main/jsonschema/verbs/qualify.json | 2 +-
.../src/main/jsonschema/verbs/read.json | 2 +-
.../src/main/jsonschema/verbs/receive.json | 2 +-
.../src/main/jsonschema/verbs/reject.json | 2 +-
.../main/jsonschema/verbs/remove-friend.json | 2 +-
.../src/main/jsonschema/verbs/remove.json | 2 +-
.../src/main/jsonschema/verbs/replace.json | 2 +-
.../main/jsonschema/verbs/request-friend.json | 2 +-
.../src/main/jsonschema/verbs/request.json | 2 +-
.../src/main/jsonschema/verbs/resolve.json | 2 +-
.../src/main/jsonschema/verbs/retract.json | 2 +-
.../src/main/jsonschema/verbs/return.json | 2 +-
.../src/main/jsonschema/verbs/rsvp-maybe.json | 2 +-
.../src/main/jsonschema/verbs/rsvp-no.json | 2 +-
.../src/main/jsonschema/verbs/rsvp-yes.json | 2 +-
.../src/main/jsonschema/verbs/satisfy.json | 2 +-
.../src/main/jsonschema/verbs/save.json | 2 +-
.../src/main/jsonschema/verbs/schedule.json | 2 +-
.../src/main/jsonschema/verbs/search.json | 2 +-
.../src/main/jsonschema/verbs/sell.json | 2 +-
.../src/main/jsonschema/verbs/send.json | 2 +-
.../src/main/jsonschema/verbs/share.json | 2 +-
.../src/main/jsonschema/verbs/sponsor.json | 2 +-
.../src/main/jsonschema/verbs/start.json | 2 +-
.../main/jsonschema/verbs/stop-following.json | 2 +-
.../src/main/jsonschema/verbs/submit.json | 2 +-
.../src/main/jsonschema/verbs/tag.json | 2 +-
.../src/main/jsonschema/verbs/terminate.json | 2 +-
.../src/main/jsonschema/verbs/tie.json | 2 +-
.../src/main/jsonschema/verbs/unfavorite.json | 2 +-
.../src/main/jsonschema/verbs/unlike.json | 2 +-
.../src/main/jsonschema/verbs/unsatisfy.json | 2 +-
.../src/main/jsonschema/verbs/unsave.json | 2 +-
.../src/main/jsonschema/verbs/unshare.json | 2 +-
.../src/main/jsonschema/verbs/update.json | 2 +-
.../src/main/jsonschema/verbs/use.json | 2 +-
.../src/main/jsonschema/verbs/watch.json | 2 +-
.../src/main/jsonschema/verbs/win.json | 2 +-
.../test/SchemaValidationTest.java | 86 ++++++++++++
streams-util/pom.xml | 26 ++--
.../util/schema/test/SchemaStoreTest.java | 11 +-
streams-verbs/pom.xml | 50 +++----
.../ObjectCombinationSpecificOrderingTest.java | 4 +-
.../verbs/VerbDefinitionTemplateTest.java | 3 +-
339 files changed, 1189 insertions(+), 4687 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index db76eb7..5e7ca2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.streams</groupId>
<artifactId>streams-project</artifactId>
- <version>0.5-incubating-SNAPSHOT</version>
+ <version>0.5-incubating-SNAPSHOT</version>
<name>Apache Streams Project</name>
<description>Apache Streams Project</description>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-components/streams-converters/pom.xml
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/pom.xml b/streams-components/streams-converters/pom.xml
index c68cfae..e9e212e 100644
--- a/streams-components/streams-converters/pom.xml
+++ b/streams-components/streams-converters/pom.xml
@@ -39,6 +39,11 @@
</dependency>
<dependency>
<groupId>org.apache.streams</groupId>
+ <artifactId>streams-pojo</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streams</groupId>
<artifactId>streams-pojo-extensions</artifactId>
<version>${project.version}</version>
</dependency>
@@ -89,62 +94,51 @@
</testResource>
</testResources>
<plugins>
-
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <sourcePaths>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.converter</targetPackage>
+ </configuration>
<executions>
<execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
<goals>
- <goal>add-source</goal>
+ <goal>generate-sources</goal>
</goals>
- <configuration>
- <sources>
- <source>target/generated-sources/jsonschema2pojo</source>
- </sources>
- </configuration>
</execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.streams</groupId>
+ <artifactId>streams-pojo</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
<execution>
- <id>add-source-jaxb2</id>
+ <id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
- <source>target/generated-sources/jaxb2</source>
+ <source>target/generated-sources/pojo</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.converter</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- <includeJsr303Annotations>true</includeJsr303Annotations>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.reflections</groupId>
<artifactId>reflections-maven</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityObjectConverterUtil.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityObjectConverterUtil.java b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityObjectConverterUtil.java
index 629d82a..8085780 100644
--- a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityObjectConverterUtil.java
+++ b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityObjectConverterUtil.java
@@ -36,6 +36,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -62,11 +63,11 @@ public class ActivityObjectConverterUtil {
private static final ActivityObjectConverterUtil INSTANCE = new ActivityObjectConverterUtil();
- public static ActivityObjectConverterUtil getInstance(){
+ public static ActivityObjectConverterUtil getInstance() {
return INSTANCE;
}
- public static ActivityObjectConverterUtil getInstance(ActivityObjectConverterProcessorConfiguration configuration){
+ public static ActivityObjectConverterUtil getInstance(ActivityObjectConverterProcessorConfiguration configuration) {
return new ActivityObjectConverterUtil(configuration);
}
@@ -91,11 +92,9 @@ public class ActivityObjectConverterUtil {
public synchronized ActivityObject convert(Object document) {
- ActivityObject result = null;
-
List<Class> detectedClasses = detectClasses(document);
- if( detectedClasses.size() == 0 ) {
+ if (detectedClasses.size() == 0) {
LOGGER.warn("Unable to classify");
return null;
} else {
@@ -106,31 +105,29 @@ public class ActivityObjectConverterUtil {
// use TypeUtil to switch the document to that type
Map<Class, Object> typedDocs = convertToDetectedClasses(detectedClasses, document);
- if( typedDocs.size() == 0 ) {
+ if (typedDocs.size() == 0) {
LOGGER.warn("Unable to convert to any detected Class");
return null;
- }
- else {
+ } else {
LOGGER.debug("Document has " + typedDocs.size() + " representations: " + typedDocs.toString());
}
+ Map<Class, ActivityObject> convertedDocs = new HashMap<>();
+
// for each specified / discovered converter
- for( ActivityObjectConverter converter : converters ) {
+ for (ActivityObjectConverter converter : converters) {
- Object typedDoc = typedDocs.get(converter.requiredClass());
+ Class requiredClass = converter.requiredClass();
- ActivityObject activityObject = applyConverter(converter, typedDoc);
+ Object typedDoc = typedDocs.get(requiredClass);
- // prefer the most specific ActivityObject sub-class returned by all converters
- if( activityObject != null ) {
- if (result == null)
- result = activityObject;
- else if (isAncestor(activityObject.getClass(), result.getClass()))
- result = activityObject;
- }
+ ActivityObject activityObject = applyConverter(converter, typedDoc);
+ convertedDocs.put(requiredClass, activityObject);
}
+ ActivityObject result = deepestDescendant(convertedDocs);
+
return result;
}
@@ -138,12 +135,12 @@ public class ActivityObjectConverterUtil {
ActivityObject activityObject = null;
// if the document can be typed as the required class
- if( typedDoc != null ) {
+ if (typedDoc != null) {
// let the converter create activities if it can
try {
activityObject = convertToActivityObject(converter, typedDoc);
- } catch( Exception e ) {
+ } catch (Exception e) {
LOGGER.debug("convertToActivity caught exception " + e.getMessage());
}
@@ -170,12 +167,12 @@ public class ActivityObjectConverterUtil {
// spark 1.5.0 uses guava 14 so for the moment this is the workaround
// Set<Class> detectedClasses = new ConcurrentHashSet();
Set<Class> detectedClasses = Collections.newSetFromMap(new ConcurrentHashMap<Class, Boolean>());
- for( DocumentClassifier classifier : classifiers ) {
+ for (DocumentClassifier classifier : classifiers) {
try {
List<Class> detected = classifier.detectClasses(document);
if (detected != null && detected.size() > 0)
detectedClasses.addAll(detected);
- } catch( Exception e) {
+ } catch (Exception e) {
LOGGER.warn("{} failed in method detectClasses - ()", classifier.getClass().getCanonicalName(), e);
}
}
@@ -186,7 +183,7 @@ public class ActivityObjectConverterUtil {
private Map<Class, Object> convertToDetectedClasses(List<Class> datumClasses, Object document) {
Map<Class, Object> convertedDocuments = Maps.newHashMap();
- for( Class detectedClass : datumClasses ) {
+ for (Class detectedClass : datumClasses) {
Object typedDoc;
if (detectedClass.isInstance(document))
@@ -194,7 +191,7 @@ public class ActivityObjectConverterUtil {
else
typedDoc = TypeConverterUtil.getInstance().convert(document, detectedClass);
- if( typedDoc != null )
+ if (typedDoc != null)
convertedDocuments.put(detectedClass, typedDoc);
}
@@ -205,7 +202,7 @@ public class ActivityObjectConverterUtil {
Reflections reflections = new Reflections(new ConfigurationBuilder()
.setUrls(ClasspathHelper.forPackage("org.apache.streams"))
.setScanners(new SubTypesScanner()));
- if ( classifiers.size() == 0) {
+ if (classifiers.size() == 0) {
Set<Class<? extends DocumentClassifier>> classifierClasses = reflections.getSubTypesOf(DocumentClassifier.class);
for (Class classifierClass : classifierClasses) {
try {
@@ -216,7 +213,7 @@ public class ActivityObjectConverterUtil {
}
}
Preconditions.checkArgument(classifiers.size() > 0);
- if ( converters.size() == 0) {
+ if (converters.size() == 0) {
Set<Class<? extends ActivityObjectConverter>> converterClasses = reflections.getSubTypesOf(ActivityObjectConverter.class);
for (Class converterClass : converterClasses) {
try {
@@ -230,10 +227,29 @@ public class ActivityObjectConverterUtil {
}
private boolean isAncestor(Class possibleDescendant, Class possibleAncestor) {
- if( possibleDescendant.equals(Object.class))
+ if (possibleDescendant.equals(Object.class))
return false;
- if( possibleDescendant.getSuperclass().equals(possibleAncestor))
+ if (possibleDescendant.getSuperclass().equals(possibleAncestor))
return true;
else return isAncestor(possibleDescendant.getSuperclass(), possibleAncestor);
}
+
+ // prefer the most specific ActivityObject sub-class returned by all converters
+ private ActivityObject deepestDescendant(Map<Class, ActivityObject> map) {
+
+ ActivityObject result = null;
+
+ for( Map.Entry<Class, ActivityObject> entry : map.entrySet()) {
+ if( entry.getKey() != null ) {
+ if (result == null)
+ result = entry.getValue();
+ else if (isAncestor(entry.getKey(), result.getClass()))
+ result = entry.getValue();
+ }
+ }
+
+ return result;
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-components/streams-converters/src/main/jsonschema/org/apache/streams/converter/ActivityConverterProcessorConfiguration.json
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/main/jsonschema/org/apache/streams/converter/ActivityConverterProcessorConfiguration.json b/streams-components/streams-converters/src/main/jsonschema/org/apache/streams/converter/ActivityConverterProcessorConfiguration.json
index 93ac094..f535b5a 100644
--- a/streams-components/streams-converters/src/main/jsonschema/org/apache/streams/converter/ActivityConverterProcessorConfiguration.json
+++ b/streams-components/streams-converters/src/main/jsonschema/org/apache/streams/converter/ActivityConverterProcessorConfiguration.json
@@ -11,15 +11,15 @@
"classifiers": {
"type": "array",
"items": {
- "type": "object",
- "javaType": "org.apache.streams.data.DocumentClassifier"
+ "javaType": "org.apache.streams.data.DocumentClassifier",
+ "type": "object"
}
},
"converters": {
"type": "array",
"items": {
- "type": "object",
- "javaType": "org.apache.streams.data.ActivityConverter"
+ "javaType": "org.apache.streams.data.ActivityConverter",
+ "type": "object"
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-components/streams-http/pom.xml
----------------------------------------------------------------------
diff --git a/streams-components/streams-http/pom.xml b/streams-components/streams-http/pom.xml
index 659530b..9f99ead 100644
--- a/streams-components/streams-http/pom.xml
+++ b/streams-components/streams-http/pom.xml
@@ -35,13 +35,6 @@
<dependencies>
<dependency>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-core</artifactId>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.streams</groupId>
<artifactId>streams-config</artifactId>
</dependency>
@@ -126,59 +119,49 @@
</testResources>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <sourcePaths>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.http</targetPackage>
+ </configuration>
<executions>
<execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
<goals>
- <goal>add-source</goal>
+ <goal>generate-sources</goal>
</goals>
- <configuration>
- <sources>
- <source>target/generated-sources/jsonschema2pojo</source>
- </sources>
- </configuration>
</execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.streams</groupId>
+ <artifactId>streams-converters</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
<execution>
- <id>add-source-jaxb2</id>
+ <id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
- <source>target/generated-sources/jaxb2</source>
+ <source>target/generated-sources/pojo</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.http</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- <includeJsr303Annotations>true</includeJsr303Annotations>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-config/pom.xml
----------------------------------------------------------------------
diff --git a/streams-config/pom.xml b/streams-config/pom.xml
index 2069489..fb5b3e6 100644
--- a/streams-config/pom.xml
+++ b/streams-config/pom.xml
@@ -46,11 +46,11 @@
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-core</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
@@ -61,6 +61,25 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>1.1.0.Final</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
@@ -100,42 +119,40 @@
</testResources>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <sourcePaths>
+ <sourcePath>${basedir}/src/main/jsonschema</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.config</targetPackage>
+ </configuration>
<executions>
<execution>
- <id>add-source</id>
<phase>generate-sources</phase>
<goals>
- <goal>add-source</goal>
+ <goal>generate-sources</goal>
</goals>
- <configuration>
- <sources>
- <source>${project.basedir}/target/generated-sources/jsonschema2pojo</source>
- </sources>
- </configuration>
</execution>
</executions>
</plugin>
<plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.config</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- </configuration>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
<goals>
- <goal>generate</goal>
+ <goal>add-source</goal>
</goals>
+ <configuration>
+ <sources>
+ <source>${basedir}/target/generated-sources/pojo</source>
+ </sources>
+ </configuration>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-amazon-aws/streams-persist-kinesis/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-amazon-aws/streams-persist-kinesis/pom.xml b/streams-contrib/streams-amazon-aws/streams-persist-kinesis/pom.xml
index baa4b97..ff74aec 100644
--- a/streams-contrib/streams-amazon-aws/streams-persist-kinesis/pom.xml
+++ b/streams-contrib/streams-amazon-aws/streams-persist-kinesis/pom.xml
@@ -80,6 +80,25 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <sourcePaths>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.amazon.kinesis.pojo</targetPackage>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
@@ -91,34 +110,12 @@
</goals>
<configuration>
<sources>
- <source>target/generated-sources/jsonschema2pojo</source>
+ <source>target/generated-sources/pojo</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.amazon.kinesis.pojo</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-amazon-aws/streams-persist-s3/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-amazon-aws/streams-persist-s3/pom.xml b/streams-contrib/streams-amazon-aws/streams-persist-s3/pom.xml
index 5151d9d..0c5bbd3 100644
--- a/streams-contrib/streams-amazon-aws/streams-persist-s3/pom.xml
+++ b/streams-contrib/streams-amazon-aws/streams-persist-s3/pom.xml
@@ -95,6 +95,25 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <sourcePaths>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.s3.pojo</targetPackage>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
@@ -106,35 +125,11 @@
</goals>
<configuration>
<sources>
- <source>target/generated-sources/jsonschema2pojo</source>
+ <source>target/generated-sources/pojo</source>
</sources>
</configuration>
</execution>
</executions>
- </plugin>
- <plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/s3/S3Configuration.json</sourcePath>
- <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/s3/S3WriterConfiguration.json</sourcePath>
- <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/s3/S3ReaderConfiguration.json</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.s3.pojo</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
<dependencies>
<dependency>
<groupId>org.apache.streams</groupId>
@@ -143,6 +138,7 @@
</dependency>
</dependencies>
</plugin>
+
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-persist-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/pom.xml b/streams-contrib/streams-persist-elasticsearch/pom.xml
index d179965..bf13df3 100644
--- a/streams-contrib/streams-persist-elasticsearch/pom.xml
+++ b/streams-contrib/streams-persist-elasticsearch/pom.xml
@@ -145,38 +145,20 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>${clean.plugin.version}</version>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
<configuration>
- <filesets>
- <fileset>
- <directory>src/site/resources</directory>
- <followSymlinks>false</followSymlinks>
- </fileset>
- <!-- this is here because elasticsearch integration tests don't have a setting to change directory where temp index files get created -->
- <fileset>
- <directory>data</directory>
- <followSymlinks>false</followSymlinks>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <includes>**/*.json</includes>
- <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
- <includeGroupIds>org.apache.streams</includeGroupIds>
- <includeArtifactIds>streams-schema-activitystreams</includeArtifactIds>
- <includeTypes>test-jar</includeTypes>
+ <sourcePaths>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.elasticsearch.pojo</targetPackage>
</configuration>
<executions>
<execution>
- <id>test-resource-dependencies</id>
- <phase>process-test-resources</phase>
<goals>
- <goal>unpack-dependencies</goal>
+ <goal>generate-sources</goal>
</goals>
</execution>
</executions>
@@ -193,32 +175,28 @@
</goals>
<configuration>
<sources>
- <source>target/generated-sources/jsonschema2pojo</source>
+ <source>target/generated-sources/pojo</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
<configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/elasticsearch/ElasticsearchConfiguration.json</sourcePath>
- <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/elasticsearch/ElasticsearchReaderConfiguration.json</sourcePath>
- <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/elasticsearch/ElasticsearchWriterConfiguration.json</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.elasticsearch.pojo</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
+ <includes>**/*.json</includes>
+ <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+ <includeGroupIds>org.apache.streams</includeGroupIds>
+ <includeArtifactIds>streams-schema-activitystreams</includeArtifactIds>
+ <includeTypes>test-jar</includeTypes>
</configuration>
<executions>
<execution>
+ <id>test-resource-dependencies</id>
+ <phase>process-test-resources</phase>
<goals>
- <goal>generate</goal>
+ <goal>unpack-dependencies</goal>
</goals>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistUpdaterIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistUpdaterIT.java b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistUpdaterIT.java
index 56f102b..d34f53f 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistUpdaterIT.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistUpdaterIT.java
@@ -34,7 +34,7 @@ import org.apache.streams.elasticsearch.ElasticsearchPersistWriter;
import org.apache.streams.elasticsearch.ElasticsearchWriterConfiguration;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
-import org.apache.streams.pojo.json.Actor;
+import org.apache.streams.pojo.json.ActivityObject;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
@@ -126,7 +126,7 @@ public class ElasticsearchPersistUpdaterIT {
update.setAdditionalProperty("str", "str");
update.setAdditionalProperty("long", 10l);
update.setActor(
- (Actor) new Actor()
+ new ActivityObject()
.withAdditionalProperty("updated", Boolean.TRUE)
.withAdditionalProperty("double", 10d)
.withAdditionalProperty("map",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-persist-filebuffer/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-filebuffer/pom.xml b/streams-contrib/streams-persist-filebuffer/pom.xml
index 2baef27..ce0a37c 100644
--- a/streams-contrib/streams-persist-filebuffer/pom.xml
+++ b/streams-contrib/streams-persist-filebuffer/pom.xml
@@ -103,6 +103,25 @@
</testResources>
<plugins>
<plugin>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <sourcePaths>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.file.pojo</targetPackage>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
@@ -114,34 +133,12 @@
</goals>
<configuration>
<sources>
- <source>target/generated-sources/jsonschema2pojo</source>
+ <source>target/generated-sources/pojo</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.file.pojo</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-persist-graph/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-graph/pom.xml b/streams-contrib/streams-persist-graph/pom.xml
index a5fe203..b8db538 100644
--- a/streams-contrib/streams-persist-graph/pom.xml
+++ b/streams-contrib/streams-persist-graph/pom.xml
@@ -104,6 +104,32 @@
</testResources>
<plugins>
<plugin>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <sourcePaths>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.graph.pojo</targetPackage>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.streams</groupId>
+ <artifactId>streams-http</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
@@ -115,35 +141,13 @@
</goals>
<configuration>
<sources>
- <source>target/generated-sources/jsonschema2pojo</source>
+ <source>target/generated-sources/pojo</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.graph.pojo</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphHttpPersistWriter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphHttpPersistWriter.java b/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphHttpPersistWriter.java
index a26168c..3c97fd7 100644
--- a/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphHttpPersistWriter.java
+++ b/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphHttpPersistWriter.java
@@ -38,7 +38,6 @@ import org.apache.streams.graph.neo4j.Neo4jHttpGraphHelper;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
-import org.apache.streams.pojo.json.Actor;
import org.apache.streams.pojo.json.Provider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -140,7 +139,7 @@ public class GraphHttpPersistWriter extends SimpleHTTPPostPersistWriter {
if( activity != null ) {
- Actor actor = activity.getActor();
+ ActivityObject actor = activity.getActor();
Provider provider = activity.getProvider();
if( provider != null &&
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-persist-graph/src/test/java/org/apache/streams/graph/test/TestCypherQueryGraphHelper.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-graph/src/test/java/org/apache/streams/graph/test/TestCypherQueryGraphHelper.java b/streams-contrib/streams-persist-graph/src/test/java/org/apache/streams/graph/test/TestCypherQueryGraphHelper.java
index a88ce16..3f889aa 100644
--- a/streams-contrib/streams-persist-graph/src/test/java/org/apache/streams/graph/test/TestCypherQueryGraphHelper.java
+++ b/streams-contrib/streams-persist-graph/src/test/java/org/apache/streams/graph/test/TestCypherQueryGraphHelper.java
@@ -21,7 +21,6 @@ package org.apache.streams.graph.test;
import org.apache.streams.graph.neo4j.CypherQueryGraphHelper;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
-import org.apache.streams.pojo.json.Actor;
import org.javatuples.Pair;
import org.junit.Test;
@@ -86,15 +85,15 @@ public class TestCypherQueryGraphHelper {
@Test
public void createEdgeRequestTest() throws Exception {
- Actor actor = new Actor();
+ ActivityObject actor = new ActivityObject();
actor.setId("actor");
actor.setObjectType("type");
actor.setContent("content");
- ActivityObject activityObject = new ActivityObject();
- activityObject.setId("object");
- activityObject.setObjectType("type");
- activityObject.setContent("content");
+ ActivityObject object = new ActivityObject();
+ object.setId("object");
+ object.setObjectType("type");
+ object.setContent("content");
Activity activity = new Activity();
activity.setId("activity");
@@ -102,7 +101,7 @@ public class TestCypherQueryGraphHelper {
activity.setContent("content");
activity.setActor(actor);
- activity.setObject(activityObject);
+ activity.setObject(object);
Pair<String, Map<String, Object>> queryAndParams = helper.createEdgeRequest(activity);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-persist-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-hbase/pom.xml b/streams-contrib/streams-persist-hbase/pom.xml
index d097a6a..af094cd 100644
--- a/streams-contrib/streams-persist-hbase/pom.xml
+++ b/streams-contrib/streams-persist-hbase/pom.xml
@@ -107,6 +107,25 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <sourcePaths>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.hbase.pojo</targetPackage>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
@@ -118,34 +137,12 @@
</goals>
<configuration>
<sources>
- <source>target/generated-sources/jsonschema2pojo</source>
+ <source>target/generated-sources/pojo</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/hbase/HbaseConfiguration.json</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.hbase.pojo</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-persist-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-hdfs/pom.xml b/streams-contrib/streams-persist-hdfs/pom.xml
index 3a722cf..0cefa91 100644
--- a/streams-contrib/streams-persist-hdfs/pom.xml
+++ b/streams-contrib/streams-persist-hdfs/pom.xml
@@ -154,41 +154,20 @@
</testResources>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/generated-sources/jsonschema2pojo</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
<configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
<sourcePaths>
<sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
</sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.hdfs.pojo</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.hdfs</targetPackage>
</configuration>
<executions>
<execution>
<goals>
- <goal>generate</goal>
+ <goal>generate-sources</goal>
</goals>
</execution>
</executions>
@@ -201,6 +180,24 @@
</dependencies>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>target/generated-sources/pojo</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-persist-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-kafka/pom.xml b/streams-contrib/streams-persist-kafka/pom.xml
index 4bdb8f2..b055f05 100644
--- a/streams-contrib/streams-persist-kafka/pom.xml
+++ b/streams-contrib/streams-persist-kafka/pom.xml
@@ -130,6 +130,25 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <sourcePaths>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.kafka.pojo</targetPackage>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
@@ -141,34 +160,12 @@
</goals>
<configuration>
<sources>
- <source>target/generated-sources/jsonschema2pojo</source>
+ <source>target/generated-sources/pojo</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/kafka/KafkaConfiguration.json</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.kafka.pojo</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-persist-mongo/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-mongo/pom.xml b/streams-contrib/streams-persist-mongo/pom.xml
index e81a367..3183455 100644
--- a/streams-contrib/streams-persist-mongo/pom.xml
+++ b/streams-contrib/streams-persist-mongo/pom.xml
@@ -88,6 +88,25 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <sourcePaths>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.mongo.pojo</targetPackage>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
@@ -99,35 +118,13 @@
</goals>
<configuration>
<sources>
- <source>target/generated-sources/jsonschema2pojo</source>
+ <source>target/generated-sources/pojo</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/mongo/MongoConfiguration.json</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.mongo.pojo</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-processor-peoplepattern/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-peoplepattern/pom.xml b/streams-contrib/streams-processor-peoplepattern/pom.xml
index 8d010e6..f2f1e4c 100644
--- a/streams-contrib/streams-processor-peoplepattern/pom.xml
+++ b/streams-contrib/streams-processor-peoplepattern/pom.xml
@@ -119,8 +119,9 @@
</executions>
</plugin>
<plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
<configuration>
<addCompileSourceRoot>true</addCompileSourceRoot>
<generateBuilders>true</generateBuilders>
@@ -135,7 +136,7 @@
<executions>
<execution>
<goals>
- <goal>generate</goal>
+ <goal>generate-sources</goal>
</goals>
</execution>
</executions>
[3/7] incubator-streams git commit: Squashed commit of STREAMS-443:
use org.apache.streams.plugins:streams-plugin-pojo instead of
org.jsonschema2pojo
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/stop-following.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/stop-following.json b/streams-pojo/src/main/jsonschema/verbs/stop-following.json
deleted file mode 100644
index e09317d..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/stop-following.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "UnFollow",
- "description": "Indicates that the actor has stopped following the object.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "follow"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} stopped following {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/submit.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/submit.json b/streams-pojo/src/main/jsonschema/verbs/submit.json
deleted file mode 100644
index c1d25b1..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/submit.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Submit",
- "description": "Indicates that the actor has submitted the object. If a target is specified, it indicates the entity to which the object was submitted.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "submit"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} submitted {object.displayName} to {target.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/tag.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/tag.json b/streams-pojo/src/main/jsonschema/verbs/tag.json
deleted file mode 100644
index 6208eae..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/tag.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Tag",
- "description": "Indicates that the actor has associated the object with the target. For example, if the actor specifies that a particular user appears in a photo. the object is the user and the target is the photo.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "tag"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} tagged {object.displayName} as {target.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/terminate.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/terminate.json b/streams-pojo/src/main/jsonschema/verbs/terminate.json
deleted file mode 100644
index 280eb31..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/terminate.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Terminate",
- "description": "Indicates that the actor has terminated the object.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "terminate"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} terminated {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/tie.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/tie.json b/streams-pojo/src/main/jsonschema/verbs/tie.json
deleted file mode 100644
index 7530ed2..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/tie.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Tie",
- "description": "Indicates that the actor has neither won or lost the object. This verb is generally only applicable when the object represents some form of competition, such as a game.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "tie"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} tied at {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/unfavorite.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/unfavorite.json b/streams-pojo/src/main/jsonschema/verbs/unfavorite.json
deleted file mode 100644
index bfa9c20..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/unfavorite.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "UnFavorite",
- "description": "Indicates that the actor has removed the object from the collection of favorited items.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "unfavorite"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} removed {object.displayName} as a favorite"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/unlike.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/unlike.json b/streams-pojo/src/main/jsonschema/verbs/unlike.json
deleted file mode 100644
index 4dc75f6..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/unlike.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "UnLike",
- "description": "Indicates that the actor has removed the object from the collection of liked items.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "unlike"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} no longer likes {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/unsatisfy.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/unsatisfy.json b/streams-pojo/src/main/jsonschema/verbs/unsatisfy.json
deleted file mode 100644
index 8ea075b..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/unsatisfy.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "UnSatisfy",
- "description": "Indicates that the actor has not satisfied the object. If a target is specified, it indicates the context within which the object was not satisfied. For instance, if a person fails to satisfy the requirements of some particular challenge, the person is the actor; the requirement is the object and the challenge is the target.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "unsatisfy"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} has not satisfied {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/unsave.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/unsave.json b/streams-pojo/src/main/jsonschema/verbs/unsave.json
deleted file mode 100644
index e45a97f..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/unsave.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "UnSave",
- "description": "Indicates that the actor has removed the object from the collection of saved items.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "unsave"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} unsaved {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/unshare.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/unshare.json b/streams-pojo/src/main/jsonschema/verbs/unshare.json
deleted file mode 100644
index 4ca924b..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/unshare.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "UnSave",
- "description": "Indicates that the actor is no longer sharing the object. If a target is specified, it indicates the entity with whom the object is no longer being shared.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "unshare"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} is no longer sharing {object.displayName} with {target.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/update.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/update.json b/streams-pojo/src/main/jsonschema/verbs/update.json
deleted file mode 100644
index 4b143fc..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/update.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Update",
- "description": "The \"update\" verb indicates that the actor has modified the object. Use of the \"update\" verb is generally reserved to indicate modifications to existing objects or data such as changing an existing user's profile information.",
- "notes": "The new property value can be a scalar value or an object. See the property object type",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "update"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} updated {target.displayName}'s {object.displayName} to {object.value}"
- },
- "object": {
- "type": "object",
- "$ref": "../object.json"
- },
- "target": {
- "type": "object",
- "optional": true,
- "$ref": "../object.json"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/use.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/use.json b/streams-pojo/src/main/jsonschema/verbs/use.json
deleted file mode 100644
index d5a79fd..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/use.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Use",
- "description": "Indicates that the actor has used the object in some manner.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "use"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} used {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/watch.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/watch.json b/streams-pojo/src/main/jsonschema/verbs/watch.json
deleted file mode 100644
index 192d56e..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/watch.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Watch",
- "description": "Indicates that the actor has watched the object. This verb is typically applicable only when the object represents dynamic, visible content such as a movie, a television show or a public performance.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "watch"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} watched {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/win.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/win.json b/streams-pojo/src/main/jsonschema/verbs/win.json
deleted file mode 100644
index a5bef2a..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/win.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Win",
- "description": "Indicates that the actor has won the object. For instance, if a person wins a game.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "win"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} won {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/xmlschema/activity.xsd
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/xmlschema/activity.xsd b/streams-pojo/src/main/xmlschema/activity.xsd
deleted file mode 100644
index 1d81b44..0000000
--- a/streams-pojo/src/main/xmlschema/activity.xsd
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- ~ 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.
- -->
-
-<xs:schema version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="id" type="xs:string"/>
- <xs:element name="actor" type="objectType"/>
- <xs:element name="verb" type="verbType"/>
- <xs:element name="object" type="objectType"/>
- <xs:element name="target" type="objectType"/>
- <xs:element name="object-type" type="xs:string"/>
- <xs:element name="published" type="xs:dateTime"/>
- <xs:element name="updated" type="xs:dateTime"/>
- <xs:element name="provider" type="objectType"/>
- <xs:element name="title" type="xs:string"/>
- <xs:element name="content" type="xs:string"/>
- <xs:element name="url" type="xs:string"/>
-
- <xs:simpleType name="verbType">
- <xs:restriction base="xs:string">
- <xs:enumeration value="favorite"/>
- <xs:enumeration value="follow"/>
- <xs:enumeration value="join"/>
- <xs:enumeration value="like"/>
- <xs:enumeration value="make-friend"/>
- <xs:enumeration value="play"/>
- <xs:enumeration value="post"/>
- <xs:enumeration value="rsvp-yes"/>
- <xs:enumeration value="rsvp-no"/>
- <xs:enumeration value="rsvp-maybe"/>
- <xs:enumeration value="save"/>
- <xs:enumeration value="share"/>
- <xs:enumeration value="tag"/>
- <xs:enumeration value="update"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:complexType name="objectType">
- <xs:sequence>
- <xs:element name="id" type="xs:string"/>
- <xs:element name="image" type="mediaLink"/>
- <xs:element name="displayName" type="xs:string"/>
- <xs:element name="summary" type="xs:string"/>
- <xs:element name="content" type="xs:string"/>
- <xs:element name="url" type="xs:string"/>
- <xs:element name="published" type="xs:string"/>
- <xs:element name="updated" type="xs:string"/>
- <xs:element name="object-type" >
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="article"/>
- <xs:enumeration value="audio"/>
- <xs:enumeration value="badge"/>
- <xs:enumeration value="collection"/>
- <xs:enumeration value="comment"/>
- <xs:enumeration value="course"/>
- <xs:enumeration value="file"/>
- <xs:enumeration value="image"/>
- <xs:enumeration value="person"/>
- <xs:enumeration value="review"/>
- <xs:enumeration value="service"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
-
- </xs:complexType>
-
- <xs:complexType name="mediaLink">
- <xs:sequence>
- <xs:element name="duration" type="xs:positiveInteger"/>
- <xs:element name="height" type="xs:positiveInteger"/>
- <xs:element name="width" type="xs:positiveInteger"/>
- <xs:element name="url" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
-
-</xs:schema>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-runtimes/streams-runtime-dropwizard/pom.xml
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-dropwizard/pom.xml b/streams-runtimes/streams-runtime-dropwizard/pom.xml
index d04d8fb..64debe5 100644
--- a/streams-runtimes/streams-runtime-dropwizard/pom.xml
+++ b/streams-runtimes/streams-runtime-dropwizard/pom.xml
@@ -107,19 +107,6 @@
</dependency>
<dependency>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-core</artifactId>
- <type>jar</type>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
@@ -199,6 +186,47 @@
</testResources>
<plugins>
<plugin>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <sourcePaths>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.dropwizard.pojo</targetPackage>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>io.dropwizard</groupId>
+ <artifactId>dropwizard-core</artifactId>
+ <version>${dropwizard.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard</groupId>
+ <artifactId>dropwizard-configuration</artifactId>
+ <version>${dropwizard.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard</groupId>
+ <artifactId>dropwizard-validation</artifactId>
+ <version>${dropwizard.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard</groupId>
+ <artifactId>dropwizard-metrics</artifactId>
+ <version>${dropwizard.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
@@ -210,35 +238,13 @@
</goals>
<configuration>
<sources>
- <source>target/generated-sources/jsonschema2pojo</source>
+ <source>target/generated-sources/pojo</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.dropwizard</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-runtimes/streams-runtime-local/pom.xml
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-local/pom.xml b/streams-runtimes/streams-runtime-local/pom.xml
index 447b1e9..9c2fea2 100644
--- a/streams-runtimes/streams-runtime-local/pom.xml
+++ b/streams-runtimes/streams-runtime-local/pom.xml
@@ -33,13 +33,6 @@
<dependencies>
<dependency>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-core</artifactId>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
@@ -113,6 +106,25 @@
</testResources>
<plugins>
<plugin>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <sourcePaths>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.local</targetPackage>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
@@ -124,35 +136,13 @@
</goals>
<configuration>
<sources>
- <source>target/generated-sources/jsonschema2pojo</source>
+ <source>target/generated-sources/pojo</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.local</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-runtimes/streams-runtime-local/src/main/jsonschema/LocalRuntimeConfiguration.json
----------------------------------------------------------------------
diff --git a/streams-runtimes/streams-runtime-local/src/main/jsonschema/LocalRuntimeConfiguration.json b/streams-runtimes/streams-runtime-local/src/main/jsonschema/LocalRuntimeConfiguration.json
index 1ba9bfa..8500a93 100644
--- a/streams-runtimes/streams-runtime-local/src/main/jsonschema/LocalRuntimeConfiguration.json
+++ b/streams-runtimes/streams-runtime-local/src/main/jsonschema/LocalRuntimeConfiguration.json
@@ -13,7 +13,7 @@
"properties": {
"monitoring": {
"type" : "object",
- "javaType" : "org.apache.streams.local.monitoring.MonitoringConfiguration"
+ "$ref": "../../../../../streams-monitoring/src/main/jsonschema/org/apache/streams/local/monitoring/MonitoringConfiguration.json"
},
"executorShutdownPauseMs": {
"type": "integer",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/pom.xml
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/pom.xml b/streams-schemas/streams-schema-activitystreams/pom.xml
index 422665b..59e2872 100644
--- a/streams-schemas/streams-schema-activitystreams/pom.xml
+++ b/streams-schemas/streams-schema-activitystreams/pom.xml
@@ -31,7 +31,35 @@
<description>Activity Streams schemas</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streams</groupId>
+ <artifactId>streams-testing</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>com.networknt</groupId>
+ <artifactId>json-schema-validator</artifactId>
+ <version>0.1.2</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<build>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
<resources>
<resource>
<directory>src/main/resources</directory>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/activity.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/activity.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/activity.json
index 27089b9..89ddeec 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/activity.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/activity.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/activity.json#",
+ "id":"#",
"type": "object",
"title": "activity",
"javaInterfaces": ["java.io.Serializable"],
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/collection.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/collection.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/collection.json
index d73b2fb..5606c0d 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/collection.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/collection.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/collection.json#",
+ "id":"#",
"type": "object",
"title": "collection",
"javaInterfaces": ["java.io.Serializable"],
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/media_link.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/media_link.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/media_link.json
index 50c2107..c5d6ce0 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/media_link.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/media_link.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/media_link.json#",
+ "id":"#",
"type": "object",
"title": "media_link",
"javaInterfaces": ["java.io.Serializable"],
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/object.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/object.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/object.json
index 0baf0ca..c00362f 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/object.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/object.json
@@ -4,9 +4,10 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/object.json#",
+ "id":"#",
"type": "object",
"title": "object",
+ "javaType": "org.apache.streams.pojo.json.ActivityObject",
"javaInterfaces": ["java.io.Serializable"],
"description": "Basic object on the web. The only required property is the id",
"properties": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/alert.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/alert.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/alert.json
index e85dc1b..d089699 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/alert.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/alert.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/alert.json#",
+ "id":"#",
"type": "object",
"title": "alert",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/application.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/application.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/application.json
index 108bb49..a5c2bdc 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/application.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/application.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/application.json#",
+ "id":"#",
"type": "object",
"title": "application",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/article.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/article.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/article.json
index f519750..5bbfd9f 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/article.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/article.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/article.json#",
+ "id":"#",
"type": "object",
"title": "article",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/audio.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/audio.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/audio.json
index 88db093..9c0d33a 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/audio.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/audio.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/audio.json#",
+ "id":"#",
"type": "object",
"title": "audio",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/badge.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/badge.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/badge.json
index 037128c..bb66203 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/badge.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/badge.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/badge.json#",
+ "id":"#",
"type": "object",
"title": "badge",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/binary.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/binary.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/binary.json
index 5028094..0bbfb87 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/binary.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/binary.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/binary.json#",
+ "id":"#",
"type": "object",
"title": "binary",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/bookmark.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/bookmark.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/bookmark.json
index e8e4603..d052898 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/bookmark.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/bookmark.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/badge.json#",
+ "id":"#",
"type": "object",
"title": "bookmark",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/comment.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/comment.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/comment.json
index f79105f..4c658ae 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/comment.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/comment.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/comment.json#",
+ "id":"#",
"type": "object",
"title": "comment",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/device.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/device.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/device.json
index b9e890b..e056c69 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/device.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/device.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/device.json#",
+ "id":"#",
"type": "object",
"title": "device",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/event.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/event.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/event.json
index 481334c..82993ee 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/event.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/event.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/event.json#",
+ "id":"#",
"type": "object",
"title": "event",
"description": "xCal fromat for vevent",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/file.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/file.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/file.json
index 38de4e9..d39fe63 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/file.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/file.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/file.json#",
+ "id":"#",
"type": "object",
"title": "file",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/folder.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/folder.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/folder.json
index b5d2f05..4be89f3 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/folder.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/folder.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/folder.json#",
+ "id":"#",
"type": "object",
"title": "folder",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/game.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/game.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/game.json
index c3b3617..434f152 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/game.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/game.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/game.json#",
+ "id":"#",
"type": "object",
"title": "game",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/group.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/group.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/group.json
index 194a5f7..cc30c29 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/group.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/group.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/group.json#",
+ "id":"#",
"type": "object",
"title": "group",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/image.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/image.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/image.json
index 45b60ab..c820065 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/image.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/image.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/image.json#",
+ "id":"#",
"type": "object",
"title": "image",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/issue.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/issue.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/issue.json
index 4e6e8f7..394d571 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/issue.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/issue.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/issue.json#",
+ "id":"#",
"type": "object",
"title": "issue",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/job.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/job.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/job.json
index 1c7ffa5..bd2d67f 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/job.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/job.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/job.json#",
+ "id":"#",
"type": "object",
"title": "job",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/list.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/list.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/list.json
index ae2451c..6fbdd94 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/list.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/list.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/list.json#",
+ "id":"#",
"type": "object",
"title": "list",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/note.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/note.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/note.json
index afd702a..b2bab1a 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/note.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/note.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/note.json#",
+ "id":"#",
"type": "object",
"title": "note",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/offer.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/offer.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/offer.json
index 78292af..f10b529 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/offer.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/offer.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/offer.json#",
+ "id":"#",
"type": "object",
"title": "offer",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/organization.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/organization.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/organization.json
index fad7e60..c295af2 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/organization.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/organization.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/organization.json#",
+ "id":"#",
"type": "object",
"title": "organization",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/page.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/page.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/page.json
index c690ff5..87cad51 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/page.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/page.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/page.json#",
+ "id":"#",
"type": "object",
"title": "page",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/permission.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/permission.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/permission.json
index 653ad16..ac8766a 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/permission.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/permission.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/permission.json#",
+ "id":"#",
"type": "object",
"title": "permission",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/person.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/person.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/person.json
index cde9b77..e508bdd 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/person.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/person.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/person.json#",
+ "id":"#",
"type": "object",
"title": "person",
"description": "vCard Format. Does not match PoCO",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/photo-album.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/photo-album.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/photo-album.json
index a9b2929..15a193c 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/photo-album.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/photo-album.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/photo-album.json#",
+ "id":"#",
"type": "object",
"title": "article",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/photo.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/photo.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/photo.json
index 5328812..f4e991a 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/photo.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/photo.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/photo.json#",
+ "id":"#",
"type": "object",
"title": "photo",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/place.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/place.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/place.json
index 3e698a8..1f5cba6 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/place.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/place.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/place.json#",
+ "id":"#",
"type": "object",
"title": "place",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/playlist.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/playlist.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/playlist.json
index 1c9d047..2ac6ec1 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/playlist.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/playlist.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/playlist.json#",
+ "id":"#",
"type": "object",
"title": "playlist",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/process.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/process.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/process.json
index f06c1b9..6c596ee 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/process.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/process.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/process.json#",
+ "id":"#",
"type": "object",
"title": "process",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/product.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/product.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/product.json
index a71ffc1..2606429 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/product.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/product.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/product.json#",
+ "id":"#",
"type": "object",
"title": "product",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/property.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/property.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/property.json
index 3e291ac..50e36f3 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/property.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/property.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/property.json#",
+ "id":"#",
"type": "object",
"title": "property",
"description": "A property describes name, path and value. Can be used with delete, update or post verbs",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/question.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/question.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/question.json
index dc14cba..7a864a0 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/question.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/question.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/question.json#",
+ "id":"#",
"type": "object",
"title": "question",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/review.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/review.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/review.json
index a6dd637..8731fde 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/review.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/review.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/review.json#",
+ "id":"#",
"type": "object",
"title": "review",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/role.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/role.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/role.json
index 234eba8..ae53c34 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/role.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/role.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/role.json#",
+ "id":"#",
"type": "object",
"title": "role",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/service.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/service.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/service.json
index 3b9adaf..979695c 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/service.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/service.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/service.json#",
+ "id":"#",
"type": "object",
"title": "service",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/song.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/song.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/song.json
index 4e4be73..289e5a4 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/song.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/song.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/song.json#",
+ "id":"#",
"type": "object",
"title": "song",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/status.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/status.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/status.json
index 2360613..1a58923 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/status.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/status.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/status.json#",
+ "id":"#",
"type": "object",
"title": "status",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/task.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/task.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/task.json
index 460470e..608514b 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/task.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/task.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/task.json#",
+ "id":"#",
"type": "object",
"title": "task",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/team.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/team.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/team.json
index d093c5e..bcc6218 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/team.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/team.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/team.json#",
+ "id":"#",
"type": "object",
"title": "team",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/video.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/video.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/video.json
index 955eadc..3129a84 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/video.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/objectTypes/video.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/0.4-incubating-SNAPSHOT/streams-project/streams-schemas/objectTypes/video.json#",
+ "id":"#",
"type": "object",
"title": "video",
"extends": {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/accept.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/accept.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/accept.json
index b0b9e97..579d128 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/accept.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/accept.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/accept.json#",
+ "id":"#",
"type": "object",
"title": "Accept",
"description": "Indicates that that the actor has accepted the object. For instance, a person accepting an award, or accepting an assignment.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/access.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/access.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/access.json
index fec12b6..2131fc5 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/access.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/access.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/access.json#",
+ "id":"#",
"type": "object",
"title": "Access",
"description": "Indicates that the actor has accessed the object. For instance, a person accessing a room, or accessing a file.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/acknowledge.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/acknowledge.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/acknowledge.json
index 1113209..d071e63 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/acknowledge.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/acknowledge.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/acknowledge.json#",
+ "id":"#",
"type": "object",
"title": "Acknowledge",
"description": "Indicates that the actor has acknowledged the object. This effectively signals that the actor is aware of the object's existence.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/add.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/add.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/add.json
index 0589a57..f48715c 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/add.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/add.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/add.json#",
+ "id":"#",
"type": "object",
"title": "Add",
"description": "Indicates that the actor has added the object to the target. For instance, adding a photo to an album.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/agree.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/agree.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/agree.json
index 05f70a0..a2c86d5 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/agree.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/agree.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/agree.json#",
+ "id":"#",
"type": "object",
"title": "Agree",
"description": "Indicates that the actor agrees with the object. For example, a person agreeing with an argument, or expressing agreement with a particular issue.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/append.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/append.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/append.json
index e10caae..fe46070 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/append.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/append.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/append.json#",
+ "id":"#",
"type": "object",
"title": "Append",
"description": "Indicates that the actor has appended the object to the target. For instance, a person appending a new record to a database.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/approve.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/approve.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/approve.json
index 925f4fb..615d4c3 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/approve.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/approve.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/approve.json#",
+ "id":"#",
"type": "object",
"title": "Approve",
"description": "Indicates that the actor has approved the object. For instance, a manager might approve a travel request.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/archive.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/archive.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/archive.json
index e9fb278..1a5455c 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/archive.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/archive.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/archive.json#",
+ "id":"#",
"type": "object",
"title": "Archive",
"description": "Indicates that the actor has archived the object.",
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/assign.json
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/assign.json b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/assign.json
index 825772c..dd3e5fa 100644
--- a/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/assign.json
+++ b/streams-schemas/streams-schema-activitystreams/src/main/jsonschema/verbs/assign.json
@@ -4,7 +4,7 @@
"http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
"http://www.apache.org/licenses/LICENSE-2.0"
],
- "id": "http://streams.incubator.apache.org/site/latest/streams-project/streams-schemas/verbs/assign.json#",
+ "id":"#",
"type": "object",
"title": "Assign",
"description": "Indicates that the actor has assigned the object to the target.",
[5/7] incubator-streams git commit: Squashed commit of STREAMS-443:
use org.apache.streams.plugins:streams-plugin-pojo instead of
org.jsonschema2pojo
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-plugins/streams-plugin-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-elasticsearch/pom.xml b/streams-plugins/streams-plugin-elasticsearch/pom.xml
index 65a6f4e..d79f92c 100644
--- a/streams-plugins/streams-plugin-elasticsearch/pom.xml
+++ b/streams-plugins/streams-plugin-elasticsearch/pom.xml
@@ -26,7 +26,7 @@
<packaging>maven-plugin</packaging>
<parent>
- <groupId>org.apache.streams</groupId>
+ <groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugins</artifactId>
<version>0.5-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
@@ -168,9 +168,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>joda-time</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-plugins/streams-plugin-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-hbase/pom.xml b/streams-plugins/streams-plugin-hbase/pom.xml
index 547ff23..b43a032 100644
--- a/streams-plugins/streams-plugin-hbase/pom.xml
+++ b/streams-plugins/streams-plugin-hbase/pom.xml
@@ -26,7 +26,7 @@
<packaging>maven-plugin</packaging>
<parent>
- <groupId>org.apache.streams</groupId>
+ <groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugins</artifactId>
<version>0.5-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
@@ -167,9 +167,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>joda-time</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-plugins/streams-plugin-hive/pom.xml
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-hive/pom.xml b/streams-plugins/streams-plugin-hive/pom.xml
index 470d449..98f1eb8 100644
--- a/streams-plugins/streams-plugin-hive/pom.xml
+++ b/streams-plugins/streams-plugin-hive/pom.xml
@@ -26,7 +26,7 @@
<packaging>maven-plugin</packaging>
<parent>
- <groupId>org.apache.streams</groupId>
+ <groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugins</artifactId>
<version>0.5-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
@@ -167,9 +167,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>joda-time</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-plugins/streams-plugin-pig/pom.xml
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-pig/pom.xml b/streams-plugins/streams-plugin-pig/pom.xml
index f5b7283..67a1eb2 100644
--- a/streams-plugins/streams-plugin-pig/pom.xml
+++ b/streams-plugins/streams-plugin-pig/pom.xml
@@ -26,7 +26,7 @@
<packaging>maven-plugin</packaging>
<parent>
- <groupId>org.apache.streams</groupId>
+ <groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugins</artifactId>
<version>0.5-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
@@ -167,9 +167,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>joda-time</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-plugins/streams-plugin-pojo/pom.xml
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-pojo/pom.xml b/streams-plugins/streams-plugin-pojo/pom.xml
index 91e34d5..a337bcc 100644
--- a/streams-plugins/streams-plugin-pojo/pom.xml
+++ b/streams-plugins/streams-plugin-pojo/pom.xml
@@ -26,7 +26,7 @@
<packaging>maven-plugin</packaging>
<parent>
- <groupId>org.apache.streams</groupId>
+ <groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugins</artifactId>
<version>0.5-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
@@ -35,21 +35,6 @@
<dependencies>
<dependency>
<groupId>org.apache.streams</groupId>
- <artifactId>streams-config</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-util</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.streams</groupId>
<artifactId>streams-schema-activitystreams</artifactId>
<version>${project.version}</version>
<type>jar</type>
@@ -57,8 +42,8 @@
</dependency>
<dependency>
<groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-core</artifactId>
- <version>0.4.10</version>
+ <artifactId>jsonschema2pojo-maven-plugin</artifactId>
+ <version>${jsonschema2pojo.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -67,9 +52,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <version>0.4.10</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
@@ -169,11 +153,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.2</version>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-plugins/streams-plugin-pojo/src/main/java/org/apache/streams/plugins/StreamsPojoGenerationConfig.java
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-pojo/src/main/java/org/apache/streams/plugins/StreamsPojoGenerationConfig.java b/streams-plugins/streams-plugin-pojo/src/main/java/org/apache/streams/plugins/StreamsPojoGenerationConfig.java
index 3b953fa..b25cc9f 100644
--- a/streams-plugins/streams-plugin-pojo/src/main/java/org/apache/streams/plugins/StreamsPojoGenerationConfig.java
+++ b/streams-plugins/streams-plugin-pojo/src/main/java/org/apache/streams/plugins/StreamsPojoGenerationConfig.java
@@ -84,4 +84,39 @@ public class StreamsPojoGenerationConfig extends DefaultGenerationConfig {
return sourceURLs.iterator();
}
+ @Override
+ public boolean isGenerateBuilders() {
+ return true;
+ }
+
+ @Override
+ public boolean isUseLongIntegers() {
+ return true;
+ }
+
+ @Override
+ public boolean isRemoveOldOutput() {
+ return true;
+ }
+
+ @Override
+ public boolean isUseJodaDates() {
+ return true;
+ }
+
+ @Override
+ public boolean isIncludeJsr303Annotations() {
+ return true;
+ }
+
+ @Override
+ public boolean isUseCommonsLang3() {
+ return true;
+ }
+
+// @Override
+// public boolean isIncludeAdditionalProperties() {
+// return true;
+// }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorTest.java
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorTest.java b/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorTest.java
index 1315c18..7e04e3e 100644
--- a/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorTest.java
+++ b/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorTest.java
@@ -71,7 +71,6 @@ public class StreamsPojoSourceGeneratorTest {
);
config.setSourcePaths(sourcePaths);
-// config.setSourceDirectory("target/test-classes/streams-schemas");
config.setTargetPackage("org.apache.streams.pojo");
config.setTargetDirectory("target/generated-sources/pojo");
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-plugins/streams-plugin-pojo/src/test/resources/streams-plugin-pojo/pom.xml
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-pojo/src/test/resources/streams-plugin-pojo/pom.xml b/streams-plugins/streams-plugin-pojo/src/test/resources/streams-plugin-pojo/pom.xml
index 77b705b..0880de4 100644
--- a/streams-plugins/streams-plugin-pojo/src/test/resources/streams-plugin-pojo/pom.xml
+++ b/streams-plugins/streams-plugin-pojo/src/test/resources/streams-plugin-pojo/pom.xml
@@ -24,13 +24,13 @@
<groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugin-pojo-test</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>0.5-incubating-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Test StreamsPojoMojo</name>
<properties>
<jackson.version>2.6.1</jackson.version>
- <commons-lang.version>2.6</commons-lang.version>
+ <commons-lang3.version>3.4</commons-lang3.version>
</properties>
<repositories>
@@ -123,9 +123,9 @@
<version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons-lang3.version}</version>
</dependency>
</dependencies>
@@ -134,7 +134,7 @@
<plugin>
<groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugin-pojo</artifactId>
- <version>0.4-incubating-SNAPSHOT</version>
+ <version>${project.version}</version>
<configuration>
<sourcePaths>
<sourcePath>target/test-classes/activitystreams-schemas/activity.json</sourcePath>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-plugins/streams-plugin-scala/pom.xml
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-scala/pom.xml b/streams-plugins/streams-plugin-scala/pom.xml
index 205e760..b8ef652 100644
--- a/streams-plugins/streams-plugin-scala/pom.xml
+++ b/streams-plugins/streams-plugin-scala/pom.xml
@@ -26,7 +26,7 @@
<packaging>maven-plugin</packaging>
<parent>
- <groupId>org.apache.streams</groupId>
+ <groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugins</artifactId>
<version>0.5-incubating-SNAPSHOT</version>
</parent>
@@ -55,10 +55,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-core</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.streams</groupId>
<artifactId>streams-pojo</artifactId>
<version>${project.version}</version>
@@ -163,9 +159,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>joda-time</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-plugins/streams-plugin-scala/src/test/java/org/apache/streams/plugins/test/StreamsScalaSourceGeneratorTest.java
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-scala/src/test/java/org/apache/streams/plugins/test/StreamsScalaSourceGeneratorTest.java b/streams-plugins/streams-plugin-scala/src/test/java/org/apache/streams/plugins/test/StreamsScalaSourceGeneratorTest.java
index b4df332..fda4416 100644
--- a/streams-plugins/streams-plugin-scala/src/test/java/org/apache/streams/plugins/test/StreamsScalaSourceGeneratorTest.java
+++ b/streams-plugins/streams-plugin-scala/src/test/java/org/apache/streams/plugins/test/StreamsScalaSourceGeneratorTest.java
@@ -31,6 +31,10 @@ import javax.annotation.Nullable;
import java.io.File;
import java.io.FileFilter;
+import static junit.framework.TestCase.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Test that Activity beans are compatible with the example activities in the spec.
*/
@@ -72,21 +76,21 @@ public class StreamsScalaSourceGeneratorTest {
}
};
- assert( testOutput != null );
- assert( testOutput.exists() == true );
- assert( testOutput.isDirectory() == true );
- assert( testOutput.listFiles(scalaFilter).length == 11 );
- assert( new File(testOutput + "/traits").exists() == true );
- assert( new File(testOutput + "/traits").isDirectory() == true );
- assert( new File(testOutput + "/traits").listFiles(scalaFilter) != null );
- assert( new File(testOutput + "/traits").listFiles(scalaFilter).length == 4 );
- assert( new File(testOutput + "/objectTypes").exists() == true );
- assert( new File(testOutput + "/objectTypes").isDirectory() == true );
- assert( new File(testOutput + "/objectTypes").listFiles(scalaFilter) != null );
- assert( new File(testOutput + "/objectTypes").listFiles(scalaFilter).length == 43 );
- assert( new File(testOutput + "/verbs").exists() == true );
- assert( new File(testOutput + "/verbs").isDirectory() == true );
- assert( new File(testOutput + "/verbs").listFiles(scalaFilter) != null );
- assert( new File(testOutput + "/verbs").listFiles(scalaFilter).length == 89 );
+ assertNotNull( testOutput );
+ assertTrue( testOutput.exists() );
+ assertTrue( testOutput.isDirectory() );
+ assertEquals( 10, testOutput.listFiles(scalaFilter).length );
+ assertTrue( new File(testOutput + "/traits").exists() );
+ assertTrue( new File(testOutput + "/traits").isDirectory() );
+ assertNotNull( new File(testOutput + "/traits").listFiles(scalaFilter) );
+ assertEquals( 4, new File(testOutput + "/traits").listFiles(scalaFilter).length );
+ assertTrue( new File(testOutput + "/objectTypes").exists() );
+ assertTrue( new File(testOutput + "/objectTypes").isDirectory() );
+ assertNotNull( new File(testOutput + "/objectTypes").listFiles(scalaFilter) );
+ assertEquals( 42, new File(testOutput + "/objectTypes").listFiles(scalaFilter).length);
+ assertTrue( new File(testOutput + "/verbs").exists() );
+ assertTrue( new File(testOutput + "/verbs").isDirectory() );
+ assertNotNull( new File(testOutput + "/verbs").listFiles(scalaFilter) );
+ assertEquals( 89, new File(testOutput + "/verbs").listFiles(scalaFilter).length );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/pom.xml
----------------------------------------------------------------------
diff --git a/streams-pojo/pom.xml b/streams-pojo/pom.xml
index 5d2c0d9..b8f265b 100644
--- a/streams-pojo/pom.xml
+++ b/streams-pojo/pom.xml
@@ -35,19 +35,6 @@
<dependencies>
<dependency>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-core</artifactId>
- <type>jar</type>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
@@ -104,6 +91,27 @@
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>1.1.0.Final</version>
+ </dependency>
+
+ <dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>${reflections.version}</version>
@@ -131,6 +139,12 @@
<groupId>org.apache.streams</groupId>
<artifactId>streams-schema-activitystreams</artifactId>
<version>${project.version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streams</groupId>
+ <artifactId>streams-schema-activitystreams</artifactId>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -158,36 +172,6 @@
</testResources>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/generated-sources/jsonschema2pojo</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-source-jaxb2</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/generated-sources/jaxb2</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.reflections</groupId>
<artifactId>reflections-maven</artifactId>
<executions>
@@ -200,35 +184,12 @@
</executions>
</plugin>
<plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <sourcePaths>
- <sourcePath>${basedir}/src/main/jsonschema</sourcePath>
- <sourcePath>${basedir}/src/main/jsonschema/org/apache/streams/pojo</sourcePath>
- <sourcePath>${basedir}/src/main/jsonschema/verbs</sourcePath>
- <sourcePath>${basedir}/src/main/jsonschema/objectTypes</sourcePath>
- </sourcePaths>
- <targetPackage>org.apache.streams.pojo.json</targetPackage>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- <configuration>
- <generatePackage>org.apache.streams.pojo.xml</generatePackage>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-schemas</id>
- <phase>process-resources</phase>
+ <phase>generate-sources</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
@@ -257,6 +218,50 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <sourcePaths>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+ <sourcePath>${project.basedir}/target/test-classes/activitystreams-schemas</sourcePath>
+ <sourcePath>${project.basedir}/target/test-classes/activitystreams-schemas/objectTypes</sourcePath>
+ <sourcePath>${project.basedir}/target/test-classes/activitystreams-schemas/verbs</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.pojo.json</targetPackage>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>target/generated-sources/pojo</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/activity.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/activity.json b/streams-pojo/src/main/jsonschema/activity.json
deleted file mode 100644
index 1bf0f7f..0000000
--- a/streams-pojo/src/main/jsonschema/activity.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "activity",
- "javaType": "org.apache.streams.pojo.json.Activity",
- "javaInterfaces": ["java.io.Serializable"],
- "description": "An activity construct recounts what an actor did to an object in the past. If there is no actor it simply describes the change.",
- "additionalProperties": true,
- "properties": {
- "id": {
- "type": "string",
- "description": "Uniquely identifies each activity within the service",
- "required": true
- },
- "actor": {
- "type": "object",
- "required": true,
- "description": "Describes the entity that performed the activity. An activity MUST contain one actor property whose value is a single Object.",
- "javaType": "org.apache.streams.pojo.json.Actor",
- "javaInterfaces": ["java.io.Serializable"],
- "additionalProperties": false,
- "extends": {
- "$ref": "./object.json"
- }
- },
- "verb": {
- "title": "verb",
- "type": "string",
- "default": "post",
- "required": true,
- "description": "Identifies the action that the activity describes. An activity MUST contain a verb property whose value is a JSON String that is non-empty and matches either the \"isegment-nz-nc\" or the \"IRI\" production in [RFC3987]. Note that the use of a relative reference other than a simple name is not allowed."
- },
- "object": {
- "type": "object",
- "required": true,
- "description": "Describes the primary object of the activity. For instance, in the activity, \"John saved a movie to his wishlist\", the object of the activity is \"movie\". An activity SHOULD contain an object property whose value is a single Object. If the object property is not contained, the primary object of the activity MAY be implied by context.",
- "$ref": "./object.json"
- },
- "target": {
- "type": "object",
- "description": "Describes the target of the activity. The precise meaning of the activity's target is dependent on the activities verb, but will often be the object the English preposition \"to\". For instance, in the activity, \"John saved a movie to his wishlist\", the target of the activity is \"wishlist\". The activity target MUST NOT be used to identity an indirect object that is not a target of the activity. An activity MAY contain a target property whose value is a single Object.",
- "$ref": "./object.json"
- },
- "published": {
- "type": "string",
- "description": "The date and time at which the activity occurred. It is important to note that this is not necessarily the same as the time at which the activity was published. An activity MUST contain a postedTime property.",
- "format": "date-time"
- },
- "updated": {
- "type": "string",
- "description": "The date and time at which a previously published activity has been modified. An Activity MAY contain an updatedTime property",
- "format": "date-time"
- },
- "generator": {
- "type": "object",
- "description": "Describes the application that generated the activity. An activity MAY contain a generator property whose value is a single Object.",
- "javaType": "org.apache.streams.pojo.json.Generator",
- "javaInterfaces": ["java.io.Serializable"],
- "additionalProperties": false,
- "extends": {
- "$ref": "./object.json"
- }
- },
- "icon": {
- "type": "object",
- "javaType": "org.apache.streams.pojo.json.Icon",
- "javaInterfaces": ["java.io.Serializable"],
- "additionalProperties": false,
- "properties": {
- "$ref": "./media_link.json#properties"
- },
- "description": "An IRI[RFC3987] identifying an image resource provides a visual representation of the activity, intended for human consumption. The image SHOULD have an aspect ratio of one (horizontal) to one (vertical) and SHOULD be suitable for presentation at a small size. An activity MAY have an icon property"
- },
- "provider": {
- "type": "object",
- "description": "Describes the application that published the activity. Note that this is not necessarily the same entity that generated the activity. An activity MAY contain a provider property whose value is a single Object",
- "javaType": "org.apache.streams.pojo.json.Provider",
- "javaInterfaces": ["java.io.Serializable"],
- "additionalProperties": false,
- "extends": {
- "$ref": "./object.json"
- }
- },
- "title": {
- "type": "string",
- "description": "Natural-language title or headline for the activity encoded as a single JSON String containing HTML markup. An activity MAY contain a title property",
- "format": "html"
- },
- "content": {
- "type": "string",
- "description": "Natural-language description of the activity encoded as a single JSON String containing HTML markup. Visual elements such as thumbnail images MAY be included. An activity MAY contain a content property",
- "format": "html"
- },
- "url": {
- "type": "string",
- "description": "An IRI [RFC3987] identifying a resource providing an HTML representation of the activity. An activity MAY contain a url property",
- "format": "url"
- },
- "links": {
- "type": "array",
- "description": "Links between this object and other resources as defined in Web Linking",
- "note": "Tell JSON schema team to not put links inside http://json-schema.org/hyper-schema#properties",
- "items": {
- "type": "string"
- }
- }
- },
- "links": [
- {
- "rel": "describedby",
- "href": "./verbs/{verb}.json"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/collection.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/collection.json b/streams-pojo/src/main/jsonschema/collection.json
deleted file mode 100644
index fcba8e5..0000000
--- a/streams-pojo/src/main/jsonschema/collection.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "collection",
- "javaType": "org.apache.streams.pojo.json.Collection",
- "javaInterfaces": ["java.io.Serializable"],
- "description": "A collection is a generic list of Objects of any object type. The objectType of each item in the collection MAY be omitted if the type of object can be established through context. The collection is used primarily as the root of an Activity Streams document, but can be used as the value of extension properties in a variety of situations. ",
- "properties": {
- "url": {
- "type": "string",
- "description": "An IRI [RFC3987] referencing a JSON document containing the full listing of objects in the collection."
- },
- "totalItems": {
- "type": "integer",
- "description": "Non-negative integer specifying the total number of activities within the stream. The Stream serialization MAY contain a count property."
- },
- "items": {
- "type": "array",
- "required": true,
- "description": "An array containing a listing of Objects of any object type. If used in combination with the url property, the items array can be used to provide a subset of the objects that may be found in the resource identified by the url.",
- "items": {
- "type": "object",
- "extends": {
- "$ref": "./object.json"
- }
- }
- },
- "links": {
- "type": "array",
- "optional": true,
- "description": "Links between an this object and other resources as defined in Web Linking",
- "extends": {
- "$ref": "http://json-schema.org/links#properties"
- }
- }
- },
- "links": [
- {
- "rel": "describedby",
- "href": "http://json-schema.org/schema"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/media_link.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/media_link.json b/streams-pojo/src/main/jsonschema/media_link.json
deleted file mode 100644
index b124642..0000000
--- a/streams-pojo/src/main/jsonschema/media_link.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "media_link",
- "javaType": "org.apache.streams.pojo.json.MediaLink",
- "javaInterfaces": ["java.io.Serializable"],
- "description": "Visual representation of an object in the form of an image, video or embedded HTML fragments",
- "properties": {
- "duration": {
- "title": "duration",
- "type": "number",
- "description": "A hint to the consumer about the length, in seconds, of the media resource identified by the url property. A media link MAY contain a \"duration\" property when the target resource is a time-based media item such as an audio or video."
- },
- "height": {
- "title": "height",
- "type": "integer",
- "description": "A hint to the consumer about the height, in pixels, of the media resource identified by the url property. A media link MAY contain a height property when the target resource is a visual media item such as an image, video or embeddable HTML page."
- },
- "width": {
- "title": "width",
- "type": "integer",
- "description": "A hint to the consumer about the width, in pixels, of the media resource identified by the url property. A media link MAY contain a width property when the target resource is a visual media item such as an image, video or embeddable HTML page."
- },
- "url": {
- "type": "string",
- "required": true,
- "description": "The IRI of the media resource being linked. A media link MUST have a url property."
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/object.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/object.json b/streams-pojo/src/main/jsonschema/object.json
deleted file mode 100644
index deff749..0000000
--- a/streams-pojo/src/main/jsonschema/object.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "object",
- "javaType": "org.apache.streams.pojo.json.ActivityObject",
- "javaInterfaces": ["java.io.Serializable"],
- "description": "Basic object on the web. The only required property is the id",
- "properties": {
- "id": {
- "type": "string",
- "description": "Provides a permanent, universally unique identifier for the object in the form of an absolute IRI [RFC3987]. An object SHOULD contain a single id property. If an object does not contain an id property, consumers MAY use the value of the url property as a less-reliable, non-unique identifier.",
- "required": true
- },
- "image": {
- "format": "image",
- "type": "object",
- "extends": {
- "$ref": "./media_link.json"
- },
- "description": "Description of a resource providing a visual representation of the object, intended for human consumption. An object MAY contain an image property whose value is a Media Link."
- },
- "displayName": {
- "type": "string",
- "description": "A natural-language, human-readable and plain-text name for the object. HTML markup MUST NOT be included. An object MAY contain a displayName property. If the object does not specify an objectType property, the object SHOULD specify a displayName"
- },
- "summary": {
- "type": "string",
- "description": "Natural-language summary of the object encoded as a single JSON String containing HTML markup. Visual elements such as thumbnail images MAY be included. An activity MAY contain a summary property"
- },
- "content": {
- "type": "string",
- "description": "Natural-language description of the object encoded as a single JSON String containing HTML markup. Visual elements such as thumbnail images MAY be included. An object MAY contain a content property"
- },
- "url": {
- "type": "string",
- "format": "url",
- "description": "An IRI [RFC3987] identifying a resource providing an HTML representation of the object. An object MAY contain a url property"
- },
- "objectType": {
- "type": "string",
- "description": "Identifies the type of object. An object MAY contain an objectType property whose value is a JSON String that is non-empty and matches either the \"isegment-nz-nc\" or the \"IRI\" production in [RFC3987]. Note that the use of a relative reference other than a simple name is not allowed. If no objectType property is contained, the object has no specific type."
- },
- "author": {
- "type": "object",
- "description": "Describes the entity that created or authored the object. An object MAY contain a single author property whose value is an Object of any type. Note that the author field identifies the entity that created the object and does not necessarily identify the entity that published the object. For instance, it may be the case that an object created by one person is posted and published to a system by an entirely different entity",
- "javaType": "org.apache.streams.pojo.json.Author",
- "javaInterfaces": ["java.io.Serializable"],
- "extends": {
- "$ref": "./object.json"
- }
- },
- "published": {
- "type": "string",
- "description": "[RFC3339] date-time. The date and time at which the object was published. An object MAY contain a published property",
- "format": "date-time"
- },
- "updated": {
- "type": "string",
- "description": "[RFC3339] date-time. The date and time at which a previously published object has been modified. An Object MAY contain an updated property.",
- "format": "date-time"
- },
- "attachments": {
- "title": "Related objects",
- "description": "A collection of one or more additional, associated objects, similar to the concept of attached files in an email message. An object MAY have an attachedObjects property whose value is a JSON Array of Objects.",
- "type": "array",
- "items": {
- "type": "object",
- "javaType": "org.apache.streams.pojo.json.Attachment",
- "javaInterfaces": ["java.io.Serializable"],
- "$ref": "./object.json"
- }
- },
- "upstreamDuplicates": {
- "type": "array",
- "description": "A JSON Array of one or more absolute IRI's [RFC3987] identifying objects that duplicate this object's content. An object SHOULD contain an upstreamDuplicates property when a publisher is knowingly duplicating with a new ID the content from another object. This MAY be used as a hint for consumers to use when resolving duplicates between objects received from different sources",
- "items": {
- "type": "string"
- }
- },
- "downstreamDuplicates": {
- "type": "array",
- "description": "A JSON Array of one or more absolute IRI's [RFC3987] identifying objects that duplicate this object's content. An object SHOULD contain a downstreamDuplicates property when there are known objects, possibly in a different system, that duplicate the content in this object. This MAY be used as a hint for consumers to use when resolving duplicates between objects received from different sources.",
- "items": {
- "type": "string"
- }
- }
- },
- "additionalProperties": true,
- "links": [
- {
- "rel": "describedby",
- "href": "./objectType/{objectType}.json"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/alert.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/alert.json b/streams-pojo/src/main/jsonschema/objectTypes/alert.json
deleted file mode 100644
index 0ace5de..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/alert.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "alert",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "alert"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/application.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/application.json b/streams-pojo/src/main/jsonschema/objectTypes/application.json
deleted file mode 100644
index ceb1208..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/application.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "application",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "application"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/article.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/article.json b/streams-pojo/src/main/jsonschema/objectTypes/article.json
deleted file mode 100644
index 8abc7f7..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/article.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "article",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "article"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/audio.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/audio.json b/streams-pojo/src/main/jsonschema/objectTypes/audio.json
deleted file mode 100644
index 92cef7f..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/audio.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "audio",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "audio"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/badge.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/badge.json b/streams-pojo/src/main/jsonschema/objectTypes/badge.json
deleted file mode 100644
index b743236..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/badge.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "badge",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "badge"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/binary.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/binary.json b/streams-pojo/src/main/jsonschema/objectTypes/binary.json
deleted file mode 100644
index 8915633..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/binary.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "binary",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "binary"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/bookmark.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/bookmark.json b/streams-pojo/src/main/jsonschema/objectTypes/bookmark.json
deleted file mode 100644
index 3d3e3f1..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/bookmark.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "bookmark",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "bookmark"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/comment.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/comment.json b/streams-pojo/src/main/jsonschema/objectTypes/comment.json
deleted file mode 100644
index 90249c4..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/comment.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "comment",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "comment"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/device.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/device.json b/streams-pojo/src/main/jsonschema/objectTypes/device.json
deleted file mode 100644
index faea368..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/device.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "device",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "device"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/event.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/event.json b/streams-pojo/src/main/jsonschema/objectTypes/event.json
deleted file mode 100644
index 479213f..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/event.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "event",
- "description": "xCal fromat for vevent",
- "extends": [
- {
- "$ref": "../object.json"
- },
- {
- "$ref": "http://www.json-schema.org/calendar"
- }
- ],
- "properties": {
- "objectType": {
- "type": "string",
- "default": "event"
- },
- "attendedBy": {
- "type": "../collection.json"
- },
- "attending": {
- "type": "../collection.json"
- },
- "endTime": {
- "type": "string",
- "format": "date-time"
- },
- "invited": {
- "type": "../collection.json"
- },
- "maybeAttending": {
- "type": "../collection.json"
- },
- "notAttendedBy": {
- "type": "../collection.json"
- },
- "notAttending": {
- "type": "../collection.json"
- },
- "startTime": {
- "type": "string",
- "format": "date-time"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/file.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/file.json b/streams-pojo/src/main/jsonschema/objectTypes/file.json
deleted file mode 100644
index 695ef98..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/file.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "file",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "file"
- },
- "fileUrl": {
- "type": "string"
- },
- "mimeType": {
- "type": "string"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/folder.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/folder.json b/streams-pojo/src/main/jsonschema/objectTypes/folder.json
deleted file mode 100644
index a319efe..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/folder.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "folder",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "folder"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/game.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/game.json b/streams-pojo/src/main/jsonschema/objectTypes/game.json
deleted file mode 100644
index 5f13dfc..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/game.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "game",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "game"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/group.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/group.json b/streams-pojo/src/main/jsonschema/objectTypes/group.json
deleted file mode 100644
index b67d88d..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/group.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "group",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "group"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/image.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/image.json b/streams-pojo/src/main/jsonschema/objectTypes/image.json
deleted file mode 100644
index 8a19fd1..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/image.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "image",
- "extends": {
- "$ref": "../media_link.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "image"
- },
- "fullImage": {
- "type": "string"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/issue.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/issue.json b/streams-pojo/src/main/jsonschema/objectTypes/issue.json
deleted file mode 100644
index 29bfe44..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/issue.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "issue",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "issue"
- },
- "types": {
- "type": "array",
- "items": {
- "type": "string"
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/job.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/job.json b/streams-pojo/src/main/jsonschema/objectTypes/job.json
deleted file mode 100644
index 2d82975..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/job.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "job",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "job"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/list.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/list.json b/streams-pojo/src/main/jsonschema/objectTypes/list.json
deleted file mode 100644
index d7c164a..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/list.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "list",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "list"
- },
- "items": {
- "type": "array",
- "items": {
- "type": "object",
- "properties": {
- "$ref": "../object.json"
- }
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/note.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/note.json b/streams-pojo/src/main/jsonschema/objectTypes/note.json
deleted file mode 100644
index 09de97c..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/note.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "note",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "note"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/offer.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/offer.json b/streams-pojo/src/main/jsonschema/objectTypes/offer.json
deleted file mode 100644
index 38db718..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/offer.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "offer",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "offer"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/organization.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/organization.json b/streams-pojo/src/main/jsonschema/objectTypes/organization.json
deleted file mode 100644
index a3fd5a2..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/organization.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "organization",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "organization"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/page.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/page.json b/streams-pojo/src/main/jsonschema/objectTypes/page.json
deleted file mode 100644
index 4f76aa2..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/page.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "page",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "page"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/permission.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/permission.json b/streams-pojo/src/main/jsonschema/objectTypes/permission.json
deleted file mode 100644
index 32b395c..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/permission.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "permission",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "permission"
- },
- "scope": {
- "type": "object",
- "extends": {
- "$ref": "../object.json"
- }
- },
- "actions": {
- "type": "array",
- "items": {
- "type": "string",
- "enumeration": [
- "create",
- "delete",
- "modify"
- ]
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/person.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/person.json b/streams-pojo/src/main/jsonschema/objectTypes/person.json
deleted file mode 100644
index f42eb8e..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/person.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "person",
- "description": "vCard Format. Does not match PoCO",
- "extends": [
- {
- "$ref": "../object.json"
- },
- {
- "$ref": "http://www.json-schema.org/card"
- }
- ],
- "properties": {
- "objectType": {
- "type": "string",
- "default": "person"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/photo-album.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/photo-album.json b/streams-pojo/src/main/jsonschema/objectTypes/photo-album.json
deleted file mode 100644
index 933804b..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/photo-album.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "article",
- "extends": {
- "$ref": "../objectTypes/list.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "photo-album"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/photo.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/photo.json b/streams-pojo/src/main/jsonschema/objectTypes/photo.json
deleted file mode 100644
index 347f25c..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/photo.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "photo",
- "extends": {
- "$ref": "../objectTypes/file.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "photo"
- },
- "displayName": {
- "type": "string",
- "default": "a photo"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/place.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/place.json b/streams-pojo/src/main/jsonschema/objectTypes/place.json
deleted file mode 100644
index bb96a79..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/place.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "place",
- "extends": [
- {
- "$ref": "../object.json"
- }
- ],
- "properties": {
- "objectType": {
- "type": "string",
- "default": "place"
- },
- "address": {
- "type": "object",
- "extends": [
- {
- "$ref": "http://www.json-schema.org/address"
- }
- ]
- },
- "position": {
- "type": "object",
- "properties": {
- "altitude": {
- "type": "number"
- },
- "latitude": {
- "type": "number"
- },
- "longitude": {
- "type": "number"
- }
- }
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/playlist.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/playlist.json b/streams-pojo/src/main/jsonschema/objectTypes/playlist.json
deleted file mode 100644
index 6ce9dd2..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/playlist.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "playlist",
- "extends": {
- "$ref": "../objectTypes/list.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "playlist"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/process.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/process.json b/streams-pojo/src/main/jsonschema/objectTypes/process.json
deleted file mode 100644
index d717cc7..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/process.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "process",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "process"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/product.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/product.json b/streams-pojo/src/main/jsonschema/objectTypes/product.json
deleted file mode 100644
index 4e035cf..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/product.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "product",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "product"
- },
- "fullImage": {
- "type": "object",
- "extends": {
- "$ref": "../media_link.json"
- }
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/property.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/property.json b/streams-pojo/src/main/jsonschema/objectTypes/property.json
deleted file mode 100644
index 0cd630e..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/property.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "property",
- "description": "A property describes name, path and value. Can be used with delete, update or post verbs",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "property"
- },
- "displayName": {
- "type": "string",
- "description": "The human readable name of the property in the appropriate language",
- "optional": true
- },
- "path": {
- "type": "string",
- "description": "dot delimited path to the property in the target. Ex: streetAddress"
- }
- },
- "example": {
- "actor": {
- "id": 1212,
- "displayName": "Peter"
- },
- "verb": "update",
- "time": "2010-08-02T15:29:00Z",
- "object": {
- "objectType": "property",
- "displayName": "street address",
- "path": "streetAddress",
- "content": "234 Amazing St"
- },
- "target": {
- "id": 12121,
- "time": "2010-08-02T15:29:00Z",
- "displayName": "Peter's House"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/question.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/question.json b/streams-pojo/src/main/jsonschema/objectTypes/question.json
deleted file mode 100644
index cccdfe0..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/question.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "question",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "question"
- },
- "options": {
- "type": "array",
- "items": {
- "type": "object",
- "extends": {
- "$ref": "../object.json"
- }
- }
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/review.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/review.json b/streams-pojo/src/main/jsonschema/objectTypes/review.json
deleted file mode 100644
index 7629cb6..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/review.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "review",
- "extends": {
- "$ref": "../objectTypes/article.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "review"
- },
- "rating": {
- "type": "number"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/role.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/role.json b/streams-pojo/src/main/jsonschema/objectTypes/role.json
deleted file mode 100644
index 25524ab..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/role.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "role",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "role"
- },
- "members": {
- "type": "object",
- "extends": {
- "$ref": "../collection.json"
- }
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/service.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/service.json b/streams-pojo/src/main/jsonschema/objectTypes/service.json
deleted file mode 100644
index 3d4a496..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/service.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "service",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "service"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/song.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/song.json b/streams-pojo/src/main/jsonschema/objectTypes/song.json
deleted file mode 100644
index 46d6eb0..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/song.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "song",
- "extends": {
- "$ref": "../objectTypes/audio.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "song"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/status.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/status.json b/streams-pojo/src/main/jsonschema/objectTypes/status.json
deleted file mode 100644
index a029f19..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/status.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "status",
- "extends": {
- "$ref": "../objectTypes/note.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "song"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/task.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/task.json b/streams-pojo/src/main/jsonschema/objectTypes/task.json
deleted file mode 100644
index 9bd0043..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/task.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "task",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "task"
- },
- "by": {
- "type": "string",
- "format": "date-time"
- },
- "prerequisites": {
- "type": "array",
- "items": {
- "type": "object",
- "extends": {
- "$ref": "./task.json"
- }
- }
- },
- "required": {
- "type": "boolean"
- },
- "supersedes": {
- "type": "array",
- "items": {
- "type": "object",
- "extends": {
- "$ref": "./task.json"
- }
- }
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/team.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/team.json b/streams-pojo/src/main/jsonschema/objectTypes/team.json
deleted file mode 100644
index 37419a0..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/team.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "team",
- "extends": {
- "$ref": "../object.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "team"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/objectTypes/video.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/objectTypes/video.json b/streams-pojo/src/main/jsonschema/objectTypes/video.json
deleted file mode 100644
index 7ac63d8..0000000
--- a/streams-pojo/src/main/jsonschema/objectTypes/video.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "video",
- "extends": {
- "$ref": "../objectTypes/file.json"
- },
- "properties": {
- "objectType": {
- "type": "string",
- "default": "video"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/accept.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/accept.json b/streams-pojo/src/main/jsonschema/verbs/accept.json
deleted file mode 100644
index a9f91fe..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/accept.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Accept",
- "description": "Indicates that that the actor has accepted the object. For instance, a person accepting an award, or accepting an assignment.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "accept"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} accepted {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/access.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/access.json b/streams-pojo/src/main/jsonschema/verbs/access.json
deleted file mode 100644
index 156e3cb..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/access.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Access",
- "description": "Indicates that the actor has accessed the object. For instance, a person accessing a room, or accessing a file.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "access"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} accessed {object.displayName}"
- }
- }
-}
[4/7] incubator-streams git commit: Squashed commit of STREAMS-443:
use org.apache.streams.plugins:streams-plugin-pojo instead of
org.jsonschema2pojo
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/acknowledge.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/acknowledge.json b/streams-pojo/src/main/jsonschema/verbs/acknowledge.json
deleted file mode 100644
index 2e84c43..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/acknowledge.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Acknowledge",
- "description": "Indicates that the actor has acknowledged the object. This effectively signals that the actor is aware of the object's existence.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "acknowledge"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} acknowledge {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/add.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/add.json b/streams-pojo/src/main/jsonschema/verbs/add.json
deleted file mode 100644
index cec0c58..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/add.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Add",
- "description": "Indicates that the actor has added the object to the target. For instance, adding a photo to an album.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "add"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} added {object.displayName} to {target.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/agree.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/agree.json b/streams-pojo/src/main/jsonschema/verbs/agree.json
deleted file mode 100644
index 5095153..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/agree.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Agree",
- "description": "Indicates that the actor agrees with the object. For example, a person agreeing with an argument, or expressing agreement with a particular issue.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "agree"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} agrees with {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/append.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/append.json b/streams-pojo/src/main/jsonschema/verbs/append.json
deleted file mode 100644
index 648d192..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/append.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Append",
- "description": "Indicates that the actor has appended the object to the target. For instance, a person appending a new record to a database.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "append"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} append {object.displayName} to {target.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/approve.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/approve.json b/streams-pojo/src/main/jsonschema/verbs/approve.json
deleted file mode 100644
index ec66f9b..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/approve.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Approve",
- "description": "Indicates that the actor has approved the object. For instance, a manager might approve a travel request.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "approve"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} approved {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/archive.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/archive.json b/streams-pojo/src/main/jsonschema/verbs/archive.json
deleted file mode 100644
index 24aea16..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/archive.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Archive",
- "description": "Indicates that the actor has archived the object.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "archive"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} archived {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/assign.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/assign.json b/streams-pojo/src/main/jsonschema/verbs/assign.json
deleted file mode 100644
index 8fe5458..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/assign.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Assign",
- "description": "Indicates that the actor has assigned the object to the target.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "assign"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} assigned {object.displayName} to {target.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/at.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/at.json b/streams-pojo/src/main/jsonschema/verbs/at.json
deleted file mode 100644
index 42c1222..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/at.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "At",
- "description": "Indicates that the actor is currently located at the object. For instance, a person being at a specific physical location.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "assign"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} assigned {object.displayName} to {target.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/attach.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/attach.json b/streams-pojo/src/main/jsonschema/verbs/attach.json
deleted file mode 100644
index 77ff605..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/attach.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Attach",
- "description": "Indicates that the actor has attached the object to the target.For instance, a person attaching a file to a wiki page or an email.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "attach"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} attached {object.displayName} to {target.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/attend.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/attend.json b/streams-pojo/src/main/jsonschema/verbs/attend.json
deleted file mode 100644
index 07e60fd..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/attend.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Attend",
- "description": "Indicates that the actor has attended the object. For instance, a person attending a meeting.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "attend"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} attended {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/author.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/author.json b/streams-pojo/src/main/jsonschema/verbs/author.json
deleted file mode 100644
index adc8b28..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/author.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Author",
- "description": "Indicates that the actor has authored the object. Note that this is a more specific form of the verb \"create\".",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "author"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} authored {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/authorize.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/authorize.json b/streams-pojo/src/main/jsonschema/verbs/authorize.json
deleted file mode 100644
index 7439b06..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/authorize.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Authorize",
- "description": "Indicates that the actor has authorized the object. If a target is specified, it means that the authorization is specifically in regards to the target. For instance, a service can authorize a person to access a given application; in which case the actor is the service, the object is the person, and the target is the application. In contrast, a person can authorize a request; in which case the actor is the person and the object is the request and there might be no explicit target.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "authorize"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} authorized {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/borrow.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/borrow.json b/streams-pojo/src/main/jsonschema/verbs/borrow.json
deleted file mode 100644
index ede59c1..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/borrow.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Borrow",
- "description": "Indicates that the actor has borrowed the object. If a target is specified, it identifies the entity from which the object was borrowed. For instance, if a person borrows a book from a library, the person is the actor, the book is the object and the library is the target.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "borrow"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} borrow {object.displayName} from {target.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/build.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/build.json b/streams-pojo/src/main/jsonschema/verbs/build.json
deleted file mode 100644
index a90441f..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/build.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Build",
- "description": "Indicates that the actor has built the object. For example, if a person builds a model or compiles code.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "build"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} built {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/cancel.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/cancel.json b/streams-pojo/src/main/jsonschema/verbs/cancel.json
deleted file mode 100644
index 4ab2406..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/cancel.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Cancel",
- "description": "Indicates that the actor has canceled the object. For instance, canceling a calendar event.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "cancel"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} cancelled {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/checkin.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/checkin.json b/streams-pojo/src/main/jsonschema/verbs/checkin.json
deleted file mode 100644
index d59a8c2..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/checkin.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "checkin",
- "description": "Indicates that the actor has checked-in to the object. For instance, a person checking-in to a Place.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "checkin"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} checked in at {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/close.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/close.json b/streams-pojo/src/main/jsonschema/verbs/close.json
deleted file mode 100644
index 7aa049d..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/close.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Close",
- "description": "Indicates that the actor has closed the object. For instance, the object could represent a ticket being tracked in an issue management system.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "close"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} closed {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/complete.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/complete.json b/streams-pojo/src/main/jsonschema/verbs/complete.json
deleted file mode 100644
index 4a95d48..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/complete.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Complete",
- "description": "Indicates that the actor has completed the object",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "complete"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} completed {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/confirm.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/confirm.json b/streams-pojo/src/main/jsonschema/verbs/confirm.json
deleted file mode 100644
index aa8d45c..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/confirm.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Confirm",
- "description": "Indicates that the actor has confirmed or agrees with the object. For instance, a software developer might confirm an issue reported against a product.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "confirm"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} confirmed {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/consume.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/consume.json b/streams-pojo/src/main/jsonschema/verbs/consume.json
deleted file mode 100644
index 3dc558a..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/consume.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Consume",
- "description": "Indicates that the actor has consumed the object. The specific meaning is dependent largely on the object's type. For instance, an actor may \"consume\" an audio object, indicating that the actor has listened to it; or an actor may \"consume\" a book, indicating that the book has been read. As such, the \"consume\" verb is a more generic form of other more specific verbs such as \"read\" and \"play\".",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "consume"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} consumed {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/create.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/create.json b/streams-pojo/src/main/jsonschema/verbs/create.json
deleted file mode 100644
index dda3012..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/create.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Create",
- "description": "Indicates that the actor has created the object.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "create"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} created {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/delete.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/delete.json b/streams-pojo/src/main/jsonschema/verbs/delete.json
deleted file mode 100644
index 39966c9..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/delete.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Delete",
- "description": "Indicates that the actor has deleted the object.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "delete"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} deleted {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/deliver.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/deliver.json b/streams-pojo/src/main/jsonschema/verbs/deliver.json
deleted file mode 100644
index a4b5648..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/deliver.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Deliver",
- "description": "Indicates that the actor has delivered the object. For example, delivering a package.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "deliver"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} delivered {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/deny.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/deny.json b/streams-pojo/src/main/jsonschema/verbs/deny.json
deleted file mode 100644
index 5bf473b..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/deny.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Deny",
- "description": "Indicates that the actor has denied the object. For example, a manager may deny a travel request.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "deny"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} denied {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/disagree.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/disagree.json b/streams-pojo/src/main/jsonschema/verbs/disagree.json
deleted file mode 100644
index b2eb0c2..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/disagree.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Disagree",
- "description": "Indicates that the actor disagrees with the object.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "disagree"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} disagrees with {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/dislike.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/dislike.json b/streams-pojo/src/main/jsonschema/verbs/dislike.json
deleted file mode 100644
index e33cb26..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/dislike.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Dislike",
- "description": "Indicates that the actor dislikes the object. Note that the \"dislike\" verb is distinct from the \"unlike\" verb which assumes that the object had been previously \"liked\".",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "dislike"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} dislikes {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/experience.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/experience.json b/streams-pojo/src/main/jsonschema/verbs/experience.json
deleted file mode 100644
index b760a5d..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/experience.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Experience",
- "description": "Indicates that the actor has experienced the object in some manner. Note that, depending on the specific object types used for both the actor and object, the meaning of this verb can overlap that of the \"consume\" and \"play\" verbs. For instance, a person might \"experience\" a movie; or \"play\" the movie; or \"consume\" the movie. The \"experience\" verb can be considered a more generic form of other more specific verbs as \"consume\", \"play\", \"watch\", \"listen\", and \"read\"",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "experience"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} experienced {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/favorite.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/favorite.json b/streams-pojo/src/main/jsonschema/verbs/favorite.json
deleted file mode 100644
index fa7afa3..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/favorite.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Favorite",
- "description": "Indicates that the actor marked the object as an item of special interest.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "favorite"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} marked {object.displayName} as a favorite"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/find.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/find.json b/streams-pojo/src/main/jsonschema/verbs/find.json
deleted file mode 100644
index b1a7dacc..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/find.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Find",
- "description": "Indicates that the actor has found the object.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "find"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} found {object.displayName}."
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/flag-as-inappropriate.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/flag-as-inappropriate.json b/streams-pojo/src/main/jsonschema/verbs/flag-as-inappropriate.json
deleted file mode 100644
index e6657aa..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/flag-as-inappropriate.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Flag-As-Inappropriate",
- "description": "Indicates that the actor has flagged the object as being inappropriate for some reason. When using this verb, the context property can be used to provide additional detail about why the object has been flagged.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "flag-as-inappropriate"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} flagged {object.displayName} as inappropriate."
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/follow.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/follow.json b/streams-pojo/src/main/jsonschema/verbs/follow.json
deleted file mode 100644
index 8f50b89..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/follow.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Follow",
- "description": "Indicates that the actor began following the activity of the object. In most cases, the objectType will be a \"person\", but it can potentially be of any type that can sensibly generate activity. Processors MAY ignore (silently drop) successive identical \"follow\" activities.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "follow"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} started following {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/give.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/give.json b/streams-pojo/src/main/jsonschema/verbs/give.json
deleted file mode 100644
index a9b6e74..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/give.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Give",
- "description": "Indicates that the actor is giving an object to the target. Examples include one person giving a badge object to another person. The object identifies the object being given. The target identifies the receiver.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "give"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} gave {object.displayName} to {target.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/host.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/host.json b/streams-pojo/src/main/jsonschema/verbs/host.json
deleted file mode 100644
index 8c59cd0..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/host.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Host",
- "description": "Indicates that the actor is hosting the object. As in hosting an event, or hosting a service.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "host"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} is hosting {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/ignore.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/ignore.json b/streams-pojo/src/main/jsonschema/verbs/ignore.json
deleted file mode 100644
index 442de31..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/ignore.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Ignore",
- "description": "Indicates that the actor has ignored the object. For instance, this verb may be used when an actor has ignored a friend request, in which case the object may be the request-friend activity.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "ignore"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} ignored {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/insert.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/insert.json b/streams-pojo/src/main/jsonschema/verbs/insert.json
deleted file mode 100644
index 99db2ec..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/insert.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Insert",
- "description": "Indicates that the actor has inserted the object into the target.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "insert"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} inserted {object.displayName} into {target.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/install.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/install.json b/streams-pojo/src/main/jsonschema/verbs/install.json
deleted file mode 100644
index e3d6e0c..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/install.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Install",
- "description": "Indicates that the actor has installed the object, as in installing an application.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "install"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} installed {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/interact.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/interact.json b/streams-pojo/src/main/jsonschema/verbs/interact.json
deleted file mode 100644
index d589ce4..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/interact.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Interact",
- "description": "Indicates that the actor has interacted with the object. For instance, when one person interacts with another.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "interact"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} interacted with {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/invite.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/invite.json b/streams-pojo/src/main/jsonschema/verbs/invite.json
deleted file mode 100644
index 34a8691..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/invite.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Invite",
- "description": "Indicates that the actor has invited the object, typically a person object, to join or participate in the object described by the target. The target could, for instance, be an event, group or a service.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "invite"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} invited {object.displayName} to {target.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/join.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/join.json b/streams-pojo/src/main/jsonschema/verbs/join.json
deleted file mode 100644
index 78daed8..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/join.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Join",
- "description": "Indicates that the actor has become a member of the object.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "join"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} joined {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/leave.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/leave.json b/streams-pojo/src/main/jsonschema/verbs/leave.json
deleted file mode 100644
index 1ce73bc..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/leave.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Leave",
- "description": "Indicates that the actor has left the object. For instance, a Person leaving a Group or checking-out of a Place.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "leave"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} left {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/like.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/like.json b/streams-pojo/src/main/jsonschema/verbs/like.json
deleted file mode 100644
index 4ac1bf7..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/like.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Like",
- "description": "Indicates that the actor marked the object as an item of special interest.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "like"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} likes {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/listen.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/listen.json b/streams-pojo/src/main/jsonschema/verbs/listen.json
deleted file mode 100644
index 3476144..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/listen.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Listen",
- "description": "Indicates that the actor has listened to the object. This is typically only applicable for objects representing audio content, such as music, an audio-book, or a radio broadcast.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "listen"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} listened to {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/lose.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/lose.json b/streams-pojo/src/main/jsonschema/verbs/lose.json
deleted file mode 100644
index 60899ba..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/lose.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Lose",
- "description": "Indicates that the actor has lost the object. For instance, if a person loses a game.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "lose"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} lost {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/make-friend.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/make-friend.json b/streams-pojo/src/main/jsonschema/verbs/make-friend.json
deleted file mode 100644
index a6440f1..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/make-friend.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Befriend",
- "description": "Indicates the creation of a friendship that is reciprocated by the object.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "make-friend"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} is now friends with {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/open.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/open.json b/streams-pojo/src/main/jsonschema/verbs/open.json
deleted file mode 100644
index 0145bab..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/open.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Open",
- "description": "Indicates that the actor has opened the object. For instance, the object could represent a ticket being tracked in an issue management system.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "open"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} opened {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/play.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/play.json b/streams-pojo/src/main/jsonschema/verbs/play.json
deleted file mode 100644
index 3f25748..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/play.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Play",
- "description": "Indicates that the actor spent some time enjoying the object. For example, if the object is a video this indicates that the subject watched all or part of the video.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "play"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} played {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/post.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/post.json b/streams-pojo/src/main/jsonschema/verbs/post.json
deleted file mode 100644
index ea1ad39..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/post.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Post",
- "description": "To publish an object",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "post"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} posted {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/present.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/present.json b/streams-pojo/src/main/jsonschema/verbs/present.json
deleted file mode 100644
index bcfb1dc..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/present.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Present",
- "description": "Indicates that the actor has presented the object. For instance, when a person gives a presentation at a conference.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "present"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} presented {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/purchase.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/purchase.json b/streams-pojo/src/main/jsonschema/verbs/purchase.json
deleted file mode 100644
index 303386a..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/purchase.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Purchase",
- "description": "Indicates that the actor has purchased the object. If a target is specified, in indicates the entity from which the object was purchased.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "purchase"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} purchased {object.displayName} from {target.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/qualify.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/qualify.json b/streams-pojo/src/main/jsonschema/verbs/qualify.json
deleted file mode 100644
index 974448f..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/qualify.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Qualify",
- "description": "Indicates that the actor has qualified for the object. If a target is specified, it indicates the context within which the qualification applies.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "qualify"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} qualified {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/read.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/read.json b/streams-pojo/src/main/jsonschema/verbs/read.json
deleted file mode 100644
index e797f41..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/read.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Read",
- "description": "Indicates that the actor read the object. This is typically only applicable for objects representing printed or written content, such as a book, a message or a comment.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "read"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} read {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/receive.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/receive.json b/streams-pojo/src/main/jsonschema/verbs/receive.json
deleted file mode 100644
index 0d44aef..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/receive.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Receive",
- "description": "Indicates that the actor is receiving an object. Examples include a person receiving a badge object. The object identifies the object being received.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "receive"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} received {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/reject.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/reject.json b/streams-pojo/src/main/jsonschema/verbs/reject.json
deleted file mode 100644
index b82fac7..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/reject.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Reject",
- "description": "Indicates that the actor has rejected the object.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "reject"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} rejected {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/remove-friend.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/remove-friend.json b/streams-pojo/src/main/jsonschema/verbs/remove-friend.json
deleted file mode 100644
index 073441d..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/remove-friend.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "UnFriend",
- "description": "Indicates that the actor has removed the object from the collection of friends.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "remove-friend"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} removed friend {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/remove.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/remove.json b/streams-pojo/src/main/jsonschema/verbs/remove.json
deleted file mode 100644
index 5b694db..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/remove.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Remove",
- "description": "Indicates that the actor has removed the object from the target.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "remove"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} removed {object.displayName} from {target.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/replace.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/replace.json b/streams-pojo/src/main/jsonschema/verbs/replace.json
deleted file mode 100644
index 198c8c5..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/replace.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Replace",
- "description": "Indicates that the actor has replaced the target with the object.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "replace"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} replaced {target.displayName} with {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/request-friend.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/request-friend.json b/streams-pojo/src/main/jsonschema/verbs/request-friend.json
deleted file mode 100644
index 9e246ca..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/request-friend.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "RequestFriend",
- "description": "Indicates the creation of a friendship that has not yet been reciprocated by the object.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "request-friend"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} sent a friend request to {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/request.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/request.json b/streams-pojo/src/main/jsonschema/verbs/request.json
deleted file mode 100644
index 35807f5..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/request.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Request",
- "description": "Indicates that the actor has requested the object. If a target is specified, it indicates the entity from which the object is being requested.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "request"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} requested {object.displayName} from {target.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/resolve.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/resolve.json b/streams-pojo/src/main/jsonschema/verbs/resolve.json
deleted file mode 100644
index 0b71ce3..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/resolve.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Resolve",
- "description": "Indicates that the actor has resolved the object. For instance, the object could represent a ticket being tracked in an issue management system.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "resolve"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} resolved {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/retract.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/retract.json b/streams-pojo/src/main/jsonschema/verbs/retract.json
deleted file mode 100644
index ff7cbe7..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/retract.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Retract",
- "description": "Indicates that the actor has retracted the object. For instance, if an actor wishes to retract a previously published activity, the object would be the previously published activity that is being retracted.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "retract"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} retracted {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/return.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/return.json b/streams-pojo/src/main/jsonschema/verbs/return.json
deleted file mode 100644
index 14a8cfb..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/return.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Return",
- "description": "Indicates that the actor has returned the object. If a target is specified, it indicates the entity to which the object was returned.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "return"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} returned {object.displayName} to {target.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/rsvp-maybe.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/rsvp-maybe.json b/streams-pojo/src/main/jsonschema/verbs/rsvp-maybe.json
deleted file mode 100644
index 4838406..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/rsvp-maybe.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Rsvp Maybe",
- "description": "To indicate that the actor may attend an event",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "rsvp-maybe"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} might attend {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/rsvp-no.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/rsvp-no.json b/streams-pojo/src/main/jsonschema/verbs/rsvp-no.json
deleted file mode 100644
index dc36ee3..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/rsvp-no.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Rsvp No",
- "description": "To indicate that the actor will not attend an event",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "rsvp-no"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} will not attend {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/rsvp-yes.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/rsvp-yes.json b/streams-pojo/src/main/jsonschema/verbs/rsvp-yes.json
deleted file mode 100644
index f62141e..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/rsvp-yes.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Rsvp Yes",
- "description": "To indicate that the actor will attend an event",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "rsvp-yes"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} is attending {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/satisfy.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/satisfy.json b/streams-pojo/src/main/jsonschema/verbs/satisfy.json
deleted file mode 100644
index a719680..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/satisfy.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Satisfy",
- "description": "Indicates that the actor has satisfied the object. If a target is specified, it indicate the context within which the object was satisfied. For instance, if a person satisfies the requirements for a particular challenge, the person is the actor; the requirement is the object; and the challenge is the target.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "satisfy"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} has satisfied {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/save.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/save.json b/streams-pojo/src/main/jsonschema/verbs/save.json
deleted file mode 100644
index 1bdbc4b..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/save.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Save",
- "description": "Indicates that the actor has called out the object as being of interest primarily to him- or herself. Though this action MAY be shared publicly, the implication is that the object has been saved primarily for the actor's own benefit rather than to show it to others as would be indicated by the \"share\" verb.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "save"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} saved {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/schedule.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/schedule.json b/streams-pojo/src/main/jsonschema/verbs/schedule.json
deleted file mode 100644
index a9824a3..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/schedule.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Schedule",
- "description": "Indicates that the actor has scheduled the object. For instance, scheduling a meeting.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "schedule"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} scheduled {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/search.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/search.json b/streams-pojo/src/main/jsonschema/verbs/search.json
deleted file mode 100644
index 3263bbb..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/search.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Search",
- "description": "Indicates that the actor is or has searched for the object. If a target is specified, it indicates the context within which the search is or has been conducted.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "satisfy"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} search for {object.displayName} in {target.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/sell.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/sell.json b/streams-pojo/src/main/jsonschema/verbs/sell.json
deleted file mode 100644
index 16aa351..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/sell.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Sell",
- "description": "Indicates that the actor has sold the object. If a target is specified, it indicates the entity to which the object was sold.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "sell"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} sold {object.displayName} to {target.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/send.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/send.json b/streams-pojo/src/main/jsonschema/verbs/send.json
deleted file mode 100644
index ead4108..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/send.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Share",
- "description": "Indicates that the actor has called out the object to readers. In most cases, the actor did not create the object being shared, but is instead drawing attention to it.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "share"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} shared {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/share.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/share.json b/streams-pojo/src/main/jsonschema/verbs/share.json
deleted file mode 100644
index 18c0aea..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/share.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Share",
- "description": "To share an object.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "share"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} shared {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/sponsor.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/sponsor.json b/streams-pojo/src/main/jsonschema/verbs/sponsor.json
deleted file mode 100644
index cc6f5cf..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/sponsor.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Sponsor",
- "description": "Indicates that the actor has sponsored the object. If a target is specified, it indicates the context within which the sponsorship is offered. For instance, a company can sponsor an event; or an individual can sponsor a project; etc.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "sponsor"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} sponsored {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-pojo/src/main/jsonschema/verbs/start.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/verbs/start.json b/streams-pojo/src/main/jsonschema/verbs/start.json
deleted file mode 100644
index 61eaf06..0000000
--- a/streams-pojo/src/main/jsonschema/verbs/start.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-03/schema",
- "$license": [
- "http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0",
- "http://www.apache.org/licenses/LICENSE-2.0"
- ],
- "id": "#",
- "type": "object",
- "title": "Start",
- "description": "Indicates that the actor has started the object. For instance, when a person starts a project.",
- "extends": {
- "$ref": "../activity.json"
- },
- "properties": {
- "verb": {
- "type": "string",
- "default": "start"
- },
- "title": {
- "type": "string",
- "default": "{actor.displayName} started {object.displayName}"
- }
- }
-}
[6/7] incubator-streams git commit: Squashed commit of STREAMS-443:
use org.apache.streams.plugins:streams-plugin-pojo instead of
org.jsonschema2pojo
Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/AccountTypeProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/AccountTypeProcessor.java b/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/AccountTypeProcessor.java
index 7aa632e..5b23e16 100644
--- a/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/AccountTypeProcessor.java
+++ b/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/AccountTypeProcessor.java
@@ -26,7 +26,6 @@ import org.apache.streams.core.StreamsDatum;
import org.apache.streams.pojo.extensions.ExtensionUtil;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
-import org.apache.streams.pojo.json.Actor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -63,9 +62,8 @@ public class AccountTypeProcessor extends SimpleHTTPGetProcessor {
@Override
protected Map<String, String> prepareParams(StreamsDatum entry) {
Activity activity = mapper.convertValue(entry.getDocument(), Activity.class);
- Actor actor = activity.getActor();
- ActivityObject actorObject = mapper.convertValue(actor, ActivityObject.class);
- String username = (String) ExtensionUtil.getInstance().getExtension(actorObject, "screenName");
+ ActivityObject actor = mapper.convertValue(activity.getActor(), ActivityObject.class);
+ String username = (String) ExtensionUtil.getInstance().getExtension(actor, "screenName");
Map<String, String> params = new HashMap<>();
params.put("id", actor.getId());
params.put("name", actor.getDisplayName());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/DemographicsProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/DemographicsProcessor.java b/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/DemographicsProcessor.java
index 4f6af35..1ee55a9 100644
--- a/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/DemographicsProcessor.java
+++ b/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/DemographicsProcessor.java
@@ -26,7 +26,6 @@ import org.apache.streams.core.StreamsDatum;
import org.apache.streams.pojo.extensions.ExtensionUtil;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
-import org.apache.streams.pojo.json.Actor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -63,9 +62,8 @@ public class DemographicsProcessor extends SimpleHTTPGetProcessor {
@Override
protected Map<String, String> prepareParams(StreamsDatum entry) {
Activity activity = mapper.convertValue(entry.getDocument(), Activity.class);
- Actor actor = activity.getActor();
- ActivityObject actorObject = mapper.convertValue(actor, ActivityObject.class);
- String username = (String) ExtensionUtil.getInstance().getExtension(actorObject, "screenName");
+ ActivityObject actor = mapper.convertValue(activity.getActor(), ActivityObject.class);
+ String username = (String) ExtensionUtil.getInstance().getExtension(actor, "screenName");
Map<String, String> params = new HashMap<>();
params.put("id", actor.getId());
params.put("name", actor.getDisplayName());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-processor-urls/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-urls/pom.xml b/streams-contrib/streams-processor-urls/pom.xml
index c6a1408..eda32a8 100644
--- a/streams-contrib/streams-processor-urls/pom.xml
+++ b/streams-contrib/streams-processor-urls/pom.xml
@@ -53,10 +53,6 @@
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-core</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
@@ -106,57 +102,42 @@
</testResources>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <sourcePaths>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.urls</targetPackage>
+ </configuration>
<executions>
<execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
<goals>
- <goal>add-source</goal>
+ <goal>generate-sources</goal>
</goals>
- <configuration>
- <sources>
- <source>target/generated-sources/jsonschema2pojo/**/*.java</source>
- </sources>
- </configuration>
</execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
<execution>
- <id>add-source-jaxb2</id>
+ <id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
- <source>target/generated-sources/jaxb2</source>
+ <source>target/generated-sources/pojo</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/urls/LinkDetails.json</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.urls</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-facebook/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/pom.xml b/streams-contrib/streams-provider-facebook/pom.xml
index 02729a7..7db5fde 100644
--- a/streams-contrib/streams-provider-facebook/pom.xml
+++ b/streams-contrib/streams-provider-facebook/pom.xml
@@ -119,6 +119,25 @@
</testResources>
<plugins>
<plugin>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <sourcePaths>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.facebook.pojo</targetPackage>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
@@ -130,7 +149,7 @@
</goals>
<configuration>
<sources>
- <source>target/generated-sources/jsonschema2pojo</source>
+ <source>target/generated-sources/pojo</source>
</sources>
</configuration>
</execution>
@@ -141,54 +160,6 @@
<artifactId>maven-resources-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/facebook/FacebookConfiguration.json</sourcePath>
- <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/facebook/FacebookUserInformationConfiguration.json</sourcePath>
- <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/facebook/FacebookUserstreamConfiguration.json</sourcePath>
- <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/facebook/graph/Post.json</sourcePath>
- <sourcePath>${project.basedir}/src/main/jsonschema/org/apache/streams/facebook/Page.json</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>com.facebook</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.8.3</version>
- <configuration>
- <schemaDirectory>../streams-provider-gnip/gnip-powertrack/src/main/xmlschema/</schemaDirectory>
- <generateDirectory>target/generated-sources/jaxb2</generateDirectory>
- <verbose>true</verbose>
- <debug>true</debug>
- <encoding>${project.build.sourceEncoding}</encoding>
- <forceRegenerate>true</forceRegenerate>
- <removeOldOutput>false</removeOldOutput>
- <generatePackage>org.apache.streams.pojo.xml</generatePackage>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.2.1</version>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java
index 0cc9d69..e8f2fff 100644
--- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java
+++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java
@@ -36,7 +36,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.extensions.ExtensionUtil;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
-import org.apache.streams.pojo.json.Actor;
import org.apache.streams.pojo.json.Image;
import org.apache.streams.pojo.json.Provider;
import org.slf4j.Logger;
@@ -130,12 +129,12 @@ public class FacebookActivityUtil {
}
/**
- * Builds the activity {@link org.apache.streams.pojo.json.Actor} object from the Page
+ * Builds the activity {@link org.apache.streams.pojo.json.ActivityObject} actor from the Page
* @param page the object to use as the source
* @return a valid Actor populated from the Page
*/
- public static Actor buildActor(Page page) {
- Actor actor = new Actor();
+ public static ActivityObject buildActor(Page page) {
+ ActivityObject actor = new ActivityObject();
actor.setId(formatId(
Optional.fromNullable(
page.getId())
@@ -164,12 +163,12 @@ public class FacebookActivityUtil {
}
/**
- * Builds an {@link org.apache.streams.pojo.json.Actor} object from the {@link Post}
+ * Builds an {@link org.apache.streams.pojo.json.ActivityObject} object from the {@link Post}
* @param post
- * @return {@link org.apache.streams.pojo.json.Actor}
+ * @return {@link org.apache.streams.pojo.json.ActivityObject}
*/
- public static Actor buildActor(Post post) {
- Actor actor = new Actor();
+ public static ActivityObject buildActor(Post post) {
+ ActivityObject actor = new ActivityObject();
try {
actor.setId(formatId(
@@ -193,7 +192,7 @@ public class FacebookActivityUtil {
* @param actor
* @param page
*/
- public static void buildExtensions(Actor actor, Page page) {
+ public static void buildExtensions(ActivityObject actor, Page page) {
Map<String, Object> extensions = new HashMap<>();
Location location = page.getLocation();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookStreamsPostSerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookStreamsPostSerializer.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookStreamsPostSerializer.java
index 3375931..f829b08 100644
--- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookStreamsPostSerializer.java
+++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookStreamsPostSerializer.java
@@ -22,7 +22,7 @@ import org.apache.streams.data.ActivitySerializer;
import org.apache.streams.exceptions.ActivitySerializerException;
import org.apache.streams.facebook.Post;
import org.apache.streams.pojo.json.Activity;
-import org.apache.streams.pojo.json.Actor;
+import org.apache.streams.pojo.json.ActivityObject;
import org.apache.streams.pojo.json.Provider;
import java.util.List;
@@ -61,8 +61,8 @@ public class FacebookStreamsPostSerializer implements ActivitySerializer<Post> {
return null;
}
- public Actor createActor(Post post) {
- Actor actor = new Actor();
+ public ActivityObject createActor(Post post) {
+ ActivityObject actor = new ActivityObject();
actor.setDisplayName(post.getFrom().getName());
actor.setId(ID_PREFIX+post.getFrom().getId());
return actor;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-google/google-gmail/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gmail/pom.xml b/streams-contrib/streams-provider-google/google-gmail/pom.xml
index 77807b6..f8370c7 100644
--- a/streams-contrib/streams-provider-google/google-gmail/pom.xml
+++ b/streams-contrib/streams-provider-google/google-gmail/pom.xml
@@ -54,10 +54,6 @@
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-core</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
@@ -128,6 +124,25 @@
</testResources>
<plugins>
<plugin>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <sourcePaths>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.google.gmail.pojo</targetPackage>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
@@ -139,35 +154,13 @@
</goals>
<configuration>
<sources>
- <source>target/generated-sources/jsonschema2pojo</source>
+ <source>target/generated-sources/pojo</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema/com/google/gmail</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.google.gmail.pojo</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java b/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java
index 7b624ba..e2b5501 100644
--- a/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java
+++ b/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java
@@ -38,7 +38,6 @@ import org.apache.streams.data.ActivitySerializer;
import org.apache.streams.pojo.extensions.ExtensionUtil;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
-import org.apache.streams.pojo.json.Actor;
import org.apache.streams.pojo.json.Generator;
import org.apache.streams.pojo.json.Icon;
import org.apache.streams.pojo.json.Provider;
@@ -94,7 +93,7 @@ public class GMailMessageActivitySerializer implements ActivitySerializer<GmailM
provider.setId("http://gmail.com");
provider.setDisplayName("GMail");
activity.setProvider(provider);
- Actor actor = new Actor();
+ ActivityObject actor = new ActivityObject();
actor.setId(gmailMessage.getFrom().getEmail());
actor.setDisplayName(gmailMessage.getFrom().getName());
activity.setActor(actor);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-google/google-gplus/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/pom.xml b/streams-contrib/streams-provider-google/google-gplus/pom.xml
index cfdba45..f91bc5f 100644
--- a/streams-contrib/streams-provider-google/google-gplus/pom.xml
+++ b/streams-contrib/streams-provider-google/google-gplus/pom.xml
@@ -59,10 +59,6 @@
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-core</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
@@ -175,6 +171,25 @@
</testResources>
<plugins>
<plugin>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <sourcePaths>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.google.gplus.pojo</targetPackage>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
@@ -186,35 +201,13 @@
</goals>
<configuration>
<sources>
- <source>target/generated-sources/jsonschema2pojo</source>
+ <source>target/generated-sources/pojo</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema/com/google/gplus/GPlusConfiguration.json</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.google.gplus.pojo</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.2.1</version>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java
index 86f019e..cdc7e8f 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java
@@ -28,7 +28,6 @@ import org.apache.streams.exceptions.ActivitySerializerException;
import org.apache.streams.pojo.extensions.ExtensionUtil;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
-import org.apache.streams.pojo.json.Actor;
import org.apache.streams.pojo.json.Image;
import org.apache.streams.pojo.json.Provider;
import org.joda.time.DateTime;
@@ -216,13 +215,13 @@ public class GooglePlusActivityUtil {
/**
* Given a {@link com.google.api.services.plus.model.Activity.Actor} object, return a fully fleshed
- * out {@link org.apache.streams.pojo.json.Actor} object
+ * out {@link org.apache.streams.pojo.json.ActivityObject} actor
*
* @param gPlusActor
- * @return {@link Actor}
+ * @return {@link ActivityObject}
*/
- private static Actor buildActor(com.google.api.services.plus.model.Activity.Actor gPlusActor) {
- Actor actor = new Actor();
+ private static ActivityObject buildActor(com.google.api.services.plus.model.Activity.Actor gPlusActor) {
+ ActivityObject actor = new ActivityObject();
actor.setDisplayName(gPlusActor.getDisplayName());
actor.setId(formatId(String.valueOf(gPlusActor.getId())));
@@ -245,8 +244,8 @@ public class GooglePlusActivityUtil {
* @param person
* @return Actor constructed with relevant Person details
*/
- private static Actor buildActor(Person person) {
- Actor actor = new Actor();
+ private static ActivityObject buildActor(Person person) {
+ ActivityObject actor = new ActivityObject();
actor.setUrl(person.getUrl());
actor.setDisplayName(person.getDisplayName());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusPersonSerDeIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusPersonSerDeIT.java b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusPersonSerDeIT.java
index 056babe..0b101e9 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusPersonSerDeIT.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/GooglePlusPersonSerDeIT.java
@@ -27,7 +27,7 @@ import com.google.gplus.serializer.util.GooglePlusActivityUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
-import org.apache.streams.pojo.json.Actor;
+import org.apache.streams.pojo.json.ActivityObject;
import org.apache.streams.pojo.json.Provider;
import org.junit.Before;
import org.junit.Ignore;
@@ -87,7 +87,7 @@ public class GooglePlusPersonSerDeIT {
assertEquals(provider.getId(), "id:providers:googleplus");
assertEquals(provider.getDisplayName(), "GooglePlus");
- Actor actor = activity.getActor();
+ ActivityObject actor = activity.getActor();
assertNotNull(actor.getImage());
assert(actor.getId().contains("id:googleplus:"));
assertNotNull(actor.getUrl());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java
index 1c67802..8ffec0b 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/test/java/com/google/gplus/processor/GooglePlusActivitySerDeIT.java
@@ -28,7 +28,7 @@ import org.apache.commons.lang.StringUtils;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.extensions.ExtensionUtil;
import org.apache.streams.pojo.json.Activity;
-import org.apache.streams.pojo.json.Actor;
+import org.apache.streams.pojo.json.ActivityObject;
import org.apache.streams.pojo.json.Provider;
import org.junit.Before;
import org.junit.Test;
@@ -86,7 +86,7 @@ public class GooglePlusActivitySerDeIT {
assertEquals(provider.getId(), "id:providers:googleplus");
assertEquals(provider.getDisplayName(), "GooglePlus");
- Actor actor = activity.getActor();
+ ActivityObject actor = activity.getActor();
assertNotNull(actor.getImage());
assert(actor.getId().contains("id:googleplus:"));
assertNotNull(actor.getUrl());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-instagram/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-instagram/pom.xml b/streams-contrib/streams-provider-instagram/pom.xml
index 4ef4469..a8b5989 100644
--- a/streams-contrib/streams-provider-instagram/pom.xml
+++ b/streams-contrib/streams-provider-instagram/pom.xml
@@ -52,10 +52,6 @@
<artifactId>jackson-datatype-joda</artifactId>
</dependency>
<dependency>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-core</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
@@ -133,6 +129,25 @@
</testResources>
<plugins>
<plugin>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <sourcePaths>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.instagram.pojo</targetPackage>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
@@ -144,36 +159,13 @@
</goals>
<configuration>
<sources>
- <source>target/generated-sources/jsonschema2pojo</source>
+ <source>target/generated-sources/pojo</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema/com/instagram/InstagramConfiguration.json</sourcePath>
- <sourcePath>${project.basedir}/src/main/jsonschema/com/instagram/InstagramUserInformationConfiguration.json</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.instagram.pojo</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.2.1</version>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java
index bf3f233..1c82da4 100644
--- a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java
+++ b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java
@@ -27,7 +27,6 @@ import org.apache.streams.exceptions.ActivitySerializerException;
import org.apache.streams.pojo.extensions.ExtensionUtil;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
-import org.apache.streams.pojo.json.Actor;
import org.apache.streams.pojo.json.Image;
import org.apache.streams.pojo.json.Provider;
import org.jinstagram.entity.comments.CommentData;
@@ -98,8 +97,8 @@ public class InstagramActivityUtil {
* @param item
* @return Actor object
*/
- public static Actor buildActor(UserInfoData item) {
- Actor actor = new Actor();
+ public static ActivityObject buildActor(UserInfoData item) {
+ ActivityObject actor = new ActivityObject();
try {
Image image = new Image();
@@ -134,8 +133,8 @@ public class InstagramActivityUtil {
* @param item the item
* @return a valid Actor
*/
- public static Actor buildActor(MediaFeedData item) {
- Actor actor = new Actor();
+ public static ActivityObject buildActor(MediaFeedData item) {
+ ActivityObject actor = new ActivityObject();
try {
Image image = new Image();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-moreover/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-moreover/pom.xml b/streams-contrib/streams-provider-moreover/pom.xml
index 4ae9993..548f534 100644
--- a/streams-contrib/streams-provider-moreover/pom.xml
+++ b/streams-contrib/streams-provider-moreover/pom.xml
@@ -56,10 +56,6 @@
<artifactId>jackson-datatype-json-org</artifactId>
</dependency>
<dependency>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-core</artifactId>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
@@ -107,54 +103,20 @@
</testResources>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source-jsonschema2pojo</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/generated-sources/jsonschema2pojo</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-source-jaxb2</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/generated-sources/jaxb2</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
<configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
<sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema/com/moreover/Moreover.json</sourcePath>
- <sourcePath>${project.basedir}/src/main/jsonschema/com/moreover/MoreoverConfiguration.json</sourcePath>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
</sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
<targetPackage>com.moreover</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
</configuration>
<executions>
<execution>
<goals>
- <goal>generate</goal>
+ <goal>generate-sources</goal>
</goals>
</execution>
</executions>
@@ -188,6 +150,26 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>target/generated-sources/pojo</source>
+ <source>target/generated-sources/jaxb2</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.2.1</version>
@@ -214,10 +196,10 @@
<skipTests>${skipITs}</skipTests>
</configuration>
</plugin>
-<plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
-</plugin>
+ </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverUtils.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverUtils.java b/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverUtils.java
index 3940a7c..8a91281 100644
--- a/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverUtils.java
+++ b/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/moreover/MoreoverUtils.java
@@ -27,7 +27,6 @@ import org.apache.streams.data.util.ActivityUtil;
import org.apache.streams.pojo.extensions.ExtensionUtil;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
-import org.apache.streams.pojo.json.Actor;
import org.apache.streams.pojo.json.Provider;
import org.joda.time.DateTime;
@@ -119,8 +118,8 @@ public class MoreoverUtils {
return provider;
}
- public static Actor convert(Author author, String platformName) {
- Actor actor = new Actor();
+ public static ActivityObject convert(Author author, String platformName) {
+ ActivityObject actor = new ActivityObject();
AuthorPublishingPlatform platform = author.getPublishingPlatform();
String userId = platform.getUserId();
if (userId != null) actor.setId(ActivityUtil.getPersonId(getProviderID(platformName), userId));
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-rss/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-rss/pom.xml b/streams-contrib/streams-provider-rss/pom.xml
index 299f9ff..de774c4 100644
--- a/streams-contrib/streams-provider-rss/pom.xml
+++ b/streams-contrib/streams-provider-rss/pom.xml
@@ -48,10 +48,6 @@
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-core</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
@@ -139,6 +135,25 @@
</testResources>
<plugins>
<plugin>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <sourcePaths>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.rss.pojo</targetPackage>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
@@ -150,35 +165,13 @@
</goals>
<configuration>
<sources>
- <source>target/generated-sources/jsonschema2pojo</source>
+ <source>target/generated-sources/pojo</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema/RssStreamConfiguration.json</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.rss.pojo</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.2.1</version>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntryActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntryActivitySerializer.java b/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntryActivitySerializer.java
index 8b483a1..e323f27 100644
--- a/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntryActivitySerializer.java
+++ b/streams-contrib/streams-provider-rss/src/main/java/org/apache/streams/rss/serializer/SyndEntryActivitySerializer.java
@@ -28,7 +28,6 @@ import org.apache.streams.data.util.RFC3339Utils;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
-import org.apache.streams.pojo.json.Actor;
import org.apache.streams.pojo.json.Author;
import org.apache.streams.pojo.json.Provider;
import org.joda.time.DateTime;
@@ -83,7 +82,7 @@ public class SyndEntryActivitySerializer implements ActivitySerializer<ObjectNod
Activity activity = new Activity();
Provider provider = buildProvider(entry);
- Actor actor = buildActor(entry);
+ ActivityObject actor = buildActor(entry);
ActivityObject activityObject = buildActivityObject(entry);
activityObject.setUrl(provider.getUrl());
@@ -124,9 +123,9 @@ public class SyndEntryActivitySerializer implements ActivitySerializer<ObjectNod
* @param entry
* @return
*/
- private Actor buildActor(ObjectNode entry) {
+ private ActivityObject buildActor(ObjectNode entry) {
+ ActivityObject actor = new ActivityObject();
Author author = new Author();
- Actor actor = new Actor();
if (entry.get("author") != null) {
author.setId(entry.get("author").textValue());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/SyndEntryActivitySerializerIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/SyndEntryActivitySerializerIT.java b/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/SyndEntryActivitySerializerIT.java
index 5e7ed53..b1d5f9d 100644
--- a/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/SyndEntryActivitySerializerIT.java
+++ b/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/SyndEntryActivitySerializerIT.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.collect.Lists;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
-import org.apache.streams.pojo.json.Actor;
+import org.apache.streams.pojo.json.ActivityObject;
import org.apache.streams.pojo.json.Author;
import org.apache.streams.pojo.json.Provider;
import org.apache.streams.rss.serializer.SyndEntryActivitySerializer;
@@ -89,7 +89,7 @@ public class SyndEntryActivitySerializerIT {
assertEquals(new DateTime(expected, DateTimeZone.UTC), published);
}
- public void testActor(String expected, Actor actor) {
+ public void testActor(String expected, ActivityObject actor) {
assertEquals("id:rss:null" + ":" + expected, actor.getId());
assertEquals(expected, actor.getDisplayName());
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-sysomos/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-sysomos/pom.xml b/streams-contrib/streams-provider-sysomos/pom.xml
index 724ee19..b00793c 100644
--- a/streams-contrib/streams-provider-sysomos/pom.xml
+++ b/streams-contrib/streams-provider-sysomos/pom.xml
@@ -48,10 +48,6 @@
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-core</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.streams</groupId>
<artifactId>streams-core</artifactId>
</dependency>
@@ -103,59 +99,24 @@
</testResources>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/generated-sources/jsonschema2pojo/**/*.java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-source-jaxb2</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/generated-sources/jaxb2</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
<configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
<sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema/com/sysomos/Sysomos.json</sourcePath>
- <sourcePath>${project.basedir}/src/main/jsonschema/com/sysomos/SysomosConfiguration.json</sourcePath>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
</sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
<targetPackage>com.sysomos</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
</configuration>
<executions>
<execution>
<goals>
- <goal>generate</goal>
+ <goal>generate-sources</goal>
</goals>
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
@@ -168,6 +129,13 @@
<forceRegenerate>true</forceRegenerate>
<removeOldOutput>false</removeOldOutput>
<generatePackage>com.sysomos.xml</generatePackage>
+ <plugins>
+ <plugin>
+ <groupId>org.jvnet.jaxb2_commons</groupId>
+ <artifactId>jaxb2-basics</artifactId>
+ <version>${jaxb2-basics.version}</version>
+ </plugin>
+ </plugins>
</configuration>
<executions>
<execution>
@@ -178,6 +146,25 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>target/generated-sources/pojo</source>
+ <source>target/generated-sources/jaxb2</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/conversion/SysomosBeatActivityConverter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/conversion/SysomosBeatActivityConverter.java b/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/conversion/SysomosBeatActivityConverter.java
index 66beaed..5d2a399 100644
--- a/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/conversion/SysomosBeatActivityConverter.java
+++ b/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/conversion/SysomosBeatActivityConverter.java
@@ -24,7 +24,6 @@ import org.apache.commons.lang.StringUtils;
import org.apache.streams.pojo.extensions.ExtensionUtil;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
-import org.apache.streams.pojo.json.Actor;
import org.apache.streams.pojo.json.Provider;
import org.joda.time.DateTime;
@@ -53,7 +52,7 @@ public class SysomosBeatActivityConverter {
converted.setTitle(beat.getTitle());
converted.setPublished(new DateTime(beat.getTime()));
converted.setUrl(beat.getLink());
- converted.setActor(new Actor());
+ converted.setActor(new ActivityObject());
Map<String, BeatApi.BeatResponse.Beat.Tag> mappedTags = mapTags(beat);
Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(converted);
extensions.put("keywords", beat.getContent());
@@ -71,7 +70,7 @@ public class SysomosBeatActivityConverter {
protected void setChannelSpecificValues(BeatApi.BeatResponse.Beat beat, Activity converted, Map<String, BeatApi.BeatResponse.Beat.Tag> mappedTags) {
String mediaType = beat.getMediaType();
String lowerMediaType = mediaType.toLowerCase();
- Actor actor = converted.getActor();
+ ActivityObject actor = converted.getActor();
ActivityObject object = converted.getObject();
if ("TWITTER".equals(mediaType)) {
actor.setId(getPersonId(lowerMediaType, beat.getHost()));
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-twitter/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/pom.xml b/streams-contrib/streams-provider-twitter/pom.xml
index e16cee2..f97a984 100644
--- a/streams-contrib/streams-provider-twitter/pom.xml
+++ b/streams-contrib/streams-provider-twitter/pom.xml
@@ -53,10 +53,6 @@
<artifactId>jackson-datatype-joda</artifactId>
</dependency>
<dependency>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-core</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
@@ -139,6 +135,25 @@
</testResources>
<plugins>
<plugin>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <sourcePaths>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
+ </sourcePaths>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
+ <targetPackage>org.apache.streams.twitter.pojo</targetPackage>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
@@ -150,35 +165,13 @@
</goals>
<configuration>
<sources>
- <source>target/generated-sources/jsonschema2pojo</source>
+ <source>target/generated-sources/pojo</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.twitter.pojo</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.2.1</version>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonUserstreameventActivityConverter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonUserstreameventActivityConverter.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonUserstreameventActivityConverter.java
index b3647fa..bb31fd6 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonUserstreameventActivityConverter.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/TwitterJsonUserstreameventActivityConverter.java
@@ -25,7 +25,6 @@ import org.apache.streams.data.ActivityConverter;
import org.apache.streams.exceptions.ActivityConversionException;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
-import org.apache.streams.pojo.json.Actor;
import org.apache.streams.twitter.pojo.UserstreamEvent;
import java.util.List;
@@ -97,8 +96,8 @@ public class TwitterJsonUserstreameventActivityConverter implements ActivityConv
return activity;
}
- public Actor buildActor(UserstreamEvent event) {
- Actor actor = new Actor();
+ public ActivityObject buildActor(UserstreamEvent event) {
+ ActivityObject actor = new ActivityObject();
//actor.setId(formatId(delete.getDelete().getStatus().getUserIdStr()));
return actor;
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/util/TwitterActivityUtil.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/util/TwitterActivityUtil.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/util/TwitterActivityUtil.java
index 08873c9..4015514 100644
--- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/util/TwitterActivityUtil.java
+++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/util/TwitterActivityUtil.java
@@ -30,7 +30,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.extensions.ExtensionUtil;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
-import org.apache.streams.pojo.json.Actor;
import org.apache.streams.pojo.json.Image;
import org.apache.streams.pojo.json.Provider;
import org.apache.streams.twitter.Url;
@@ -127,8 +126,8 @@ public class TwitterActivityUtil {
* @param delete the delete event
* @return a valid Actor
*/
- public static Actor buildActor(Delete delete) {
- Actor actor = new Actor();
+ public static ActivityObject buildActor(Delete delete) {
+ ActivityObject actor = new ActivityObject();
actor.setId(formatId(delete.getDelete().getStatus().getUserIdStr()));
actor.setObjectType("page");
return actor;
@@ -184,24 +183,24 @@ public class TwitterActivityUtil {
}
/**
- * Builds the activity {@link org.apache.streams.pojo.json.Actor} object from the tweet
+ * Builds the activity {@link org.apache.streams.pojo.json.ActivityObject} actor from the tweet
* @param tweet the object to use as the source
* @return a valid Actor populated from the Tweet
*/
- public static Actor buildActor(Tweet tweet) {
- Actor actor = new Actor();
+ public static ActivityObject buildActor(Tweet tweet) {
+ ActivityObject actor = new ActivityObject();
User user = tweet.getUser();
return buildActor(user);
}
/**
- * Builds the activity {@link org.apache.streams.pojo.json.Actor} object from the User
+ * Builds the activity {@link org.apache.streams.pojo.json.ActivityObject} actor from the User
* @param user the object to use as the source
* @return a valid Actor populated from the Tweet
*/
- public static Actor buildActor(User user) {
- Actor actor = new Actor();
+ public static ActivityObject buildActor(User user) {
+ ActivityObject actor = new ActivityObject();
actor.setId(formatId(
Optional.fromNullable(
user.getIdStr())
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityObjectsConvertersTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityObjectsConvertersTest.java b/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityObjectsConvertersTest.java
index a455754..c110670 100644
--- a/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityObjectsConvertersTest.java
+++ b/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/utils/TwitterActivityObjectsConvertersTest.java
@@ -20,17 +20,23 @@ package org.apache.streams.twitter.test.utils;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
+import org.apache.streams.converter.ActivityObjectConverterProcessorConfiguration;
import org.apache.streams.converter.ActivityObjectConverterUtil;
+import org.apache.streams.data.DocumentClassifier;
import org.apache.streams.data.util.ActivityUtil;
import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.ActivityObject;
import org.apache.streams.twitter.converter.TwitterDateTimeFormat;
+import org.apache.streams.twitter.converter.TwitterDocumentClassifier;
+import org.apache.streams.twitter.converter.TwitterJsonUserActivityObjectConverter;
import org.apache.streams.twitter.pojo.User;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+
/**
* Tests {org.apache.streams.twitter.converter.*}
*/
@@ -40,7 +46,12 @@ public class TwitterActivityObjectsConvertersTest {
private ObjectMapper mapper = StreamsJacksonMapper.getInstance(Lists.newArrayList(TwitterDateTimeFormat.TWITTER_FORMAT));
- private ActivityObjectConverterUtil activityObjectConverterUtil = ActivityObjectConverterUtil.getInstance();
+ private ActivityObjectConverterProcessorConfiguration activityObjectConverterProcessorConfiguration =
+ new ActivityObjectConverterProcessorConfiguration()
+ .withClassifiers(Lists.newArrayList(new TwitterDocumentClassifier()))
+ .withConverters(Lists.newArrayList(new TwitterJsonUserActivityObjectConverter()));
+
+ private ActivityObjectConverterUtil activityObjectConverterUtil = ActivityObjectConverterUtil.getInstance(activityObjectConverterProcessorConfiguration);
private String userJson = "{\"id\":1663018644,\"id_str\":\"1663018644\",\"name\":\"M.R. Clark\",\"screen_name\":\"cantennisfan\",\"location\":\"\",\"url\":null,\"description\":null,\"protected\":false,\"verified\":false,\"followers_count\":0,\"friends_count\":5,\"listed_count\":0,\"favourites_count\":2,\"statuses_count\":72,\"created_at\":\"Sun Aug 11 17:23:47 +0000 2013\",\"utc_offset\":-18000,\"time_zone\":\"Eastern Time (US & Canada)\",\"geo_enabled\":false,\"lang\":\"en\",\"contributors_enabled\":false,\"is_translator\":false,\"profile_background_color\":\"C0DEED\",\"profile_background_image_url\":\"http://abs.twimg.com/images/themes/theme1/bg.png\",\"profile_background_image_url_https\":\"https://abs.twimg.com/images/themes/theme1/bg.png\",\"profile_background_tile\":false,\"profile_link_color\":\"0084B4\",\"profile_sidebar_border_color\":\"C0DEED\",\"profile_sidebar_fill_color\":\"DDEEF6\",\"profile_text_color\":\"333333\",\"profile_use_background_image\":true,\"profile_im
age_url\":\"http://abs.twimg.com/sticky/default_profile_images/default_profile_0_normal.png\",\"profile_image_url_https\":\"https://abs.twimg.com/sticky/default_profile_images/default_profile_0_normal.png\",\"default_profile\":true,\"default_profile_image\":true,\"following\":null,\"follow_request_sent\":null,\"notifications\":null,\"status\":{\"created_at\":\"Thu Jan 01 14:11:48 +0000 2015\",\"id\":550655634706669568,\"id_str\":\"550655634706669568\",\"text\":\"CBC Media Centre - CBC - Air Farce New Year's Eve 2014/2015: http://t.co/lMlL9VbC5e\",\"source\":\"<a href=\\\"https://dev.twitter.com/docs/tfw\\\" rel=\\\"nofollow\\\">Twitter for Websites</a>\",\"truncated\":false,\"in_reply_to_status_id\":null,\"in_reply_to_status_id_str\":null,\"in_reply_to_user_id\":null,\"in_reply_to_user_id_str\":null,\"in_reply_to_screen_name\":null,\"geo\":null,\"coordinates\":null,\"place\":null,\"contributors\":null,\"retweet_count\":0,\"favorite_count\":0,\"entities\":{\"hashtags\":[],\"trends\":
[],\"urls\":[{\"url\":\"http://t.co/lMlL9VbC5e\",\"expanded_url\":\"http://www.cbc.ca/mediacentre/air-farce-new-years-eve-20142015.html#.VKVVarDhVxR.twitter\",\"display_url\":\"cbc.ca/mediacentre/ai\u2026\",\"indices\":[61,83]}],\"user_mentions\":[],\"symbols\":[]},\"favorited\":false,\"retweeted\":false,\"possibly_sensitive\":false,\"filter_level\":\"medium\",\"lang\":\"en\",\"timestamp_ms\":\"1420121508658\"}}\n";
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-youtube/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-youtube/pom.xml b/streams-contrib/streams-provider-youtube/pom.xml
index 92ab036..2e8db41 100644
--- a/streams-contrib/streams-provider-youtube/pom.xml
+++ b/streams-contrib/streams-provider-youtube/pom.xml
@@ -139,33 +139,48 @@
</testResources>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
<configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
<sourcePaths>
- <sourcePath>${project.basedir}/src/main/jsonschema/com/youtube/YoutubeConfiguration.json</sourcePath>
+ <sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
</sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
<targetPackage>org.apache.streams.youtube.pojo</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
</configuration>
<executions>
<execution>
<goals>
- <goal>generate</goal>
+ <goal>generate-sources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
</goals>
+ <configuration>
+ <sources>
+ <source>target/generated-sources/pojo</source>
+ </sources>
+ </configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skipTests>${skipITs}</skipTests>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java b/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java
index 482ec04..ab2f55c 100644
--- a/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java
+++ b/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java
@@ -31,7 +31,6 @@ import org.apache.streams.exceptions.ActivitySerializerException;
import org.apache.streams.pojo.extensions.ExtensionUtil;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
-import org.apache.streams.pojo.json.Actor;
import org.apache.streams.pojo.json.Image;
import org.apache.streams.pojo.json.Provider;
import org.joda.time.DateTime;
@@ -95,8 +94,8 @@ public class YoutubeActivityUtil {
}
}
- public static Actor createActorForChannel(Channel channel) {
- Actor actor = new Actor();
+ public static ActivityObject createActorForChannel(Channel channel) {
+ ActivityObject actor = new ActivityObject();
actor.setId("id:youtube:"+channel.getId());
actor.setSummary(channel.getSnippet().getDescription());
actor.setDisplayName(channel.getSnippet().getTitle());
@@ -156,13 +155,13 @@ public class YoutubeActivityUtil {
}
/**
- * Build an {@link org.apache.streams.pojo.json.Actor} object given the video object
+ * Build an {@link org.apache.streams.pojo.json.ActivityObject} actor given the video object
* @param video
* @param id
* @return Actor object
*/
- private static Actor buildActor(Video video, String id) {
- Actor actor = new Actor();
+ private static ActivityObject buildActor(Video video, String id) {
+ ActivityObject actor = new ActivityObject();
actor.setId("id:youtube:" + id);
actor.setDisplayName(video.getSnippet().getChannelTitle());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/serializer/YoutubeVideoSerDeTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/serializer/YoutubeVideoSerDeTest.java b/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/serializer/YoutubeVideoSerDeTest.java
index 9b93e59..c162f41 100644
--- a/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/serializer/YoutubeVideoSerDeTest.java
+++ b/streams-contrib/streams-provider-youtube/src/test/java/com/youtube/serializer/YoutubeVideoSerDeTest.java
@@ -25,7 +25,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.extensions.ExtensionUtil;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
-import org.apache.streams.pojo.json.Actor;
import org.apache.streams.pojo.json.Provider;
import org.joda.time.DateTime;
import org.junit.Before;
@@ -76,7 +75,7 @@ public class YoutubeVideoSerDeTest {
assertEquals(provider.getId(), "id:providers:youtube");
assertEquals(provider.getDisplayName(), "YouTube");
- Actor actor = activity.getActor();
+ ActivityObject actor = activity.getActor();
assert (actor.getId().contains("id:youtube:"));
assertNotNull(actor.getDisplayName());
assertNotNull(actor.getSummary());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-monitoring/pom.xml
----------------------------------------------------------------------
diff --git a/streams-monitoring/pom.xml b/streams-monitoring/pom.xml
index 1955c11..9cd97bd 100644
--- a/streams-monitoring/pom.xml
+++ b/streams-monitoring/pom.xml
@@ -93,36 +93,56 @@
</testResources>
<plugins>
<plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
+ <groupId>org.apache.streams.plugins</groupId>
+ <artifactId>streams-plugin-pojo</artifactId>
+ <version>${project.version}</version>
<configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
<sourcePaths>
<sourcePath>${project.basedir}/src/main/jsonschema</sourcePath>
</sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
+ <targetDirectory>${project.basedir}/target/generated-sources/pojo</targetDirectory>
<targetPackage>org.apache.streams.pojo.json</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>true</useJodaDates>
</configuration>
<executions>
<execution>
<goals>
- <goal>generate</goal>
+ <goal>generate-sources</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
- <exclude>src/test/resources/MemoryUsageObjects.json</exclude>
- </excludes>
- </configuration>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>target/generated-sources/pojo</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>src/test/resources/MemoryUsageObjects.json</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
+
</project>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-monitoring/src/test/java/org/apache/streams/jackson/MemoryUsageDeserializerTest.java
----------------------------------------------------------------------
diff --git a/streams-monitoring/src/test/java/org/apache/streams/jackson/MemoryUsageDeserializerTest.java b/streams-monitoring/src/test/java/org/apache/streams/jackson/MemoryUsageDeserializerTest.java
index fc0d6ea..1c68239 100644
--- a/streams-monitoring/src/test/java/org/apache/streams/jackson/MemoryUsageDeserializerTest.java
+++ b/streams-monitoring/src/test/java/org/apache/streams/jackson/MemoryUsageDeserializerTest.java
@@ -20,7 +20,7 @@ package org.apache.streams.jackson;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.streams.pojo.json.MemoryUsageBroadcast;
import org.junit.Before;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/streams-plugins/pom.xml b/streams-plugins/pom.xml
index 75825e0..166636a 100644
--- a/streams-plugins/pom.xml
+++ b/streams-plugins/pom.xml
@@ -27,6 +27,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
+ <groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugins</artifactId>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4f100f3a/streams-plugins/streams-plugin-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/streams-plugins/streams-plugin-cassandra/pom.xml b/streams-plugins/streams-plugin-cassandra/pom.xml
index f13df92..9d94ec5 100644
--- a/streams-plugins/streams-plugin-cassandra/pom.xml
+++ b/streams-plugins/streams-plugin-cassandra/pom.xml
@@ -26,7 +26,7 @@
<packaging>maven-plugin</packaging>
<parent>
- <groupId>org.apache.streams</groupId>
+ <groupId>org.apache.streams.plugins</groupId>
<artifactId>streams-plugins</artifactId>
<version>0.5-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
@@ -167,9 +167,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>joda-time</groupId>