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:20:14 UTC

[36/71] [abbrv] git commit: fixing STREAMS-26 branch

fixing STREAMS-26 branch

git-svn-id: https://svn.apache.org/repos/asf/incubator/streams/branches/STREAMS-26@1571362 13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/master
Commit: 6ea69f298a1c0453e4e4059948fcae70ed3c039c
Parents: 2886fbb
Author: sblackmon <sb...@unknown>
Authored: Mon Feb 24 17:29:43 2014 +0000
Committer: sblackmon <sb...@unknown>
Committed: Mon Feb 24 17:29:43 2014 +0000

----------------------------------------------------------------------
 provision/provision.iml                         |    11 +-
 streams-contrib/pom.xml                         |    18 +-
 .../streams/console/ConsolePersistWriter.java   |    22 +-
 .../ElasticsearchPersistReader.java             |    38 +-
 .../ElasticsearchPersistWriter.java             |    40 +-
 .../ElasticsearchPersistWriterTask.java         |    38 +
 .../streams-provider-rss.iml                    |    13 +-
 .../streams/core/StreamsPersistReader.java      |    12 +-
 trunk/.gitignore                                |    23 -
 trunk/DISCLAIMER                                |    10 -
 trunk/LICENSE                                   |   202 -
 trunk/NOTICE                                    |     5 -
 trunk/README.txt                                |    52 -
 trunk/pom.xml                                   |   305 -
 trunk/poms/compiled/pom.xml                     |    80 -
 trunk/poms/pom.xml                              |    94 -
 trunk/poms/wrappers/pom.xml                     |    75 -
 trunk/provision/pom.xml                         |    42 -
 trunk/provision/provision.iml                   |    14 -
 .../bundles/downloaded_bundles.properties       |    25 -
 .../org.apache.felix.gogo.command_0.12.0.jar    |   Bin 51746 -> 0 bytes
 .../org.apache.felix.gogo.runtime_0.10.0.jar    |   Bin 66965 -> 0 bytes
 .../org.apache.felix.gogo.shell_0.10.0.jar      |   Bin 49004 -> 0 bytes
 .../bundles/org.apache.felix.main_4.0.3.jar     |   Bin 493717 -> 0 bytes
 trunk/runner/deploy-pom.xml                     |    52 -
 trunk/runner/felix/config.ini                   |    34 -
 trunk/streams-cassandra/pom.xml                 |   142 -
 .../configuration/CassandraConfiguration.java   |    63 -
 .../model/CassandraActivityStreamsEntry.java    |    45 -
 .../CassandraActivityStreamsRepository.java     |   176 -
 .../repository/impl/CassandraKeyspace.java      |    43 -
 .../impl/CassandraSubscriptionRepository.java   |    69 -
 .../spring/streams-cassandra-context.xml        |    25 -
 .../CassandraActivityStreamsRepositoryTest.java |    99 -
 .../impl/CassandraActivitySubscriptionTest.java |    54 -
 trunk/streams-config-graph/pom.xml              |    71 -
 .../config/graph/PipelineGraphConfigurator.java |    88 -
 trunk/streams-config/pom.xml                    |   129 -
 .../streams/config/StreamsConfigurator.java     |    38 -
 .../main/jsonschema/StreamsConfiguration.json   |    12 -
 trunk/streams-contrib/pom.xml                   |    74 -
 .../streams-persist-console/pom.xml             |    30 -
 .../streams/console/ConsolePersistWriter.java   |    50 -
 .../streams-persist-elasticsearch/pom.xml       |    93 -
 .../elasticsearch/ElasticsearchClient.java      |    26 -
 .../ElasticsearchClientManager.java             |   171 -
 .../ElasticsearchConfigurator.java              |    30 -
 .../ElasticsearchPersistReader.java             |   329 -
 .../ElasticsearchPersistReaderTask.java         |    52 -
 .../ElasticsearchPersistWriter.java             |   530 -
 .../ElasticsearchConfiguration.json             |    24 -
 .../streams-persist-hdfs/pom.xml                |   102 -
 .../apache/streams/hdfs/HdfsConfigurator.java   |    32 -
 .../streams/hdfs/WebHdfsPersistWriter.java      |   330 -
 .../streams/hdfs/WebHdfsPersistWriterTask.java  |    38 -
 .../apache/streams/hdfs/HdfsConfiguration.json  |    29 -
 .../streams-persist-kafka/pom.xml               |   138 -
 .../apache/streams/kafka/KafkaConfigurator.java |    31 -
 .../streams/kafka/KafkaPersistReader.java       |   141 -
 .../streams/kafka/KafkaPersistReaderTask.java   |    44 -
 .../streams/kafka/KafkaPersistWriter.java       |   109 -
 .../streams/kafka/KafkaPersistWriterTask.java   |    38 -
 .../streams/kafka/StreamsPartitioner.java       |    23 -
 .../streams/kafka/KafkaConfiguration.json       |    25 -
 .../src/main/resources/reference.properties     |    43 -
 .../streams-persist-mongo/pom.xml               |    92 -
 .../apache/streams/mongo/MongoConfigurator.java |    31 -
 .../streams/mongo/MongoPersistWriter.java       |   163 -
 .../streams/mongo/MongoPersistWriterTask.java   |    38 -
 .../streams/mongo/MongoConfiguration.json       |    33 -
 .../src/main/resources/reference.properties     |    10 -
 .../streams-provider-datasift/pom.xml           |    95 -
 .../main/jsonschema/com/datasift/Datasift.json  |  1205 -
 .../com/datasift/DatasiftConfiguration.json     |    21 -
 .../com/datasift/test/DatasiftSerDeTest.java    |    64 -
 .../src/test/resources/datasift_jsons.txt       |   101 -
 .../streams-provider-facebook/pom.xml           |   126 -
 .../api/FacebookPostActivitySerializer.java     |   293 -
 ...FacebookPublicFeedXmlActivitySerializer.java |    11 -
 .../jsonschema/com/facebook/graph/Post.json     |   192 -
 .../FacebookPostActivitySerializerTest.java     |   214 -
 .../facebook/test/FacebookPostSerDeTest.java    |    65 -
 .../org/apache/streams/data/Facebook.json       |   251 -
 .../src/test/resources/testpost.json            |   162 -
 .../gnip-edc-facebook/pom.xml                   |   128 -
 .../test/FacebookEDCAsActivityTest.java         |   103 -
 .../facebook/test/FacebookEDCSerDeTest.java     |    59 -
 .../src/test/resources/FacebookEDC.xml          |    71 -
 .../gnip-edc-flickr/pom.xml                     |   119 -
 .../flickr/test/FlickrEDCAsActivityTest.java    |   104 -
 .../gnip/flickr/test/FlickrEDCSerDeTest.java    |    69 -
 .../src/test/resources/FlickrEDC.xml            |    64 -
 .../gnip-edc-googleplus/pom.xml                 |   133 -
 .../com/gplus/api/GPlusActivitySerializer.java  |    75 -
 .../com/gplus/api/GPlusEDCAsActivityTest.java   |    80 -
 .../src/test/resources/GPlusEDCFixed.json       |   100 -
 .../gnip-edc-instagram/pom.xml                  |    96 -
 .../jsonschema/com/instagram/Instagram.json     |   204 -
 .../com/instagram/test/InstagramSerDeTest.java  |    47 -
 .../src/test/resources/instagram_jsons.txt      |     6 -
 .../gnip-edc-reddit/pom.xml                     |   138 -
 .../reddit/api/RedditActivitySerializer.java    |    89 -
 .../reddit/api/RedditEDCAsActivityJSONTest.java |    82 -
 .../src/test/resources/RedditEDC.json           |   100 -
 .../src/test/resources/RedditEDC.xml            |  5762 ---
 .../src/test/resources/RedditEDCFixed.json      |   100 -
 .../src/test/resources/RedditEDCFlattened.xml   |   100 -
 .../src/test/resources/redditTest.xml           |     1 -
 .../gnip-edc-youtube/pom.xml                    |   119 -
 .../java/com/gnip/test/YouTubeEDCSerDeTest.java |    68 -
 .../com/gnip/test/YoutubeEDCAsActivityTest.java |    96 -
 .../src/test/resources/YoutubeEDC.xml           |     8 -
 .../gnip-powertrack/pom.xml                     |   164 -
 .../ActivityXMLActivitySerializer.java          |   222 -
 .../gnip/powertrack/GnipActivityFixer.java      |   151 -
 .../PowerTrackActivitySerializer.java           |   103 -
 .../src/main/jsonschema/com/gnip/Gnip.json      |   811 -
 .../src/main/xmlschema/com/gnip/binding.xjb     |    16 -
 .../src/main/xmlschema/com/gnip/entry.xsd       |   381 -
 .../test/PowerTrackDeserializationTest.java     |    37 -
 .../streams-provider-gnip/pom.xml               |    49 -
 .../streams-provider-moreover/pom.xml           |   163 -
 .../data/MoreoverJsonActivitySerializer.java    |    71 -
 .../data/MoreoverXmlActivitySerializer.java     |    87 -
 .../streams/data/moreover/MoreoverClient.java   |    83 -
 .../data/moreover/MoreoverConfigurator.java     |    34 -
 .../streams/data/moreover/MoreoverProvider.java |    85 -
 .../data/moreover/MoreoverProviderTask.java     |    71 -
 .../streams/data/moreover/MoreoverResult.java   |   153 -
 .../data/moreover/MoreoverResultSetWrapper.java |    41 -
 .../apache/streams/data/util/MoreoverUtils.java |   136 -
 .../main/jsonschema/com/moreover/Moreover.json  |   333 -
 .../com/moreover/MoreoverConfiguration.json     |    34 -
 .../main/xmlschema/com/moreover/articles10.xsd  |   366 -
 .../src/main/xmlschema/com/moreover/binding.xjb |    16 -
 .../MoreoverJsonActivitySerializerTest.java     |    71 -
 .../data/MoreoverXmlActivitySerializerTest.java |    43 -
 .../streams/data/util/MoreoverTestUtil.java     |    23 -
 .../org/apache/streams/data/moreover.json       | 39433 -----------------
 .../org/apache/streams/data/moreover.xml        |  1324 -
 .../streams-provider-rss/README.markdown        |    16 -
 .../streams-provider-rss/pom.xml                |   172 -
 .../rss/provider/RssEventClassifier.java        |    14 -
 .../streams/rss/provider/RssEventProcessor.java |    85 -
 .../rss/provider/RssStreamConfigurator.java     |    30 -
 .../streams/rss/provider/RssStreamProvider.java |   190 -
 .../rss/provider/RssStreamProviderTask.java     |    52 -
 .../serializer/SyndEntryActivitySerializer.java |    64 -
 .../main/jsonschema/RssStreamConfiguration.json |    28 -
 .../src/main/xmlschema/contents.xsd             |   247 -
 .../src/main/xmlschema/opml.xsd                 |   108 -
 .../streams/rss/test/Top100FeedsTest.java       |    65 -
 .../src/test/resources/top100.opml              |   110 -
 .../src/test/resources/top100.txt               |   100 -
 .../streams-provider-rss.iml                    |    66 -
 .../streams-provider-sysomos/pom.xml            |   176 -
 .../streams/sysomos/ContentRequestBuilder.java  |    95 -
 .../apache/streams/sysomos/HeartbeatInfo.java   |   122 -
 .../apache/streams/sysomos/RequestBuilder.java  |    95 -
 .../apache/streams/sysomos/SysomosClient.java   |    67 -
 .../streams/sysomos/SysomosException.java       |    41 -
 .../streams/sysomos/SysomosJacksonResponse.java |    90 -
 .../apache/streams/sysomos/SysomosProvider.java |   106 -
 .../streams/sysomos/SysomosProviderTask.java    |    48 -
 .../apache/streams/sysomos/SysomosResponse.java |    20 -
 .../streams/sysomos/SysomosTagDefinition.java   |    77 -
 .../main/jsonschema/com/sysomos/Sysomos.json    |    57 -
 .../com/sysomos/SysomosConfiguration.json       |    29 -
 .../src/main/xmlschema/com/sysomos/binding.xjb  |    16 -
 .../src/main/xmlschema/com/sysomos/sysomos.xsd  |    72 -
 .../com/sysomos/test/SysomosJsonSerDeTest.java  |    54 -
 .../com/sysomos/test/SysomosXmlSerDeTest.java   |    85 -
 .../src/test/resources/sysomos_jsons.txt        |   101 -
 .../src/test/resources/sysomos_xmls.txt         |     6 -
 .../streams-provider-twitter/README.markdown    |    48 -
 .../streams-provider-twitter/pom.xml            |   150 -
 .../twitter/provider/TwitterErrorHandler.java   |    82 -
 .../provider/TwitterEventClassifier.java        |    29 -
 .../twitter/provider/TwitterEventProcessor.java |   164 -
 .../provider/TwitterStreamConfigurator.java     |    54 -
 .../twitter/provider/TwitterStreamProvider.java |   161 -
 .../provider/TwitterStreamProviderTask.java     |    53 -
 .../provider/TwitterTimelineProvider.java       |   223 -
 .../provider/TwitterTimelineProviderTask.java   |    94 -
 .../TwitterJsonDeleteActivitySerializer.java    |    56 -
 .../TwitterJsonEventActivitySerializer.java     |   123 -
 .../TwitterJsonRetweetActivitySerializer.java   |    92 -
 .../TwitterJsonTweetActivitySerializer.java     |    96 -
 .../src/main/jsonschema/com/twitter/Delete.json |    33 -
 .../main/jsonschema/com/twitter/Retweet.json    |    15 -
 .../com/twitter/TwitterStreamConfiguration.json |    79 -
 .../src/main/jsonschema/com/twitter/tweet.json  |   296 -
 .../src/main/resources/reference.conf           |    12 -
 .../streams/twitter/test/TweetSerDeTest.java    |   106 -
 .../test/TwitterEventClassifierTest.java        |    39 -
 .../twitter/test/TwitterStreamProviderTest.java |    40 -
 .../src/test/resources/twitter_jsons.txt        |   115 -
 trunk/streams-core/pom.xml                      |    58 -
 .../org/apache/streams/core/StreamHandler.java  |    22 -
 .../org/apache/streams/core/StreamState.java    |    13 -
 .../org/apache/streams/core/StreamsDatum.java   |   115 -
 .../org/apache/streams/core/StreamsFilter.java  |    40 -
 .../streams/core/StreamsPersistReader.java      |    46 -
 .../streams/core/StreamsPersistWriter.java      |    35 -
 .../apache/streams/core/StreamsProcessor.java   |    39 -
 .../apache/streams/core/StreamsProvider.java    |    40 -
 .../apache/streams/core/StreamsResultSet.java   |    47 -
 trunk/streams-eip-routes/ReadMe.txt             |    32 -
 trunk/streams-eip-routes/pom.xml                |   209 -
 .../aggregation/ActivityAggregator.java         |    59 -
 .../configuration/EipConfigurator.java          |   201 -
 .../ActivityPublisherRegistrationProcessor.java |    73 -
 ...yStreamsSubscriberRegistrationProcessor.java |    94 -
 .../routers/ActivityConsumerRouteBuilder.java   |    32 -
 .../ActivityStreamsSubscriberRouteBuilder.java  |    32 -
 .../routers/impl/ActivityConsumerRouter.java    |   144 -
 .../impl/ActivityStreamsSubscriberRouter.java   |   142 -
 .../messaging/service/ActivityService.java      |    31 -
 .../messaging/service/SubscriptionService.java  |    29 -
 .../service/impl/CassandraActivityService.java  |    96 -
 .../impl/CassandraSubscriptionService.java      |    43 -
 .../META-INF/spring/propertiesLoader.xml        |    35 -
 .../spring/streams-eip-applicationContext.xml   |   113 -
 .../streams-eip-osgi-component-import.xml       |    38 -
 .../META-INF/spring/streamsCamelContext.xml     |    96 -
 .../main/resources/META-INF/streams.properties  |    41 -
 .../impl/CassandraActivityServiceTest.java      |    87 -
 .../activity-consumer/osgi.bnd                  |     5 -
 .../activity-consumer/pom.xml                   |   150 -
 .../activityconsumer/ActivityConsumer.java      |    21 -
 .../ActivityConsumerWarehouse.java              |    13 -
 .../impl/ActivityConsumerWarehouseImpl.java     |    39 -
 .../impl/PushActivityConsumer.java              |    88 -
 .../spring/activity-consumer-context.xml        |    11 -
 .../META-INF/spring/activity-consumer-osgi.xml  |    12 -
 .../src/main/resources/readme.txt               |     1 -
 .../activity-registration/osgi.bnd              |     5 -
 .../activity-registration/pom.xml               |   125 -
 .../ActivityPublisherRegistration.java          |    11 -
 .../ActivityStreamsSubscriberRegistration.java  |    11 -
 .../impl/ActivityPublisherRegistrationImpl.java |    49 -
 ...tivityStreamsSubscriberRegistrationImpl.java |    49 -
 .../activity-registration-context-osgi.xml      |    13 -
 .../spring/activity-registration-context.xml    |    12 -
 .../src/main/resources/readme.txt               |     1 -
 .../activity-subscriber/osgi.bnd                |     5 -
 .../activity-subscriber/pom.xml                 |   129 -
 .../ActivityStreamsSubscriber.java              |    20 -
 .../ActivityStreamsSubscriberWarehouse.java     |    16 -
 .../ActivityStreamsSubscription.java            |    20 -
 .../ActivityStreamsSubscriptionFilter.java      |    16 -
 .../ActivityStreamsSubscriptionOutput.java      |    29 -
 .../impl/ActivityStreamsSubscriberDelegate.java |   108 -
 .../ActivityStreamsSubscriberWarehouseImpl.java |    42 -
 ...yStreamsSubscriptionCassandraFilterImpl.java |    24 -
 .../impl/ActivityStreamsSubscriptionImpl.java   |    56 -
 ...vityStreamsSubscriptionLuceneFilterImpl.java |    25 -
 .../spring/activity-subscriber-context.xml      |    11 -
 .../spring/activity-subscriber-osgi.xml         |    12 -
 .../src/main/resources/readme.txt               |     1 -
 trunk/streams-osgi-components/pom.xml           |    46 -
 .../streams-components-all/pom.xml              |    86 -
 trunk/streams-pojo-extensions/pom.xml           |   149 -
 .../org/apache/streams/ActivityExtended.json    |    17 -
 .../pojo/test/ActivityExtendedSerDeTest.java    |   108 -
 .../test/resources/gnip_twitter_extended.json   |   146 -
 trunk/streams-pojo/pom.xml                      |   235 -
 .../apache/streams/data/ActivitySerializer.java |    58 -
 .../apache/streams/data/util/ActivityUtil.java  |   116 -
 .../org/apache/streams/data/util/JsonUtil.java  |   126 -
 .../org/apache/streams/pojo/json/activity.json  |    87 -
 .../apache/streams/pojo/json/collection.json    |    34 -
 .../apache/streams/pojo/json/media_link.json    |    28 -
 .../org/apache/streams/pojo/json/object.json    |    78 -
 .../streams/pojo/json/objectTypes/article.json  |    11 -
 .../streams/pojo/json/objectTypes/audio.json    |    11 -
 .../streams/pojo/json/objectTypes/bookmark.json |    11 -
 .../streams/pojo/json/objectTypes/comment.json  |    11 -
 .../streams/pojo/json/objectTypes/event.json    |    13 -
 .../streams/pojo/json/objectTypes/file.json     |    11 -
 .../streams/pojo/json/objectTypes/folder.json   |    11 -
 .../streams/pojo/json/objectTypes/group.json    |    11 -
 .../streams/pojo/json/objectTypes/list.json     |    18 -
 .../streams/pojo/json/objectTypes/note.json     |    11 -
 .../streams/pojo/json/objectTypes/person.json   |    13 -
 .../pojo/json/objectTypes/photo-album.json      |    11 -
 .../streams/pojo/json/objectTypes/photo.json    |    15 -
 .../streams/pojo/json/objectTypes/place.json    |    11 -
 .../streams/pojo/json/objectTypes/playlist.json |    11 -
 .../streams/pojo/json/objectTypes/product.json  |    11 -
 .../streams/pojo/json/objectTypes/property.json |    38 -
 .../streams/pojo/json/objectTypes/review.json   |    11 -
 .../streams/pojo/json/objectTypes/service.json  |    11 -
 .../streams/pojo/json/objectTypes/song.json     |    11 -
 .../streams/pojo/json/objectTypes/status.json   |    11 -
 .../streams/pojo/json/objectTypes/video.json    |    11 -
 .../streams/pojo/json/verbs/favorite.json       |    16 -
 .../apache/streams/pojo/json/verbs/follow.json  |    16 -
 .../apache/streams/pojo/json/verbs/join.json    |    16 -
 .../apache/streams/pojo/json/verbs/like.json    |    16 -
 .../streams/pojo/json/verbs/make-friend.json    |    16 -
 .../apache/streams/pojo/json/verbs/play.json    |    16 -
 .../apache/streams/pojo/json/verbs/post.json    |    16 -
 .../streams/pojo/json/verbs/rsvp-maybe.json     |    16 -
 .../apache/streams/pojo/json/verbs/rsvp-no.json |    16 -
 .../streams/pojo/json/verbs/rsvp-yes.json       |    16 -
 .../apache/streams/pojo/json/verbs/save.json    |    16 -
 .../apache/streams/pojo/json/verbs/share.json   |    16 -
 .../org/apache/streams/pojo/json/verbs/tag.json |    16 -
 .../apache/streams/pojo/json/verbs/update.json  |    26 -
 .../org/apache/streams/pojo/xml/activity.xsd    |    94 -
 .../streams/data/data/util/JsonUtilTest.java    |    31 -
 trunk/streams-storm/pom.xml                     |   108 -
 .../streams/storm/PipelineGraphLauncher.java    |   196 -
 .../trident/StreamsPersistWriterState.java      |   107 -
 .../storm/trident/StreamsProviderSpout.java     |    69 -
 .../streams/storm/trident/StreamsTopology.java  |    73 -
 trunk/streams-util/pom.xml                      |    44 -
 .../java/org/apache/streams/util/GuidUtils.java |    48 -
 .../org/apache/streams/util/RegexUtils.java     |    93 -
 trunk/streams-web/pom.xml                       |   218 -
 .../main/webapp/WEB-INF/cassandra.properties    |     5 -
 .../main/webapp/WEB-INF/propertiesLoader.xml    |    36 -
 .../main/webapp/WEB-INF/spring-web-servlet.xml  |    49 -
 .../src/main/webapp/WEB-INF/streams.properties  |    43 -
 .../streams-web/src/main/webapp/WEB-INF/web.xml |    57 -
 .../src/main/webapp/demo/activityDemo.html      |    26 -
 .../src/main/webapp/demo/css/activityStyles.css |     9 -
 .../src/main/webapp/demo/js/activityDemo.js     |    66 -
 .../src/main/webapp/demo/js/handlebars.js       |  2278 -
 .../src/main/webapp/demo/js/publisher.js        |    43 -
 .../src/main/webapp/demo/js/subscriber.js       |    40 -
 .../src/main/webapp/demo/publisher.html         |    74 -
 .../src/main/webapp/demo/subscriber.html        |    40 -
 trunk/streams-web/src/main/webapp/index.html    |    10 -
 335 files changed, 132 insertions(+), 74213 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/provision/provision.iml
