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/02/10 21:05:53 UTC

svn commit: r1566722 - in /incubator/streams/trunk: streams-config/ streams-config/src/main/jsonschema/ streams-contrib/ streams-contrib/streams-persist-hdfs/ streams-contrib/streams-persist-kafka/ streams-contrib/streams-provider-datasift/ streams-con...

Author: sblackmon
Date: Mon Feb 10 20:05:53 2014
New Revision: 1566722

URL: http://svn.apache.org/r1566722
Log:
These changes should allow the project to build on Jenkins, rather than error out when jsonschema2pojo tries to build .svn directories

Removed:
    incubator/streams/trunk/streams-config/src/main/jsonschema/StreamsConfiguration.json
Modified:
    incubator/streams/trunk/streams-config/pom.xml
    incubator/streams/trunk/streams-contrib/pom.xml
    incubator/streams/trunk/streams-contrib/streams-persist-hdfs/pom.xml
    incubator/streams/trunk/streams-contrib/streams-persist-kafka/pom.xml
    incubator/streams/trunk/streams-contrib/streams-provider-datasift/pom.xml
    incubator/streams/trunk/streams-contrib/streams-provider-facebook/pom.xml
    incubator/streams/trunk/streams-contrib/streams-provider-gnip/gnip-edc-instagram/pom.xml
    incubator/streams/trunk/streams-contrib/streams-provider-gnip/gnip-powertrack/pom.xml
    incubator/streams/trunk/streams-contrib/streams-provider-moreover/pom.xml
    incubator/streams/trunk/streams-contrib/streams-provider-rss/pom.xml
    incubator/streams/trunk/streams-contrib/streams-provider-sysomos/pom.xml
    incubator/streams/trunk/streams-contrib/streams-provider-twitter/pom.xml
    incubator/streams/trunk/streams-pojo-extensions/pom.xml

Modified: incubator/streams/trunk/streams-config/pom.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-config/pom.xml?rev=1566722&r1=1566721&r2=1566722&view=diff
==============================================================================
--- incubator/streams/trunk/streams-config/pom.xml (original)
+++ incubator/streams/trunk/streams-config/pom.xml Mon Feb 10 20:05:53 2014
@@ -117,15 +117,14 @@
             <plugin>
                 <groupId>org.jsonschema2pojo</groupId>
                 <artifactId>jsonschema2pojo-maven-plugin</artifactId>
-
                 <configuration>
                     <addCompileSourceRoot>true</addCompileSourceRoot>
                     <generateBuilders>true</generateBuilders>
                     <sourcePaths>
-                        <sourcePath>src/main/jsonschema</sourcePath>
+                        <sourcePath>src/main/jsonschema/StreamsConfiguration.json</sourcePath>
                     </sourcePaths>
                     <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
-                    <targetPackage>org.apache.streams</targetPackage>
+                    <targetPackage>org.apache.streams.config</targetPackage>
                     <useLongIntegers>true</useLongIntegers>
                     <useJodaDates>false</useJodaDates>
                 </configuration>

Modified: incubator/streams/trunk/streams-contrib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-contrib/pom.xml?rev=1566722&r1=1566721&r2=1566722&view=diff
==============================================================================
--- incubator/streams/trunk/streams-contrib/pom.xml (original)
+++ incubator/streams/trunk/streams-contrib/pom.xml Mon Feb 10 20:05:53 2014
@@ -37,6 +37,7 @@
 
     <modules>
         <module>streams-persist-console</module>
+        <module>streams-persist-elasticsearch</module>
         <module>streams-persist-hdfs</module>
         <module>streams-persist-kafka</module>
         <module>streams-provider-datasift</module>

Modified: incubator/streams/trunk/streams-contrib/streams-persist-hdfs/pom.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-contrib/streams-persist-hdfs/pom.xml?rev=1566722&r1=1566721&r2=1566722&view=diff
==============================================================================
--- incubator/streams/trunk/streams-contrib/streams-persist-hdfs/pom.xml (original)
+++ incubator/streams/trunk/streams-contrib/streams-persist-hdfs/pom.xml Mon Feb 10 20:05:53 2014
@@ -82,7 +82,7 @@
                     <addCompileSourceRoot>true</addCompileSourceRoot>
                     <generateBuilders>true</generateBuilders>
                     <sourcePaths>
-                        <sourcePath>src/main/jsonschema/org/apache/streams/hdfs</sourcePath>
+                        <sourcePath>src/main/jsonschema/org/apache/streams/hdfs/HdfsConfiguration.json</sourcePath>
                     </sourcePaths>
                     <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
                     <targetPackage>org.apache.streams.hdfs.pojo</targetPackage>

