http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0b512d8b/streams-contrib/streams-provider-datasift/src/main/jsonschema/org/apache/streams/datasift/interaction/DatasiftInteraction.json
----------------------------------------------------------------------
diff --git 
a/streams-contrib/streams-provider-datasift/src/main/jsonschema/org/apache/streams/datasift/interaction/DatasiftInteraction.json
 
b/streams-contrib/streams-provider-datasift/src/main/jsonschema/org/apache/streams/datasift/interaction/DatasiftInteraction.json
deleted file mode 100644
index 5ff366a..0000000
--- 
a/streams-contrib/streams-provider-datasift/src/main/jsonschema/org/apache/streams/datasift/interaction/DatasiftInteraction.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-03/schema";,
-    "$license": [
-        "http://www.apache.org/licenses/LICENSE-2.0";
-    ],
-    "id": "#",
-    "type": "object",
-    "javaType": "org.apache.streams.datasift.interaction.Interaction",
-    "javaInterfaces": ["java.io.Serializable"],
-    "properties": {
-        "author": {
-            "javaType": "org.apache.streams.datasift.interaction.Author",
-            "type": "object",
-            "dynamic": "true",
-            "properties": {
-                "avatar": {
-                    "type": "string"
-                },
-                "id": {
-                    "type": "integer"
-                },
-                "link": {
-                    "type": "string"
-                },
-                "name": {
-                    "type": "string"
-                },
-                "username": {
-                    "type": "string"
-                }
-            }
-        },
-        "content": {
-            "type": "string"
-        },
-        "contenttype": {
-            "type": "string"
-        },
-        "created_at": {
-            "type": "string",
-            "format": "date-time"
-        },
-        "geo": {
-            "javaType": "org.apache.streams.datasift.interaction.Geo",
-            "type": "object",
-            "dynamic": "true",
-            "properties": {
-                "latitude": {
-                    "type": "number"
-                },
-                "longitude": {
-                    "type": "number"
-                }
-            }
-        },
-        "id": {
-            "type": "string"
-        },
-        "link": {
-            "type": "string"
-        },
-        "received_at": {
-            "type": "long"
-        },
-        "subtype": {
-            "type": "string"
-        },
-        "schema": {
-            "dynamic": "true",
-            "properties": {
-                "version": {
-                    "type": "integer"
-                }
-            }
-        },
-        "source": {
-            "type": "string"
-        },
-        "subtype": {
-            "type": "string"
-        },
-        "tags": {
-            "type": "array",
-            "items": [
-                {
-                    "type": "string"
-                }
-            ]
-        },
-        "title": {
-            "type": "string"
-        },
-        "type": {
-            "type": "string"
-        }
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0b512d8b/streams-contrib/streams-provider-datasift/src/main/jsonschema/org/apache/streams/datasift/twitter/DatasiftTwitter.json
----------------------------------------------------------------------
diff --git 
a/streams-contrib/streams-provider-datasift/src/main/jsonschema/org/apache/streams/datasift/twitter/DatasiftTwitter.json
 
b/streams-contrib/streams-provider-datasift/src/main/jsonschema/org/apache/streams/datasift/twitter/DatasiftTwitter.json
deleted file mode 100644
index 8c373a3..0000000
--- 
a/streams-contrib/streams-provider-datasift/src/main/jsonschema/org/apache/streams/datasift/twitter/DatasiftTwitter.json
+++ /dev/null
@@ -1,370 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-03/schema";,
-    "$license": [
-        "http://www.apache.org/licenses/LICENSE-2.0";
-    ],
-    "id": "#",
-    "type": "object",
-    "javaType" : "org.apache.streams.datasift.twitter.Twitter",
-    "javaInterfaces": ["java.io.Serializable"],
-    "properties" :
-    {
-        "created_at" :
-        {
-            "type" : "string"
-        },
-        "display_urls" :
-        {
-            "type" : "array",
-            "items" :
-                [
-                    {
-                        "type" : "string"
-                    }
-                ]
-        },
-        "domains" :
-        {
-            "type" : "array",
-            "items" :
-                [
-                    {
-                        "type" : "string"
-                    }
-                ]
-        },
-        "filter_level" :
-        {
-            "type" : "string"
-        },
-        "geo" :
-        {
-            "javaType" : "org.apache.streams.datasift.twitter.Geo",
-            "type" : "object",
-            "dynamic" : "true",
-            "properties" :
-            {
-                "latitude" :
-                {
-                    "type" : "number"
-                },
-                "longitude" :
-                {
-                    "type" : "number"
-                }
-            }
-        },
-        "hashtags" :
-        {
-            "type" : "array",
-            "items" :
-                [
-                    {
-                        "type" : "string"
-                    }
-                ]
-        },
-        "id" :
-        {
-            "type" : "string"
-        },
-        "in_reply_to_screen_name" :
-        {
-            "type" : "string"
-        },
-        "in_reply_to_status_id" :
-        {
-            "type" : "string"
-        },
-        "in_reply_to_user_id" :
-        {
-            "type" : "string"
-        },
-        "lang" :
-        {
-            "type" : "string"
-        },
-        "links" :
-        {
-            "type" : "array",
-            "items" :
-                [
-                    {
-                        "type" : "string"
-                    }
-                ]
-        },
-        "media" :
-        {
-            "type" : "array",
-            "items" :
-                [
-                    {
-                        "type" : "object",
-                        "$ref" : "DatasiftTwitterMedia.json"
-                    }
-                ]
-        },
-        "mention_ids" :
-        {
-            "type" : "array",
-            "items" :
-                [
-                    {
-                        "type" : "string"
-                    }
-                ]
-        },
-        "mentions" :
-        {
-            "type" : "array",
-            "items" :
-                [
-                    {
-                        "type" : "string"
-                    }
-                ]
-        },
-        "place" :
-        {
-            "javaType" : "org.apache.streams.datasift.twitter.Place",
-            "type" : "object",
-            "dynamic" : "true",
-            "properties" :
-            {
-                "attributes" :
-                {
-                    "dynamic" : "true",
-                    "properties" :
-                    {
-                        "street_address" :
-                        {
-                            "type" : "string"
-                        }
-                    }
-                },
-                "country" :
-                {
-                    "type" : "string"
-                },
-                "country_code" :
-                {
-                    "type" : "string"
-                },
-                "full_name" :
-                {
-                    "type" : "string"
-                },
-                "id" :
-                {
-                    "type" : "string"
-                },
-                "name" :
-                {
-                    "type" : "string"
-                },
-                "place_type" :
-                {
-                    "type" : "string"
-                },
-                "url" :
-                {
-                    "type" : "string"
-                }
-            }
-        },
-        "retweet" :
-        {
-            "javaType" : "org.apache.streams.datasift.twitter.Retweet",
-            "type" : "object",
-            "dynamic" : "true",
-            "properties" :
-            {
-                "count" :
-                {
-                    "type" : "integer"
-                },
-                "created_at" :
-                {
-                    "type" : "string"
-                },
-                "domains" :
-                {
-                    "type" : "array",
-                    "items" :
-                        [
-                            {
-                                "type" : "string"
-                            }
-                        ]
-                },
-                "hashtags" :
-                {
-                    "type" : "array",
-                    "items" :
-                        [
-                            {
-                                "type" : "string"
-                            }
-                        ]
-                },
-                "id" :
-                {
-                    "type" : "string"
-                },
-                "lang" :
-                {
-                    "type" : "string"
-                },
-                "links" :
-                {
-                    "type" : "array",
-                    "items" :
-                        [
-                            {
-                                "type" : "string"
-                            }
-                        ]
-                },
-                "media" :
-                {
-                    "type" : "array",
-                    "items" :
-                        [
-                            {
-                            "type" : "object",
-                            "$ref" : "DatasiftTwitterMedia.json"
-                            }
-                        ]
-                },
-                "mention_ids" :
-                {
-                    "type" : "array",
-                    "items" :
-                        [
-                            {
-                                "type" : "integer"
-                            }
-                        ]
-                },
-                "mentions" :
-                {
-                    "type" : "array",
-                    "items" :
-                        [
-                            {
-                                "type" : "string"
-                            }
-                        ]
-                },
-                "source" :
-                {
-                    "type" : "string"
-                },
-                "text" :
-                {
-                    "type" : "string"
-                },
-                "user" :
-                {
-                    "type": "object",
-                    "$ref": "DatasiftTwitterUser.json"
-                }
-            }
-        },
-        "retweeted" :
-        {
-            "javaType" : "org.apache.streams.datasift.twitter.Retweeted",
-            "type" : "object",
-            "dynamic" : "true",
-            "properties" :
-            {
-                "created_at" :
-                {
-                    "type" : "string"
-                },
-                "geo" :
-                {
-                    "dynamic" : "true",
-                    "properties" :
-                    {
-                        "latitude" :
-                        {
-                            "type" : "number"
-                        },
-                        "longitude" :
-                        {
-                            "type" : "number"
-                        }
-                    }
-                },
-                "id" :
-                {
-                    "type" : "string"
-                },
-                "place" :
-                {
-                    "dynamic" : "true",
-                    "properties" :
-                    {
-                        "attributes" :
-                        {
-                            "type" : "object",
-                            "dynamic" : "true"
-                        },
-                        "country" :
-                        {
-                            "type" : "string"
-                        },
-                        "country_code" :
-                        {
-                            "type" : "string"
-                        },
-                        "full_name" :
-                        {
-                            "type" : "string"
-                        },
-                        "id" :
-                        {
-                            "type" : "string"
-                        },
-                        "name" :
-                        {
-                            "type" : "string"
-                        },
-                        "place_type" :
-                        {
-                            "type" : "string"
-                        },
-                        "url" :
-                        {
-                            "type" : "string"
-                        }
-                    }
-                },
-                "source" :
-                {
-                    "type" : "string"
-                },
-                "user" :
-                {
-                    "type": "object",
-                    "$ref": "DatasiftTwitterUser.json"
-                }
-            }
-        },
-        "source" :
-        {
-            "type" : "string"
-        },
-        "text" :
-        {
-            "type" : "string"
-        },
-        "user" :
-        {
-            "type": "object",
-            "$ref": "DatasiftTwitterUser.json"
-        }
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0b512d8b/streams-contrib/streams-provider-datasift/src/main/jsonschema/org/apache/streams/datasift/twitter/DatasiftTwitterMedia.json
----------------------------------------------------------------------
diff --git 
a/streams-contrib/streams-provider-datasift/src/main/jsonschema/org/apache/streams/datasift/twitter/DatasiftTwitterMedia.json
 
b/streams-contrib/streams-provider-datasift/src/main/jsonschema/org/apache/streams/datasift/twitter/DatasiftTwitterMedia.json
deleted file mode 100644
index ee19320..0000000
--- 
a/streams-contrib/streams-provider-datasift/src/main/jsonschema/org/apache/streams/datasift/twitter/DatasiftTwitterMedia.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-03/schema";,
-    "$license": [
-        "http://www.apache.org/licenses/LICENSE-2.0";
-    ],
-    "id": "#",
-    "type": "object",
-    "javaType" : "org.apache.streams.datasift.twitter.Media",
-    "javaInterfaces": ["java.io.Serializable"],
-    "properties" :
-    {
-        "display_url" :
-        {
-            "type" : "string"
-        },
-        "expanded_url" :
-        {
-            "type" : "string"
-        },
-        "id" :
-        {
-            "type" : "integer"
-        },
-        "id_str" :
-        {
-            "type" : "string"
-        },
-        "media_url" :
-        {
-            "type" : "string"
-        },
-        "media_url_https" :
-        {
-            "type" : "string"
-        },
-        "sizes" :
-        {
-            "properties" :
-            {
-                "large" :
-                {
-                    "properties" :
-                    {
-                        "h" :
-                        {
-                            "type" : "integer"
-                        },
-                        "resize" :
-                        {
-                            "type" : "string"
-                        },
-                        "w" :
-                        {
-                            "type" : "integer"
-                        }
-                    }
-                },
-                "medium" :
-                {
-                    "properties" :
-                    {
-                        "h" :
-                        {
-                            "type" : "integer"
-                        },
-                        "resize" :
-                        {
-                            "type" : "string"
-                        },
-                        "w" :
-                        {
-                            "type" : "integer"
-                        }
-                    }
-                },
-                "small" :
-                {
-                    "dynamic" : "true",
-                    "properties" :
-                    {
-                        "h" :
-                        {
-                            "type" : "integer"
-                        },
-                        "resize" :
-                        {
-                            "type" : "string"
-                        },
-                        "w" :
-                        {
-                            "type" : "integer"
-                        }
-                    }
-                },
-                "thumb" :
-                {
-                    "properties" :
-                    {
-                        "h" :
-                        {
-                            "type" : "integer"
-                        },
-                        "resize" :
-                        {
-                            "type" : "string"
-                        },
-                        "w" :
-                        {
-                            "type" : "integer"
-                        }
-                    }
-                }
-            }
-        },
-        "source_status_id" :
-        {
-            "type" : "integer"
-        },
-        "source_status_id_str" :
-        {
-            "type" : "string"
-        },
-        "type" :
-        {
-            "type" : "string"
-        },
-        "url" :
-        {
-            "type" : "string"
-        }
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0b512d8b/streams-contrib/streams-provider-datasift/src/main/jsonschema/org/apache/streams/datasift/twitter/DatasiftTwitterUser.json
----------------------------------------------------------------------
diff --git 
a/streams-contrib/streams-provider-datasift/src/main/jsonschema/org/apache/streams/datasift/twitter/DatasiftTwitterUser.json
 
b/streams-contrib/streams-provider-datasift/src/main/jsonschema/org/apache/streams/datasift/twitter/DatasiftTwitterUser.json
deleted file mode 100644
index d444ee0..0000000
--- 
a/streams-contrib/streams-provider-datasift/src/main/jsonschema/org/apache/streams/datasift/twitter/DatasiftTwitterUser.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-03/schema";,
-    "$license": [
-        "http://www.apache.org/licenses/LICENSE-2.0";
-    ],
-    "id": "#",
-    "type": "object",
-    "javaType": "org.apache.streams.datasift.twitter.DatasiftTwitterUser",
-    "javaInterfaces": ["java.io.Serializable"],
-    "properties": {
-        "created_at": {
-            "type": "string",
-            "format": "date-time"
-        },
-        "description": {
-            "type": "string"
-        },
-        "favourites_count": {
-            "type": "integer"
-        },
-        "followers_count": {
-            "type": "integer"
-        },
-        "friends_count": {
-            "type": "integer"
-        },
-        "geo_enabled": {
-            "type": "boolean"
-        },
-        "id": {
-            "type": "integer"
-        },
-        "id_str": {
-            "type": "string"
-        },
-        "lang": {
-            "type": "string"
-        },
-        "listed_count": {
-            "type": "integer"
-        },
-        "location": {
-            "type": "string"
-        },
-        "name": {
-            "type": "string"
-        },
-        "profile_image_url": {
-            "type": "string"
-        },
-        "profile_image_url_https": {
-            "type": "string"
-        },
-        "screen_name": {
-            "type": "string"
-        },
-        "statuses_count": {
-            "type": "integer"
-        },
-        "time_zone": {
-            "type": "string"
-        },
-        "url": {
-            "type": "string"
-        },
-        "utc_offset": {
-            "type": "integer"
-        },
-        "verified": {
-            "type": "boolean"
-        }
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0b512d8b/streams-contrib/streams-provider-datasift/src/main/resources/datasift.conf
----------------------------------------------------------------------
diff --git 
a/streams-contrib/streams-provider-datasift/src/main/resources/datasift.conf 
b/streams-contrib/streams-provider-datasift/src/main/resources/datasift.conf
deleted file mode 100644
index bfe6125..0000000
--- a/streams-contrib/streams-provider-datasift/src/main/resources/datasift.conf
+++ /dev/null
@@ -1,25 +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
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-datasift {
-    apiKey = ""
-    userName = ""
-    hashes = [
-        "b8aaf7cec5faa2fadbd55d651933a31e",
-        "f41f054e2a2ba8d2e7b0d74f56e727d6"
-    ]
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0b512d8b/streams-contrib/streams-provider-datasift/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git 
a/streams-contrib/streams-provider-datasift/src/site/markdown/index.md 
b/streams-contrib/streams-provider-datasift/src/site/markdown/index.md
deleted file mode 100644
index 87b9dee..0000000
--- a/streams-contrib/streams-provider-datasift/src/site/markdown/index.md
+++ /dev/null
@@ -1,27 +0,0 @@
-streams-provider-datasift
-==============
-
-streams-provider-datasift contains schema definitions, providers, conversions, 
and utility classes.
-
-## Data Types
-
-| Schema |
-|--------|
-| [Datasift.json](org/apache/streams/datasift/Datasift.json "Datasift.json")
-| 
[DatasiftInteraction.json](org/apache/streams/datasift/interaction/DatasiftInteraction.json
 "DatasiftInteraction.json")
-| 
[DatasiftFacebook.json](org/apache/streams/datasift/facebook/DatasiftFacebook.json
 "DatasiftFacebook.json")
-| 
[DatasiftInstagram.json](org/apache/streams/datasift/instagram/DatasiftInstagram.json
 "DatasiftInstagram.json")
-| 
[DatasiftWebhookData.json](org/apache/streams/datasift/DatasiftWebhookData.json 
"DatasiftWebhookData.json")
-
-## Configuration
-
-| Schema |
-|--------|
-| 
[DatasiftConfiguration.json](org/apache/streams/datasift/DatasiftConfiguration.json
 "DatasiftConfiguration.json") 
[DatasiftConfiguration.html](apidocs/org/apache/streams/datasift/DatasiftConfiguration.html
 "javadoc") |
-| 
[DatasiftPushConfiguration.json](org/apache/streams/datasift/DatasiftPushConfiguration.json
 "DatasiftPushConfiguration.json") 
[DatasiftPushConfiguration.html](apidocs/org/apache/streams/datasift/DatasiftPushConfiguration.html
 "javadoc") |
-| 
[DatasiftStreamConfiguration.json](org/apache/streams/datasift/DatasiftStreamConfiguration.json
 "DatasiftStreamConfiguration.json") 
[DatasiftStreamConfiguration.html](apidocs/org/apache/streams/datasift/DatasiftStreamConfiguration.html
 "javadoc") |
-| 
[DatasiftWebhookConfiguration.json](org/apache/streams/datasift/DatasiftWebhookConfiguration.json
 "DatasiftWebhookConfiguration.json") 
[DatasiftWebhookConfiguration.html](apidocs/org/apache/streams/datasift/DatasiftWebhookConfiguration.html
 "javadoc") |
-
-[JavaDocs](apidocs/index.html "JavaDocs")
-
-###### Licensed under Apache License 2.0 - 
http://www.apache.org/licenses/LICENSE-2.0
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0b512d8b/streams-contrib/streams-provider-datasift/src/test/java17/com/datasift/test/DatasiftSerDeTest.java
----------------------------------------------------------------------
diff --git 
a/streams-contrib/streams-provider-datasift/src/test/java17/com/datasift/test/DatasiftSerDeTest.java
 
b/streams-contrib/streams-provider-datasift/src/test/java17/com/datasift/test/DatasiftSerDeTest.java
deleted file mode 100644
index 11a384d..0000000
--- 
a/streams-contrib/streams-provider-datasift/src/test/java17/com/datasift/test/DatasiftSerDeTest.java
+++ /dev/null
@@ -1,75 +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 com.datasift.test;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
-import org.apache.streams.datasift.Datasift;
-import org.apache.streams.datasift.util.StreamsDatasiftMapper;
-import org.apache.streams.jackson.StreamsJacksonMapper;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-/**
- * Tests serialization of Datasift inputs
- */
-@Ignore("ignore until test resources are available.")
-public class DatasiftSerDeTest {
-
-    private final static Logger LOGGER = 
LoggerFactory.getLogger(DatasiftSerDeTest.class);
-
-    private ObjectMapper mapper = 
StreamsJacksonMapper.getInstance(Lists.newArrayList(StreamsDatasiftMapper.DATASIFT_FORMAT));
-
-    @Test
-    public void Tests()
-    {
-        InputStream is = 
DatasiftSerDeTest.class.getResourceAsStream("/part-r-00000.json");
-        InputStreamReader isr = new InputStreamReader(is);
-        BufferedReader br = new BufferedReader(isr);
-
-        try {
-            while (br.ready()) {
-                String line = br.readLine();
-                LOGGER.debug(line);
-
-                Datasift ser = mapper.readValue(line, Datasift.class);
-
-                String de = mapper.writeValueAsString(ser);
-
-                LOGGER.debug(de);
-
-                Datasift serde = mapper.readValue(de, Datasift.class);
-
-                Assert.assertEquals(ser, serde);
-
-                LOGGER.debug(mapper.writeValueAsString(serde));
-            }
-        } catch( Exception e ) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0b512d8b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/provider/DatasiftStreamProviderTest.java
----------------------------------------------------------------------
diff --git 
a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/provider/DatasiftStreamProviderTest.java
 
b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/provider/DatasiftStreamProviderTest.java
deleted file mode 100644
index a7d14b4..0000000
--- 
a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/provider/DatasiftStreamProviderTest.java
+++ /dev/null
@@ -1,144 +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.datasift.provider;
-
-import com.datasift.client.DataSiftClient;
-import com.datasift.client.stream.ConnectionManager;
-import com.datasift.client.stream.StreamEventListener;
-import com.google.common.collect.Lists;
-import org.apache.streams.datasift.DatasiftConfiguration;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.times;
-
-/**
- * Requires Java version 1.7!
- */
-public class DatasiftStreamProviderTest {
-
-    private static final String HASH1 = "fake1";
-    private static final String HASH2 = "fake2";
-    private static final String HASH3 = "fake3";
-
-    @Test
-    public void startStreamForHash() {
-        DatasiftStreamProvider.DeleteHandler handler = new 
DatasiftStreamProvider.DeleteHandler();
-        final List<DataSiftClient> clientList = Lists.newLinkedList();
-        DatasiftStreamProvider provider = createStubbedProvider(clientList, 
handler);
-        provider.prepare(null);
-        provider.startStreamForHash(HASH1);
-        assertEquals(1, clientList.size());
-        provider.startStreamForHash(HASH2);
-        assertEquals(2, clientList.size());
-        provider.startStreamForHash(HASH3);
-    }
-
-    @Test
-    public void testStartStream() {
-        DatasiftStreamProvider.DeleteHandler handler = new 
DatasiftStreamProvider.DeleteHandler();
-        final List<DataSiftClient> clientList = Lists.newLinkedList();
-        DatasiftStreamProvider provider = createStubbedProvider(clientList, 
handler);
-        provider.prepare(null);
-        provider.startStream();
-        assertEquals(3, clientList.size());
-    }
-
-    @Test
-    public void testShutDownStream() {
-        DatasiftStreamProvider.DeleteHandler handler = new 
DatasiftStreamProvider.DeleteHandler();
-        final List<DataSiftClient> clientList = Lists.newLinkedList();
-        DatasiftStreamProvider provider = createStubbedProvider(clientList, 
handler);
-        provider.prepare(null);
-        provider.startStream();
-        assertEquals(3, clientList.size());
-        int shutDownCount = 0;
-        DataSiftClient client = clientList.get(0);
-        provider.shutDownStream(HASH1);
-        Mockito.verify(client, times(1)).shutdown();
-        client = clientList.get(1);
-        Mockito.verify(client, times(0)).shutdown();
-        client = clientList.get(2);
-        Mockito.verify(client, times(0)).shutdown();
-
-        provider.shutDownStream(HASH3);
-        Mockito.verify(client, times(1)).shutdown();
-        client = clientList.get(1);
-        Mockito.verify(client, times(0)).shutdown();
-        client = clientList.get(2);
-        Mockito.verify(client, times(1)).shutdown();
-    }
-
-    @Test
-    public void testStartAlreadyInprogressStream() {
-        DatasiftStreamProvider.DeleteHandler handler = new 
DatasiftStreamProvider.DeleteHandler();
-        final List<DataSiftClient> clientList = Lists.newLinkedList();
-        DatasiftStreamProvider provider = createStubbedProvider(clientList, 
handler);
-        provider.prepare(null);
-        provider.startStream();
-        assertEquals(3, clientList.size());
-        int shutDownCount = 0;
-        DataSiftClient client = clientList.get(0);
-        provider.startStreamForHash(HASH1);
-        assertEquals(4, clientList.size());
-        Mockito.verify(client, times(1)).shutdown();
-        client = clientList.get(1);
-        Mockito.verify(client, times(0)).shutdown();
-        client = clientList.get(2);
-        Mockito.verify(client, times(0)).shutdown();
-        client = clientList.get(3);
-        Mockito.verify(client, times(0)).shutdown();
-    }
-
-
-
-
-    private DatasiftStreamProvider createStubbedProvider(final 
List<DataSiftClient> clientList, StreamEventListener listener) {
-        DatasiftStreamProvider provider = new DatasiftStreamProvider(listener, 
getTestConfiguration()) {
-            @Override
-            protected DataSiftClient getNewClient(String userName, String 
apiKey) {
-                DataSiftClient client = Mockito.mock(DataSiftClient.class);
-                ConnectionManager mockConnection = 
Mockito.mock(ConnectionManager.class);
-                Mockito.when(client.liveStream()).thenReturn(mockConnection);
-                clientList.add(client);
-                return client;
-            }
-        };
-        return provider;
-    }
-
-    private DatasiftConfiguration getTestConfiguration() {
-        DatasiftConfiguration config = new DatasiftConfiguration();
-        config.setUserName("fakeName");
-        config.setApiKey("fakeApiKey");
-        List<String> streamHashes = Lists.newLinkedList();
-        streamHashes.add(HASH1);
-        streamHashes.add(HASH2);
-        streamHashes.add(HASH3);
-        config.setStreamHash(streamHashes);
-        return config;
-    }
-
-
-
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0b512d8b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/provider/ErrorHandlerTest.java
----------------------------------------------------------------------
diff --git 
a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/provider/ErrorHandlerTest.java
 
b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/provider/ErrorHandlerTest.java
deleted file mode 100644
index 2cd411a..0000000
--- 
a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/provider/ErrorHandlerTest.java
+++ /dev/null
@@ -1,40 +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.datasift.provider;
-
-import org.junit.Test;
-import org.mockito.Mockito;
-
-/**
- * Requires Java version 1.7!
- */
-public class ErrorHandlerTest {
-
-    @Test
-    public void testErrorHandler() {
-        DatasiftStreamProvider mockProvider = 
Mockito.mock(DatasiftStreamProvider.class);
-        String streamHash = "fakeHash1";
-        ErrorHandler handler = new ErrorHandler(mockProvider, streamHash);
-        handler.exceptionCaught(new Exception("TEST EXCEPTION"));
-        Mockito.verify(mockProvider).startStreamForHash(streamHash);
-    }
-
-
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0b512d8b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/provider/SubscriptionTest.java
----------------------------------------------------------------------
diff --git 
a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/provider/SubscriptionTest.java
 
b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/provider/SubscriptionTest.java
deleted file mode 100644
index f194792..0000000
--- 
a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/provider/SubscriptionTest.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.datasift.provider;
-
-import com.datasift.client.core.Stream;
-import com.datasift.client.stream.Interaction;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Requires Java version 1.7!
- */
-public class SubscriptionTest {
-
-    @Test
-    public void testSubscriptionOnMessage() {
-        Stream mockStream = Mockito.mock(Stream.class);
-        Mockito.when(mockStream.hash()).thenReturn("1");
-        Queue<Interaction> interactionQueue = new 
ConcurrentLinkedQueue<Interaction>();
-        Subscription subscriptionStub = new Subscription(mockStream, 
interactionQueue);
-        addInteractions(1, subscriptionStub);
-        assertEquals(1, interactionQueue.size());
-        addInteractions(30, subscriptionStub);
-        assertEquals(31, interactionQueue.size());
-        while(!interactionQueue.isEmpty())
-            interactionQueue.poll();
-        addInteractions(5, subscriptionStub);
-        assertEquals(5, interactionQueue.size());
-    }
-
-    private void addInteractions(int numToAdd, Subscription subscription) {
-        for(int i=0; i < numToAdd; ++i) {
-            subscription.onMessage(Mockito.mock(Interaction.class));
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0b512d8b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftActivitySerializerIT.java
----------------------------------------------------------------------
diff --git 
a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftActivitySerializerIT.java
 
b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftActivitySerializerIT.java
deleted file mode 100644
index 69c49fd..0000000
--- 
a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftActivitySerializerIT.java
+++ /dev/null
@@ -1,110 +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.datasift.serializer;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
-import org.apache.commons.lang.StringUtils;
-import org.apache.streams.data.ActivitySerializer;
-import org.apache.streams.datasift.Datasift;
-import org.apache.streams.datasift.util.StreamsDatasiftMapper;
-import org.apache.streams.jackson.StreamsJacksonMapper;
-import org.apache.streams.pojo.json.Activity;
-import org.apache.streams.pojo.json.Actor;
-import org.apache.streams.util.files.StreamsScannerUtil;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.util.Scanner;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-/**
- * Tests serialization and conversion of Datasift inputs
- */
-public class DatasiftActivitySerializerIT {
-
-    protected ActivitySerializer SERIALIZER;
-
-    protected static ObjectMapper MAPPER = 
StreamsJacksonMapper.getInstance(Lists.newArrayList(StreamsDatasiftMapper.DATASIFT_FORMAT));
-
-    @Before
-    public void initSerializer() {
-        SERIALIZER = new DatasiftActivitySerializer();
-    }
-
-    @Test
-    public void testConversion() throws Exception {
-
-        Scanner scanner = 
StreamsScannerUtil.getInstance("/rand_sample_datasift_json.txt");
-
-        String line = null;
-        while(scanner.hasNextLine()) {
-            try {
-                line = scanner.nextLine();
-                Datasift item = MAPPER.readValue(line, Datasift.class);
-                testConversion(item);
-                String json = MAPPER.writeValueAsString(item);
-                testDeserNoNull(json);
-                testDeserNoAddProps(json);
-            } catch (Exception e) {
-                System.err.println(line);
-                throw e;
-            }
-        }
-    }
-
-    /**
-     * Test that the minimum number of things that an activity has
-     * @param item
-     */
-    protected void testConversion(Datasift item) throws Exception {
-        Activity activity = SERIALIZER.deserialize(item);
-        assertNotNull("activity.id", activity.getId());
-        assertNotNull("activity.published", activity.getPublished());
-        assertNotNull("activity.provider", activity.getProvider());
-        assertNotNull("activity.url", activity.getUrl());
-        assertNotNull("activity.verb", activity.getVerb());
-        Actor actor = activity.getActor();
-        assertNotNull("activity.actor", actor);
-    }
-
-    /**
-     * Test that null fields are not present
-     * @param json
-     */
-    protected void testDeserNoNull(String json) throws Exception {
-        int nulls = StringUtils.countMatches(json, ":null");
-        assertEquals(0l, (long)nulls);
-
-    }
-
-    /**
-     * Test that null fields are not present
-     * @param json
-     */
-    protected void testDeserNoAddProps(String json) throws Exception {
-        int nulls = StringUtils.countMatches(json, "additionalProperties:{");
-        assertEquals(0l, (long)nulls);
-
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0b512d8b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftEventClassifierTest.java
----------------------------------------------------------------------
diff --git 
a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftEventClassifierTest.java
 
b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftEventClassifierTest.java
deleted file mode 100644
index 257e8ef..0000000
--- 
a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftEventClassifierTest.java
+++ /dev/null
@@ -1,71 +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.datasift.serializer;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
-import org.apache.streams.datasift.Datasift;
-import org.apache.streams.datasift.instagram.Instagram;
-import org.apache.streams.datasift.twitter.Twitter;
-import org.apache.streams.datasift.util.StreamsDatasiftMapper;
-import org.apache.streams.jackson.StreamsJacksonMapper;
-import org.apache.streams.util.files.StreamsScannerUtil;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.util.Scanner;
-
-/**
- * Tests serialization and conversion of Datasift inputs
- */
-@Ignore("ignore until test resources are available.")
-public class DatasiftEventClassifierTest {
-
-    private static final ObjectMapper MAPPER = 
StreamsJacksonMapper.getInstance(Lists.newArrayList(StreamsDatasiftMapper.DATASIFT_FORMAT));
-
-    @Test
-    public void testTwitterDetection() throws Exception {
-
-        Scanner scanner = 
StreamsScannerUtil.getInstance("/twitter_datasift_json.txt");
-
-        String line = null;
-        while(scanner.hasNextLine()) {
-            line = scanner.nextLine();
-            Datasift datasift = MAPPER.readValue(line, Datasift.class);
-            assert(DatasiftEventClassifier.detectClass(datasift) == 
Twitter.class);
-            assert(DatasiftEventClassifier.bestSerializer(datasift) instanceof 
DatasiftTwitterActivitySerializer);
-        }
-    }
-
-    @Test
-    public void testInstagramDetection() throws Exception {
-
-        Scanner scanner = 
StreamsScannerUtil.getInstance("/instagram_datasift_json.txt");
-
-        String line = null;
-        while(scanner.hasNextLine()) {
-            line = scanner.nextLine();
-            Datasift datasift = MAPPER.readValue(line, Datasift.class);
-            assert(DatasiftEventClassifier.detectClass(datasift) == 
Instagram.class);
-            assert(DatasiftEventClassifier.bestSerializer(datasift) instanceof 
DatasiftInstagramActivitySerializer);
-        }
-    }
-    
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0b512d8b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInstagramActivitySerializerIT.java
----------------------------------------------------------------------
diff --git 
a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInstagramActivitySerializerIT.java
 
b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInstagramActivitySerializerIT.java
deleted file mode 100644
index aa57454..0000000
--- 
a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInstagramActivitySerializerIT.java
+++ /dev/null
@@ -1,57 +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.datasift.serializer;
-
-import org.apache.streams.datasift.Datasift;
-import org.apache.streams.util.files.StreamsScannerUtil;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.util.Scanner;
-
-/**
- * Tests serialization and conversion of Datasift inputs
- */
-public class DatasiftInstagramActivitySerializerIT extends 
DatasiftActivitySerializerIT {
-
-    @Before
-    @Override
-    public void initSerializer() {
-        SERIALIZER = new DatasiftInstagramActivitySerializer();
-    }
-
-    @Test
-    @Override
-    public void testConversion() throws Exception {
-
-        Scanner scanner = 
StreamsScannerUtil.getInstance("/instagram_datasift_json.txt");
-
-        String line = null;
-        while(scanner.hasNextLine()) {
-            line = scanner.nextLine();
-            Datasift item = MAPPER.readValue(line, Datasift.class);
-            testConversion(item);
-            String json = MAPPER.writeValueAsString(item);
-            testDeserNoNull(json);
-            testDeserNoAddProps(json);
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0b512d8b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializerIT.java
----------------------------------------------------------------------
diff --git 
a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializerIT.java
 
b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializerIT.java
deleted file mode 100644
index 40a1e95..0000000
--- 
a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializerIT.java
+++ /dev/null
@@ -1,62 +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.datasift.serializer;
-
-import org.apache.streams.datasift.Datasift;
-import org.apache.streams.util.files.StreamsScannerUtil;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.util.Scanner;
-
-/**
- * Tests serialization and conversion of Datasift inputs
- */
-public class DatasiftInteractionActivitySerializerIT extends 
DatasiftActivitySerializerIT {
-
-    @Before
-    @Override
-    public void initSerializer() {
-        SERIALIZER = new DatasiftInteractionActivitySerializer();
-    }
-
-    @Test
-    @Override
-    public void testConversion() throws Exception {
-
-        Scanner scanner = 
StreamsScannerUtil.getInstance("/rand_sample_datasift_json.txt");
-
-        String line = null;
-        while(scanner.hasNextLine()) {
-            try {
-                line = scanner.nextLine();
-                Datasift item = MAPPER.readValue(line, Datasift.class);
-                testConversion(item);
-                String json = MAPPER.writeValueAsString(item);
-                testDeserNoNull(json);
-                testDeserNoAddProps(json);
-            } catch (Exception e) {
-                System.err.println(line);
-                throw e;
-            }
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0b512d8b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftTwitterActivitySerializerIT.java
----------------------------------------------------------------------
diff --git 
a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftTwitterActivitySerializerIT.java
 
b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftTwitterActivitySerializerIT.java
deleted file mode 100644
index 42241f1..0000000
--- 
a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftTwitterActivitySerializerIT.java
+++ /dev/null
@@ -1,57 +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.datasift.serializer;
-
-import org.apache.streams.datasift.Datasift;
-import org.apache.streams.util.files.StreamsScannerUtil;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.util.Scanner;
-
-/**
- * Tests serialization and conversion of Datasift inputs
- */
-public class DatasiftTwitterActivitySerializerIT extends 
DatasiftActivitySerializerIT {
-
-    @Before
-    @Override
-    public void initSerializer() {
-        SERIALIZER = new DatasiftTwitterActivitySerializer();
-    }
-
-    @Test
-    @Override
-    public void testConversion() throws Exception {
-
-        Scanner scanner = 
StreamsScannerUtil.getInstance("/twitter_datasift_json.txt");
-
-        String line = null;
-        while(scanner.hasNextLine()) {
-            line = scanner.nextLine();
-            Datasift item = MAPPER.readValue(line, Datasift.class);
-            testConversion(item);
-            String json = MAPPER.writeValueAsString(item);
-            testDeserNoNull(json);
-            testDeserNoAddProps(json);
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0b512d8b/streams-contrib/streams-provider-gnip/gnip-edc-facebook/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-gnip/gnip-edc-facebook/pom.xml 
b/streams-contrib/streams-provider-gnip/gnip-edc-facebook/pom.xml
deleted file mode 100644
index ebbd18a..0000000
--- a/streams-contrib/streams-provider-gnip/gnip-edc-facebook/pom.xml
+++ /dev/null
@@ -1,152 +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>
-        <artifactId>streams-provider-gnip</artifactId>
-        <groupId>org.apache.streams</groupId>
-        <version>0.4-incubating-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>gnip-edc-facebook</artifactId>
-    <name>${project.artifactId}</name>
-
-    <description>Gnip EDC Facebook Provider</description>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jsonschema2pojo</groupId>
-            <artifactId>jsonschema2pojo-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streams</groupId>
-            <artifactId>streams-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streams</groupId>
-            <artifactId>streams-pojo</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-joda</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streams</groupId>
-            <artifactId>streams-provider-facebook</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streams</groupId>
-            <artifactId>gnip-powertrack</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml</groupId>
-            <artifactId>aalto-xml</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streams</groupId>
-            <artifactId>streams-testing</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-            <type>test-jar</type>
-        </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>
-                <executions>
-                    <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.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <configuration>
-                    
<schemaDirectory>src/main/xmlschema/com/facebook/</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.facebook.api</generatePackage>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.jvnet.jaxb2_commons</groupId>
-                            <artifactId>jaxb2-basics</artifactId>
-                            <version>${jaxb2-basics.version}</version>
-                        </plugin>
-                    </plugins>
-                </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/0b512d8b/streams-contrib/streams-provider-gnip/gnip-edc-facebook/src/test/java/org/apache/streams/gnip/facebook/test/FacebookEDCAsActivityTest.java
----------------------------------------------------------------------
diff --git 
a/streams-contrib/streams-provider-gnip/gnip-edc-facebook/src/test/java/org/apache/streams/gnip/facebook/test/FacebookEDCAsActivityTest.java
 
b/streams-contrib/streams-provider-gnip/gnip-edc-facebook/src/test/java/org/apache/streams/gnip/facebook/test/FacebookEDCAsActivityTest.java
deleted file mode 100644
index 18fbfac..0000000
--- 
a/streams-contrib/streams-provider-gnip/gnip-edc-facebook/src/test/java/org/apache/streams/gnip/facebook/test/FacebookEDCAsActivityTest.java
+++ /dev/null
@@ -1,93 +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.gnip.facebook.test;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import org.apache.commons.lang.StringUtils;
-import org.apache.streams.gnip.powertrack.GnipActivityFixer;
-import org.apache.streams.pojo.json.Activity;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-/**
- * Tests conversion of FacebookEDC inputs to Activity
- */
-@Ignore("ignore until test resources are available.")
-public class FacebookEDCAsActivityTest {
-
-    private final static Logger LOGGER = 
LoggerFactory.getLogger(FacebookEDCAsActivityTest.class);
-
-    private ObjectMapper jsonMapper = new ObjectMapper();
-    XmlMapper xmlMapper = new XmlMapper();
-
-    @Test
-    public void Tests()   throws Exception
-    {
-        InputStream is = 
FacebookEDCAsActivityTest.class.getResourceAsStream("/FacebookEDC.xml");
-        if(is == null) LOGGER.debug("null");
-        InputStreamReader isr = new InputStreamReader(is);
-        BufferedReader br = new BufferedReader(isr);
-        xmlMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, 
Boolean.FALSE);
-        
xmlMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, 
Boolean.TRUE);
-        
xmlMapper.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, 
Boolean.TRUE);
-        
jsonMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, 
Boolean.FALSE);
-        
jsonMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, 
Boolean.TRUE);
-        
jsonMapper.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, 
Boolean.TRUE);
-
-        try {
-            while (br.ready()) {
-                String line = br.readLine();
-                if(!StringUtils.isEmpty(line))
-                {
-                    LOGGER.debug(line);
-                    Object activityObject = xmlMapper.readValue(line, 
Object.class);
-
-                    String jsonString = 
jsonMapper.writeValueAsString(activityObject);
-
-                    JSONObject jsonObject = new JSONObject(jsonString);
-
-                    JSONObject fixedObject = GnipActivityFixer.fix(jsonObject);
-
-                    Activity activity = null;
-                    try {
-                        activity = 
jsonMapper.readValue(fixedObject.toString(), Activity.class);
-                    } catch( Exception e ) {
-                        LOGGER.error(jsonObject.toString());
-                        LOGGER.error(fixedObject.toString());
-                        e.printStackTrace();
-                        Assert.fail();
-                    }
-                }
-            }
-        } catch( Exception e ) {
-            LOGGER.error(e.getMessage());
-            Assert.fail();
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0b512d8b/streams-contrib/streams-provider-gnip/gnip-edc-facebook/src/test/java/org/apache/streams/gnip/facebook/test/FacebookEDCSerDeTest.java
----------------------------------------------------------------------
diff --git 
a/streams-contrib/streams-provider-gnip/gnip-edc-facebook/src/test/java/org/apache/streams/gnip/facebook/test/FacebookEDCSerDeTest.java
 
b/streams-contrib/streams-provider-gnip/gnip-edc-facebook/src/test/java/org/apache/streams/gnip/facebook/test/FacebookEDCSerDeTest.java
deleted file mode 100644
index 91a7634..0000000
--- 
a/streams-contrib/streams-provider-gnip/gnip-edc-facebook/src/test/java/org/apache/streams/gnip/facebook/test/FacebookEDCSerDeTest.java
+++ /dev/null
@@ -1,74 +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.gnip.facebook.test;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import com.gnip.api.Entry;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-/**
- * Tests serialization of FacebookEDC inputs
- */
-@Ignore("ignore until test resources are available.")
-public class FacebookEDCSerDeTest {
-
-    private final static Logger LOGGER = 
LoggerFactory.getLogger(FacebookEDCSerDeTest.class);
-
-    XmlMapper xmlMapper = new XmlMapper();
-
-    @Test
-    public void Tests()   throws Exception
-    {
-        xmlMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, 
Boolean.FALSE);
-        
xmlMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, 
Boolean.TRUE);
-        
xmlMapper.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, 
Boolean.TRUE);
-
-        InputStream is = 
FacebookEDCSerDeTest.class.getResourceAsStream("/FacebookEDC.xml");
-        if(is == null) LOGGER.debug("null");
-        InputStreamReader isr = new InputStreamReader(is);
-        BufferedReader br = new BufferedReader(isr);
-        xmlMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, 
Boolean.FALSE);
-        
xmlMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, 
Boolean.TRUE);
-        
xmlMapper.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, 
Boolean.TRUE);
-
-        try {
-            while (br.ready()) {
-                String line = br.readLine();
-                LOGGER.debug(line);
-
-                Entry xmlObject = xmlMapper.readValue(line, Entry.class);
-
-                String xml = xmlMapper.writeValueAsString(xmlObject);
-
-            }
-        } catch( Exception e ) {
-            LOGGER.error(e.getMessage());
-            Assert.fail();
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0b512d8b/streams-contrib/streams-provider-gnip/gnip-edc-flickr/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-gnip/gnip-edc-flickr/pom.xml 
b/streams-contrib/streams-provider-gnip/gnip-edc-flickr/pom.xml
deleted file mode 100644
index 3ebd84d..0000000
--- a/streams-contrib/streams-provider-gnip/gnip-edc-flickr/pom.xml
+++ /dev/null
@@ -1,139 +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>
-        <artifactId>streams-provider-gnip</artifactId>
-        <groupId>org.apache.streams</groupId>
-        <version>0.4-incubating-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>gnip-edc-flickr</artifactId>
-    <name>${project.artifactId}</name>
-
-    <description>Gnip EDC Flickr Provider</description>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jsonschema2pojo</groupId>
-            <artifactId>jsonschema2pojo-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streams</groupId>
-            <artifactId>streams-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streams</groupId>
-            <artifactId>streams-pojo</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streams</groupId>
-            <artifactId>gnip-powertrack</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml</groupId>
-            <artifactId>aalto-xml</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streams</groupId>
-            <artifactId>streams-testing</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-            <type>test-jar</type>
-        </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>
-                <executions>
-                    <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.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <configuration>
-                    
<schemaDirectory>src/main/xmlschema/com/flickr/</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>com.flickr.api</generatePackage>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.jvnet.jaxb2_commons</groupId>
-                            <artifactId>jaxb2-basics</artifactId>
-                            <version>${jaxb2-basics.version}</version>
-                        </plugin>
-                    </plugins>
-                </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/0b512d8b/streams-contrib/streams-provider-gnip/gnip-edc-flickr/src/test/java/org/apache/streams/gnip/flickr/test/FlickrEDCAsActivityTest.java
----------------------------------------------------------------------
diff --git 
a/streams-contrib/streams-provider-gnip/gnip-edc-flickr/src/test/java/org/apache/streams/gnip/flickr/test/FlickrEDCAsActivityTest.java
 
b/streams-contrib/streams-provider-gnip/gnip-edc-flickr/src/test/java/org/apache/streams/gnip/flickr/test/FlickrEDCAsActivityTest.java
deleted file mode 100644
index f1257e3..0000000
--- 
a/streams-contrib/streams-provider-gnip/gnip-edc-flickr/src/test/java/org/apache/streams/gnip/flickr/test/FlickrEDCAsActivityTest.java
+++ /dev/null
@@ -1,92 +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.gnip.flickr.test;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import org.apache.streams.gnip.powertrack.GnipActivityFixer;
-import org.apache.streams.pojo.json.Activity;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-/**
- * Tests conversion of FlickrEDC inputs to Activity
- */
-@Ignore("ignore until test resources are available.")
-public class FlickrEDCAsActivityTest {
-
-    private final static Logger LOGGER = 
LoggerFactory.getLogger(FlickrEDCAsActivityTest.class);
-
-    private ObjectMapper mapper = new ObjectMapper();
-
-    @Test
-    public void Tests()   throws Exception
-    {
-        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, 
Boolean.FALSE);
-        mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, 
Boolean.TRUE);
-        
mapper.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, 
Boolean.TRUE);
-
-        InputStream is = 
FlickrEDCAsActivityTest.class.getResourceAsStream("/FlickrEDC.xml");
-        if(is == null) LOGGER.debug("null");
-        InputStreamReader isr = new InputStreamReader(is);
-        BufferedReader br = new BufferedReader(isr);
-        XmlMapper xmlMapper = new XmlMapper();
-        xmlMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, 
Boolean.FALSE);
-        
xmlMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, 
Boolean.TRUE);
-        
xmlMapper.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, 
Boolean.TRUE);
-
-        ObjectMapper jsonMapper = new ObjectMapper();
-
-        try {
-            while (br.ready()) {
-                String line = br.readLine();
-
-                Object activityObject = xmlMapper.readValue(line, 
Object.class);
-
-                String jsonString = 
jsonMapper.writeValueAsString(activityObject);
-
-                JSONObject jsonObject = new JSONObject(jsonString);
-
-                JSONObject fixedObject = GnipActivityFixer.fix(jsonObject);
-
-                Activity activity = null;
-                try {
-                    activity = jsonMapper.readValue(fixedObject.toString(), 
Activity.class);
-                } catch( Exception e ) {
-                    LOGGER.error(jsonObject.toString());
-                    LOGGER.error(fixedObject.toString());
-                    e.printStackTrace();
-                    Assert.fail();
-                }
-            }
-        } catch( Exception e ) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0b512d8b/streams-contrib/streams-provider-gnip/gnip-edc-flickr/src/test/java/org/apache/streams/gnip/flickr/test/FlickrEDCSerDeTest.java
----------------------------------------------------------------------
diff --git 
a/streams-contrib/streams-provider-gnip/gnip-edc-flickr/src/test/java/org/apache/streams/gnip/flickr/test/FlickrEDCSerDeTest.java
 
b/streams-contrib/streams-provider-gnip/gnip-edc-flickr/src/test/java/org/apache/streams/gnip/flickr/test/FlickrEDCSerDeTest.java
deleted file mode 100644
index 3b3a847..0000000
--- 
a/streams-contrib/streams-provider-gnip/gnip-edc-flickr/src/test/java/org/apache/streams/gnip/flickr/test/FlickrEDCSerDeTest.java
+++ /dev/null
@@ -1,76 +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.gnip.flickr.test;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-/**
- * Tests serialization of FlickrEDC inputs
- */
-@Ignore("ignore until test resources are available.")
-public class FlickrEDCSerDeTest {
-
-    private final static Logger LOGGER = 
LoggerFactory.getLogger(FlickrEDCSerDeTest.class);
-
-    private ObjectMapper mapper = new ObjectMapper();
-
-    @Test
-    public void Tests()   throws Exception
-    {
-        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, 
Boolean.FALSE);
-        mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, 
Boolean.TRUE);
-        
mapper.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, 
Boolean.TRUE);
-
-        InputStream is = 
FlickrEDCSerDeTest.class.getResourceAsStream("/FlickrEDC.xml");
-        if(is == null) LOGGER.debug("null");
-        InputStreamReader isr = new InputStreamReader(is);
-        BufferedReader br = new BufferedReader(isr);
-        XmlMapper xmlMapper = new XmlMapper();
-        xmlMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, 
Boolean.FALSE);
-        
xmlMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, 
Boolean.TRUE);
-        
xmlMapper.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, 
Boolean.TRUE);
-        xmlMapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, 
Boolean.FALSE);
-
-        ObjectMapper jsonMapper = new ObjectMapper();
-
-        try {
-            while (br.ready()) {
-                String line = br.readLine();
-
-                Object activityObject = xmlMapper.readValue(line, 
Object.class);
-
-                String jsonObject = 
jsonMapper.writeValueAsString(activityObject);
-            }
-        } catch( Exception e ) {
-            e.printStackTrace();
-            Assert.fail();
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/0b512d8b/streams-contrib/streams-provider-gnip/gnip-edc-googleplus/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-gnip/gnip-edc-googleplus/pom.xml 
b/streams-contrib/streams-provider-gnip/gnip-edc-googleplus/pom.xml
deleted file mode 100644
index 6045dfb..0000000
--- a/streams-contrib/streams-provider-gnip/gnip-edc-googleplus/pom.xml
+++ /dev/null
@@ -1,102 +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-provider-gnip</artifactId>
-        <version>0.4-incubating-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>gnip-edc-googleplus</artifactId>
-    <name>${project.artifactId}</name>
-
-    <description>Gnip EDC Google+ Provider</description>
-
-    <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>org.json</groupId>
-            <artifactId>json</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.streams</groupId>
-            <artifactId>streams-pojo</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.streams</groupId>
-            <artifactId>streams-pojo-extensions</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.streams</groupId>
-            <artifactId>gnip-powertrack</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.streams</groupId>
-            <artifactId>streams-testing</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-            <type>test-jar</type>
-        </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>
-
-    </build>
-</project>


Reply via email to