----------------------------------------------------------------------
diff --git a/provision/provision.iml b/provision/provision.iml
index 6e0bf2b..fb87ba5 100644
--- a/provision/provision.iml
+++ b/provision/provision.iml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MAVEN_REPOSITORY$/org/apache/streams/streams-master/0.2-incubating-SNAPSHOT/target/classes" />
-    <output-test url="file://$MAVEN_REPOSITORY$/org/apache/streams/streams-master/0.2-incubating-SNAPSHOT/target/test-classes" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.6" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.0.9" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.0.9" level="project" />
   </component>
   <component name="POM File Configuration" pomFile="" />
 </module>

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/streams-contrib/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/pom.xml b/streams-contrib/pom.xml
index 1a3ba61..1e1feca 100644
--- a/streams-contrib/pom.xml
+++ b/streams-contrib/pom.xml
@@ -38,17 +38,15 @@
     <modules>
         <module>streams-persist-console</module>
         <module>streams-persist-elasticsearch</module>
-        <module>streams-persist-hbase</module>
-        <module>streams-persist-hdfs</module>
-        <module>streams-persist-kafka</module>
-        <module>streams-persist-mongo</module>
-        <module>streams-provider-datasift</module>
-        <module>streams-provider-facebook</module>
-        <module>streams-provider-gnip</module>
-        <module>streams-provider-moreover</module>
+        <!--<module>streams-persist-hdfs</module>-->
+        <!--<module>streams-persist-kafka</module>-->
+        <!--<module>streams-provider-datasift</module>-->
+        <!--<module>streams-provider-facebook</module>-->
+        <!--<module>streams-provider-gnip</module>-->
+        <!--<module>streams-provider-moreover</module>-->
         <module>streams-provider-twitter</module>