Modified: incubator/streams/trunk/streams-contrib/streams-persist-kafka/pom.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-contrib/streams-persist-kafka/pom.xml?rev=1566722&r1=1566721&r2=1566722&view=diff
==============================================================================
--- incubator/streams/trunk/streams-contrib/streams-persist-kafka/pom.xml (original)
+++ incubator/streams/trunk/streams-contrib/streams-persist-kafka/pom.xml Mon Feb 10 20:05:53 2014
@@ -110,7 +110,7 @@
                     <addCompileSourceRoot>true</addCompileSourceRoot>
                     <generateBuilders>true</generateBuilders>
                     <sourcePaths>
-                        <sourcePath>src/main/jsonschema/org/apache/streams/kafka</sourcePath>
+                        <sourcePath>src/main/jsonschema/org/apache/streams/kafka/KafkaConfiguration.json</sourcePath>
                     </sourcePaths>
                     <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
                     <targetPackage>org.apache.streams.kafka.pojo</targetPackage>

Modified: incubator/streams/trunk/streams-contrib/streams-provider-datasift/pom.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-contrib/streams-provider-datasift/pom.xml?rev=1566722&r1=1566721&r2=1566722&view=diff
==============================================================================
--- incubator/streams/trunk/streams-contrib/streams-provider-datasift/pom.xml (original)
+++ incubator/streams/trunk/streams-contrib/streams-provider-datasift/pom.xml Mon Feb 10 20:05:53 2014
@@ -74,7 +74,8 @@
                     <addCompileSourceRoot>true</addCompileSourceRoot>
                     <generateBuilders>true</generateBuilders>
                     <sourcePaths>
-                        <sourcePath>src/main/jsonschema/com/datasift</sourcePath>
+                        <sourcePath>src/main/jsonschema/com/datasift/Datasift.json</sourcePath>
+                        <sourcePath>src/main/jsonschema/com/datasift/DatasiftConfiguration.json</sourcePath>
                     </sourcePaths>
                     <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
                     <targetPackage>com.datasift</targetPackage>

Modified: incubator/streams/trunk/streams-contrib/streams-provider-facebook/pom.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-contrib/streams-provider-facebook/pom.xml?rev=1566722&r1=1566721&r2=1566722&view=diff
==============================================================================
--- incubator/streams/trunk/streams-contrib/streams-provider-facebook/pom.xml (original)
+++ incubator/streams/trunk/streams-contrib/streams-provider-facebook/pom.xml Mon Feb 10 20:05:53 2014
@@ -84,7 +84,7 @@
                     <addCompileSourceRoot>true</addCompileSourceRoot>
                     <generateBuilders>true</generateBuilders>
                     <sourcePaths>
-                        <sourcePath>src/main/jsonschema/com/facebook/graph</sourcePath>
+                        <sourcePath>src/main/jsonschema/com/facebook/graph/Post.json</sourcePath>
                     </sourcePaths>
                     <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
                     <targetPackage>com.facebook</targetPackage>

Modified: incubator/streams/trunk/streams-contrib/streams-provider-gnip/gnip-edc-instagram/pom.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-contrib/streams-provider-gnip/gnip-edc-instagram/pom.xml?rev=1566722&r1=1566721&r2=1566722&view=diff
==============================================================================
--- incubator/streams/trunk/streams-contrib/streams-provider-gnip/gnip-edc-instagram/pom.xml (original)
+++ incubator/streams/trunk/streams-contrib/streams-provider-gnip/gnip-edc-instagram/pom.xml Mon Feb 10 20:05:53 2014
@@ -75,7 +75,7 @@
                     <addCompileSourceRoot>true</addCompileSourceRoot>
                     <generateBuilders>true</generateBuilders>
                     <sourcePaths>
-                        <sourcePath>src/main/jsonschema/com/instagram</sourcePath>
+                        <sourcePath>src/main/jsonschema/com/instagram/Instagram.json</sourcePath>
                     </sourcePaths>
                     <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
                     <targetPackage>com.instagram</targetPackage>

Modified: incubator/streams/trunk/streams-contrib/streams-provider-gnip/gnip-powertrack/pom.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-contrib/streams-provider-gnip/gnip-powertrack/pom.xml?rev=1566722&r1=1566721&r2=1566722&view=diff
==============================================================================
--- incubator/streams/trunk/streams-contrib/streams-provider-gnip/gnip-powertrack/pom.xml (original)
+++ incubator/streams/trunk/streams-contrib/streams-provider-gnip/gnip-powertrack/pom.xml Mon Feb 10 20:05:53 2014
@@ -116,7 +116,7 @@
                     <addCompileSourceRoot>true</addCompileSourceRoot>
                     <generateBuilders>true</generateBuilders>
                     <sourcePaths>
-                        <sourcePath>src/main/jsonschema/com/gnip</sourcePath>
+                        <sourcePath>src/main/jsonschema/com/gnip/Gnip.json</sourcePath>
                     </sourcePaths>
                     <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
                     <targetPackage>com.gnip</targetPackage>

