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/20 02:02:29 UTC
[1/2] git commit: these iml files shouldn't be here
Repository: incubator-streams
Updated Branches:
refs/heads/STREAMS-26 3a192885a -> 81478217f
these iml files shouldn't be here
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/d4b03f85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/d4b03f85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/d4b03f85
Branch: refs/heads/STREAMS-26
Commit: d4b03f8539c913294623003ccd0ec531d9b1aab7
Parents: 3499016
Author: Steve Blackmon <sb...@w2odigital.com>
Authored: Wed Mar 19 19:22:10 2014 -0500
Committer: Steve Blackmon <sb...@w2odigital.com>
Committed: Wed Mar 19 19:22:10 2014 -0500
----------------------------------------------------------------------
provision/provision.iml | 19 ------
.../streams-components-test.iml | 57 ----------------
.../streams-provider-rss.iml | 71 --------------------
3 files changed, 147 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d4b03f85/provision/provision.iml
----------------------------------------------------------------------
diff --git a/provision/provision.iml b/provision/provision.iml
deleted file mode 100644
index fb87ba5..0000000
--- a/provision/provision.iml
+++ /dev/null
@@ -1,19 +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" 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/d4b03f85/streams-contrib/streams-components-test/streams-components-test.iml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-components-test/streams-components-test.iml b/streams-contrib/streams-components-test/streams-components-test.iml
deleted file mode 100644
index 0fcef34..0000000
--- a/streams-contrib/streams-components-test/streams-components-test.iml
+++ /dev/null
@@ -1,57 +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" 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$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="streams-core (3)" />
- <orderEntry type="library" name="Maven: joda-time:joda-time:2.2" level="project" />
- <orderEntry type="module" module-name="streams-util (3)" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />
- <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" 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" />
- <orderEntry type="module" module-name="streams-pojo (3)" />
- <orderEntry type="library" name="Maven: org.jsonschema2pojo:jsonschema2pojo-core:0.4.0" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.2.1" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.2.1" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.2.1" level="project" />
- <orderEntry type="library" name="Maven: com.sun.codemodel:codemodel:2.6" level="project" />
- <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
- <orderEntry type="library" name="Maven: javax.validation:validation-api:1.0.0.GA" level="project" />
- <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.11" level="project" />
- <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.11" level="project" />
- <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.2.4" level="project" />
- <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:1.3.9" level="project" />
- <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" />
- <orderEntry type="library" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml:jackson-xml-databind:0.5.0" level="project" />
- <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-xc:1.7.0" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml:aalto-xml:0.9.9" level="project" />
- <orderEntry type="library" name="Maven: nz.net.ultraq.jaxb:jaxb-utilities:1.2.6" level="project" />
- <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.7" level="project" />
- <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.2.7" level="project" />
- <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.2.7" level="project" />
- <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:2.16" level="project" />
- <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: com.fasterxml.jackson.datatype:jackson-datatype-json-org:2.2.1" level="project" />
- <orderEntry type="library" name="Maven: org.json:json:20090211" level="project" />
- <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" />
- </component>
- <component name="POM File Configuration" pomFile="" />
-</module>
-
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/d4b03f85/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
deleted file mode 100644
index 2846a74..0000000
--- a/streams-contrib/streams-provider-rss/streams-provider-rss.iml
+++ /dev/null
@@ -1,71 +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" 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$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/jsonschema2pojo" isTestSource="false" generated="true" />
- <excludeFolder url="file://$MODULE_DIR$/target/classes" />
- <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
- <excludeFolder url="file://$MODULE_DIR$/target/maven-shared-archive-resources" />
- <excludeFolder url="file://$MODULE_DIR$/target/maven-status" />
- <excludeFolder url="file://$MODULE_DIR$/target/surefire-reports" />
- <excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: com.typesafe:config:1.2.0" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.2.1" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.2.1" level="project" />
- <orderEntry type="library" name="Maven: org.jsonschema2pojo:jsonschema2pojo-core:0.4.0" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.2.0" level="project" />
- <orderEntry type="library" name="Maven: com.sun.codemodel:codemodel:2.6" level="project" />
- <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
- <orderEntry type="library" name="Maven: javax.validation:validation-api:1.0.0.GA" level="project" />
- <orderEntry type="library" name="Maven: joda-time:joda-time:2.2" level="project" />
- <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.11" level="project" />
- <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.11" level="project" />
- <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.2.4" level="project" />
- <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:1.3.9" level="project" />
- <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="module" module-name="streams-core" />
- <orderEntry type="module" module-name="streams-util" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />
- <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" 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" />
- <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" />
- <orderEntry type="library" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml:jackson-xml-databind:0.5.0" level="project" />
- <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-xc:1.7.0" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml:aalto-xml:0.9.9" level="project" />
- <orderEntry type="library" name="Maven: nz.net.ultraq.jaxb:jaxb-utilities:1.2.6" level="project" />
- <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.7" level="project" />
- <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.2.7" level="project" />
- <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.2.7" level="project" />
- <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:2.16" level="project" />
- <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="module" module-name="streams-config" />
- <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" 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>
- <component name="POM File Configuration" pomFile="" />
-</module>
-
[2/2] git commit: Merge branch 'STREAMS-26' of
https://git-wip-us.apache.org/repos/asf/incubator-streams into STREAMS-26
Posted by sb...@apache.org.
Merge branch 'STREAMS-26' of https://git-wip-us.apache.org/repos/asf/incubator-streams into STREAMS-26
Conflicts:
provision/provision.iml
streams-contrib/streams-components-test/streams-components-test.iml
streams-contrib/streams-provider-rss/streams-provider-rss.iml
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/81478217
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/81478217
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/81478217
Branch: refs/heads/STREAMS-26
Commit: 81478217f66cb326bd377977fdddd7129c9ca196
Parents: d4b03f8 3a19288
Author: Steve Blackmon <sb...@w2odigital.com>
Authored: Wed Mar 19 19:22:59 2014 -0500
Committer: Steve Blackmon <sb...@w2odigital.com>
Committed: Wed Mar 19 19:22:59 2014 -0500
----------------------------------------------------------------------
provision/provision.iml | 19 ++++++
streams-contrib/pom.xml | 11 ++--
.../streams-components-test.iml | 55 +++++++++++++++++
.../streams/hdfs/WebHdfsPersistReader.java | 27 ++++++---
.../streams/hdfs/WebHdfsPersistReaderTask.java | 4 +-
.../streams/rss/provider/RssStreamProvider.java | 2 +-
.../streams/rss/test/Top100FeedsTest.java | 4 +-
.../streams-provider-rss.iml | 63 ++++++++++++++++++++
.../apache/streams/sysomos/SysomosProvider.java | 20 +++----
.../core/builders/LocalStreamBuilder.java | 2 +-
.../core/builders/LocalStreamBuilderTest.java | 10 ++--
11 files changed, 182 insertions(+), 35 deletions(-)
----------------------------------------------------------------------