From c0c53aeceb2d3205042fc4a7cc3a8b0166332e06 Mon Sep 17 00:00:00 2001
From: crusader <crusader@loafle.com>
Date: Fri, 15 Dec 2017 14:57:43 +0900
Subject: [PATCH] ing

---
 pom.xml                                       | 53 +++++++++++++++++++
 .../probe/container/service/DataService.java  |  4 +-
 .../database/oracle/OracleCrawlerTest.java    |  2 +
 .../postgresql/PostgreSQLCrawlerTest.java     |  2 +
 .../sqlserver/SQLServerCrawlerTest.java       |  3 ++
 .../impl/jmx/tomcat/TomcatCrawlerTest.java    |  3 ++
 .../crawler/impl/wmi/WMICrawlerTest.java      |  7 ++-
 7 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1f4dd57..0461e78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,4 +99,57 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <!-- Copy Maven dependencies into target/lib/ -->
+            <!--<plugin>-->
+                <!--<artifactId>maven-dependency-plugin</artifactId>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<phase>package</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>copy-dependencies</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<overWriteReleases>false</overWriteReleases>-->
+                            <!--<includeScope>runtime</includeScope>-->
+                            <!--<outputDirectory>${project.build.directory}/lib</outputDirectory>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
+
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-jar-plugin</artifactId>-->
+                <!--<configuration>-->
+                    <!--<archive>-->
+                        <!--<manifest>-->
+                            <!--<mainClass>com.loafle.overflow.probe.container.Container</mainClass>-->
+                        <!--</manifest>-->
+                    <!--</archive>-->
+                <!--</configuration>-->
+            <!--</plugin>-->
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <archive>
+                        <manifest>
+                            <mainClass>com.loafle.overflow.probe.container.Container</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+
+            </plugin>
+
+        </plugins>
+
+    </build>
+
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/loafle/overflow/probe/container/service/DataService.java b/src/main/java/com/loafle/overflow/probe/container/service/DataService.java
index 30a1fb0..7914156 100644
--- a/src/main/java/com/loafle/overflow/probe/container/service/DataService.java
+++ b/src/main/java/com/loafle/overflow/probe/container/service/DataService.java
@@ -1,9 +1,7 @@
 package com.loafle.overflow.probe.container.service;
 
 import com.loafle.overflow.probe.container.crawler.Crawler;
-import com.loafle.overflow.probe.container.crawler.result.ResultSet;
 
