mapcode-foundation · rijnb · Nov 4, 2016 · Nov 4, 2016 · Nov 4, 2016
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 **/mapcode-secret.properties
+service/src/main/resources/log4j.xml
 out/
 target/
diff --git a/README.md b/README.md
@@ -139,14 +139,25 @@ your Tomcat instance.
 The first method, running the WAR file from the command-line, using `java` only is particularly
 useful if you wish use the XML services, for example, in a Microsoft Excel spreadsheet.
 
-### Missing `mapcode-secret.properties` File
+### Missing `mapcode-secret.properties` and `log4j.xml` Files
 
-The service requires a file called `mapcode-secret.properties` to be present on the
-classpath.  The properties file `mapcode-secret.properties` contains the username and password for
+The service requires 2 files called `mapcode-secret.properties` and `log4j.xml` to be present on the
+classpath. They are specifically **not** included in the WAR file by default, because that would
+make it impossible to change them without recompiling the service.
+
+#### `log4j.xml`
+
+The file `log4j.xml` specifies the log levels during operations. An example of a `log4j.xml` file
+can be found in `service/src/test/resources/log4j.xml`. Make sure that file can be found on the classpath
+or add it `services/src/main/resources` before building and it will be integrated in the WAR file.
+
+#### `mapcode-secret.properties`
+
+The properties file `mapcode-secret.properties` contains the username and password for
 your MongDB database server for tracing, should you wish to use that.
 
 If you get a start-up error complaining about a missing `mapcode-secret.properties` file,
-make sure you add it to the classpath (or add it to `src/main/resources`) before building.
+make sure you add it to the classpath (or add it to `service/src/main/resources`) before building.
 
 By default, you can simply use an empty `mapcode-secret.properties` file. So, you may want to
 just create an empty file by executing:

diff --git a/deployment/pom.xml b/deployment/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+  ~ Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.

diff --git a/deployment/src/main/java/com/mapcode/services/cli/Main.java b/deployment/src/main/java/com/mapcode/services/cli/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/deployment/src/main/java/com/mapcode/services/deployment/DeploymentModule.java b/deployment/src/main/java/com/mapcode/services/deployment/DeploymentModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/deployment/src/main/java/com/mapcode/services/deployment/StartupCheck.java b/deployment/src/main/java/com/mapcode/services/deployment/StartupCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/deployment/src/main/webapp/WEB-INF/web.xml b/deployment/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+  ~ Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.

diff --git a/example/index.html b/example/index.html
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+  ~ Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.

diff --git a/example/monitorclient/MapcodeMonitor.css b/example/monitorclient/MapcodeMonitor.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/example/monitorclient/MapcodeMonitor.js b/example/monitorclient/MapcodeMonitor.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/example/monitorclient/index.html b/example/monitorclient/index.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!--
-    ~ Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+    ~ Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
     ~
     ~ Licensed under the Apache License, Version 2.0 (the "License");
     ~ you may not use this file except in compliance with the License.

diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+  ~ Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.

diff --git a/service/pom.xml b/service/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+  ~ Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/ApiConstants.java b/service/src/main/java/com/mapcode/services/ApiConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/CorsFeature.java b/service/src/main/java/com/mapcode/services/CorsFeature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/MapcodeResource.java b/service/src/main/java/com/mapcode/services/MapcodeResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/ResourcesModule.java b/service/src/main/java/com/mapcode/services/ResourcesModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/RootResource.java b/service/src/main/java/com/mapcode/services/RootResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/SystemMetrics.java b/service/src/main/java/com/mapcode/services/SystemMetrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/dto/AlphabetDTO.java b/service/src/main/java/com/mapcode/services/dto/AlphabetDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/dto/AlphabetListDTO.java b/service/src/main/java/com/mapcode/services/dto/AlphabetListDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/dto/AlphabetsDTO.java b/service/src/main/java/com/mapcode/services/dto/AlphabetsDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/dto/CoordinatesDTO.java b/service/src/main/java/com/mapcode/services/dto/CoordinatesDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/dto/MapcodeDTO.java b/service/src/main/java/com/mapcode/services/dto/MapcodeDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/dto/MapcodeListDTO.java b/service/src/main/java/com/mapcode/services/dto/MapcodeListDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/dto/MapcodesDTO.java b/service/src/main/java/com/mapcode/services/dto/MapcodesDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/dto/TerritoriesDTO.java b/service/src/main/java/com/mapcode/services/dto/TerritoriesDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/dto/TerritoryDTO.java b/service/src/main/java/com/mapcode/services/dto/TerritoryDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/dto/TerritoryListDTO.java b/service/src/main/java/com/mapcode/services/dto/TerritoryListDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/dto/VersionDTO.java b/service/src/main/java/com/mapcode/services/dto/VersionDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/implementation/MapcodeResourceImpl.java b/service/src/main/java/com/mapcode/services/implementation/MapcodeResourceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/implementation/RootResourceImpl.java b/service/src/main/java/com/mapcode/services/implementation/RootResourceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/implementation/SystemMetricsImpl.java b/service/src/main/java/com/mapcode/services/implementation/SystemMetricsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/jmx/SystemMetricsAgent.java b/service/src/main/java/com/mapcode/services/jmx/SystemMetricsAgent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/standalone/MainCommandLine.java b/service/src/main/java/com/mapcode/services/standalone/MainCommandLine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/standalone/Server.java b/service/src/main/java/com/mapcode/services/standalone/Server.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/java/com/mapcode/services/standalone/StandaloneModule.java b/service/src/main/java/com/mapcode/services/standalone/StandaloneModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/main/resources/log4j.xml b/service/src/main/resources/log4j.xml
diff --git a/service/src/main/resources/mapcode.properties b/service/src/main/resources/mapcode.properties
@@ -1,4 +1,4 @@
-# Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+# Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/service/src/test/java/com/mapcode/services/ApiAlphabetsTest.java b/service/src/test/java/com/mapcode/services/ApiAlphabetsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/test/java/com/mapcode/services/ApiCodesTest.java b/service/src/test/java/com/mapcode/services/ApiCodesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/test/java/com/mapcode/services/ApiCoordsTest.java b/service/src/test/java/com/mapcode/services/ApiCoordsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/service/src/test/java/com/mapcode/services/ApiDTOTest.java b/service/src/test/java/com/mapcode/services/ApiDTOTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.