Update pom.xml to include dependencies in generated jar; MongoDB reads conf from porperties.xml

Author: mikelsr

conf/properties.xml

@@ -39,8 +39,8 @@
 
         <!--MongoDB-->
         <mongodb-server>
-            <host></host>
-            <port></port>
+            <host>localhost</host>
+            <port>27017</port>
         </mongodb-server>
     </network>
 

pom.xml

@@ -29,7 +29,6 @@
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
-
                 </configuration>
             </plugin>
             <plugin>
@@ -48,7 +47,6 @@
                             <mainClass>ud.binmonkey.prog3_proyecto_server.Server</mainClass>
                         </manifest>
                     </archive>
-
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
                     </descriptorRefs>

src/main/java/ud/binmonkey/prog3_proyecto_server/http/HTTPSServer.java

@@ -77,6 +77,8 @@ public void init() throws IOException {
         try {
 
             String propertiesFile = "conf/properties.xml";
+            String certPath = DocumentReader.getAttr(DocumentReader.getDoc(propertiesFile),
+                    "ssl", "certfile", "location").getTextContent();
 
             /* obtain keyword from config xml*/
             Element settings = DocumentReader.getAttr(DocumentReader.getDoc(propertiesFile),
@@ -94,7 +96,7 @@ public void init() throws IOException {
 
             /* configure key store */
             KeyStore ks = KeyStore.getInstance("JKS");
-            ks.load(new FileInputStream("src/test/resources/keys/keystore.jks"), passwd);
+            ks.load(new FileInputStream("conf/ssl/keystore.jks"), passwd);
 
             /* configure key management factory */
             KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());

src/main/java/ud/binmonkey/prog3_proyecto_server/mongodb/MongoDB.java

@@ -7,6 +7,7 @@
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 import org.bson.Document;
+import ud.binmonkey.prog3_proyecto_server.common.DocumentReader;
 import ud.binmonkey.prog3_proyecto_server.common.exceptions.*;
 import ud.binmonkey.prog3_proyecto_server.common.security.UserAuthentication;
 import ud.binmonkey.prog3_proyecto_server.common.time.DateUtils;
@@ -25,6 +26,11 @@ public class MongoDB {
     /* TODO: tests */
     private static final Logger LOG = Logger.getLogger(MongoDB.class.getName());
     private static String COLLECTION = "users";
+    private static final String ns = DocumentReader.getAttr(DocumentReader.getDoc("conf/properties.xml"),
+            "network", "mongodb-server", "host").getTextContent();
+    private static final int port = Integer.parseInt(DocumentReader.getAttr(DocumentReader.getDoc("conf/properties.xml"),
+            "network", "mongodb-server", "port").getTextContent());
+
     static {
         try {
             LOG.addHandler(new FileHandler(
@@ -76,7 +82,7 @@ public static void changeUserName(String oldUserName, String newUserName)
      * @return User MongoDatabase object
      */
     private static MongoDatabase getUsersDB(){
-        MongoClient mongoClient = new MongoClient("localhost", 27017);
+        MongoClient mongoClient = new MongoClient(ns, port);
         MongoDatabase db = mongoClient.getDatabase(COLLECTION);
         try {
             db.createCollection(COLLECTION);