http invoker, added dependencies

jcechace · Dec 9, 2015 · e8ffaa5 · e8ffaa5
1 parent 5008f3f
commit e8ffaa5
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/http-invoker-provider/pom.xml → http-invoker-microservice-provider/pom.xml b/http-invoker-provider/pom.xml → http-invoker-microservice-provider/pom.xml
@@ -6,7 +6,7 @@
       <artifactId>silverware-parent</artifactId>
       <version>1.0-SNAPSHOT</version>
    </parent>
-   <artifactId>http-invoker-provider</artifactId>
+   <artifactId>http-invoker-microservice-provider</artifactId>
    <packaging>jar</packaging>
    <name>Http Invoker Microservices Provider</name>
    <dependencies>
@@ -24,6 +24,10 @@
          <groupId>org.apache.logging.log4j</groupId>
          <artifactId>log4j-slf4j-impl</artifactId>
       </dependency>
+      <dependency>
+         <groupId>org.codehaus.jackson</groupId>
+         <artifactId>jackson-mapper-asl</artifactId>
+      </dependency>
    </dependencies>
    <build>
    </build>

diff --git a/...oker/HttpInvokerMicroserviceProvider.java → ...oker/HttpInvokerMicroserviceProvider.java b/...oker/HttpInvokerMicroserviceProvider.java → ...oker/HttpInvokerMicroserviceProvider.java
@@ -23,8 +23,8 @@
 import org.apache.logging.log4j.Logger;
 import org.silverware.microservices.Context;
 import org.silverware.microservices.providers.MicroserviceProvider;
+import org.silverware.microservices.silver.HttpInvokerSilverService;
 import org.silverware.microservices.silver.HttpServerSilverService;
-import org.silverware.microservices.silver.MonitoringSilverService;
 import org.silverware.microservices.silver.http.ServletDescriptor;
 import org.silverware.microservices.util.Utils;
 
@@ -82,10 +82,10 @@ public void run() {
                            context.getProperties().get(INVOKER_URL) + "/";
 
                      if (log.isTraceEnabled()) {
-                        log.trace("Waiting for invoker to appear at {}", monitorUrl);
+                        log.trace("Waiting for invoker to appear at {}", invokerUrl);
                      }
 
-                     if (!Utils.waitForHttp(monitorUrl, 200)) {
+                     if (!Utils.waitForHttp(invokerUrl, 200)) {
                         throw new InterruptedException("Unable to start Http Invoker.");
                      }
                   }
@@ -104,7 +104,6 @@ public void run() {
 
    private ServletDescriptor getServletDescriptor() {
       final Properties properties = new Properties();
-      properties.setProperty("dispatcherClasses", org.jolokia.jsr160.Jsr160RequestDispatcher.class.getName());
       properties.setProperty("debug", "false");
       properties.setProperty("historyMaxEntries", "10");
       properties.setProperty("debugMaxEntries", "100");

diff --git a/...er-provider/src/main/resources/log4j2.xml → ...ce-provider/src/main/resources/log4j2.xml b/...er-provider/src/main/resources/log4j2.xml → ...ce-provider/src/main/resources/log4j2.xml
diff --git a/.../HttpInvokerMicroserviceProviderTest.java → .../HttpInvokerMicroserviceProviderTest.java b/.../HttpInvokerMicroserviceProviderTest.java → .../HttpInvokerMicroserviceProviderTest.java
diff --git a/...er-provider/src/test/resources/log4j2.xml → ...ce-provider/src/test/resources/log4j2.xml b/...er-provider/src/test/resources/log4j2.xml → ...ce-provider/src/test/resources/log4j2.xml
diff --git a/microservices-bom/pom.xml b/microservices-bom/pom.xml
@@ -21,6 +21,7 @@
       <version.javassist>3.19.0-GA</version.javassist>
       <version.undertow>1.2.0.Beta10</version.undertow>
       <version.jolokia>1.2.3</version.jolokia>
+      <version.jackson>1.9.13</version.jackson>
       <java.level>1.8</java.level>
    </properties>
    <dependencyManagement>
@@ -138,6 +139,11 @@
             <type>war</type>
             <version>${version.jolokia}</version>
          </dependency>
+         <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>${version.jackson}</version>
+         </dependency>
       </dependencies>
    </dependencyManagement>
    <build>