Merge remote-tracking branch 'origin/master'

piflow-bundle/pom.xml

@@ -150,6 +150,12 @@
             <version>1.9.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.memcached</groupId>
+            <artifactId>java_memcached-release</artifactId>
+            <version>2.6.6</version>
+        </dependency>
+
 
         <dependency>
             <groupId>org.apache.hbase</groupId>
@@ -171,6 +177,29 @@
     <build>
         <plugins>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>2.5.2</version>
+                <executions>
+                    <execution>
+                        <id>install-external-1</id>
+                        <goals>
+                            <goal>install-file</goal>
+                        </goals>
+                        <phase>install</phase>
+                        <configuration>
+                            <file>${basedir}/lib/java_memcached-release_2.6.6.jar</file>
+                            <groupId>com.memcached</groupId>
+                            <artifactId>java_memcached-release</artifactId>
+                            <version>2.6.6</version>
+                            <packaging>jar</packaging>
+                            <generatePom>true</generatePom>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>1.5</version>

piflow-bundle/src/main/scala/cn/piflow/bundle/http/LoadZipFromUrl.scala

@@ -82,7 +82,7 @@ class LoadZipFromUrl extends ConfigurableStop{
   }
 
   override def getIcon(): Array[Byte] = {
-    ImageUtil.getImage("http.jpg")
+    ImageUtil.getImage("http.png")
   }
 
   override def getGroup(): List[String] = {

piflow-bundle/src/main/scala/cn/piflow/bundle/http/UnGZip.scala

@@ -204,12 +204,12 @@ class UnGZip extends ConfigurableStop {
   }
 
   override def getPropertyDescriptor(): List[PropertyDescriptor] = {
-    var descriptor : List[PropertyDescriptor] = null
+    var descriptor : List[PropertyDescriptor] = List()
     return descriptor
   }
 
   override def getIcon(): Array[Byte] = {
-    ImageUtil.getImage("http.jpg")
+    ImageUtil.getImage("http.png")
   }
 
   override def getGroup(): List[String] = {

piflow-bundle/src/main/scala/cn/piflow/bundle/internetWorm/spider.scala

@@ -214,11 +214,11 @@ class spider extends ConfigurableStop{
   }
 
   override def getIcon(): Array[Byte] = {
-    ImageUtil.getImage("hive.jpg")
+    ImageUtil.getImage("spider.jpg")
   }
 
   override def getGroup(): List[String] = {
-    List(StopGroupEnum.spider.toString)
+    List(StopGroupEnum.Spider.toString)
   }
 
   override def initialize(ctx: ProcessContext): Unit = {}

piflow-bundle/src/main/scala/cn/piflow/bundle/memcache/ComplementByMemcache.scala

@@ -166,7 +166,7 @@ class ComplementByMemcache extends ConfigurableStop {
   }
 
   override def getGroup(): List[String] = {
-    List(StopGroupEnum.memcache.toString)
+    List(StopGroupEnum.Memcache.toString)
   }
 
   override def initialize(ctx: ProcessContext): Unit = {

piflow-bundle/src/main/scala/cn/piflow/bundle/memcache/GetMemcache.scala

@@ -164,7 +164,7 @@ class GetMemcache extends ConfigurableStop{
   }
 
   override def getGroup(): List[String] = {
-    List(StopGroupEnum.memcache.toString)
+    List(StopGroupEnum.Memcache.toString)
   }
 
   override def initialize(ctx: ProcessContext): Unit = {

piflow-bundle/src/main/scala/cn/piflow/bundle/memcache/PutMemcache.scala

@@ -120,7 +120,7 @@ class PutMemcache extends ConfigurableStop{
   }
 
   override def getGroup(): List[String] = {
-    List(StopGroupEnum.memcache.toString)
+    List(StopGroupEnum.Memcache.toString)
   }
 
   override def initialize(ctx: ProcessContext): Unit = { }

piflow-bundle/src/main/scala/cn/piflow/bundle/mongodb/GetMongo.scala

@@ -132,7 +132,7 @@ class GetMongo extends ConfigurableStop{
   }
 
   override def getGroup(): List[String] = {
-    List(StopGroupEnum.mongodb.toString)
+    List(StopGroupEnum.Mongodb.toString)
   }
 
   override def initialize(ctx: ProcessContext): Unit = { }

piflow-bundle/src/main/scala/cn/piflow/bundle/mongodb/PutMongo.scala

@@ -99,7 +99,7 @@ class PutMongo extends ConfigurableStop{
   }
 
   override def getGroup(): List[String] = {
-    List(StopGroupEnum.mongodb.toString)
+    List(StopGroupEnum.Mongodb.toString)
   }
 
   override def initialize(ctx: ProcessContext): Unit = { }

piflow-bundle/src/main/scala/cn/piflow/bundle/url/GetUrl.scala

@@ -163,7 +163,7 @@ class GetUrl extends ConfigurableStop{
   }
 
   override def getIcon(): Array[Byte] = {
-    ImageUtil.getImage("http.jpg")
+    ImageUtil.getImage("http.png")
   }
 
   override def getGroup(): List[String] = {

piflow-bundle/src/main/scala/cn/piflow/bundle/url/InvokeUrl.scala

@@ -266,7 +266,7 @@ class InvokeUrl extends ConfigurableStop{
   }
 
   override def getIcon(): Array[Byte] = {
-    ImageUtil.getImage("http.jpg")
+    ImageUtil.getImage("http.png")
   }
 
   override def getGroup(): List[String] = {

piflow-bundle/src/main/scala/cn/piflow/bundle/url/PostUrl.scala

@@ -76,7 +76,7 @@ class PostUrl extends ConfigurableStop{
   }
 
   override def getIcon(): Array[Byte] = {
-    ImageUtil.getImage("http.jpg")
+    ImageUtil.getImage("http.png")
   }
 
   override def getGroup(): List[String] = {

piflow-bundle/src/main/scala/cn/piflow/conf/StopGroupEnum.scala

@@ -23,8 +23,8 @@ object StopGroupEnum extends Enumeration {
   val UrlGroup= Value("UrlGroup")
   val HdfsGroup= Value("HdfsGroup")
   val MicroorganismGroup= Value("MicroorganismGroup")
-  val spider= Value("spider")
-  val mongodb= Value("mongodb")
-  val memcache= Value("memcache")
+  val Spider= Value("Spider")
+  val Mongodb= Value("Mongodb")
+  val Memcache= Value("Memcache")
 
 }

readMe.txt

@@ -1,6 +1,7 @@
 1.maven error
 apt-get install maven
 mvn install:install-file -Dfile=/opt/project/piflow/piflow-bundle/lib/spark-xml_2.11-0.4.2.jar -DgroupId=com.databricks -DartifactId=spark-xml_2.11 -Dversion=0.4.2 -Dpackaging=jar
+mvn install:install-file -Dfile=/opt/project/piflow/piflow-bundle/lib/java_memcached-release_2.6.6.jar -DgroupId=com.memcached -DartifactId=java_memcached-release -Dversion=2.6.6 -Dpackaging=jar
 
 2.packaging