-        <module>streams-provider-sysomos</module>
-        <module>streams-provider-rss</module>
+        <!--<module>streams-provider-sysomos</module>-->
+        <!--<module>streams-provider-rss</module>-->
         <!--<module>streams-proxy-semantria</module>-->
     </modules>
 

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/streams-contrib/streams-persist-console/src/main/java/org/apache/streams/console/ConsolePersistWriter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-console/src/main/java/org/apache/streams/console/ConsolePersistWriter.java b/streams-contrib/streams-persist-console/src/main/java/org/apache/streams/console/ConsolePersistWriter.java
index 7e62a7d..8f56821 100644
--- a/streams-contrib/streams-persist-console/src/main/java/org/apache/streams/console/ConsolePersistWriter.java
+++ b/streams-contrib/streams-persist-console/src/main/java/org/apache/streams/console/ConsolePersistWriter.java
@@ -12,22 +12,26 @@ import org.slf4j.LoggerFactory;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-public class ConsolePersistWriter extends StreamsPersistWriterTask implements StreamsPersistWriter  {
+public class ConsolePersistWriter implements StreamsPersistWriter, Runnable {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ConsolePersistWriter.class);
 
+    protected volatile Queue<StreamsDatum> persistQueue;
+
     private ObjectMapper mapper = new ObjectMapper();
 
-    public ConsolePersistWriter(StreamsPersistWriter writer) {
-        super(writer);
+    public ConsolePersistWriter() {
+        this.persistQueue = new ConcurrentLinkedQueue<StreamsDatum>();
+    }
+
+    public ConsolePersistWriter(Queue<StreamsDatum> persistQueue) {
+        this.persistQueue = persistQueue;
     }
 
-    @Override
     public void prepare(Object o) {
-        Preconditions.checkNotNull(this.getInputQueues());
+
     }
 
-    @Override
     public void cleanUp() {
 
     }
@@ -47,4 +51,10 @@ public class ConsolePersistWriter extends StreamsPersistWriterTask implements St
 
     }
 
+    @Override
+    public void run() {
+        Preconditions.checkNotNull(persistQueue);
+        new Thread(new ConsolePersistWriterTask(this)).start();
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.java
index 52e40cb..480e3bc 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.java
@@ -168,11 +168,6 @@ public class ElasticsearchPersistReader implements StreamsPersistReader, Iterabl
         }
     }
 