Modified: incubator/streams/trunk/streams-contrib/streams-provider-moreover/pom.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-contrib/streams-provider-moreover/pom.xml?rev=1566722&r1=1566721&r2=1566722&view=diff
==============================================================================
--- incubator/streams/trunk/streams-contrib/streams-provider-moreover/pom.xml (original)
+++ incubator/streams/trunk/streams-contrib/streams-provider-moreover/pom.xml Mon Feb 10 20:05:53 2014
@@ -114,7 +114,8 @@
                     <addCompileSourceRoot>true</addCompileSourceRoot>
                     <generateBuilders>true</generateBuilders>
                     <sourcePaths>
-                        <sourcePath>src/main/jsonschema/com/moreover</sourcePath>
+                        <sourcePath>src/main/jsonschema/com/moreover/Moreover.json</sourcePath>
+                        <sourcePath>src/main/jsonschema/com/moreover/MoreoverConfiguration.json</sourcePath>
                     </sourcePaths>
                     <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
                     <targetPackage>com.moreover</targetPackage>

Modified: incubator/streams/trunk/streams-contrib/streams-provider-rss/pom.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-contrib/streams-provider-rss/pom.xml?rev=1566722&r1=1566721&r2=1566722&view=diff
==============================================================================
--- incubator/streams/trunk/streams-contrib/streams-provider-rss/pom.xml (original)
+++ incubator/streams/trunk/streams-contrib/streams-provider-rss/pom.xml Mon Feb 10 20:05:53 2014
@@ -15,7 +15,6 @@
         <dependency>
             <groupId>com.typesafe</groupId>
             <artifactId>config</artifactId>
-            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

Modified: incubator/streams/trunk/streams-contrib/streams-provider-sysomos/pom.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-contrib/streams-provider-sysomos/pom.xml?rev=1566722&r1=1566721&r2=1566722&view=diff
==============================================================================
--- incubator/streams/trunk/streams-contrib/streams-provider-sysomos/pom.xml (original)
+++ incubator/streams/trunk/streams-contrib/streams-provider-sysomos/pom.xml Mon Feb 10 20:05:53 2014
@@ -14,7 +14,6 @@
         <dependency>
             <groupId>com.typesafe</groupId>
             <artifactId>config</artifactId>
-            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -133,7 +132,8 @@
                     <addCompileSourceRoot>true</addCompileSourceRoot>
                     <generateBuilders>true</generateBuilders>
                     <sourcePaths>
-                        <sourcePath>src/main/jsonschema/com/sysomos</sourcePath>
+                        <sourcePath>src/main/jsonschema/com/sysomos/Sysomos.json</sourcePath>
+                        <sourcePath>src/main/jsonschema/com/sysomos/SysomosConfiguration.json</sourcePath>
                     </sourcePaths>
                     <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
                     <targetPackage>com.sysomos</targetPackage>

Modified: incubator/streams/trunk/streams-contrib/streams-provider-twitter/pom.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-contrib/streams-provider-twitter/pom.xml?rev=1566722&r1=1566721&r2=1566722&view=diff
==============================================================================
--- incubator/streams/trunk/streams-contrib/streams-provider-twitter/pom.xml (original)
+++ incubator/streams/trunk/streams-contrib/streams-provider-twitter/pom.xml Mon Feb 10 20:05:53 2014
@@ -127,7 +127,10 @@
                     <addCompileSourceRoot>true</addCompileSourceRoot>
                     <generateBuilders>true</generateBuilders>
                     <sourcePaths>
-                        <sourcePath>src/main/jsonschema/com/twitter</sourcePath>
+                        <sourcePath>src/main/jsonschema/com/twitter/TwitterStreamConfiguration.json</sourcePath>
+                        <sourcePath>src/main/jsonschema/com/twitter/Delete.json</sourcePath>
+                        <sourcePath>src/main/jsonschema/com/twitter/Retweet.json</sourcePath>
+                        <sourcePath>src/main/jsonschema/com/twitter/tweet.json</sourcePath>
                     </sourcePaths>
                     <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
                     <targetPackage>org.apache.streams.twitter.pojo</targetPackage>

Modified: incubator/streams/trunk/streams-pojo-extensions/pom.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-pojo-extensions/pom.xml?rev=1566722&r1=1566721&r2=1566722&view=diff
==============================================================================
--- incubator/streams/trunk/streams-pojo-extensions/pom.xml (original)
+++ incubator/streams/trunk/streams-pojo-extensions/pom.xml Mon Feb 10 20:05:53 2014
@@ -129,7 +129,7 @@
                     <addCompileSourceRoot>true</addCompileSourceRoot>
                     <generateBuilders>true</generateBuilders>
                     <sourcePaths>
-                        <sourcePath>src/main/jsonschema/org/apache/streams</sourcePath>
+                        <sourcePath>src/main/jsonschema/org/apache/streams/ActivityExtended.json</sourcePath>
                     </sourcePaths>
                     <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
                     <targetPackage>org.apache.streams</targetPackage>