versao 2.0

tdsereno · tdsereno · commit af527c3bfb44 · 2016-05-23T22:18:53.000-03:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /NativeServer2/NativeServer2/dist/
 /NativeServer2/NativeServer/build/
-/NativeServer2/NativeServer/nbproject/private/
+/NativeServer2/NativeServer/nbproject/private/
+/NativeServer2/NativeServer/dist/
diff --git a/NativeServer2/NativeServer/src/java/Db/ArvoreDb.java b/NativeServer2/NativeServer/src/java/Db/ArvoreDb.java
@@ -66,9 +66,10 @@ public ArrayList<Arvore> consultarTodas() {
         String sql = "select * from arvore ORDER BY idarvore";
         System.out.println("sql "+sql);
         try {
-    
-            ResultSet resultado = ConexaoBD.getInstance().getConnection().createStatement().executeQuery(sql);
-
+            System.out.println("start");
+            ConexaoBD bd = new ConexaoBD();
+            ResultSet resultado = bd.getInstance().getConnection().createStatement().executeQuery(sql);
+            System.out.println("stop");
             while (resultado.next()) {
                 Arvore v = new Arvore();
                 v.setEnderecoGeoCode(resultado.getString("geocode"));
@@ -90,7 +91,7 @@ public ArrayList<Arvore> consultarTodas() {
             }
 
         } catch (Exception e) {
-            System.out.println("Erro 0002 ao consultar arvores = " + e);
+            System.out.println("Erro 0002aasd ao consultar arvores = " + e);
             System.out.println("Erro 0002 ao consultar arvores error =  " + e.toString());
             return null;
         }
@@ -124,7 +125,7 @@ public Arvore consultarArvore(Arvore arvore) {
             }
 
         } catch (Exception e) {
-            System.out.println("Erro 0002 ao consultar arvores = " + e);
+            System.out.println("Erro 000222 ao consultar arvores = " + e);
             return null;
         }
         return null;
diff --git a/NativeServer2/NativeServer/src/java/Model/ConexaoBD.java b/NativeServer2/NativeServer/src/java/Model/ConexaoBD.java
@@ -19,7 +19,9 @@ public class ConexaoBD {
     private Connection conexao = null;
 
     public ConexaoBD() {
+        System.out.println("inicio construtor");
         try {
+          
             // Carrega informações do arquivo de propriedades
             Properties prop = new Properties();
             //prop.load(new FileInputStream("DB.propertie s"));
@@ -31,8 +33,9 @@ public ConexaoBD() {
 
 
             // Carrega Driver do Banco de Dados
+            System.out.println("carregando driver bd");
             Class.forName(dbdriver);
-
+            System.out.println("carregado");
             if (dbuser.length() != 0) // conexão COM usuário e senha
             {
                 conexao = DriverManager.getConnection(dburl, dbuser, dbsenha);
@@ -42,23 +45,30 @@ public ConexaoBD() {
             }
 
         } catch (Exception e) {
+            System.out.println("erro ao criar conex "+e);
             System.err.println(e);
         }
     }
 
     // Retorna instância
     public static ConexaoBD getInstance() {
+        System.out.println("instanciando");
         if (instancia == null) {
+            System.out.println("constructor");
             instancia = new ConexaoBD();
+            System.out.println("done");
         }
         return instancia;
     }
 
     // Retorna conexão
     public Connection getConnection() {
+        System.out.println("get conection");
         if (conexao == null) {
+            System.out.println("errror cx nul");
             throw new RuntimeException("conexao==null");
         }
+        System.out.println("return");
         return conexao;
     }
 
diff --git a/NativeServer2/NativeServer/web/index.html b/NativeServer2/NativeServer/web/index.html
diff --git a/NativeServer2/NativeServer/web/server.jsp b/NativeServer2/NativeServer/web/server.jsp
@@ -12,7 +12,7 @@
         <title>Native Server</title>
     </head>
     <body>
-        <h1>Exemplos de como usar o servidor NativeServer!</h1>
+        <h1>Exemplos de como usar o servidor NativeServer! versao 2.0</h1>
         <span><a href="/NativeServer/actions?acao=cadarvore&id=0&idespecie=1&idade=25&lat=33.333&longt=44.444&idpropietario=1&idusuario=1&status=viva&geocode=Rua%20ABC,%20Lajeado">Clique aqui para inserir uma arvore de exemplo</a></span>
         <br>
         <span><a href="/NativeServer/actions?acao=cadarvore&id=2&idespecie=1&idade=30&lat=13133.333&longt=1244.444&idpropietario=1&idusuario=1&status=morta&geocode=Rua%20ABC,%20LajeadoAlterado">Clique aqui para alterar a arvore id 2</a></span>

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,9 @@ public class ConexaoBD {`
`19`	`19`	`private Connection conexao = null;`
`20`	`20`
`21`	`21`	`public ConexaoBD() {`
	`22`	`+ System.out.println("inicio construtor");`
`22`	`23`	`try {`
	`24`	`+`
`23`	`25`	`// Carrega informações do arquivo de propriedades`
`24`	`26`	`Properties prop = new Properties();`
`25`	`27`	`//prop.load(new FileInputStream("DB.propertie s"));`
`@@ -31,8 +33,9 @@ public ConexaoBD() {`
`31`	`33`
`32`	`34`
`33`	`35`	`// Carrega Driver do Banco de Dados`
	`36`	`+ System.out.println("carregando driver bd");`
`34`	`37`	`Class.forName(dbdriver);`
`35`		`-`
	`38`	`+ System.out.println("carregado");`
`36`	`39`	`if (dbuser.length() != 0) // conexão COM usuário e senha`
`37`	`40`	`{`
`38`	`41`	`conexao = DriverManager.getConnection(dburl, dbuser, dbsenha);`
`@@ -42,23 +45,30 @@ public ConexaoBD() {`
`42`	`45`	`}`
`43`	`46`
`44`	`47`	`} catch (Exception e) {`
	`48`	`+ System.out.println("erro ao criar conex "+e);`
`45`	`49`	`System.err.println(e);`
`46`	`50`	`}`
`47`	`51`	`}`
`48`	`52`
`49`	`53`	`// Retorna instância`
`50`	`54`	`public static ConexaoBD getInstance() {`
	`55`	`+ System.out.println("instanciando");`
`51`	`56`	`if (instancia == null) {`
	`57`	`+ System.out.println("constructor");`
`52`	`58`	`instancia = new ConexaoBD();`
	`59`	`+ System.out.println("done");`
`53`	`60`	`}`
`54`	`61`	`return instancia;`
`55`	`62`	`}`
`56`	`63`
`57`	`64`	`// Retorna conexão`
`58`	`65`	`public Connection getConnection() {`
	`66`	`+ System.out.println("get conection");`
`59`	`67`	`if (conexao == null) {`
	`68`	`+ System.out.println("errror cx nul");`
`60`	`69`	`throw new RuntimeException("conexao==null");`
`61`	`70`	`}`
	`71`	`+ System.out.println("return");`
`62`	`72`	`return conexao;`
`63`	`73`	`}`
`64`	`74`