-    @Override
-    public void cleanUp() {
-        LOGGER.info("PersistReader done");
-    }
-
     public void setWithfields(String[] withfields) {
         this.withfields = withfields;
     }
@@ -311,19 +306,48 @@ public class ElasticsearchPersistReader implements StreamsPersistReader, Iterabl
             item.getMetadata().put("type", hit.getType());
             currentQueue.add(item);
         }
+
+        cleanUp();
+
         return (StreamsResultSet)currentQueue;
     }
 
+    public StreamsResultSet readAll() {
+        return readCurrent();
+    }
+
     @Override
     public StreamsResultSet readNew(BigInteger sequence) {
-        return null;
+        return readCurrent();
     }
 
     @Override
     public StreamsResultSet readRange(DateTime start, DateTime end) {
-        return null;
+        return readCurrent();
     }
 
+    void shutdownAndAwaitTermination(ExecutorService pool) {
+        pool.shutdown(); // Disable new tasks from being submitted
+        try {
+            // Wait a while for existing tasks to terminate
+            if (!pool.awaitTermination(10, TimeUnit.SECONDS)) {
+                pool.shutdownNow(); // Cancel currently executing tasks
+                // Wait a while for tasks to respond to being cancelled
+                if (!pool.awaitTermination(10, TimeUnit.SECONDS))
+                    System.err.println("Pool did not terminate");
+            }
+        } catch (InterruptedException ie) {
+            // (Re-)Cancel if current thread also interrupted
+            pool.shutdownNow();
+            // Preserve interrupt status
+            Thread.currentThread().interrupt();
+        }
+    }
+
+    @Override
+    public void cleanUp() {
+        LOGGER.info("PersistReader done");
+    }
 }
 
 

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java
index 67fa724..6afe959 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java
@@ -124,14 +124,29 @@ public class ElasticsearchPersistWriter implements StreamsPersistWriter, Flushab
     public boolean isConnected() 		                { return (client != null); }
 
     @Override
