[ADD] SE AGREGÓ DOTENV

nbproject/build-impl.xml

@@ -999,17 +999,21 @@ exists or setup the property manually. For example like this:
     <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
     <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
         <copyfiles files="${file.reference.json-20171018.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.sqljdbc42.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.commons-codec-1.10.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.sqljdbc42.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.json-20160212.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.java-dotenv-3.1.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.kotlin-stdlib-1.2.21.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
         <copyfiles files="${file.reference.json-20171018.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.sqljdbc42.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.commons-codec-1.10.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.sqljdbc42.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.json-20160212.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.java-dotenv-3.1.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.kotlin-stdlib-1.2.21.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
     </target>
     <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
         <delete dir="${build.web.dir}/WEB-INF/lib"/>

nbproject/genfiles.properties

-build.xml.data.CRC32=e2509847
+build.xml.data.CRC32=6abbea67
 build.xml.script.CRC32=c7931e0f
 build.xml.stylesheet.CRC32=651128d4@1.77.1.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=e2509847
-nbproject/build-impl.xml.script.CRC32=a2a0b985
+nbproject/build-impl.xml.data.CRC32=6abbea67
+nbproject/build-impl.xml.script.CRC32=367d1582
 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.77.1.1
 nbproject/jaxws-build.xml.stylesheet.CRC32=6608c2cf

nbproject/private/private.properties

-deploy.ant.properties.file=C:\\Users\\sistem02user\\AppData\\Roaming\\NetBeans\\8.2\\config\\GlassFishEE6\\Properties\\gfv3258829979.properties
+deploy.ant.properties.file=C:\\Users\\Aaron\\AppData\\Roaming\\NetBeans\\8.2\\config\\GlassFishEE6\\Properties\\gfv3640173384.properties
 j2ee.platform.is.jsr109=true
-j2ee.server.domain=C:/Users/sistem02user/AppData/Roaming/NetBeans/8.2/config/GF_4.1.1/domain1
+j2ee.server.domain=C:/Users/Aaron/AppData/Roaming/NetBeans/8.2/config/GF_4.1.1/domain1
 j2ee.server.home=C:/Program Files/glassfish-4.1.1/glassfish
 j2ee.server.instance=[C:\\Program Files\\glassfish-4.1.1\\glassfish;C:\\Program Files\\glassfish-4.1.1\\glassfish\\domains\\domain1]deployer:gfv3ee6wc:localhost:4848
 j2ee.server.middleware=C:/Program Files/glassfish-4.1.1
 javac.debug=true
 javadoc.preview=true
 selected.browser=Chrome
-user.properties.file=C:\\Users\\sistem02user\\AppData\\Roaming\\NetBeans\\8.2\\build.properties
+user.properties.file=C:\\Users\\Aaron\\AppData\\Roaming\\NetBeans\\8.2\\build.properties

nbproject/project.properties

@@ -28,10 +28,12 @@ dist.war=${dist.dir}/${war.name}
 endorsed.classpath=\
     ${libs.javaee-endorsed-api-7.0.classpath}
 excludes=
-file.reference.commons-codec-1.10.jar=E:\\LIBRERIAS\\commons-codec-1.10.jar
+file.reference.commons-codec-1.10.jar=D:\\Migracion\\LIBRERIAS\\commons-codec-1.10.jar
+file.reference.java-dotenv-3.1.1.jar=D:\\LIBRERIAS\\java-dotenv-3.1.1.jar
 file.reference.json-20160212.jar=E:\\LIBRERIAS\\json-20160212.jar
 file.reference.json-20171018.jar=E:\\LIBRERIAS\\json-20171018.jar
-file.reference.sqljdbc42.jar=E:\\LIBRERIAS\\sqljdbc42.jar
+file.reference.kotlin-stdlib-1.2.21.jar=D:\\LIBRERIAS\\kotlin-stdlib-1.2.21.jar
+file.reference.sqljdbc42.jar=D:\\Migracion\\LIBRERIAS\\sqljdbc42.jar
 includes=**
 j2ee.compile.on.save=true
 j2ee.copy.static.files.on.save=true
@@ -47,9 +49,11 @@ j2ee.server.type=gfv3ee6
 jar.compress=false
 javac.classpath=\
     ${file.reference.json-20171018.jar}:\
-    ${file.reference.sqljdbc42.jar}:\
     ${file.reference.commons-codec-1.10.jar}:\
