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 2014/03/22 00:19:42 UTC
[04/71] [abbrv] fixing STREAMS-26 branch
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-pojo-extensions/src/test/java/org/apache/streams/pojo/test/ActivityExtendedSerDeTest.java
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo-extensions/src/test/java/org/apache/streams/pojo/test/ActivityExtendedSerDeTest.java b/trunk/streams-pojo-extensions/src/test/java/org/apache/streams/pojo/test/ActivityExtendedSerDeTest.java
deleted file mode 100644
index 5abd42d..0000000
--- a/trunk/streams-pojo-extensions/src/test/java/org/apache/streams/pojo/test/ActivityExtendedSerDeTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.pojo.json.test;
-
-import com.google.common.base.Joiner;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.input.BoundedInputStream;
-import org.apache.streams.pojo.json.ActivityExtended;
-import org.apache.streams.pojo.json.Activity;
-import org.apache.streams.pojo.json.Extensions;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.Ignore;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.InputStream;
-import java.util.Map;
-
-/**
- * Created with IntelliJ IDEA.
- * User: sblackmon
- * Date: 8/20/13
- * Time: 5:57 PM
- * To change this template use File | Settings | File Templates.
- */
-public class ActivityExtendedSerDeTest {
-
- private final static Logger LOGGER = LoggerFactory.getLogger(ActivityExtendedSerDeTest.class);
-
- private ObjectMapper mapper = new ObjectMapper();
-
- @Test
- public void TestActivity()
- {
- mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, Boolean.FALSE);
- mapper.configure(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY, Boolean.TRUE);
- mapper.configure(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, Boolean.TRUE);
-
- InputStream is = ActivityExtendedSerDeTest.class.getResourceAsStream("/gnip_twitter_extended.json");
- Joiner joiner = Joiner.on(" ").skipNulls();
- is = new BoundedInputStream(is, 10000);
- String json;
- try {
- json = joiner.join(IOUtils.readLines(is));
- LOGGER.debug(json);
-
- Activity ser = mapper.readValue(json, Activity.class);
-
- String des = mapper.writeValueAsString(ser);
- LOGGER.debug(des);
-
- } catch( Exception e ) {
- e.printStackTrace();
- Assert.fail();
- }
- }
-
- @Ignore
- @Test
- public void TestActivityExtended()
- {
- mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, Boolean.FALSE);
- mapper.configure(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY, Boolean.TRUE);
- mapper.configure(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, Boolean.TRUE);
-
- InputStream is = ActivityExtendedSerDeTest.class.getResourceAsStream("/gnip_twitter_extended.json");
- Joiner joiner = Joiner.on(" ").skipNulls();
- is = new BoundedInputStream(is, 10000);
- String json;
- try {
- json = joiner.join(IOUtils.readLines(is));
- LOGGER.debug(json);
-
- ActivityExtended ser = mapper.readValue(json, ActivityExtended.class);
-
- Extensions extensions = ser.getExtensions();
-
- String des = mapper.writeValueAsString(extensions);
-
- Assert.assertTrue(extensions.getAdditionalProperties().size() > 0);
- LOGGER.debug(des);
-
- } catch( Exception e ) {
- e.printStackTrace();
- Assert.fail();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-pojo-extensions/src/test/resources/gnip_twitter_extended.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo-extensions/src/test/resources/gnip_twitter_extended.json b/trunk/streams-pojo-extensions/src/test/resources/gnip_twitter_extended.json
deleted file mode 100644
index ee764cb..0000000
--- a/trunk/streams-pojo-extensions/src/test/resources/gnip_twitter_extended.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
- "gnip": {
- "matching_rules": [
- {
- "tag": "cascade_CA_CA_en"
- }
- ],
- "klout_score": 10,
- "urls": [
- {
- "expanded_url": "https://itunes.apple.com/us/app/smurfs-village/id399648212?mt=8",
- "url": "http://t.co/Ytn45Pbttk"
- }
- ],
- "klout_profile": {
- "topics": [],
- "klout_user_id": "257268143479895040",
- "link": "http://klout.com/user/id/257268143479895040"
- },
- "language": {
- "value": "fr"
- }
- },
- "body": "Le Grand Schtroumpf confirme que la cascade magique n'est \"Plus tr?�s loin.\" http://t.co/Ytn45Pbttk #SmurfsVillage @BeelineGames",
- "favoritesCount": 0,
- "link": "http://twitter.com/spoffff/statuses/372802927385403392",
- "retweetCount": 0,
- "twitter_lang": "fr",
- "postedTime": "2013-08-28T19:28:38.000Z",
- "provider": {
- "id": "{link}",
- "upstreamDuplicates": [],
- "link": "http://www.twitter.com",
- "attachments": [],
- "displayName": "Twitter",
- "objectType": "service",
- "downstreamDuplicates": []
- },
- "links": [],
- "actor": {
- "twitterTimeZone": "Brussels",
- "friendsCount": 6,
- "favoritesCount": 0,
- "link": "http://www.twitter.com/spoffff",
- "image": {
- "url": "https://si0.twimg.com/sticky/default_profile_images/default_profile_1_normal.png"
- },
- "postedTime": "2012-05-18T15:14:35.000Z",
- "links": [
- {
- "rel": "me",
- "href": null
- }
- ],
- "listedCount": 0,
- "downstreamDuplicates": [],
- "id": "id:twitter.com:583891967",
- "upstreamDuplicates": [],
- "languages": [
- "fr"
- ],
- "verified": false,
- "utcOffset": "7200",
- "followersCount": 0,
- "attachments": [],
- "displayName": "Sabine Chappuis",
- "preferredUsername": "spoffff",
- "statusesCount": 87,
- "objectType": "person"
- },
- "object": {
- "id": "object:search.twitter.com,2005:372802927385403392",
- "summary": "Le Grand Schtroumpf confirme que la cascade magique n'est \"Plus tr?�s loin.\" http://t.co/Ytn45Pbttk #SmurfsVillage @BeelineGames",
- "upstreamDuplicates": [],
- "link": "http://twitter.com/spoffff/statuses/372802927385403392",
- "postedTime": "2013-08-28T19:28:38.000Z",
- "attachments": [],
- "objectType": "note",
- "downstreamDuplicates": []
- },
- "twitter_entities": {
- "symbols": [],
- "urls": [
- {
- "expanded_url": "http://bit.ly/hUmoRz",
- "indices": [
- 77,
- 99
- ],
- "display_url": "bit.ly/hUmoRz",
- "url": "http://t.co/Ytn45Pbttk"
- }
- ],
- "hashtags": [
- {
- "text": "SmurfsVillage",
- "indices": [
- 100,
- 114
- ]
- }
- ],
- "user_mentions": [
- {
- "id": 188075479,
- "name": "Beeline Interactive",
- "indices": [
- 115,
- 128
- ],
- "screen_name": "BeelineGames",
- "id_str": "188075479"
- }
- ]
- },
- "extensions": {
- "w2o": {
- "tags": [
- "brand-cascade",
- "language-en",
- "country-ca"
- ],
- "provider": "twitter",
- "analyzer": "romance_analyzer",
- "lang": {
- "primaryLanguage": "en"
- }
- }
- },
- "twitter_filter_level": "medium",
- "guid": "A8fccSz7rpKfDJY078VLyw==_201308",
- "content": "Le Grand Schtroumpf confirme que la cascade magique n'est \"Plus tr?�s loin.\" http://t.co/Ytn45Pbttk #SmurfsVillage @BeelineGames",
- "id": "tag:search.twitter.com,2005:372802927385403392",
- "verb": "post",
- "generator": {
- "id": "{link}",
- "upstreamDuplicates": [],
- "link": "https://itunes.apple.com/us/app/smurfs-village/id399648212?mt=8&uo=4",
- "attachments": [],
- "displayName": "Smurfs' Village on iOS",
- "downstreamDuplicates": []
- },
- "published": "2013-08-28T19:28:38Z",
- "objectType": "activity"
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-pojo/pom.xml
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/pom.xml b/trunk/streams-pojo/pom.xml
deleted file mode 100644
index dc75aba..0000000
--- a/trunk/streams-pojo/pom.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.streams</groupId>
- <artifactId>streams-project</artifactId>
- <version>0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>streams-pojo</artifactId>
-
- <name>streams-pojo</name>
-
- <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>
-
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-xml</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml</groupId>
- <artifactId>jackson-xml-databind</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml</groupId>
- <artifactId>aalto-xml</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml</groupId>
- <artifactId>aalto-xml</artifactId>
- </dependency>
-
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- </dependency>
-
- <dependency>
- <groupId>nz.net.ultraq.jaxb</groupId>
- <artifactId>jaxb-utilities</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
- </dependency>
-
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.0.9</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <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.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <version>0.4.0</version>
- <configuration>
- <addCompileSourceRoot>true</addCompileSourceRoot>
- <generateBuilders>true</generateBuilders>
- <sourcePaths>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/activity.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/collection.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/media_link.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/object.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/article.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/audio.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/bookmark.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/comment.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/event.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/file.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/folder.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/group.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/list.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/note.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/person.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/photo-album.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/photo.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/place.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/playlist.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/product.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/property.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/review.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/service.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/song.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/status.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/video.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/verbs/favorite.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/verbs/follow.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/verbs/join.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/verbs/like.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/verbs/make-friend.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/verbs/play.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/verbs/post.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/verbs/rsvp-maybe.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/verbs/rsvp-no.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/verbs/rsvp-yes.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/verbs/save.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/verbs/share.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/verbs/tag.json</sourcePath>
- <sourcePath>src/main/jsonschema/org/apache/streams/pojo/json/verbs/update.json</sourcePath>
- </sourcePaths>
- <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
- <targetPackage>org.apache.streams.pojo.json</targetPackage>
- <useLongIntegers>true</useLongIntegers>
- <useJodaDates>false</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>src/main/xmlschema/org/apache/streams/pojo/xml</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>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-pojo/src/main/java/org/apache/streams/data/ActivitySerializer.java
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/java/org/apache/streams/data/ActivitySerializer.java b/trunk/streams-pojo/src/main/java/org/apache/streams/data/ActivitySerializer.java
deleted file mode 100644
index ae01fed..0000000
--- a/trunk/streams-pojo/src/main/java/org/apache/streams/data/ActivitySerializer.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.data;
-
-import org.apache.streams.pojo.json.Activity;
-
-import java.util.List;
-
-/**
- * Serializes and deserializes Activities
- */
-public interface ActivitySerializer<T> {
-
- /**
- * Gets the supported content type that can be deserialized/serialized
- *
- * @return A string representing the format name. Can be an IETF MIME type or other
- */
- String serializationFormat();
-
- /**
- * Converts the activity to a POJO representation.
- *
- * @param deserialized the string
- * @return a fully populated Activity object
- */
- T serialize(Activity deserialized);
-
- /**
- * Converts a POJO into an Activity
- * @param serialized the string representation
- * @return a fully populated Activity object
- */
- Activity deserialize(T serialized);
-
- /**
- * Converts multiple documents into a list of Activity objects
- * @param serializedList a typed List of documents
- * @return a list of fully populated activities
- */
- List<Activity> deserializeAll(List<T> serializedList);
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-pojo/src/main/java/org/apache/streams/data/util/ActivityUtil.java
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/java/org/apache/streams/data/util/ActivityUtil.java b/trunk/streams-pojo/src/main/java/org/apache/streams/data/util/ActivityUtil.java
deleted file mode 100644
index f1fcf44..0000000
--- a/trunk/streams-pojo/src/main/java/org/apache/streams/data/util/ActivityUtil.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.data.util;
-
-import org.apache.streams.pojo.json.Activity;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Utility class for managing activities
- */
-public class ActivityUtil {
- private ActivityUtil() {}
-
- /**
- * Property on the activity object to use for extensions
- */
- public static final String EXTENSION_PROPERTY = "extensions";
- /**
- * The number of +1, Like, favorites, etc that the post has received
- */
- public static final String LIKES_EXTENSION = "likes";
- /**
- * The number of retweets, shares, etc that the post has received
- */
- public static final String REBROADCAST_EXTENSION = "rebroadcasts";
- /**
- * The language of the post
- */
- public static final String LANGUAGE_EXTENSION = "language";
- /**
- * Location that the post was made or the actor's residence
- */
- public static final String LOCATION_EXTENSION = "location";
- /**
- * Country that the post was made
- */
- public static final String LOCATION_EXTENSION_COUNTRY = "country";
- /**
- * Specific JSON-geo coordinates (long,lat)
- */
- public static final String LOCATION_EXTENSION_COORDINATES = "coordinates";
-
- /**
- * Creates a standard extension property
- * @param activity activity to create the property in
- * @return the Map representing the extensions property
- */
- @SuppressWarnings("unchecked")
- public static Map<String, Object> ensureExtensions(Activity activity) {
- Map<String, Object> properties = (Map)activity.getAdditionalProperties().get(EXTENSION_PROPERTY);
- if(properties == null) {
- properties = new HashMap<String, Object>();
- activity.setAdditionalProperty(EXTENSION_PROPERTY, properties);
- }
- return properties;
- }
-
- /**
- * Gets a formatted ID
- * @param providerName name of the provider
- * @param personId ID of the person within the system
- * @return id:<providerName>:people:<personId>
- */
- public static String getPersonId(String providerName, String personId) {
- return String.format("id:%s:people:%s", providerName, personId);
- }
-
- /**
- * Gets a formatted provider ID
- * @param providerName name of the provider
- * @return id:providers:<providerName>
- */
- public static String getProviderId(String providerName) {
- return String.format("id:providers:%s", providerName);
- }
-
- /**
- * Gets a formatted object ID
- * @param provider name of the provider
- * @param objectType type of the object
- * @param objectId the ID of the object
- * @return id:<provider>:<objectType>s:<objectId>
- */
- public static String getObjectId(String provider, String objectType, String objectId) {
- return String.format("id:%s:%ss:%s", provider, objectType, objectId);
- }
-
- /**
- * Gets a formatted activity ID
- * @param providerName name of the provider
- * @param activityId ID of the provider
- * @return id:<providerName>:activities:<activityId>
- */
- public static String getActivityId(String providerName, String activityId) {
- return String.format("id:%s:activities:%s", providerName, activityId);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-pojo/src/main/java/org/apache/streams/data/util/JsonUtil.java
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/java/org/apache/streams/data/util/JsonUtil.java b/trunk/streams-pojo/src/main/java/org/apache/streams/data/util/JsonUtil.java
deleted file mode 100644
index d49ef2a..0000000
--- a/trunk/streams-pojo/src/main/java/org/apache/streams/data/util/JsonUtil.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.data.util;
-
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import java.io.*;
-import java.util.List;
-
-/**
- * JSON utilities
- */
-public class JsonUtil {
-
- private JsonUtil() {}
-
- public static JsonNode jsonToJsonNode(String json) {
- ObjectMapper mapper = new ObjectMapper();
- JsonFactory factory = mapper.getFactory();
-
- JsonNode node;
- try {
- JsonParser jp = factory.createJsonParser(json);
- node = mapper.readTree(jp);
- } catch (IOException e) {
- throw new RuntimeException("IO exception while reading JSON", e);
- }
- return node;
- }
-
- public static String jsonNodeToJson(JsonNode node) {
- ObjectMapper mapper = new ObjectMapper();
- try {
- return mapper.writeValueAsString(node);
- } catch (JsonProcessingException e) {
- throw new RuntimeException("IO exception while writing JSON", e);
- }
- }
-
- public static <T> T jsonToObject(String json, Class<T> clazz) {
- ObjectMapper mapper = new ObjectMapper();
- try {
- return mapper.readValue(json, clazz);
- } catch (IOException e) {
- throw new RuntimeException("Could not map to object");
- }
- }
-
- public static <T> T jsonNodeToObject(JsonNode node, Class<T> clazz) {
- ObjectMapper mapper = new ObjectMapper();
- return mapper.convertValue(node, clazz);
- }
-
- public static <T> JsonNode objectToJsonNode(T obj) {
- ObjectMapper mapper = new ObjectMapper();
- return mapper.valueToTree(obj);
- }
-
- public static <T> List<T> jsoNodeToList(JsonNode node, Class<T> clazz) {
- ObjectMapper mapper = new ObjectMapper();
- return mapper.convertValue(node, new TypeReference<List<T>>() {});
- }
-
- public static <T> String objectToJson(T object) {
- ObjectMapper mapper = new ObjectMapper();
- try {
- return mapper.writeValueAsString(object);
- } catch (IOException e) {
- throw new RuntimeException("Could not map to object");
- }
- }
-
- public static <T> T getObjFromFile(String filePath, Class<T> clazz) {
- return jsonNodeToObject(getFromFile(filePath), clazz);
- }
-
- public static JsonNode getFromFile(String filePath) {
- ObjectMapper mapper = new ObjectMapper();
- JsonFactory factory = mapper.getFactory(); // since 2.1 use mapper.getFactory() instead
-
- JsonNode node = null;
- try {
- InputStream stream = getStreamForLocation(filePath);
- JsonParser jp = factory.createParser(stream);
- node = mapper.readTree(jp);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- return node;
- }
-
- private static InputStream getStreamForLocation(String filePath) throws FileNotFoundException {
- InputStream stream = null;
- if(filePath.startsWith("file:///")) {
- stream = new FileInputStream(filePath.replace("file:///", ""));
- } else if(filePath.startsWith("file:") || filePath.startsWith("/")) {
- stream = new FileInputStream(filePath.replace("file:", ""));
- } else {
- //Assume classpath
- stream = JsonUtil.class.getClassLoader().getResourceAsStream(filePath.replace("classpath:", ""));
- }
-
- return stream;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json
deleted file mode 100644
index d5e2d27..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
- "type" : "object",
- "title" : "activity",
- "javaType": "org.apache.streams.pojo.json.Activity",
- "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",
- "default" :"{url}"
- },
- "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.",
- "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.",
- "extends" : { "$ref" : "./object.json" }
- },
- "icon" : {
- "type": "object",
- "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",
- "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",
- "properties" : {"$ref" : "http://json-schema.org/links#properties"}
- }
- },
- "links": [
- {"rel": "describedby", "href": "./verbs/{verb}.json"}
- ]
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/collection.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/collection.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/collection.json
deleted file mode 100644
index b9bdd76..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/collection.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "type" : "object",
- "title" : "collection",
- "javaType": "org.apache.streams.pojo.json.Collection",
- "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" : "number",
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/media_link.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/media_link.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/media_link.json
deleted file mode 100644
index 2d8e31f..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/media_link.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "type" : "object",
- "title" : "media_link",
- "javaType": "org.apache.streams.pojo.json.MediaLink",
- "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" : "number",
- "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" : "number",
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/object.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/object.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/object.json
deleted file mode 100644
index 349ca71..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/object.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
- "type" : "object",
- "title" : "object",
- "javaType": "org.apache.streams.pojo.json.ActivityObject",
- "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.",
- "default" : "{link}"
- },
- "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",
- "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",
- "$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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/article.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/article.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/article.json
deleted file mode 100644
index f02394e..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/article.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/audio.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/audio.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/audio.json
deleted file mode 100644
index e2818df..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/audio.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/bookmark.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/bookmark.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/bookmark.json
deleted file mode 100644
index ee6f4b2..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/bookmark.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/comment.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/comment.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/comment.json
deleted file mode 100644
index 0a4857d..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/comment.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/event.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/event.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/event.json
deleted file mode 100644
index a116516..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/event.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "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"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/file.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/file.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/file.json
deleted file mode 100644
index b3514a3..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/file.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "type" : "object",
- "title" : "file",
- "extends": {"$ref":"../object.json"},
- "properties" :{
- "objectType" :{
- "type" :"string",
- "default" : "file"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/folder.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/folder.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/folder.json
deleted file mode 100644
index a4db729..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/folder.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/group.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/group.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/group.json
deleted file mode 100644
index 58c7dd3..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/group.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/list.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/list.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/list.json
deleted file mode 100644
index ca48eab..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/list.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/note.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/note.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/note.json
deleted file mode 100644
index 127efd9..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/note.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/person.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/person.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/person.json
deleted file mode 100644
index 43eab84..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/person.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/photo-album.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/photo-album.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/photo-album.json
deleted file mode 100644
index 69db681..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/photo-album.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/photo.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/photo.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/photo.json
deleted file mode 100644
index 8fc608f..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/photo.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/place.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/place.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/place.json
deleted file mode 100644
index d3dfb49..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/place.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "type" : "object",
- "title" : "place",
- "extends": [{"$ref":"../object.json"},{"$ref":"http://www.json-schema.org/address"}],
- "properties" :{
- "objectType" :{
- "type" :"string",
- "default" : "photo"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/playlist.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/playlist.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/playlist.json
deleted file mode 100644
index 073e961..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/playlist.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/product.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/product.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/product.json
deleted file mode 100644
index b7a5c02..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/product.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "type" : "object",
- "title" : "product",
- "extends": {"$ref":"../object.json"},
- "properties" :{
- "objectType" :{
- "type" :"string",
- "default" : "product"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/property.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/property.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/property.json
deleted file mode 100644
index d99725d..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/property.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/review.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/review.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/review.json
deleted file mode 100644
index 5705746..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/review.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "type" : "object",
- "title" : "review",
- "extends": {"$ref":"../objectTypes/article.json"},
- "properties" :{
- "objectType" :{
- "type" :"string",
- "default" : "review"
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/service.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/service.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/service.json
deleted file mode 100644
index 92544f4..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/service.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/song.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/song.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/song.json
deleted file mode 100644
index 9ebe7f2..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/song.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/status.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/status.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/status.json
deleted file mode 100644
index 3309510..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/status.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/video.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/video.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/video.json
deleted file mode 100644
index 21f32a4..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/objectTypes/video.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/favorite.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/favorite.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/favorite.json
deleted file mode 100644
index e2fad27..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/favorite.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "type" : "object",
- "title" : "Favorite",
- "description" : "To mark an object as a favorite",
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/follow.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/follow.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/follow.json
deleted file mode 100644
index b82f5c8..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/follow.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "type" : "object",
- "title" : "Follow",
- "description" : "To start following an object",
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/join.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/join.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/join.json
deleted file mode 100644
index bf912fb..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/join.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "type" : "object",
- "title" : "Join",
- "description" : "To join an object. Usually a group",
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/like.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/like.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/like.json
deleted file mode 100644
index 1da03bc..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/like.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "type" : "object",
- "title" : "Like",
- "description" : "To like an object",
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/make-friend.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/make-friend.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/make-friend.json
deleted file mode 100644
index b9bb15d..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/make-friend.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "type" : "object",
- "title" : "Befriend",
- "description" : "To friend an object. Usually a person",
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/play.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/play.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/play.json
deleted file mode 100644
index 242a8ac..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/play.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "type" : "object",
- "title" : "Play",
- "description" : "To play an object",
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/post.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/post.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/post.json
deleted file mode 100644
index e1d2b05..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/post.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/rsvp-maybe.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/rsvp-maybe.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/rsvp-maybe.json
deleted file mode 100644
index 5510e4b..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/rsvp-maybe.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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} may be attending {object.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/rsvp-no.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/rsvp-no.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/rsvp-no.json
deleted file mode 100644
index 59a08cd..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/rsvp-no.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/rsvp-yes.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/rsvp-yes.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/rsvp-yes.json
deleted file mode 100644
index 7eb5eee..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/rsvp-yes.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/save.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/save.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/save.json
deleted file mode 100644
index 65ceb70..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/save.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "type" : "object",
- "title" : "Save",
- "description" : "To save an object",
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/share.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/share.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/share.json
deleted file mode 100644
index 8825008..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/share.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "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/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/tag.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/tag.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/tag.json
deleted file mode 100644
index dfefbd2..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/tag.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "type" : "object",
- "title" : "Tag",
- "description" : "To tag an object. Ex: A person being tagged in a photo",
- "extends": {"$ref":"../activity.json"},
- "properties" :{
- "verb" :{
- "type" : "string",
- "default" : "tag"
- },
- "title" : {
- "type" : "string",
- "default" : "{actor.displayName} tagged {object.displayName} in {target.displayName}"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/update.json
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/update.json b/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/update.json
deleted file mode 100644
index bf25485..0000000
--- a/trunk/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/update.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "type" : "object",
- "title" : "Update",
- "description" : "To update a property on an object. Ex: Monica updated her street address to 234 Awesome St.",
- "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/6ea69f29/trunk/streams-pojo/src/main/xmlschema/org/apache/streams/pojo/xml/activity.xsd
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/main/xmlschema/org/apache/streams/pojo/xml/activity.xsd b/trunk/streams-pojo/src/main/xmlschema/org/apache/streams/pojo/xml/activity.xsd
deleted file mode 100644
index 1d81b44..0000000
--- a/trunk/streams-pojo/src/main/xmlschema/org/apache/streams/pojo/xml/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/6ea69f29/trunk/streams-pojo/src/test/java/org/apache/streams/data/data/util/JsonUtilTest.java
----------------------------------------------------------------------
diff --git a/trunk/streams-pojo/src/test/java/org/apache/streams/data/data/util/JsonUtilTest.java b/trunk/streams-pojo/src/test/java/org/apache/streams/data/data/util/JsonUtilTest.java
deleted file mode 100644
index 190be54..0000000
--- a/trunk/streams-pojo/src/test/java/org/apache/streams/data/data/util/JsonUtilTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.streams.data.data.util;
-
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class JsonUtilTest {
-
- @Ignore @Test
- public void testJsonToObject(){
- }
-
-}