-    public void prepare(Object o) {
+    public void write(StreamsDatum streamsDatum) {
+
+        String json;
+        try {
+
+            json = mapper.writeValueAsString(streamsDatum.getDocument());
+
+            add(index, type, null, json);
+
+        } catch (JsonProcessingException e) {
+            LOGGER.warn("{} {}", e.getLocation(), e.getMessage());
+
+        }
+    }
+
+    public void start() {
+
         manager = new ElasticsearchClientManager(config);
         client = manager.getClient();
 
         LOGGER.info(client.toString());
     }
 
-    @Override
     public void cleanUp() {
 
         try {
@@ -143,22 +158,6 @@ public class ElasticsearchPersistWriter implements StreamsPersistWriter, Flushab
     }
 
     @Override
-    public void write(StreamsDatum streamsDatum) {
-
-        String json;
-        try {
-
-            json = mapper.writeValueAsString(streamsDatum.getDocument());
-
-            add(index, type, null, json);
-
-        } catch (JsonProcessingException e) {
-            LOGGER.warn("{} {}", e.getLocation(), e.getMessage());
-
-        }
-    }
-
-    @Override
     public void close()
     {
         try
@@ -527,4 +526,9 @@ public class ElasticsearchPersistWriter implements StreamsPersistWriter, Flushab
         return toReturn;
     }
 
+    @Override
+    public void prepare(Object configurationObject) {
+        start();
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriterTask.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriterTask.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriterTask.java
new file mode 100644
index 0000000..744a216
--- /dev/null
+++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriterTask.java
@@ -0,0 +1,38 @@
+package org.apache.streams.elasticsearch;
+
+import org.apache.streams.core.StreamsDatum;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Random;
+
+public class ElasticsearchPersistWriterTask implements Runnable {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ElasticsearchPersistWriterTask.class);
+
+    private ElasticsearchPersistWriter writer;
+
+    public ElasticsearchPersistWriterTask(ElasticsearchPersistWriter writer) {
+        this.writer = writer;
+    }
+
+    @Override
+    public void run() {
+
+        while(true) {
+            if( writer.persistQueue.peek() != null ) {
+                try {
+                    StreamsDatum entry = writer.persistQueue.remove();
+                    writer.write(entry);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            try {
+                Thread.sleep(new Random().nextInt(1));
+            } catch (InterruptedException e) {}
+        }
+
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/streams-contrib/streams-provider-rss/streams-provider-rss.iml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-rss/streams-provider-rss.iml b/streams-contrib/streams-provider-rss/streams-provider-rss.iml
index fa38897..f27b242 100644
--- a/streams-contrib/streams-provider-rss/streams-provider-rss.iml
+++ b/streams-contrib/streams-provider-rss/streams-provider-rss.iml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+<module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/jaxb2" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/jsonschema2pojo" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
@@ -30,10 +29,10 @@
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.6" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.streams:streams-core:0.1-SNAPSHOT" level="project" />
+    <orderEntry type="module" module-name="streams-core" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.0.9" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.0.9" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.streams:streams-pojo:0.1-SNAPSHOT" level="project" />
+    <orderEntry type="module" module-name="streams-pojo" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.2.1" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.2.1" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.1" level="project" />
@@ -49,15 +48,15 @@
     <orderEntry type="library" name="Maven: com.sun.xml.fastinfoset:FastInfoset:1.2.12" level="project" />
     <orderEntry type="library" name="Maven: javax.xml.bind:jsr173_api:1.0" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.streams:streams-config:0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
+    <orderEntry type="module" module-name="streams-config" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:15.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.2.1" level="project" />
     <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:0.9.0" level="project" />
     <orderEntry type="library" name="Maven: net.minidev:json-smart:1.2" level="project" />
     <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path-assert:0.9.0" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
-    <orderEntry type="module" module-name="streams-persist-console (2)" scope="TEST" />
+    <orderEntry type="module" module-name="streams-persist-console" scope="TEST" />
     <orderEntry type="library" name="Maven: rome:rome:1.0" level="project" />
     <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
   </component>

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/streams-core/src/main/java/org/apache/streams/core/StreamsPersistReader.java
----------------------------------------------------------------------
diff --git a/streams-core/src/main/java/org/apache/streams/core/StreamsPersistReader.java b/streams-core/src/main/java/org/apache/streams/core/StreamsPersistReader.java
index 6fb703c..386a5e0 100644
--- a/streams-core/src/main/java/org/apache/streams/core/StreamsPersistReader.java
+++ b/streams-core/src/main/java/org/apache/streams/core/StreamsPersistReader.java
@@ -32,15 +32,9 @@ import java.util.Queue;
  */
 public interface StreamsPersistReader extends StreamsProvider {
 
-//    void start();
-//    void stop();
-//
-//    public void setPersistQueue(Queue<StreamsDatum> persistQueue);
-//    public Queue<StreamsDatum> getPersistQueue();
-
-//    public StreamsResultSet readAll();
-//    public StreamsResultSet readNew(BigInteger sequence);
-//    public StreamsResultSet readRange(DateTime start, DateTime end);
+    public StreamsResultSet readAll();
+    public StreamsResultSet readNew(BigInteger sequence);
+    public StreamsResultSet readRange(DateTime start, DateTime end);
 
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/.gitignore
----------------------------------------------------------------------
diff --git a/trunk/.gitignore b/trunk/.gitignore
deleted file mode 100644
index 247f694..0000000
--- a/trunk/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# environment ignores #
-streams-master-pom/
-
-# Compile directores and files #
-
-target/
-dependency-reduced-pom.xml
-
-# IDE directories/files #
-/.idea
-*.iml
-.eclipse/
-.settings/
-
-# OS generated files #
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-Icon?
-ehthumbs.db
-Thumbs.db

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/DISCLAIMER
----------------------------------------------------------------------
diff --git a/trunk/DISCLAIMER b/trunk/DISCLAIMER
deleted file mode 100644
index 02aecb7..0000000
--- a/trunk/DISCLAIMER
+++ /dev/null
@@ -1,10 +0,0 @@
-Apache Streams is an effort undergoing incubation at the Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC. 
-
-Incubation is required of all newly accepted projects until a further review 
-indicates that the infrastructure, communications, and decision making process 
-have stabilized in a manner consistent with other successful ASF projects. 
-
-While incubation status is not necessarily a reflection of the completeness 
-or stability of the code, it does indicate that the project has yet to be 
-fully endorsed by the ASF.

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/LICENSE
----------------------------------------------------------------------
diff --git a/trunk/LICENSE b/trunk/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/trunk/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/NOTICE
----------------------------------------------------------------------
diff --git a/trunk/NOTICE b/trunk/NOTICE
deleted file mode 100644
index 421a17c..0000000
--- a/trunk/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Streams
-Copyright 2012-2013 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/README.txt
----------------------------------------------------------------------
diff --git a/trunk/README.txt b/trunk/README.txt
deleted file mode 100644
index 55a4a37..0000000
--- a/trunk/README.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-Apache Streams (incubating) - README.txt
-Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
---------------------------------------------------------------------------------
-
-About
-=====
-Apache Streams is a lightweight (yet scalable) server for ActivityStreams. The role of Apache Streams is to provide a central point of aggregation, filtering and querying for Activities that have been submitted by disparate systems. Apache Streams also intends to include a mechanism for intelligent filtering and recommendation to reduce the noise to end users.
-
-
-
-Release Notes
-=============
- - Initial project structure and master POM release
-
-
-Getting Started
-===============
-Please visit the project website for the latest information:
-    http://streams.incubator.apache.org/
-
-Along with the developer mailing list archive:
-    http://mail-archives.apache.org/mod_mbox/streams-dev/
-
-
-System Requirements
-===================
-You need a platform that supports Java SE 6 or later.
-
-Building and running
-====================
-To build from source code:
-
-  - Requirements:
-    Sources compilation require Java SE 6 or higher.
-    The project is built with Apache Maven 3+ (suggested is 3.0.3).
-    You need to download and install Maven 3 from: http://maven.apache.org/
-
-  - The Streams project itself (this one) depends on the separate Streams Master project
-    which defines general and global settings for the whole of the Streams project,
-    independent of a specific release.
-    As its streams-master-pom is already published to the Apache Snapshots repository,
-    there is no need to check it out manually and build it locally yourself,
-    unless changes are needed on general and global level.
-    
-    If so needed, the Rave Master project can be checked out from:
-      http://svn.apache.org/repos/asf/incubator/streams/streams-master-pom/trunk streams-master-pom
-
-    After check out, cd into streams-master-pom and invoke maven to install it using:
-      $mvn install
-    
-  - To build the Streams project invoke maven in the root directory:
-      $mvn install

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/pom.xml
----------------------------------------------------------------------
diff --git a/trunk/pom.xml b/trunk/pom.xml
deleted file mode 100644
index 9ba1cae..0000000
--- a/trunk/pom.xml
+++ /dev/null
@@ -1,305 +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/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.streams</groupId>
-        <artifactId>streams-master</artifactId>
-        <version>0.2-incubating-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.streams</groupId>
-    <artifactId>streams-project</artifactId>
-    <version>0.1-SNAPSHOT</version>
-
-    <name>Apache Streams Project</name>
-
-    <description>Apache Streams Project</description>
-
-    <repositories>
-        <repository>
-            <id>apache.snapshots</id>
-            <name>Apache Snapshot Repository</name>
-            <url>http://repository.apache.org/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-        <repository>
-          <id>clojars.org</id>
-          <url>http://clojars.org/repo</url>
-        </repository>
-        <repository>
-            <id>cloudera</id>
-            <url>https://repository.cloudera.com/artifactory/repo</url>
-        </repository>
-    </repositories>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.6</java.version>
-        <org.osgi.service.http.port>8080</org.osgi.service.http.port>
-        <org.osgi.service.http.port.secure>8443</org.osgi.service.http.port.secure>
-        <jackson.version>2.2.1</jackson.version>
-        <jackson-xml-databind.version>0.5.0</jackson-xml-databind.version>
-        <aalto.version>0.9.9</aalto.version>
-        <joda-time.version>2.2</joda-time.version>
-        <rave.version>0.22</rave.version>
-        <datastax.version>1.0.3</datastax.version>
-        <jsonschema2pojo.version>0.4.0</jsonschema2pojo.version>
-        <jaxb2.version>0.8.3</jaxb2.version>
-        <jaxbutil.version>1.2.6</jaxbutil.version>
-        <junit.version>4.11</junit.version>
-        <slf4j.version>1.7.6</slf4j.version>
-        <logback.version>1.0.9</logback.version>
-        <commons-io.version>2.4</commons-io.version>
-        <commons-lang3.version>3.1</commons-lang3.version>
-        <typesafe.config.version>1.2.0</typesafe.config.version>
-        <guava.version>16.0.1</guava.version>
-        <scala.version>2.8.0</scala.version>
-        <clojure.version>1.4.0</clojure.version>
-        <storm.version>0.9.0.1</storm.version>
-        <kafka.version>0.8.0</kafka.version>
-        <zookeeper.version>3.3.4</zookeeper.version>
-        <netty.version>3.8.0.Final</netty.version>
-        <json-path.version>0.9.0</json-path.version>
-    </properties>
-
-    <modules>
-        <module>poms</module>
-        <module>provision</module>
-        <module>streams-osgi-components</module>
-        <module>streams-eip-routes</module>
-        <module>streams-cassandra</module>
-        <module>streams-web</module>
-        <module>streams-config</module>
-        <module>streams-config-graph</module>
-        <module>streams-pojo</module>
-        <!--<module>streams-storm</module>-->
-        <module>streams-util</module>
-        <module>streams-pojo-extensions</module>
-        <module>streams-contrib</module>
-        <module>streams-core</module>
-    </modules>
-
-    <packaging>pom</packaging>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.ops4j</groupId>
-                <artifactId>maven-pax-plugin</artifactId>
-                <version>1.5</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <compilerVersion>1.5</compilerVersion>
-                    <provision>
-                        <param>--platform=felix</param>
-                    </provision>
-                </configuration>
-                <executions>
-                </executions>
-            </plugin>
-        </plugins>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.jsonschema2pojo</groupId>
-                    <artifactId>jsonschema2pojo-maven-plugin</artifactId>
-                    <version>${jsonschema2pojo.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.jvnet.jaxb2.maven2</groupId>
-                    <artifactId>maven-jaxb2-plugin</artifactId>
-                    <version>${jaxb2.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
-    </dependencies>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>${commons-io.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>${commons-lang3.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jsonschema2pojo</groupId>
-                <artifactId>jsonschema2pojo-core</artifactId>
-                <version>${jsonschema2pojo.version}</version>
-                <type>jar</type>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.typesafe</groupId>
-                <artifactId>config</artifactId>
-                <version>${typesafe.config.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>${junit.version}</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>${slf4j.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>ch.qos.logback</groupId>
-                <artifactId>logback-classic</artifactId>
-                <version>${logback.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>${guava.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty</artifactId>
-                <version>${netty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>joda-time</groupId>
-                <artifactId>joda-time</artifactId>
-                <version>${joda-time.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-core</artifactId>
-                <version>${jackson.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-annotations</artifactId>
-                <version>${jackson.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.dataformat</groupId>
-                <artifactId>jackson-dataformat-xml</artifactId>
-                <version>${jackson.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml</groupId>
-                <artifactId>jackson-xml-databind</artifactId>
-                <version>${jackson-xml-databind.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.dataformat</groupId>
-                <artifactId>jackson-dataformat-yaml</artifactId>
-                <version>${jackson.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.datatype</groupId>
-                <artifactId>jackson-datatype-json-org</artifactId>
-                <version>${jackson.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml</groupId>
-                <artifactId>aalto-xml</artifactId>
-                <version>${aalto.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>nz.net.ultraq.jaxb</groupId>
-                <artifactId>jaxb-utilities</artifactId>
-                <version>${jaxbutil.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.clojure</groupId>
-                <artifactId>clojure</artifactId>
-                <version>${clojure.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.clojure</groupId>
-                <artifactId>clojure-contrib</artifactId>
-                <version>${clojure.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>storm</groupId>
-                <artifactId>storm-core</artifactId>
-                <version>${storm.version}</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>storm</groupId>
-                <artifactId>storm-netty</artifactId>
-                <version>${storm.version}</version>
-                <scope>provided</scope>
-            </dependency>
-            <!-- JsonPath -->
-            <dependency>
-                <groupId>com.jayway.jsonpath</groupId>
-                <artifactId>json-path</artifactId>
-                <version>${json-path.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.jayway.jsonpath</groupId>
-                <artifactId>json-path-assert</artifactId>
-                <version>${json-path.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.zookeeper</groupId>
-                <artifactId>zookeeper</artifactId>
-                <version>${zookeeper.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>log4j</groupId>
-                        <artifactId>log4j</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/poms/compiled/pom.xml
----------------------------------------------------------------------
diff --git a/trunk/poms/compiled/pom.xml b/trunk/poms/compiled/pom.xml
deleted file mode 100644
index ca176d2..0000000
--- a/trunk/poms/compiled/pom.xml
+++ /dev/null
@@ -1,80 +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
-  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.
--->
-<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/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.streams.build</groupId>
-    <artifactId>shared-plugin-settings</artifactId>
-    <version>0.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>compiled-bundle-settings</artifactId>
-
-  <name>apache-streams - bundle instructions</name>
-
-  <packaging>pom</packaging>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-      </resource>
-      <!--
-       | example additional resource entries, useful when building Eclipse RCP applications
-      -->
-      <resource>
-        <directory>.</directory>
-        <includes>
-          <include>plugin.xml</include>
-          <include>plugin.properties</include>
-          <include>icons/**</include>
-        </includes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <!--
-         | the following instructions build a simple set of public/private classes into an OSGi bundle
-        -->
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <!--
-             | assume public classes are in the top package, and private classes are under ".impl"
-            -->
-            <Export-Package>!${bundle.namespace}.internal.*,${bundle.namespace}.*;version="${project.version}"</Export-Package>
-            <Private-Package>${bundle.namespace}.internal.*</Private-Package>
-            <!--
-             | each module can override these defaults in their osgi.bnd file
-            -->
-            <_include>-osgi.bnd</_include>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/poms/pom.xml
----------------------------------------------------------------------
diff --git a/trunk/poms/pom.xml b/trunk/poms/pom.xml
deleted file mode 100644
index 321beee..0000000
--- a/trunk/poms/pom.xml
+++ /dev/null
@@ -1,94 +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/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.streams</groupId>
-    <artifactId>streams-project</artifactId>
-    <version>0.1-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.apache.streams.build</groupId>
-  <artifactId>shared-plugin-settings</artifactId>
-
-  <name>apache-streams - plugin configuration</name>
-
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>wrappers</module>
-    <module>compiled</module>
-  </modules>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.ops4j</groupId>
-          <artifactId>maven-pax-plugin</artifactId>
-          <!--
-           | enable improved OSGi compilation support for the bundle life-cycle.
-           | to switch back to the standard bundle life-cycle, move this setting
-           | down to the maven-bundle-plugin section
-          -->
-          <extensions>true</extensions>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>1.4.3</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <!--
-         | dependency pom representing the global classpath of imported bundles
-        -->
-        <type>pom</type>
-        <groupId>org.apache.streams.build</groupId>
-        <artifactId>provision</artifactId>
-        <version>${project.version}</version>
-        <scope>provided</scope>
-        <optional>true</optional>
-      </dependency>
-      <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>osgi_R4_core</artifactId>
-        <version>1.0</version>
-        <scope>provided</scope>
-        <optional>true</optional>
-      </dependency>
-      <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>osgi_R4_compendium</artifactId>
-        <version>1.0</version>
-        <scope>provided</scope>
-        <optional>true</optional>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/poms/wrappers/pom.xml
----------------------------------------------------------------------
diff --git a/trunk/poms/wrappers/pom.xml b/trunk/poms/wrappers/pom.xml
deleted file mode 100644
index 5c83d59..0000000
--- a/trunk/poms/wrappers/pom.xml
+++ /dev/null
@@ -1,75 +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
-  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.
--->
-<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/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.streams.build</groupId>
-    <artifactId>shared-plugin-settings</artifactId>
-    <version>0.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>wrapper-bundle-settings</artifactId>
-
-  <name>apache-streams - wrapper instructions</name>
-
-  <!--
-   | don't apply project details to wrapped jars
-  -->
-  <organization/>
-  <description>
-    Simple OSGi wrapper around third-party jar(s)
-  </description>
-  <licenses>
-    <license/>
-  </licenses>
-
-  <packaging>pom</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <!--
-         | the following instructions are optimized for wrapping third-party libraries as OSGi bundles
-        -->
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
-            <Bundle-Version>${wrapped.version}</Bundle-Version>
-            <!--
-             | export wrapped contents: don't use Export-Package:* as this bundles everything on the classpath
-            -->
-            <_exportcontents>*</_exportcontents>
-            <Private-Package>!*</Private-Package>
-            <!--
-             | each module can override these defaults in their osgi.bnd file
-            -->
-            <_include>-osgi.bnd</_include>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/provision/pom.xml
----------------------------------------------------------------------
diff --git a/trunk/provision/pom.xml b/trunk/provision/pom.xml
deleted file mode 100644
index 2b66e2e..0000000
--- a/trunk/provision/pom.xml
+++ /dev/null
@@ -1,42 +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/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.streams</groupId>
-    <artifactId>streams-project</artifactId>
-    <version>0.1-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.apache.streams.build</groupId>
-  <artifactId>provision</artifactId>
-  <name>apache-streams - imported bundles</name>
-
-  <packaging>pom</packaging>
-
-  <!--
-   | imported (non-local) bundles are listed here as dependencies
-   | and will be deployed by pax:provision unless they are marked
-   | with <optional>true</optional>
-  -->
-
-</project>

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/provision/provision.iml
----------------------------------------------------------------------
diff --git a/trunk/provision/provision.iml b/trunk/provision/provision.iml
deleted file mode 100644
index 6e0bf2b..0000000
--- a/trunk/provision/provision.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MAVEN_REPOSITORY$/org/apache/streams/streams-master/0.2-incubating-SNAPSHOT/target/classes" />
-    <output-test url="file://$MAVEN_REPOSITORY$/org/apache/streams/streams-master/0.2-incubating-SNAPSHOT/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-  <component name="POM File Configuration" pomFile="" />
-</module>
-

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/runner/bundles/downloaded_bundles.properties
----------------------------------------------------------------------
diff --git a/trunk/runner/bundles/downloaded_bundles.properties b/trunk/runner/bundles/downloaded_bundles.properties
deleted file mode 100644
index 53c91bd..0000000
--- a/trunk/runner/bundles/downloaded_bundles.properties
+++ /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
-#
-#   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.
-#
-
-#
-#Thu Dec 06 14:30:27 EST 2012
-mvn\:org.apache.streams.activity-publisher-registration/org.apache.streams.activity.publisher.registration/1.0-SNAPSHOT=org.apache.streams.activity.publisher.registration_1.0.0.SNAPSHOT.jar
-link\:classpath\:runner-links/org.apache.felix.gogo.runtime-0.10.0.link=org.apache.felix.gogo.runtime_0.10.0.jar
-link\:classpath\:runner-links/org.apache.felix.main-4.0.3.link=org.apache.felix.main_4.0.3.jar
-link\:classpath\:runner-links/org.apache.felix.gogo.shell-0.10.0.link=org.apache.felix.gogo.shell_0.10.0.jar
-link\:classpath\:runner-links/org.apache.felix.gogo.command-0.12.0.link=org.apache.felix.gogo.command_0.12.0.jar

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/runner/bundles/org.apache.felix.gogo.command_0.12.0.jar
----------------------------------------------------------------------
diff --git a/trunk/runner/bundles/org.apache.felix.gogo.command_0.12.0.jar b/trunk/runner/bundles/org.apache.felix.gogo.command_0.12.0.jar
deleted file mode 100644
index dfd8ae3..0000000
Binary files a/trunk/runner/bundles/org.apache.felix.gogo.command_0.12.0.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/runner/bundles/org.apache.felix.gogo.runtime_0.10.0.jar
----------------------------------------------------------------------
diff --git a/trunk/runner/bundles/org.apache.felix.gogo.runtime_0.10.0.jar b/trunk/runner/bundles/org.apache.felix.gogo.runtime_0.10.0.jar
deleted file mode 100644
index d3ccb4b..0000000
Binary files a/trunk/runner/bundles/org.apache.felix.gogo.runtime_0.10.0.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/runner/bundles/org.apache.felix.gogo.shell_0.10.0.jar
----------------------------------------------------------------------
diff --git a/trunk/runner/bundles/org.apache.felix.gogo.shell_0.10.0.jar b/trunk/runner/bundles/org.apache.felix.gogo.shell_0.10.0.jar
deleted file mode 100644
index f74e68e..0000000
Binary files a/trunk/runner/bundles/org.apache.felix.gogo.shell_0.10.0.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/runner/bundles/org.apache.felix.main_4.0.3.jar
----------------------------------------------------------------------
diff --git a/trunk/runner/bundles/org.apache.felix.main_4.0.3.jar b/trunk/runner/bundles/org.apache.felix.main_4.0.3.jar
deleted file mode 100644
index 9d313e3..0000000
Binary files a/trunk/runner/bundles/org.apache.felix.main_4.0.3.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/6ea69f29/trunk/runner/deploy-pom.xml
----------------------------------------------------------------------
diff --git a/trunk/runner/deploy-pom.xml b/trunk/runner/deploy-pom.xml
deleted file mode 100644
index 4320207..0000000
--- a/trunk/runner/deploy-pom.xml
+++ /dev/null
@@ -1,52 +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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.streams.build</groupId>
-  <artifactId>deployment</artifactId>
-  <version>1.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>org.apache.streams (OSGi project)</name>
-  <description>Generated using Pax-Construct</description>
-  <properties>
-    <org.osgi.service.http.port>8080</org.osgi.service.http.port>
-    <org.osgi.service.http.port.secure>8443</org.osgi.service.http.port.secure>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.streams.activity-publisher-registration</groupId>
-      <artifactId>org.apache.streams.activity.publisher.registration</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <type>bundle</type>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <repositories>
-    <repository>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>central</id>
-      <name>Maven Repository Switchboard</name>
-      <url>http://repo1.maven.org/maven2</url>
-    </repository>
-  </repositories>
-</project>