http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6187265f/streams-schemas/src/main/java/org/apache/streams/schema/FileUtil.java
----------------------------------------------------------------------
diff --git 
a/streams-schemas/src/main/java/org/apache/streams/schema/FileUtil.java 
b/streams-schemas/src/main/java/org/apache/streams/schema/FileUtil.java
deleted file mode 100644
index 53f0a98..0000000
--- a/streams-schemas/src/main/java/org/apache/streams/schema/FileUtil.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.apache.streams.schema;
-
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Created by steve on 5/1/16.
- */
-public class FileUtil {
-
-    private final static Logger LOGGER = 
LoggerFactory.getLogger(FileUtil.class);
-
-    public static String dropSourcePathPrefix(String inputFile, String 
sourceDirectory) {
-        if(Strings.isNullOrEmpty(sourceDirectory))
-            return inputFile;
-        else {
-            try {
-                if( inputFile.contains(sourceDirectory) && 
inputFile.indexOf(sourceDirectory) > 0) {
-                    return 
inputFile.substring(inputFile.indexOf(sourceDirectory)+sourceDirectory.length()+1);
-                }
-            } catch( Throwable e ) {
-                return inputFile;
-            }
-        }
-        return inputFile;
-    }
-
-    public static String swapExtension(String inputFile, String 
originalExtension, String newExtension) {
-        if(inputFile.endsWith("."+originalExtension))
-            return inputFile.replace("."+originalExtension, "."+newExtension);
-        else return inputFile;
-    }
-
-    public static String dropExtension(String inputFile) {
-        if(inputFile.contains("."))
-            return inputFile.substring(0, inputFile.lastIndexOf("."));
-        else return inputFile;
-    }
-
-    public static void writeFile(String resourceFile, String resourceContent) {
-        try {
-            File path = new File(resourceFile);
-            File dir = path.getParentFile();
-            if( !dir.exists() )
-                dir.mkdirs();
-            Files.write(Paths.get(resourceFile), resourceContent.getBytes(), 
StandardOpenOption.CREATE_NEW);
-        } catch (Exception e) {
-            LOGGER.error("Write Exception: {}", e);
-        }
-    }
-
-    public static void resolveRecursive(GenerationConfig config, List<File> 
schemaFiles) {
-
-        Preconditions.checkArgument(schemaFiles.size() > 0);
-        int i = 0;
-        while( schemaFiles.size() > i) {
-            File child = schemaFiles.get(i);
-            if (child.isDirectory()) {
-                
schemaFiles.addAll(Arrays.asList(child.listFiles(config.getFileFilter())));
-                schemaFiles.remove(child);
-            } else {
-                i += 1;
-            }
-        }
-
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6187265f/streams-schemas/src/main/java/org/apache/streams/schema/GenerationConfig.java
----------------------------------------------------------------------
diff --git 
a/streams-schemas/src/main/java/org/apache/streams/schema/GenerationConfig.java 
b/streams-schemas/src/main/java/org/apache/streams/schema/GenerationConfig.java
deleted file mode 100644
index ec77367..0000000
--- 
a/streams-schemas/src/main/java/org/apache/streams/schema/GenerationConfig.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.apache.streams.schema;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.net.URL;
-import java.util.Iterator;
-
-/**
- * Created by sblackmon on 5/3/16.
- */
-public interface GenerationConfig {
-
-    /**
-     * Gets the 'source' configuration option.
-     *
-     * @return The source file(s) or directory(ies) from which JSON Schema will
-     *         be read.
-     */
-    Iterator<URL> getSource();
-
-    /**
-     * Gets the 'targetDirectory' configuration option.
-     *
-     * @return The target directory into which generated types will be written
-     *         (may or may not exist before types are written)
-     */
-    File getTargetDirectory();
-
-    /**
-     * Gets the 'outputEncoding' configuration option.
-     *
-     * @return The character encoding that should be used when writing output 
files.
-     */
-    String getOutputEncoding();
-
-    /**
-     * Gets the file filter used to isolate the schema mapping files in the
-     * source directories.
-     *
-     * @return the file filter use when scanning for schema files.
-     */
-    FileFilter getFileFilter();
-
-    /**
-     * Gets the 'includeAdditionalProperties' configuration option.
-     *
-     * @return Whether to allow 'additional properties' support in objects.
-     *         Setting this to false will disable additional properties 
support,
-     *         regardless of the input schema(s).
-     */
-//    boolean isIncludeAdditionalProperties();
-
-    /**
-     * Gets the 'targetVersion' configuration option.
-     *
-     *  @return The target version for generated source files.
-     */
-//    String getTargetVersion();
-
-//    /**
-//     * Gets the `includeDynamicAccessors` configuraiton option.
-//     *
-//     * @return Whether to include dynamic getters, setters, and builders
-//     *         or to omit these methods.
-//     */
-//    boolean isIncludeDynamicAccessors();
-
-//    /**
-//     * Gets the `dateTimeType` configuration option.
-//     *         <p>
-//     *         Example values:
-//     *         <ul>
-//     *         <li><code>org.joda.time.LocalDateTime</code> (Joda)</li>
-//     *         <li><code>java.time.LocalDateTime</code> (JSR310)</li>
-//     *         <li><code>null</code> (default behavior)</li>
-//     *         </ul>
-//     *
-//     * @return The java type to use instead of {@link java.util.Date}
-//     *         when adding date type fields to generate Java types.
-//     */
-//    String getDateTimeType();
-//
-//    /**
-//     * Gets the `dateType` configuration option.
-//     *         <p>
-//     *         Example values:
-//     *         <ul>
-//     *         <li><code>org.joda.time.LocalDate</code> (Joda)</li>
-//     *         <li><code>java.time.LocalDate</code> (JSR310)</li>
-//     *         <li><code>null</code> (default behavior)</li>
-//     *         </ul>
-//     *
-//     * @return The java type to use instead of string
-//     *         when adding string type fields with a format of date (not
-//     *         date-time) to generated Java types.
-//     */
-//    String getDateType();
-//
-//    /**
-//     * Gets the `timeType` configuration option.
-//     *         <p>
-//     *         Example values:
-//     *         <ul>
-//     *         <li><code>org.joda.time.LocalTime</code> (Joda)</li>
-//     *         <li><code>java.time.LocalTime</code> (JSR310)</li>
-//     *         <li><code>null</code> (default behavior)</li>
-//     *         </ul>
-//     *
-//     * @return The java type to use instead of string
-//     *         when adding string type fields with a format of time (not
-//     *         date-time) to generated Java types.
-//     */
-//    String getTimeType();
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6187265f/streams-schemas/src/main/java/org/apache/streams/schema/Schema.java
----------------------------------------------------------------------
diff --git 
a/streams-schemas/src/main/java/org/apache/streams/schema/Schema.java 
b/streams-schemas/src/main/java/org/apache/streams/schema/Schema.java
deleted file mode 100644
index ea75ffd..0000000
--- a/streams-schemas/src/main/java/org/apache/streams/schema/Schema.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.apache.streams.schema;
-
-import com.fasterxml.jackson.databind.JsonNode;
-
-import java.net.URI;
-
-/**
- * A JSON Schema document.
- */
-public class Schema {
-
-    private final URI id;
-    private final URI uri;
-    private final JsonNode content;
-    private final Schema parent;
-    private final boolean generate;
-
-    public Schema(URI uri, JsonNode content, Schema parent, boolean generate) {
-        this.uri = uri;
-        this.content = content;
-        this.parent = parent;
-        this.generate = generate;
-        this.id = content.has("id") ? URI.create(content.get("id").asText()) : 
null;
-    }
-
-    public URI getId() {
-        return id;
-    }
-
-    public URI getURI() {
-        return uri;
-    }
-
-    public JsonNode getContent() {
-        return content;
-    }
-
-    public JsonNode getParentContent() {
-        if( parent != null )
-            return parent.getContent();
-        else return null;
-    }
-
-    public URI getParentURI() {
-        if( parent != null ) return parent.getURI();
-        else return null;
-    }
-
-    public boolean isGenerated() {
-        return generate;
-    }
-
-    public Schema getParent() {
-        return parent;
-    }
-
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6187265f/streams-schemas/src/main/java/org/apache/streams/schema/SchemaStore.java
----------------------------------------------------------------------
diff --git 
a/streams-schemas/src/main/java/org/apache/streams/schema/SchemaStore.java 
b/streams-schemas/src/main/java/org/apache/streams/schema/SchemaStore.java
deleted file mode 100644
index e612aff..0000000
--- a/streams-schemas/src/main/java/org/apache/streams/schema/SchemaStore.java
+++ /dev/null
@@ -1,283 +0,0 @@
-package org.apache.streams.schema;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.Optional;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Ordering;
-import org.apache.commons.lang3.StringUtils;
-import org.jsonschema2pojo.ContentResolver;
-import org.jsonschema2pojo.FragmentResolver;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.URI;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import static org.apache.streams.schema.URIUtil.safeResolve;
-
-/**
- * Created by steve on 4/30/16.
- */
-public class SchemaStore extends Ordering<Schema> {
-
-    private final static Logger LOGGER = 
LoggerFactory.getLogger(SchemaStore.class);
-    private final static JsonNodeFactory NODE_FACTORY = 
JsonNodeFactory.instance;
-
-    protected Map<URI, Schema> schemas = new HashMap();
-    protected FragmentResolver fragmentResolver = new FragmentResolver();
-    protected ContentResolver contentResolver = new ContentResolver();
-
-    public SchemaStore() {
-    }
-
-    public synchronized Schema create(URI uri) {
-        if(!getByUri(uri).isPresent()) {
-            URI baseURI = URIUtil.removeFragment(uri);
-            JsonNode baseNode = this.contentResolver.resolve(baseURI);
-            if(uri.toString().contains("#") && !uri.toString().endsWith("#")) {
-                Schema newSchema = new Schema(baseURI, baseNode, null, true);
-                this.schemas.put(baseURI, newSchema);
-                JsonNode childContent = 
this.fragmentResolver.resolve(baseNode, '#' + 
StringUtils.substringAfter(uri.toString(), "#"));
-                this.schemas.put(uri, new Schema(uri, childContent, newSchema, 
false));
-            } else {
-                if( baseNode.has("extends") && 
baseNode.get("extends").isObject()) {
-                    URI ref = 
URI.create(((ObjectNode)baseNode.get("extends")).get("$ref").asText());
-                    URI absoluteURI;
-                    if( ref.isAbsolute())
-                        absoluteURI = ref;
-                    else
-                        absoluteURI = baseURI.resolve(ref);
-                    JsonNode parentNode = 
this.contentResolver.resolve(absoluteURI);
-                    Schema parentSchema = null;
-                    if( this.schemas.get(absoluteURI) != null ) {
-                        parentSchema = this.schemas.get(absoluteURI);
-                    } else {
-                        parentSchema = create(absoluteURI);
-                    }
-                    this.schemas.put(uri, new Schema(uri, baseNode, 
parentSchema, true));
-                } else {
-                    this.schemas.put(uri, new Schema(uri, baseNode, null, 
true));
-                }
-            }
-            List<JsonNode> refs = baseNode.findValues("$ref");
-            for( JsonNode ref : refs ) {
-                if( ref.isValueNode() ) {
-                    String refVal = ref.asText();
-                    URI refURI = null;
-                    try {
-                        refURI = URI.create(refVal);
-                    } catch( Exception e ) {
-                        LOGGER.info("Exception: {}", e.getMessage());
-                    }
-                    if (refURI != null && !getByUri(refURI).isPresent()) {
-                        if (refURI.isAbsolute())
-                            create(refURI);
-                        else
-                            create(baseURI.resolve(refURI));
-                    }
-                }
-            }
-        }
-
-        return this.schemas.get(uri);
-    }
-
-    public Schema create(Schema parent, String path) {
-        if(path.equals("#")) {
-            return parent;
-        } else {
-            path = StringUtils.stripEnd(path, "#?&/");
-            URI id = parent != null && parent.getId() != 
null?parent.getId().resolve(path):URI.create(path);
-            if(this.selfReferenceWithoutParentFile(parent, path)) {
-                this.schemas.put(id, new Schema(id, 
this.fragmentResolver.resolve(parent.getParentContent(), path), parent, false));
-                return this.schemas.get(id);
-            } else {
-                return this.create(id);
-            }
-        }
-    }
-
-    protected boolean selfReferenceWithoutParentFile(Schema parent, String 
path) {
-        return parent != null && (parent.getId() == null || 
parent.getId().toString().startsWith("#/")) && path.startsWith("#/");
-    }
-
-    public synchronized void clearCache() {
-        this.schemas.clear();
-    }
-
-    public Integer getSize() {
-        return schemas.size();
-    }
-
-    public Optional<Schema> getById(URI id) {
-        for( Schema schema : schemas.values() ) {
-            if( schema.getId() != null && schema.getId().equals(id) )
-                return Optional.of(schema);
-        }
-        return Optional.absent();
-    }
-
-    public Optional<Schema> getByUri(URI uri) {
-        for( Schema schema : schemas.values() ) {
-            if( schema.getURI().equals(uri) )
-                return Optional.of(schema);
-        }
-        return Optional.absent();
-    }
-
-    public Integer getFileUriCount() {
-        int count = 0;
-        for( Schema schema : schemas.values() ) {
-            if( schema.getURI().getScheme().equals("file") )
-                count++;
-        }
-        return count;
-    }
-
-    public Integer getHttpUriCount() {
-        int count = 0;
-        for( Schema schema : schemas.values() ) {
-            if( schema.getURI().getScheme().equals("http") )
-                count++;
-        }
-        return count;
-    }
-
-    public Iterator<Schema> getSchemaIterator() {
-        List<Schema> schemaList = Lists.newArrayList(schemas.values());
-        Collections.sort(schemaList, this);
-        return schemaList.iterator();
-    }
-
-    public ObjectNode resolveProperties(Schema schema, ObjectNode fieldNode, 
String resourceId) {
-        // this should return something more suitable like:
-        //   Map<String, Pair<Schema, ObjectNode>>
-        ObjectNode schemaProperties = NODE_FACTORY.objectNode();
-        ObjectNode parentProperties = NODE_FACTORY.objectNode();
-        if (fieldNode == null) {
-            ObjectNode schemaContent = (ObjectNode) schema.getContent();
-            if( schemaContent.has("properties") ) {
-                schemaProperties = (ObjectNode) 
schemaContent.get("properties");
-                if (schema.getParentContent() != null) {
-                    ObjectNode parentContent = (ObjectNode) 
schema.getParentContent();
-                    if (parentContent.has("properties")) {
-                        parentProperties = (ObjectNode) 
parentContent.get("properties");
-                    }
-                }
-            }
-        } else if (fieldNode != null && fieldNode.size() > 0) {
-            if( fieldNode.has("properties") && 
fieldNode.get("properties").isObject() && fieldNode.get("properties").size() > 
0 )
-                schemaProperties = (ObjectNode) fieldNode.get("properties");
-            URI parentURI = null;
-            if( fieldNode.has("$ref") || fieldNode.has("extends") ) {
-                JsonNode refNode = fieldNode.get("$ref");
-                JsonNode extendsNode = fieldNode.get("extends");
-                if (refNode != null && refNode.isValueNode())
-                    parentURI = URI.create(refNode.asText());
-                else if (extendsNode != null && extendsNode.isObject())
-                    parentURI = URI.create(extendsNode.get("$ref").asText());
-                ObjectNode parentContent = null;
-                URI absoluteURI;
-                if (parentURI.isAbsolute())
-                    absoluteURI = parentURI;
-                else {
-                    absoluteURI = schema.getURI().resolve(parentURI);
-                    if (!absoluteURI.isAbsolute() || (absoluteURI.isAbsolute() 
&& !getByUri(absoluteURI).isPresent() ))
-                        absoluteURI = schema.getParentURI().resolve(parentURI);
-                }
-                if (absoluteURI != null && absoluteURI.isAbsolute()) {
-                    if (getByUri(absoluteURI).isPresent())
-                        parentContent = (ObjectNode) 
getByUri(absoluteURI).get().getContent();
-                    if (parentContent != null && parentContent.isObject() && 
parentContent.has("properties")) {
-                        parentProperties = (ObjectNode) 
parentContent.get("properties");
-                    } else if (absoluteURI.getPath().endsWith("#properties")) {
-                        absoluteURI = 
URI.create(absoluteURI.toString().replace("#properties", ""));
-                        parentProperties = (ObjectNode) 
getByUri(absoluteURI).get().getContent().get("properties");
-                    }
-                }
-            }
-
-
-        }
-
-        ObjectNode resolvedProperties = NODE_FACTORY.objectNode();
-        if (parentProperties != null && parentProperties.size() > 0)
-            resolvedProperties = SchemaUtil.mergeProperties(schemaProperties, 
parentProperties);
-        else resolvedProperties = schemaProperties.deepCopy();
-
-        return resolvedProperties;
-    }
-
-    @Override
-    public int compare(Schema left, Schema right) {
-        // are they the same?
-        if( left.equals(right)) return 0;
-        // is one an ancestor of the other
-        Schema candidateAncestor = left;
-        while( candidateAncestor.getParent() != null ) {
-            candidateAncestor = candidateAncestor.getParent();
-            if( candidateAncestor.equals(right))
-                return 1;
-        }
-        candidateAncestor = right;
-        while( candidateAncestor.getParent() != null ) {
-            candidateAncestor = candidateAncestor.getParent();
-            if( candidateAncestor.equals(left))
-                return -1;
-        }
-        // does one have a field that reference the other?
-        for( JsonNode refNode : left.getContent().findValues("$ref") ) {
-            String refText = refNode.asText();
-            Optional<URI> resolvedURI = safeResolve(left.getURI(), refText);
-            if( resolvedURI.isPresent() && 
resolvedURI.get().equals(right.getURI()))
-                return 1;
-        }
-        for( JsonNode refNode : right.getContent().findValues("$ref") ) {
-            String refText = refNode.asText();
-            Optional<URI> resolvedURI = safeResolve(right.getURI(), refText);
-            if( resolvedURI.isPresent() && 
resolvedURI.get().equals(left.getURI()))
-                return -1;
-        }
-        // does one have a field that reference a third schema that references 
the other?
-        for( JsonNode refNode : left.getContent().findValues("$ref") ) {
-            String refText = refNode.asText();
-            Optional<URI> possibleConnectorURI = safeResolve(left.getURI(), 
refText);
-            if( possibleConnectorURI.isPresent()) {
-                Optional<Schema> possibleConnector = 
getByUri(possibleConnectorURI.get());
-                if (possibleConnector.isPresent()) {
-                    for (JsonNode connectorRefNode : 
possibleConnector.get().getContent().findValues("$ref")) {
-                        String connectorRefText = connectorRefNode.asText();
-                        Optional<URI> resolvedURI = 
safeResolve(possibleConnector.get().getURI(), connectorRefText);
-                        if (resolvedURI.isPresent() && 
resolvedURI.get().equals(right.getURI()))
-                            return 1;
-                    }
-                }
-            }
-        }
-        for( JsonNode refNode : right.getContent().findValues("$ref") ) {
-            String refText = refNode.asText();
-            Optional<URI> possibleConnectorURI = safeResolve(right.getURI(), 
refText);
-            if( possibleConnectorURI.isPresent()) {
-                Optional<Schema> possibleConnector = 
getByUri(possibleConnectorURI.get());
-                if (possibleConnector.isPresent()) {
-                    for (JsonNode connectorRefNode : 
possibleConnector.get().getContent().findValues("$ref")) {
-                        String connectorRefText = connectorRefNode.asText();
-                        Optional<URI> resolvedURI = 
safeResolve(possibleConnector.get().getURI(), connectorRefText);
-                        if (resolvedURI.isPresent() && 
resolvedURI.get().equals(left.getURI()))
-                            return -1;
-                    }
-                }
-            }
-        }
-        return 0;
-    }
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6187265f/streams-schemas/src/main/java/org/apache/streams/schema/SchemaUtil.java
----------------------------------------------------------------------
diff --git 
a/streams-schemas/src/main/java/org/apache/streams/schema/SchemaUtil.java 
b/streams-schemas/src/main/java/org/apache/streams/schema/SchemaUtil.java
deleted file mode 100644
index cefc5e8..0000000
--- a/streams-schemas/src/main/java/org/apache/streams/schema/SchemaUtil.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.apache.streams.schema;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.URI;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-
-import static org.apache.commons.lang3.StringUtils.isEmpty;
-
-/**
- * Created by steve on 4/30/16.
- */
-public class SchemaUtil {
-
-    private final static Logger LOGGER = 
LoggerFactory.getLogger(SchemaUtil.class);
-    private static final JsonNodeFactory NODE_FACTORY = 
JsonNodeFactory.instance;
-    public static final String ILLEGAL_CHARACTER_REGEX = "[^0-9a-zA-Z_$]";
-
-    public static String childQualifiedName(String parentQualifiedName, String 
childSimpleName) {
-        String safeChildName = 
childSimpleName.replaceAll(ILLEGAL_CHARACTER_REGEX, "_");
-        return isEmpty(parentQualifiedName) ? safeChildName : 
parentQualifiedName + "." + safeChildName;
-    }
-
-    public static ObjectNode readSchema(URL schemaUrl) {
-
-        ObjectNode schemaNode = NODE_FACTORY.objectNode();
-        schemaNode.put("$ref", schemaUrl.toString());
-        return schemaNode;
-
-    }
-
-    public static ObjectNode mergeProperties(ObjectNode content, ObjectNode 
parent) {
-
-        ObjectNode merged = parent.deepCopy();
-        Iterator<Map.Entry<String, JsonNode>> fields = content.fields();
-        for( ; fields.hasNext(); ) {
-            Map.Entry<String, JsonNode> field = fields.next();
-            String fieldId = field.getKey();
-            merged.put(fieldId, field.getValue().deepCopy());
-        }
-        return merged;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6187265f/streams-schemas/src/main/java/org/apache/streams/schema/URIUtil.java
----------------------------------------------------------------------
diff --git 
a/streams-schemas/src/main/java/org/apache/streams/schema/URIUtil.java 
b/streams-schemas/src/main/java/org/apache/streams/schema/URIUtil.java
deleted file mode 100644
index 04e8904..0000000
--- a/streams-schemas/src/main/java/org/apache/streams/schema/URIUtil.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.apache.streams.schema;
-
-import com.google.common.base.Optional;
-import org.apache.commons.lang3.StringUtils;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-/**
- * Created by sblackmon on 5/1/16.
- */
-public class URIUtil {
-
-    public static URI removeFragment(URI id) {
-        return URI.create(StringUtils.substringBefore(id.toString(), "#"));
-    }
-
-    public static URI removeFile(URI id) {
-        return URI.create(StringUtils.substringBeforeLast(id.toString(), "/"));
-    }
-
-    public static Optional<URI> safeResolve(URI absolute, String relativePart) 
{
-        if( !absolute.isAbsolute()) return Optional.absent();
-        try {
-            return Optional.of(absolute.resolve(relativePart));
-        } catch( IllegalArgumentException e ) {
-            return Optional.absent();
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6187265f/streams-schemas/src/main/jsonschema/activity.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/activity.json 
b/streams-schemas/src/main/jsonschema/activity.json
deleted file mode 100644
index 2edd759..0000000
--- a/streams-schemas/src/main/jsonschema/activity.json
+++ /dev/null
@@ -1,108 +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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/activity.json#";,
-    "type": "object",
-    "title": "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.",
-            "javaInterfaces": ["java.io.Serializable"],
-            "$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.",
-            "javaInterfaces": ["java.io.Serializable"],
-            "extends": {
-                "$ref": "./object.json"
-            }
-        },
-        "icon": {
-            "type": "object",
-            "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",
-            "javaInterfaces": ["java.io.Serializable"],
-            "extends": {
-                "$ref": "./media_link.json"
-            }
-        },
-        "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",
-            "javaInterfaces": ["java.io.Serializable"],
-            "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/6187265f/streams-schemas/src/main/jsonschema/collection.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/collection.json 
b/streams-schemas/src/main/jsonschema/collection.json
deleted file mode 100644
index 38f83e7..0000000
--- a/streams-schemas/src/main/jsonschema/collection.json
+++ /dev/null
@@ -1,47 +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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/collection.json#";,
-    "type": "object",
-    "title": "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/6187265f/streams-schemas/src/main/jsonschema/media_link.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/media_link.json 
b/streams-schemas/src/main/jsonschema/media_link.json
deleted file mode 100644
index e7eece0..0000000
--- a/streams-schemas/src/main/jsonschema/media_link.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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/media_link.json#";,
-    "type": "object",
-    "title": "media_link",
-    "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/6187265f/streams-schemas/src/main/jsonschema/object.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/object.json 
b/streams-schemas/src/main/jsonschema/object.json
deleted file mode 100644
index 94f6719..0000000
--- a/streams-schemas/src/main/jsonschema/object.json
+++ /dev/null
@@ -1,98 +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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/object.json#";,
-    "type": "object",
-    "title": "object",
-    "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",
-            "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.",
-            "extends": {
-                "$ref": "./media_link.json"
-            }
-        },
-        "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",
-            "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/alert.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/alert.json 
b/streams-schemas/src/main/jsonschema/objectTypes/alert.json
deleted file mode 100644
index 0fa4d60..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/alert.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/application.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/application.json 
b/streams-schemas/src/main/jsonschema/objectTypes/application.json
deleted file mode 100644
index ea3219d..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/application.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/article.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/article.json 
b/streams-schemas/src/main/jsonschema/objectTypes/article.json
deleted file mode 100644
index 2260532..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/article.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/audio.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/audio.json 
b/streams-schemas/src/main/jsonschema/objectTypes/audio.json
deleted file mode 100644
index 1e94405..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/audio.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/badge.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/badge.json 
b/streams-schemas/src/main/jsonschema/objectTypes/badge.json
deleted file mode 100644
index 08af422..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/badge.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/binary.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/binary.json 
b/streams-schemas/src/main/jsonschema/objectTypes/binary.json
deleted file mode 100644
index 8723f51..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/binary.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/bookmark.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/bookmark.json 
b/streams-schemas/src/main/jsonschema/objectTypes/bookmark.json
deleted file mode 100644
index 808555f..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/badge.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/comment.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/comment.json 
b/streams-schemas/src/main/jsonschema/objectTypes/comment.json
deleted file mode 100644
index 1ec2dc2..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/comment.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/device.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/device.json 
b/streams-schemas/src/main/jsonschema/objectTypes/device.json
deleted file mode 100644
index 74dfb39..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/device.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/event.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/event.json 
b/streams-schemas/src/main/jsonschema/objectTypes/event.json
deleted file mode 100644
index f6e5fb6..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/event.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/file.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/file.json 
b/streams-schemas/src/main/jsonschema/objectTypes/file.json
deleted file mode 100644
index 50ec239..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/file.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/folder.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/folder.json 
b/streams-schemas/src/main/jsonschema/objectTypes/folder.json
deleted file mode 100644
index 35592c1..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/folder.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/game.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/game.json 
b/streams-schemas/src/main/jsonschema/objectTypes/game.json
deleted file mode 100644
index ca761ed..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/game.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/group.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/group.json 
b/streams-schemas/src/main/jsonschema/objectTypes/group.json
deleted file mode 100644
index 8623922..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/group.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/image.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/image.json 
b/streams-schemas/src/main/jsonschema/objectTypes/image.json
deleted file mode 100644
index 7eca770..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/image.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/issue.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/issue.json 
b/streams-schemas/src/main/jsonschema/objectTypes/issue.json
deleted file mode 100644
index 29f2fad..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/issue.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/job.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/job.json 
b/streams-schemas/src/main/jsonschema/objectTypes/job.json
deleted file mode 100644
index b832f16..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/job.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/list.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/list.json 
b/streams-schemas/src/main/jsonschema/objectTypes/list.json
deleted file mode 100644
index c93a5e8..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/list.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/note.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/note.json 
b/streams-schemas/src/main/jsonschema/objectTypes/note.json
deleted file mode 100644
index 63445d5..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/note.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/offer.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/offer.json 
b/streams-schemas/src/main/jsonschema/objectTypes/offer.json
deleted file mode 100644
index 6d4b5f2..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/offer.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/organization.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/organization.json 
b/streams-schemas/src/main/jsonschema/objectTypes/organization.json
deleted file mode 100644
index 7ee7513..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/organization.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/page.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/page.json 
b/streams-schemas/src/main/jsonschema/objectTypes/page.json
deleted file mode 100644
index 4f18fcf..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/page.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/permission.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/permission.json 
b/streams-schemas/src/main/jsonschema/objectTypes/permission.json
deleted file mode 100644
index 2a156dc..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/permission.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/person.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/person.json 
b/streams-schemas/src/main/jsonschema/objectTypes/person.json
deleted file mode 100644
index 6855634..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/person.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/photo-album.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/photo-album.json 
b/streams-schemas/src/main/jsonschema/objectTypes/photo-album.json
deleted file mode 100644
index 1ad4b18..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/photo-album.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/photo.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/photo.json 
b/streams-schemas/src/main/jsonschema/objectTypes/photo.json
deleted file mode 100644
index ab44aad..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/photo.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/place.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/place.json 
b/streams-schemas/src/main/jsonschema/objectTypes/place.json
deleted file mode 100644
index 02d5fe4..0000000
--- a/streams-schemas/src/main/jsonschema/objectTypes/place.json
+++ /dev/null
@@ -1,39 +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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/place.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/playlist.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/playlist.json 
b/streams-schemas/src/main/jsonschema/objectTypes/playlist.json
deleted file mode 100644
index d40b109..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/playlist.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/process.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/process.json 
b/streams-schemas/src/main/jsonschema/objectTypes/process.json
deleted file mode 100644
index 343ff38..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/process.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/product.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/product.json 
b/streams-schemas/src/main/jsonschema/objectTypes/product.json
deleted file mode 100644
index 7614cb9..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/product.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/property.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/property.json 
b/streams-schemas/src/main/jsonschema/objectTypes/property.json
deleted file mode 100644
index ff2e73b..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/property.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/question.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/question.json 
b/streams-schemas/src/main/jsonschema/objectTypes/question.json
deleted file mode 100644
index 9383caf..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/question.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/review.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/review.json 
b/streams-schemas/src/main/jsonschema/objectTypes/review.json
deleted file mode 100644
index 5b5ab58..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/review.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/role.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/role.json 
b/streams-schemas/src/main/jsonschema/objectTypes/role.json
deleted file mode 100644
index 0521f93..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/role.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/service.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/service.json 
b/streams-schemas/src/main/jsonschema/objectTypes/service.json
deleted file mode 100644
index ff89fae..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/service.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/song.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/song.json 
b/streams-schemas/src/main/jsonschema/objectTypes/song.json
deleted file mode 100644
index 2b89d4b..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/song.json#";,
-    "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/6187265f/streams-schemas/src/main/jsonschema/objectTypes/status.json
----------------------------------------------------------------------
diff --git a/streams-schemas/src/main/jsonschema/objectTypes/status.json 
b/streams-schemas/src/main/jsonschema/objectTypes/status.json
deleted file mode 100644
index ac7a844..0000000
--- a/streams-schemas/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": 
"http://streams.incubator.apache.org/site/0.3-incubating-SNAPSHOT/streams-schemas/objectTypes/status.json#";,
-    "type": "object",
-    "title": "status",
-    "extends": {
-        "$ref": "../objectTypes/note.json"
-    },
-    "properties": {
-        "objectType": {
-            "type": "string",
-            "default": "song"
-        }
-    }
-}
\ No newline at end of file


Reply via email to