-import java.util.List;
 import java.util.Map;
 
 public class DataService extends Service {
@@ -11,7 +9,7 @@ public class DataService extends Service {
         super(crawlers);
     }
 
-    public List<ResultSet> get(String crawlerName, String id) throws Exception {
+    public Map<String, String> get(String crawlerName, String id) throws Exception {
         Crawler crawler = getCrawler(crawlerName);
         return crawler.get(id);
     }
diff --git a/src/test/java/com/loafle/overflow/probe/container/crawler/impl/database/oracle/OracleCrawlerTest.java b/src/test/java/com/loafle/overflow/probe/container/crawler/impl/database/oracle/OracleCrawlerTest.java
index 6c82da1..7784e6e 100644
--- a/src/test/java/com/loafle/overflow/probe/container/crawler/impl/database/oracle/OracleCrawlerTest.java
+++ b/src/test/java/com/loafle/overflow/probe/container/crawler/impl/database/oracle/OracleCrawlerTest.java
@@ -2,11 +2,13 @@ package com.loafle.overflow.probe.container.crawler.impl.database.oracle;
 
 import com.loafle.overflow.probe.container.crawler.impl.database.DatabaseCrawlerTest;
 import com.loafle.overflow.probe.container.crawler.result.ResultSet;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.List;
 
 public class OracleCrawlerTest extends DatabaseCrawlerTest {
+    @Ignore
     @Test
     public void testMySQL() throws Exception {
         Object result = new OracleCrawler().getInternal( getConfig("config/oracle/oracle-test.json"));
diff --git a/src/test/java/com/loafle/overflow/probe/container/crawler/impl/database/postgresql/PostgreSQLCrawlerTest.java b/src/test/java/com/loafle/overflow/probe/container/crawler/impl/database/postgresql/PostgreSQLCrawlerTest.java
index b8e8669..626e5b9 100644
--- a/src/test/java/com/loafle/overflow/probe/container/crawler/impl/database/postgresql/PostgreSQLCrawlerTest.java
+++ b/src/test/java/com/loafle/overflow/probe/container/crawler/impl/database/postgresql/PostgreSQLCrawlerTest.java
@@ -2,11 +2,13 @@ package com.loafle.overflow.probe.container.crawler.impl.database.postgresql;
 
 import com.loafle.overflow.probe.container.crawler.impl.database.DatabaseCrawlerTest;
 import com.loafle.overflow.probe.container.crawler.result.ResultSet;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.List;
 
 public class PostgreSQLCrawlerTest extends DatabaseCrawlerTest {
+    @Ignore
     @Test
     public void testPostgreSQL() throws Exception {
         Object result = new PostgreSQLCrawler().getInternal( getConfig("config/postgresql/postgresql.json"));
diff --git a/src/test/java/com/loafle/overflow/probe/container/crawler/impl/database/sqlserver/SQLServerCrawlerTest.java b/src/test/java/com/loafle/overflow/probe/container/crawler/impl/database/sqlserver/SQLServerCrawlerTest.java
index 90cd197..1ea2db3 100644
--- a/src/test/java/com/loafle/overflow/probe/container/crawler/impl/database/sqlserver/SQLServerCrawlerTest.java
+++ b/src/test/java/com/loafle/overflow/probe/container/crawler/impl/database/sqlserver/SQLServerCrawlerTest.java
@@ -2,17 +2,20 @@ package com.loafle.overflow.probe.container.crawler.impl.database.sqlserver;
 
 import com.loafle.overflow.probe.container.crawler.impl.database.DatabaseCrawlerTest;
 import com.loafle.overflow.probe.container.crawler.result.ResultSet;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.List;
 
 public class SQLServerCrawlerTest extends DatabaseCrawlerTest {
+    @Ignore
     @Test
     public void testConnection_Count() throws Exception {
         Object result = new SQLServerCrawler().getInternal( getConfig("config/sqlserver/sqlserver_connection_count.json"));
         print("SQL Server Connection count", (List<ResultSet>) result);
     }
 
+    @Ignore
     @Test
     public void testMultiKeyArray() throws Exception {
         Object result = new SQLServerCrawler().getInternal( getConfig("config/sqlserver/sqlserver_multiple_key_array.json"));
diff --git a/src/test/java/com/loafle/overflow/probe/container/crawler/impl/jmx/tomcat/TomcatCrawlerTest.java b/src/test/java/com/loafle/overflow/probe/container/crawler/impl/jmx/tomcat/TomcatCrawlerTest.java
index 0f8881c..b9a5264 100644
--- a/src/test/java/com/loafle/overflow/probe/container/crawler/impl/jmx/tomcat/TomcatCrawlerTest.java
+++ b/src/test/java/com/loafle/overflow/probe/container/crawler/impl/jmx/tomcat/TomcatCrawlerTest.java
@@ -4,6 +4,7 @@ import com.loafle.overflow.probe.container.crawler.config.Config;
 import com.loafle.overflow.probe.container.crawler.impl.jmx.JMXCrawler;
 import com.loafle.overflow.probe.container.crawler.impl.jmx.JMXCrawlerTest;
 import com.loafle.overflow.probe.container.crawler.result.ResultSet;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.File;
@@ -21,6 +22,7 @@ public class TomcatCrawlerTest extends JMXCrawlerTest {
         assertEquals(1,1);
     }
 
+    @Ignore
     @Test
     public void TestDoCrawler() throws Exception {
 
@@ -52,6 +54,7 @@ public class TomcatCrawlerTest extends JMXCrawlerTest {
         }
     }
 
+    @Ignore
     @Test
     public void testParseObject () {
 
diff --git a/src/test/java/com/loafle/overflow/probe/container/crawler/impl/wmi/WMICrawlerTest.java b/src/test/java/com/loafle/overflow/probe/container/crawler/impl/wmi/WMICrawlerTest.java
index 9037bca..6b7732b 100644
--- a/src/test/java/com/loafle/overflow/probe/container/crawler/impl/wmi/WMICrawlerTest.java
+++ b/src/test/java/com/loafle/overflow/probe/container/crawler/impl/wmi/WMICrawlerTest.java
@@ -6,6 +6,7 @@ import com.loafle.overflow.probe.container.crawler.config.Config;
 import com.loafle.overflow.probe.container.crawler.result.ResultSet;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.File;
@@ -27,7 +28,7 @@ public class WMICrawlerTest extends CrawlerTest {
     }
 
 
-    //    @Ignore
+    @Ignore
     @Test
     public void testLinuxExe() throws Exception {
 
@@ -94,6 +95,7 @@ public class WMICrawlerTest extends CrawlerTest {
 
     }
 
+    @Ignore
     @Test
     public void testConfig() throws IOException {
         ClassLoader classLoader = getClass().getClassLoader();
@@ -107,7 +109,7 @@ public class WMICrawlerTest extends CrawlerTest {
         System.out.println(c);
     }
 
-    //    @Ignore
+    @Ignore
     @Test
     public void testWMIJson() throws Exception {
         ClassLoader classLoader = getClass().getClassLoader();
@@ -156,6 +158,7 @@ public class WMICrawlerTest extends CrawlerTest {
         }
     }
 
+    @Ignore
     @Test
     public void testMetaProcess() throws Exception {