-    ${file.reference.json-20160212.jar}
+    ${file.reference.sqljdbc42.jar}:\
+    ${file.reference.json-20160212.jar}:\
+    ${file.reference.java-dotenv-3.1.1.jar}:\
+    ${file.reference.kotlin-stdlib-1.2.21.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.debug=true

nbproject/project.xml

@@ -16,17 +16,25 @@
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.sqljdbc42.jar}</file>
+                    <file>${file.reference.commons-codec-1.10.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.commons-codec-1.10.jar}</file>
+                    <file>${file.reference.sqljdbc42.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
                     <file>${file.reference.json-20160212.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
+                <library dirs="200">
+                    <file>${file.reference.java-dotenv-3.1.1.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.kotlin-stdlib-1.2.21.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
             </web-module-libraries>
             <web-module-additional-libraries/>
             <source-roots>

src/java/moduloSeguridad/config/RequestPath.java

@@ -5,6 +5,8 @@
  */
 package moduloSeguridad.config;
 
+import moduloSeguridad.utilities.dotenSrv;
+
 /**
  *
  * @author Percy Oliver Quispe Huarcaya Clase encargada de almacenar las Url
@@ -13,13 +15,13 @@ package moduloSeguridad.config;
 public final class RequestPath {
 
 	/*REST PRODUCCION*/
-	private static final String BASE = "http://app9.sacooliveros.edu.pe:8080/security-rest/api/";  //base path;
+	private static final String BASE = dotenSrv.obtenerValorVariableEntorno("BASE_SECURITY_REST");  //base path;
 	/*Rest seguridad (security-rest)*/
 	public static final String LOG_OUT = BASE + "user/logout";
 	public static final String LOGIN = BASE + "user/login";
 	public static final String ENVIAR_NUEVO_TOKEN = BASE + "proyecto/enviarNuevoToken";
 	public static final String VERIFICAR_LOGIN = BASE + "user/verificarLogin";
 	/*Rest Matricula*/
-	private static final String BASE_MATRICULA = "http://172.16.2.53:8080/servicios-matricula/api/";
+	private static final String BASE_MATRICULA = dotenSrv.obtenerValorVariableEntorno("BASE_MATRICULA");
 	public static final String PERIODO_SERVLET = BASE_MATRICULA + "periodo/periodoServlet";
 }

src/java/moduloSeguridad/sqlserverdao/SqlServerDAOFactory.java

@@ -12,6 +12,7 @@ import moduloSeguridad.dao.ProyectoDAO;
 import moduloSeguridad.dao.MenuDAO;
 import moduloSeguridad.dao.TipoUsuarioDAO;
 import moduloSeguridad.dao.UsuarioDAO;
+import moduloSeguridad.utilities.dotenSrv;
 
 /**
  *
@@ -22,15 +23,25 @@ public class SqlServerDAOFactory extends DAOFactory {
 
 	public static Connection getConnectionSQL(String base) {
 		Connection conexion = null;
+                String host = "";
+                String port = "";
+                String databaseName = "";
+                String userSgbd = "";
+                String passwordSgbd = "";
 		if (base.equalsIgnoreCase("security")) {
-			String user = "###########";
+			/*String user = "###########";
 			String pwd = "########";
-			String url = "jdbc:sqlserver://172.16.0.6:1433;databaseName=security";
-//			String url = "jdbc:sqlserver://172.16.2.40:1433;databaseName=Security";
-
+			String url = "jdbc:sqlserver://172.16.0.6:1433;databaseName=security";*/
+//			String url = "jdbc:sqlserver://172.16.2.40:1433;databaseName=Security";                       
+                        host = dotenSrv.obtenerValorVariableEntorno("SQLSERVER_SECURITY_DB_HOST");
+                        port = dotenSrv.obtenerValorVariableEntorno("SQLSERVER_SECURITY_DB_PORT");
+                        databaseName = dotenSrv.obtenerValorVariableEntorno("SQLSERVER_SECURITY_DB_NAME");
+                        userSgbd = dotenSrv.obtenerValorVariableEntorno("SQLSERVER_SECURITY_DB_USER");
+                        passwordSgbd = dotenSrv.obtenerValorVariableEntorno("SQLSERVER_SECURITY_DB_PASS");
+                        String url = "jdbc:sqlserver://"+host+":"+port+";databaseName="+databaseName;
 			try {
 				Class.forName("com.microsoft.sqlserver.jdbc.SQLServerDriver");
-				conexion = DriverManager.getConnection(url, user, pwd);
+				conexion = DriverManager.getConnection(url, userSgbd, passwordSgbd);
 			} catch (Exception e) {
 				e.printStackTrace();
 				System.out.println("Error al conectarse a la bd");

src/java/moduloSeguridad/utilities/OsUtils.java

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package moduloSeguridad.utilities;
+import java.io.File;
+import java.util.Locale;
+
+/**
+ *
+ * @author Aaron
+ */
+public class OsUtils {
+    // cached result of OS detection
+    protected static String detectedOS;
+    public static String getOperatingSysstemType() {
+        if (detectedOS == null) {
+            String OS = System.getProperty("os.name", "generic").toLowerCase(Locale.ENGLISH);
+            if ((OS.contains("mac")) || (OS.contains("darwin"))) {
+                detectedOS = "MacOS";
+            } else if (OS.contains("win")) {
+                detectedOS = "Windows";
+            } else if (OS.contains("nux")) {
+                detectedOS = "Linux";
+            } else {
+                detectedOS = "Other";
+            }
+        }
+        return detectedOS;
+    }
+    public static String getDotEnvPath(String projectName) {
+        String path = "";
+        String detectedOs = OsUtils.getOperatingSysstemType();
+        switch (detectedOs) {
+            case "MacOS":
+                path = "";
+                break;
+            case "Windows":
+                char[] alphabet = "abcdefghijklmnopqrstuvwxyz".toCharArray();
+                for (char letter : alphabet) {
+                    path = letter + ":/dotenv/" + projectName;
+                    File directory = new File(path);
+                    if (directory.exists()) {
+                        break;
+                    }
+                }
+                break;
+            case "Linux":
+                path = "/opt/dotenv/"+ projectName;
+                break;
+        }
+        return path;
+    }
+}

src/java/moduloSeguridad/utilities/dotenSrv.java

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package moduloSeguridad.utilities;
+
+import io.github.cdimascio.dotenv.Dotenv;
+
+/**
+ *
+ * @author sistem05user
+ */
+public final class dotenSrv {
+
+  static Dotenv dotenSrv = Dotenv
+          .configure()
+          .directory(OsUtils.getDotEnvPath("moduloSeguridad"))
+          .load();
+  
+  public static String obtenerValorVariableEntorno(String nombre){
+      String valor = dotenSrv.get(nombre);
+      return valor;
+  }
+
+}