Download as
Browse Code »

Commit 00506d9b6e8238ad90599d6ff729bcf4fd3003ba

Authored by 96409975520
1 parent a7cf6316
Exists in master

Limpesa de código e criação de variável na propriedade 'config'.

Showing 3 changed files with 28 additions and 10 deletions   Show diff stats
Desenvolvimento/Codificacao/e-Selo/pom.xml
  Diff comments   View file @00506d9
@@ -48,22 +48,33 @@ @@ -48,22 +48,33 @@
48 <version>1.1.3</version> 48 <version>1.1.3</version>
49 <scope>compile</scope> 49 <scope>compile</scope>
50 </dependency> 50 </dependency>
51 - <dependency> 51 + <!-- <dependency>
52 <groupId>org.hibernate</groupId> 52 <groupId>org.hibernate</groupId>
53 <artifactId>hibernate-commons-annotations</artifactId> 53 <artifactId>hibernate-commons-annotations</artifactId>
54 <version>3.2.0.Final</version> 54 <version>3.2.0.Final</version>
  55 + </dependency>-->
  56 + <dependency>
  57 + <groupId>org.hibernate</groupId>
  58 + <artifactId>hibernate-commons-annotations</artifactId>
  59 + <version>3.3.0.ga</version>
55 </dependency> 60 </dependency>
  61 +
56 <dependency> 62 <dependency>
57 <groupId>com.thoughtworks.xstream</groupId> 63 <groupId>com.thoughtworks.xstream</groupId>
58 <artifactId>xstream</artifactId> 64 <artifactId>xstream</artifactId>
59 <version>1.3.1</version> 65 <version>1.3.1</version>
60 </dependency> 66 </dependency>
61 - <dependency> 67 + <!-- <dependency>
62 <groupId>org.hibernate</groupId> 68 <groupId>org.hibernate</groupId>
63 <artifactId>hibernate-core</artifactId> 69 <artifactId>hibernate-core</artifactId>
64 <version>3.6.6.Final</version> 70 <version>3.6.6.Final</version>
65 <scope>compile</scope> 71 <scope>compile</scope>
66 <optional>true</optional> 72 <optional>true</optional>
  73 + </dependency>-->
  74 + <dependency>
  75 + <groupId>org.hibernate</groupId>
  76 + <artifactId>hibernate-core</artifactId>
  77 + <version>5.2.8.Final</version>
67 </dependency> 78 </dependency>
68 <dependency> 79 <dependency>
69 <groupId>org.slf4j</groupId> 80 <groupId>org.slf4j</groupId>
Desenvolvimento/Codificacao/e-Selo/src/main/java/br/com/eselo/controller/AvaliacaoController.java
  Diff comments   View file @00506d9
@@ -83,6 +83,7 @@ public class AvaliacaoController { @@ -83,6 +83,7 @@ public class AvaliacaoController {
83 private final RecomendacaoDAO daoRecomendacao; 83 private final RecomendacaoDAO daoRecomendacao;
84 84
85 private static final String CAMINHO_SELOS = "eselo.config.avaliacao.caminhoSelos"; 85 private static final String CAMINHO_SELOS = "eselo.config.avaliacao.caminhoSelos";
  86 + private static final String URL_SERVICO = "eselo.config.avaliacao.urlServico";
86 87
87 private final Properties properties = new Properties(); 88 private final Properties properties = new Properties();
88 89
@@ -522,10 +523,17 @@ public class AvaliacaoController { @@ -522,10 +523,17 @@ public class AvaliacaoController {
522 @Get("/avaliar-url") 523 @Get("/avaliar-url")
523 @Post("/avaliar-url") 524 @Post("/avaliar-url")
524 public void avaliarUrl(@QueryParam("url") String url) { 525 public void avaliarUrl(@QueryParam("url") String url) {
525 -  
526 - WebChecker.PostParams postParams = WebChecker  
527 - .from("http://localhost:18080/ases/servico-avaliacao-acessibilidade-salvando")  
528 - .withPostRequest(); 526 +
  527 +
  528 + /* String fullContextPath = request.getScheme() + "://"
  529 + + request.getServerName() + ":" + request.getServerPort()
  530 + + request.getContextPath();*/
  531 +
  532 + String urlServico = properties.getProperty(URL_SERVICO);
  533 +
  534 +
  535 + WebChecker.PostParams postParams = WebChecker.from(urlServico).withPostRequest();
  536 +
529 postParams.addParam("url", url); 537 postParams.addParam("url", url);
530 Gson g = new GsonBuilder().create(); 538 Gson g = new GsonBuilder().create();
531 539
@@ -650,9 +658,6 @@ public class AvaliacaoController { @@ -650,9 +658,6 @@ public class AvaliacaoController {
650 html.append(" <li><a accesskey=\"1\" href=\"#inicioConteudo\" id=\"link-conteudo\">Ir"); 658 html.append(" <li><a accesskey=\"1\" href=\"#inicioConteudo\" id=\"link-conteudo\">Ir");
651 html.append(" para o conteúdo <span>1</span>"); 659 html.append(" para o conteúdo <span>1</span>");
652 html.append(" </a></li>"); 660 html.append(" </a></li>");
653 - html.append(" <li><a accesskey=\"2\" href=\"#menu\" id=\"link-menu\">Ir para o");  
654 - html.append(" menu <span>2</span>");  
655 - html.append(" </a></li>");  
656 html.append(" <li><a accesskey=\"4\" href=\"#footer-brasil\" id=\"link-rodape\">Ir"); 661 html.append(" <li><a accesskey=\"4\" href=\"#footer-brasil\" id=\"link-rodape\">Ir");
657 html.append(" para o rodapé <span>4</span>"); 662 html.append(" para o rodapé <span>4</span>");
658 html.append(" </a></li>"); 663 html.append(" </a></li>");
Desenvolvimento/Codificacao/e-Selo/src/main/resources/config.properties
  Diff comments   View file @00506d9
1 -eselo.config.avaliacao.caminhoSelos = imgSelo  
2 \ No newline at end of file 1 \ No newline at end of file
  2 +eselo.config.avaliacao.caminhoSelos = imgSelo
  3 +#eselo.config.avaliacao.urlServico = http://localhost:18080/ases/servico-avaliacao-acessibilidade-salvando
  4 +eselo.config.avaliacao.urlServico = http://189.9.137.162:8080/ases/servico-avaliacao-acessibilidade-salvando