Merge branch 'develop' of github.com:networknt/light-4j into develop

config/src/main/java/com/networknt/config/Config.java

@@ -39,7 +39,7 @@
  * another jar in the classpath to replace the default implementation.
  *
  * Config files are loaded in the following sequence:
- * 1. resources/config folder for the default
+ * 1. resource/config folder for the default
  * 2. externalized directory specified by light-4j-config-dir
  *
  * In docker, the config files should be in volume and any update will

metrics/src/main/java/io/dropwizard/metrics/InstrumentedExecutors.java

@@ -207,7 +207,7 @@ public static InstrumentedExecutorService newSingleThreadExecutor(
      * thread will be created and added to the pool. Threads that have
      * not been used for sixty seconds are terminated and removed from
      * the cache. Thus, a pool that remains idle for long enough will
-     * not consume any resources. Note that pools with similar
+     * not consume any resource. Note that pools with similar
      * properties but different details (for example, timeout parameters)
      * may be created using {@link ThreadPoolExecutor} constructors.
      *
@@ -230,7 +230,7 @@ public static InstrumentedExecutorService newCachedThreadPool(MetricRegistry reg
      * thread will be created and added to the pool. Threads that have
      * not been used for sixty seconds are terminated and removed from
      * the cache. Thus, a pool that remains idle for long enough will
-     * not consume any resources. Note that pools with similar
+     * not consume any resource. Note that pools with similar
      * properties but different details (for example, timeout parameters)
      * may be created using {@link ThreadPoolExecutor} constructors.
      *

pom.xml

@@ -126,7 +126,7 @@
         <module>common</module>
         <module>email</module>
         <module>server</module>
-        <module>resources</module>
+        <module>resource</module>
     </modules>
 
     <dependencyManagement>
@@ -286,7 +286,7 @@
             </dependency>
             <dependency>
                 <groupId>com.networknt</groupId>
-                <artifactId>resources</artifactId>
+                <artifactId>resource</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

resources/pom.xml → resource/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>resources</artifactId>
+    <artifactId>resource</artifactId>
     <packaging>jar</packaging>
     <description>Handler endpoints that will provide clients the ability to server static content.</description>
 

resources/src/main/java/com/networknt/resources/PathResourceProvider.java → resource/src/main/java/com/networknt/resource/PathResourceProvider.java

@@ -1,4 +1,4 @@
-package com.networknt.resources;
+package com.networknt.resource;
 
 import io.undertow.server.handlers.resource.ResourceManager;
 

resources/src/main/java/com/networknt/resources/PredicatedHandlersProvider.java → resource/src/main/java/com/networknt/resource/PredicatedHandlersProvider.java

@@ -1,4 +1,4 @@
-package com.networknt.resources;
+package com.networknt.resource;
 
 import io.undertow.server.handlers.builder.PredicatedHandler;
 

resources/src/main/java/com/networknt/resources/ResourceHelpers.java → resource/src/main/java/com/networknt/resource/ResourceHelpers.java

@@ -1,4 +1,4 @@
-package com.networknt.resources;
+package com.networknt.resource;
 
 import io.undertow.server.handlers.PathHandler;
 import io.undertow.server.handlers.builder.PredicatedHandler;

server/src/main/java/com/networknt/server/ShutdownHookProvider.java

@@ -1,12 +1,12 @@
 package com.networknt.server;
 
 /**
- * If you want close database connections, release the resources allocated
+ * If you want close database connections, release the resource allocated
  * in the application before server shutdown, please implement this interface
  * with a class and put it into your API project
- * /src/main/resources/config/service.yml com.networknt.server.ShutdownHookProvider
+ * /src/main/resource/config/service.yml com.networknt.server.ShutdownHookProvider
  *
- * All shutdown hooks will be called during server shutdown so that resources can
+ * All shutdown hooks will be called during server shutdown so that resource can
  * be released completely.
  *
  * @author Steve Hu

server/src/main/java/com/networknt/server/StartupHookProvider.java

@@ -1,9 +1,9 @@
 package com.networknt.server;
 
 /**
- * If you want initialize database connections, load some resources or cached data
+ * If you want initialize database connections, load some resource or cached data
  * during server startup, please implement this interface with a class and put
- * it into your API project /src/main/resources/config/service.yml com.networknt.server.StartupHookProvider
+ * it into your API project /src/main/resource/config/service.yml com.networknt.server.StartupHookProvider
  * During server startup, these startup hooks will be called to initialize the server
  * state.
  *