Download as
Browse Code »

Commit cfded036d38799e966f36025eb93230b1ac0e70a

Authored by 96409975520
1 parent c135c4a6
Exists in master

Envio para o repositório.

Showing 17 changed files with 181 additions and 73 deletions   Show diff stats
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<classpath>  
3 - <classpathentry kind="src" output="target/classes" path="src/main/java">  
4 - <attributes>  
5 - <attribute name="optional" value="true"/>  
6 - <attribute name="maven.pomderived" value="true"/>  
7 - </attributes>  
8 - </classpathentry>  
9 - <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">  
10 - <attributes>  
11 - <attribute name="maven.pomderived" value="true"/>  
12 - </attributes>  
13 - </classpathentry>  
14 - <classpathentry kind="src" output="target/test-classes" path="src/test/java">  
15 - <attributes>  
16 - <attribute name="optional" value="true"/>  
17 - <attribute name="maven.pomderived" value="true"/>  
18 - </attributes>  
19 - </classpathentry>  
20 - <classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">  
21 - <attributes>  
22 - <attribute name="maven.pomderived" value="true"/>  
23 - <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>  
24 - </attributes>  
25 - </classpathentry>  
26 - <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">  
27 - <attributes>  
28 - <attribute name="maven.pomderived" value="true"/>  
29 - </attributes>  
30 - </classpathentry>  
31 - <classpathentry exported="true" kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0"/>  
32 - <classpathentry kind="output" path="target/classes"/>  
33 -</classpath> 1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<classpath>
  3 + <classpathentry kind="src" output="target/classes" path="src/main/java">
  4 + <attributes>
  5 + <attribute name="optional" value="true"/>
  6 + <attribute name="maven.pomderived" value="true"/>
  7 + </attributes>
  8 + </classpathentry>
  9 + <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
  10 + <attributes>
  11 + <attribute name="maven.pomderived" value="true"/>
  12 + </attributes>
  13 + </classpathentry>
  14 + <classpathentry kind="src" output="target/test-classes" path="src/test/java">
  15 + <attributes>
  16 + <attribute name="optional" value="true"/>
  17 + <attribute name="maven.pomderived" value="true"/>
  18 + </attributes>
  19 + </classpathentry>
  20 + <classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
  21 + <attributes>
  22 + <attribute name="maven.pomderived" value="true"/>
  23 + <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
  24 + </attributes>
  25 + </classpathentry>
  26 + <classpathentry exported="true" kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0"/>
  27 + <classpathentry exported="true" kind="lib" path="C:/Users/96409975520/Documents/lombok.jar"/>
  28 + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
  29 + <attributes>
  30 + <attribute name="maven.pomderived" value="true"/>
  31 + </attributes>
  32 + </classpathentry>
  33 + <classpathentry kind="output" path="target/classes"/>
  34 +</classpath>
.gitignore 0 → 100644
  Diff comments   View file @cfded03
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +/target/
.settings/org.eclipse.core.runtime.prefs 0 → 100644
  Diff comments   View file @cfded03
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
  1 +eclipse.preferences.version=1
  2 +line.separator=\n
.settings/org.eclipse.wst.common.project.facet.core.prefs.xml 0 → 100644
  Diff comments   View file @cfded03
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
  1 +<root>
  2 + <facet id="jst.jaxrs">
  3 + <node name="libprov">
  4 + <attribute name="provider-id" value="jaxrs-no-op-library-provider"/>
  5 + </node>
  6 + </facet>
  7 +</root>
.settings/org.eclipse.wst.common.project.facet.core.xml
  Diff comments   View file @cfded03
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<faceted-project>  
3 - <fixed facet="wst.jsdt.web"/>  
4 - <installed facet="jst.web" version="2.5"/>  
5 - <installed facet="wst.jsdt.web" version="1.0"/>  
6 - <installed facet="java" version="1.5"/>  
7 -</faceted-project> 1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<faceted-project>
  3 + <fixed facet="wst.jsdt.web"/>
  4 + <installed facet="jst.web" version="2.5"/>
  5 + <installed facet="wst.jsdt.web" version="1.0"/>
  6 + <installed facet="java" version="1.5"/>
  7 + <installed facet="jst.jaxrs" version="1.1"/>
  8 +</faceted-project>
@@ -94,7 +94,8 @@ @@ -94,7 +94,8 @@
94 <artifactId>jasperreports</artifactId> 94 <artifactId>jasperreports</artifactId>
95 <version>5.0.1</version> 95 <version>5.0.1</version>
96 </dependency> 96 </dependency>
97 - 97 +
  98 +
98 <dependency> 99 <dependency>
99 <groupId>org.apache.poi</groupId> 100 <groupId>org.apache.poi</groupId>
100 <artifactId>poi</artifactId> 101 <artifactId>poi</artifactId>
src/main/java/br/com/ases/business/impl/AvaliacaoBusinessImpl.java
  Diff comments   View file @cfded03
@@ -51,7 +51,8 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness { @@ -51,7 +51,8 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness {
51 private static String CSS_VALIDATOR_URL = null; 51 private static String CSS_VALIDATOR_URL = null;
52 // private static String HTML_VALIDATOR_URL = 52 // private static String HTML_VALIDATOR_URL =
53 // "https://validator.w3.org/nu/?doc=#{url}&out=json"; 53 // "https://validator.w3.org/nu/?doc=#{url}&out=json";
54 - private static String HTML_VALIDATOR_URL = "https://validator.w3.org/check?uri=#{url}&output=json"; 54 + //private static String HTML_VALIDATOR_URL = "https://validator.w3.org/check?uri=#{url}&output=json";
  55 + private static String HTML_VALIDATOR_URL = null;
55 56
56 private static String PROPERTIES_PATH = "/WEB-INF/deparaAsesComEselo.properties"; 57 private static String PROPERTIES_PATH = "/WEB-INF/deparaAsesComEselo.properties";
57 private Properties properties = new Properties(); 58 private Properties properties = new Properties();
@@ -201,7 +202,7 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness { @@ -201,7 +202,7 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness {
201 //Separa a crit�rio da recomenda��o sendo (z) de (x.y.z) 202 //Separa a crit�rio da recomenda��o sendo (z) de (x.y.z)
202 criterioProperties = recomendacaoCriterio[2]; 203 criterioProperties = recomendacaoCriterio[2];
203 204
204 - 205 +
205 if (!recomendacaoProperties.equalsIgnoreCase(recomendacaoAntiga) || recomendacaoAntiga.equalsIgnoreCase("")) { 206 if (!recomendacaoProperties.equalsIgnoreCase(recomendacaoAntiga) || recomendacaoAntiga.equalsIgnoreCase("")) {
206 207
207 if(lsRecomendacaoCriterios.size() > 0) 208 if(lsRecomendacaoCriterios.size() > 0)
@@ -535,6 +536,7 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness { @@ -535,6 +536,7 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness {
535 536
536 this.CSS_VALIDATOR_URL = this.eseloProperties.getUrl("linkAvaliacaoCSS"); 537 this.CSS_VALIDATOR_URL = this.eseloProperties.getUrl("linkAvaliacaoCSS");
537 538
  539 +
538 if (isCss) { 540 if (isCss) {
539 String content = WebChecker.from(CSS_VALIDATOR_URL.replace("#{url}", URLEncoder.encode(UrlConvertida.toExternalForm(), "UTF-8"))).withGetRequest().execute().getContent(); 541 String content = WebChecker.from(CSS_VALIDATOR_URL.replace("#{url}", URLEncoder.encode(UrlConvertida.toExternalForm(), "UTF-8"))).withGetRequest().execute().getContent();
540 542
@@ -566,6 +568,7 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness { @@ -566,6 +568,7 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness {
566 568
567 } else { 569 } else {
568 570
  571 + this.HTML_VALIDATOR_URL = this.eseloProperties.getUrl("linkAvaliacaoHtml");
569 572
570 String content = WebChecker.from(HTML_VALIDATOR_URL.replace("#{url}", URLEncoder.encode(UrlConvertida.toExternalForm(), "UTF-8"))).withGetRequest().execute().getContent(); 573 String content = WebChecker.from(HTML_VALIDATOR_URL.replace("#{url}", URLEncoder.encode(UrlConvertida.toExternalForm(), "UTF-8"))).withGetRequest().execute().getContent();
571 Gson g = new GsonBuilder().create(); 574 Gson g = new GsonBuilder().create();
src/main/java/br/com/ases/controller/AvaliacaoController.java
  Diff comments   View file @cfded03
@@ -320,6 +320,11 @@ public class AvaliacaoController { @@ -320,6 +320,11 @@ public class AvaliacaoController {
320 boolean multimedia, boolean form, boolean behavior, int tiporel) { 320 boolean multimedia, boolean form, boolean behavior, int tiporel) {
321 321
322 Validate validate = new Validate(this.validator); 322 Validate validate = new Validate(this.validator);
  323 + if (!url.startsWith("http"))
  324 + {
  325 + url = "http://" + url;
  326 + }
  327 +
323 if (validate.url(url)) { 328 if (validate.url(url)) {
324 329
325 /* 330 /*
@@ -327,9 +332,7 @@ public class AvaliacaoController { @@ -327,9 +332,7 @@ public class AvaliacaoController {
327 * mark, content, presentation, multimedia, form, behavior, tiporel, true); 332 * mark, content, presentation, multimedia, form, behavior, tiporel, true);
328 */ 333 */
329 334
330 - if (url.startsWith("www"))  
331 - url = "http://" + url;  
332 - 335 +
333 WebChecker pagina = WebChecker.from(url).withGetRequest().execute(); 336 WebChecker pagina = WebChecker.from(url).withGetRequest().execute();
334 337
335 338
@@ -600,6 +603,7 @@ public class AvaliacaoController { @@ -600,6 +603,7 @@ public class AvaliacaoController {
600 603
601 } 604 }
602 605
  606 + @Get("/avaliar-codigo")
603 @Post("/avaliar-codigo") 607 @Post("/avaliar-codigo")
604 public void avaliarPlainText(String html, boolean mark, boolean content, boolean presentation, 608 public void avaliarPlainText(String html, boolean mark, boolean content, boolean presentation,
605 boolean multimedia, boolean form, boolean behavior, int tiporel) throws IOException { 609 boolean multimedia, boolean form, boolean behavior, int tiporel) throws IOException {
@@ -872,6 +876,7 @@ public class AvaliacaoController { @@ -872,6 +876,7 @@ public class AvaliacaoController {
872 e.printStackTrace(); 876 e.printStackTrace();
873 } 877 }
874 result.include("linkAvaliacaoCSSExterno",this.eseloProperties.getUrl("linkAvaliacaoCSSExterno")); 878 result.include("linkAvaliacaoCSSExterno",this.eseloProperties.getUrl("linkAvaliacaoCSSExterno"));
  879 + result.include("linkAvaliacaoHtmlExterno",this.eseloProperties.getUrl("linkAvaliacaoHtmlExterno"));
875 } 880 }
876 881
877 private String encodeURI(String url) throws UnsupportedEncodingException { 882 private String encodeURI(String url) throws UnsupportedEncodingException {
@@ -971,7 +976,8 @@ public class AvaliacaoController { @@ -971,7 +976,8 @@ public class AvaliacaoController {
971 @Post("/servico-avaliacao-acessibilidade-salvando") 976 @Post("/servico-avaliacao-acessibilidade-salvando")
972 public void servicoAvaliacaoAcessibilidadeSalvando(@QueryParam("url") String url) { 977 public void servicoAvaliacaoAcessibilidadeSalvando(@QueryParam("url") String url) {
973 978
974 - Boolean retornoNota = false; 979 + //Boolean retornoNota = false;
  980 + String retornoNota = "false";
975 ErroWs erroWs = new ErroWs(); 981 ErroWs erroWs = new ErroWs();
976 this.dataHoraAvaliacao = (String) DateUtil.dataHoraAtual(); 982 this.dataHoraAvaliacao = (String) DateUtil.dataHoraAtual();
977 983
@@ -980,11 +986,13 @@ public class AvaliacaoController { @@ -980,11 +986,13 @@ public class AvaliacaoController {
980 986
981 Validate validate = new Validate(this.validator); 987 Validate validate = new Validate(this.validator);
982 988
983 - if (validate.url(url)) {  
984 -  
985 - if (!url.startsWith("http")) { 989 + if (!url.startsWith("http")) {
986 url = "http://" + url; 990 url = "http://" + url;
987 } 991 }
  992 +
  993 + if (validate.url(url)) {
  994 +
  995 +
988 996
989 997
990 WebChecker pagina = WebChecker.from(url).withGetRequest().execute(); 998 WebChecker pagina = WebChecker.from(url).withGetRequest().execute();
@@ -1021,10 +1029,14 @@ public class AvaliacaoController { @@ -1021,10 +1029,14 @@ public class AvaliacaoController {
1021 avaliacaoBusiness.obterNotaEselo(checker.getDocument(), url, mapaListaOcorrencias, true); 1029 avaliacaoBusiness.obterNotaEselo(checker.getDocument(), url, mapaListaOcorrencias, true);
1022 if(nota != null) 1030 if(nota != null)
1023 { 1031 {
1024 - retornoNota = true; 1032 + retornoNota = "true";
1025 } 1033 }
1026 1034
1027 } 1035 }
  1036 + else
  1037 + {
  1038 + retornoNota = "Url não responde";
  1039 + }
1028 1040
1029 } catch (Exception e) { 1041 } catch (Exception e) {
1030 1042
@@ -1037,9 +1049,14 @@ public class AvaliacaoController { @@ -1037,9 +1049,14 @@ public class AvaliacaoController {
1037 1049
1038 mensagensErros.add(e.getMessage()); 1050 mensagensErros.add(e.getMessage());
1039 erroWs.setMensagem(mensagensErros); 1051 erroWs.setMensagem(mensagensErros);
1040 -  
1041 - }  
1042 - result.use(Results.json()).withoutRoot().from(retornoNota).serialize(); 1052 + retornoNota = e.getMessage();
  1053 +
  1054 + }
  1055 + finally
  1056 + {
  1057 + result.use(Results.json()).withoutRoot().from(retornoNota).serialize();
  1058 + }
  1059 +
1043 } 1060 }
1044 1061
1045 @Get("/servico-avaliacao-acessibilidade") 1062 @Get("/servico-avaliacao-acessibilidade")
src/main/java/br/com/ases/domain/HtmlValidation.java
  Diff comments   View file @cfded03
@@ -7,6 +7,7 @@ public class HtmlValidation { @@ -7,6 +7,7 @@ public class HtmlValidation {
7 7
8 List<Message> messages = new ArrayList<HtmlValidation.Message>(); 8 List<Message> messages = new ArrayList<HtmlValidation.Message>();
9 9
  10 +
10 11
11 public List<Message> getMessages() { 12 public List<Message> getMessages() {
12 return messages; 13 return messages;
src/main/java/br/com/ases/model/utilities/Validate.java
  Diff comments   View file @cfded03
@@ -10,6 +10,8 @@ import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler; @@ -10,6 +10,8 @@ import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler;
10 import org.apache.commons.httpclient.HttpClient; 10 import org.apache.commons.httpclient.HttpClient;
11 import org.apache.commons.httpclient.HttpMethod; 11 import org.apache.commons.httpclient.HttpMethod;
12 import org.apache.commons.httpclient.methods.GetMethod; 12 import org.apache.commons.httpclient.methods.GetMethod;
  13 +import org.apache.commons.httpclient.methods.HeadMethod;
  14 +import org.apache.commons.httpclient.params.HttpConnectionParams;
13 import org.apache.commons.httpclient.params.HttpMethodParams; 15 import org.apache.commons.httpclient.params.HttpMethodParams;
14 16
15 import br.com.ases.model.entity.Contato; 17 import br.com.ases.model.entity.Contato;
@@ -117,10 +119,33 @@ public class Validate { @@ -117,10 +119,33 @@ public class Validate {
117 URL UrlConvertida; 119 URL UrlConvertida;
118 120
119 try { 121 try {
  122 +
  123 + clienteHTTPJakartaCommons = new HttpClient();
  124 + clienteHTTPJakartaCommons.getParams().setParameter(HttpMethodParams.RETRY_HANDLER,
  125 + new DefaultHttpMethodRetryHandler(3, false));
  126 + clienteHTTPJakartaCommons.getParams().setParameter("http.protocol.allow-circular-redirects",
  127 + true);
  128 + clienteHTTPJakartaCommons.getParams().setParameter(HttpConnectionParams.CONNECTION_TIMEOUT, new Integer(10000));
  129 +
  130 +
  131 + metodoRequisicaoGET = new HeadMethod(campo);// GetMethod(UrlConvertida.toExternalForm());// URLEncoder.encode(UrlConvertida.toExternalForm(),
  132 + // "UTF-8"));
  133 +
  134 + metodoRequisicaoGET.setRequestHeader(usuario, agente);
  135 + // metodoRequisicaoGET.setFollowRedirects(true);
  136 +
  137 + codResponse = clienteHTTPJakartaCommons.executeMethod(metodoRequisicaoGET);
  138 +
  139 + // if(codResponse >= 400 && codResponse < 500)
  140 + if(codResponse != 200)
  141 + {
  142 + metodoRequisicaoGET = new GetMethod(campo);
  143 + codResponse = clienteHTTPJakartaCommons.executeMethod(metodoRequisicaoGET);
  144 + }
120 145
121 //UrlConvertida = new URL(campo); 146 //UrlConvertida = new URL(campo);
122 147
123 - clienteHTTPJakartaCommons = new HttpClient(); 148 + /*clienteHTTPJakartaCommons = new HttpClient();
124 clienteHTTPJakartaCommons.getParams().setParameter(HttpMethodParams.RETRY_HANDLER, 149 clienteHTTPJakartaCommons.getParams().setParameter(HttpMethodParams.RETRY_HANDLER,
125 new DefaultHttpMethodRetryHandler(5, false)); 150 new DefaultHttpMethodRetryHandler(5, false));
126 clienteHTTPJakartaCommons.getParams().setParameter("http.protocol.allow-circular-redirects", 151 clienteHTTPJakartaCommons.getParams().setParameter("http.protocol.allow-circular-redirects",
@@ -131,9 +156,9 @@ public class Validate { @@ -131,9 +156,9 @@ public class Validate {
131 metodoRequisicaoGET.setRequestHeader(usuario, agente); 156 metodoRequisicaoGET.setRequestHeader(usuario, agente);
132 metodoRequisicaoGET.setFollowRedirects(true); 157 metodoRequisicaoGET.setFollowRedirects(true);
133 158
134 - codResponse = clienteHTTPJakartaCommons.executeMethod(metodoRequisicaoGET); 159 + codResponse = clienteHTTPJakartaCommons.executeMethod(metodoRequisicaoGET);*/
135 160
136 - return codResponse; 161 +
137 162
138 } catch (MalformedURLException e) { 163 } catch (MalformedURLException e) {
139 e.printStackTrace(); 164 e.printStackTrace();
@@ -148,6 +173,13 @@ public class Validate { @@ -148,6 +173,13 @@ public class Validate {
148 // + " é considerada inválida.", "warning")); 173 // + " é considerada inválida.", "warning"));
149 return -1; 174 return -1;
150 } 175 }
  176 + finally
  177 + {
  178 + if (metodoRequisicaoGET != null) {
  179 + metodoRequisicaoGET.releaseConnection();
  180 + }
  181 + }
  182 + return codResponse;
151 183
152 } 184 }
153 185
src/main/java/br/com/ases/ws/model/ElementoLink.java 0 → 100644
  Diff comments   View file @cfded03
@@ -0,0 +1,19 @@ @@ -0,0 +1,19 @@
  1 +package br.com.ases.ws.model;
  2 +
  3 +import javax.swing.text.Element;
  4 +
  5 +public class ElementoLink {
  6 +
  7 + private Element link;
  8 +
  9 + public Element getElemento() {
  10 + return link;
  11 + }
  12 +
  13 + public void setElemento(Element elemento) {
  14 + this.link = elemento;
  15 + }
  16 +
  17 +
  18 +
  19 +}
src/main/webapp/WEB-INF/eselo.properties
  Diff comments   View file @cfded03
1 #url=https://sistemas-treinamento.ifbaiano.edu.br/intg_ases_selo/calcular-nota 1 #url=https://sistemas-treinamento.ifbaiano.edu.br/intg_ases_selo/calcular-nota
2 -u#rl=http://localhost:18080/eselo/calcular-nota 2 +#url=http://localhost:18080/eselo/calcular-nota
3 url=http://189.9.137.162:8080/eselo/calcular-nota 3 url=http://189.9.137.162:8080/eselo/calcular-nota
4 #url=http://eselo-prd.brazilsouth.cloudapp.azure.com:8080/calcular-nota 4 #url=http://eselo-prd.brazilsouth.cloudapp.azure.com:8080/calcular-nota
5 5
6 6
7 7
8 #urlAutenticacaoServico=http://189.9.137.162:8080/eselo/existe_usuario_servico_web 8 #urlAutenticacaoServico=http://189.9.137.162:8080/eselo/existe_usuario_servico_web
9 -urlAutenticacaoServico=http://localhost:18080/eselo/existe_usuario_servico_web 9 +#urlAutenticacaoServico=http://localhost:18080/eselo/existe_usuario_servico_web
  10 +urlAutenticacaoServico=http://eselo-prd.brazilsouth.cloudapp.azure.com:8080/existe_usuario_servico_web
10 11
11 #Esconde a nota caso não esteja usando o ESELO 12 #Esconde a nota caso não esteja usando o ESELO
12 #Se atribuir o valor "sem_nota" na chave 'sem_nota', não exibirá a nota 13 #Se atribuir o valor "sem_nota" na chave 'sem_nota', não exibirá a nota
@@ -17,5 +18,19 @@ mensagem_avaliacao =Nota e Resumo da Avaliação de Acessibilidade @@ -17,5 +18,19 @@ mensagem_avaliacao =Nota e Resumo da Avaliação de Acessibilidade
17 18
18 19
19 20
20 -linkAvaliacaoCSS=http://189.9.137.162:8080/css-validator/validator?uri=#{url}&warning=0&output=soap12  
21 -linkAvaliacaoCSSExterno=http://189.9.137.162:8080/css-validator/validator?uri=  
22 \ No newline at end of file 21 \ No newline at end of file
  22 +linkAvaliacaoCSS=http://jigsaw.w3.org/css-validator/validator?uri=#{url}&profile=css3svg&warning=0&output=soap12
  23 +linkAvaliacaoCSSExterno=http://jigsaw.w3.org/css-validator/validator?uri=
  24 +
  25 +linkAvaliacaoHtml=https://validator.w3.org/check?uri=#{url}&output=json
  26 +linkAvaliacaoHtmlExterno=https://validator.w3.org/check?uri=
  27 +
  28 +
  29 +
  30 +#É preciso alterar também no projeto emag-checker na classe MarkEvaluation.java
  31 +#linkAvaliacaoCSS=http://css.ases.nuvem.gov.br:8080/validator?uri=#{url}&warning=0&output=soap12
  32 +#linkAvaliacaoCSSExterno=http://css.ases.nuvem.gov.br:8080/validator?uri=
  33 +
  34 +
  35 +#É preciso alterar também no projeto emag-checker na classe MarkEvaluation.java
  36 +#linkAvaliacaoHtml=http://html.ases.nuvem.gov.br:8080/w3c-validator/check?uri=#{url}&output=json
  37 +#linkAvaliacaoHtmlExterno=http://html.ases.nuvem.gov.br:8080/w3c-validator/check?uri=
23 \ No newline at end of file 38 \ No newline at end of file
src/main/webapp/WEB-INF/jsp/avaliacao/detalhesAvaliacao.jsp
  Diff comments   View file @cfded03
@@ -116,7 +116,7 @@ @@ -116,7 +116,7 @@
116 varStatus="index"> 116 varStatus="index">
117 <c:if test="${fn:contains(aReqIsW3c, req)}"> 117 <c:if test="${fn:contains(aReqIsW3c, req)}">
118 <c:if test="${fn:contains(aReqIsCss, req) && linkCssJaAdicionado == false}"> 118 <c:if test="${fn:contains(aReqIsCss, req) && linkCssJaAdicionado == false}">
119 - <a href=" ${linkAvaliacaoCSSExterno}${urlFormatada}"> Serviço de validação de CSS do W3C (link para um novo sitio) 119 + <a href=" ${linkAvaliacaoCSSExterno}${urlFormatada}&profile=css3svg"> Serviço de validação de CSS do W3C (link para um novo sitio)
120 120
121 </a> 121 </a>
122 <!--<a href=" http://jigsaw.w3.org/css-validator/validator?uri=${urlFormatada}"> Serviço de validação de CSS do W3C (link para um novo sitio)</a> --> 122 <!--<a href=" http://jigsaw.w3.org/css-validator/validator?uri=${urlFormatada}"> Serviço de validação de CSS do W3C (link para um novo sitio)</a> -->
@@ -125,8 +125,10 @@ @@ -125,8 +125,10 @@
125 125
126 <c:if test="${!fn:contains(aReqIsCss, req) && linkHtmlJaAdicionado == false}"> 126 <c:if test="${!fn:contains(aReqIsCss, req) && linkHtmlJaAdicionado == false}">
127 <a 127 <a
128 - href="http://validator.w3.org/check?uri=http%3A%2F%2F${urlFormatada}">Serviço de validação de HTML do W3C (link para um novo sitio) 128 + href="${linkAvaliacaoHtmlExterno}${urlFormatada}">Serviço de validação de HTML do W3C (link para um novo sitio)
129 </a> 129 </a>
  130 + <!-- href="http://validator.w3.org/check?uri=http%3A%2F%2F${urlFormatada}">Serviço de validação de HTML do W3C (link para um novo sitio)-->
  131 +
130 <c:set var="linkHtmlJaAdicionado" value="true" /> 132 <c:set var="linkHtmlJaAdicionado" value="true" />
131 </c:if> 133 </c:if>
132 </c:if> 134 </c:if>
src/main/webapp/inicial_arquivos/css/avaliar.css
  Diff comments   View file @cfded03
@@ -340,7 +340,7 @@ @@ -340,7 +340,7 @@
340 } 340 }
341 .imgErro 341 .imgErro
342 { 342 {
343 - background-image: url("/ases/inicial_arquivos/imagens/stop.gif"); 343 + background-image: url("/inicial_arquivos/imagens/stop.gif");
344 background-repeat: no-repeat; 344 background-repeat: no-repeat;
345 height: 22px; 345 height: 22px;
346 } 346 }
@@ -351,13 +351,13 @@ @@ -351,13 +351,13 @@
351 351
352 .imgAviso 352 .imgAviso
353 { 353 {
354 - background-image: url("/ases/inicial_arquivos/imagens/alert.gif"); 354 + background-image: url("/inicial_arquivos/imagens/alert.gif");
355 background-repeat: no-repeat; 355 background-repeat: no-repeat;
356 height: 22px; 356 height: 22px;
357 } 357 }
358 #pdf 358 #pdf
359 { 359 {
360 - background-image: url("/ases/inicial_arquivos/imagens/pdf.png"); 360 + background-image: url("/inicial_arquivos/imagens/pdf.png");
361 background-repeat: no-repeat; 361 background-repeat: no-repeat;
362 height: 30px; 362 height: 30px;
363 } 363 }
@@ -684,7 +684,7 @@ @@ -684,7 +684,7 @@
684 } 684 }
685 .imgErro 685 .imgErro
686 { 686 {
687 - background-image: url("/ases/inicial_arquivos/imagens/stop.gif"); 687 + background-image: url("/inicial_arquivos/imagens/stop.gif");
688 background-repeat: no-repeat; 688 background-repeat: no-repeat;
689 height: 22px; 689 height: 22px;
690 } 690 }
@@ -695,14 +695,14 @@ @@ -695,14 +695,14 @@
695 695
696 .imgAviso 696 .imgAviso
697 { 697 {
698 - background-image: url("/ases/inicial_arquivos/imagens/alert.gif"); 698 + background-image: url("/inicial_arquivos/imagens/alert.gif");
699 background-repeat: no-repeat; 699 background-repeat: no-repeat;
700 height: 22px; 700 height: 22px;
701 } 701 }
702 702
703 #pdf 703 #pdf
704 { 704 {
705 - background-image: url("/ases/inicial_arquivos/imagens/pdf.png"); 705 + background-image: url("/inicial_arquivos/imagens/pdf.png");
706 background-repeat: no-repeat; 706 background-repeat: no-repeat;
707 height: 30px; 707 height: 30px;
708 } 708 }
target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
  Diff comments   View file @cfded03
1 Manifest-Version: 1.0 1 Manifest-Version: 1.0
2 Built-By: 96409975520 2 Built-By: 96409975520
3 -Build-Jdk: 1.8.0_66 3 +Build-Jdk: 1.8.0_60
4 Created-By: Maven Integration for Eclipse 4 Created-By: Maven Integration for Eclipse
5 5
target/m2e-wtp/web-resources/META-INF/maven/br.com.ases/ases/pom.properties
  Diff comments   View file @cfded03
1 #Generated by Maven Integration for Eclipse 1 #Generated by Maven Integration for Eclipse
2 -#Wed Apr 20 08:33:57 BRT 2016 2 +#Wed May 30 13:38:56 BRT 2018
3 version=1.0 3 version=1.0
4 groupId=br.com.ases 4 groupId=br.com.ases
5 m2e.projectName=ases 5 m2e.projectName=ases
target/m2e-wtp/web-resources/META-INF/maven/br.com.ases/ases/pom.xml
  Diff comments   View file @cfded03
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 <name>Ases Webapp</name> 8 <name>Ases Webapp</name>
9 9
10 <url>http://maven.apache.org</url> 10 <url>http://maven.apache.org</url>
  11 +
11 <dependencies> 12 <dependencies>
12 <dependency> 13 <dependency>
13 <groupId>junit</groupId> 14 <groupId>junit</groupId>
@@ -93,7 +94,8 @@ @@ -93,7 +94,8 @@
93 <artifactId>jasperreports</artifactId> 94 <artifactId>jasperreports</artifactId>
94 <version>5.0.1</version> 95 <version>5.0.1</version>
95 </dependency> 96 </dependency>
96 - 97 +
  98 +
97 <dependency> 99 <dependency>
98 <groupId>org.apache.poi</groupId> 100 <groupId>org.apache.poi</groupId>
99 <artifactId>poi</artifactId> 101 <artifactId>poi</artifactId>
@@ -142,7 +144,11 @@ @@ -142,7 +144,11 @@
142 <artifactId>hibernate-validator</artifactId> 144 <artifactId>hibernate-validator</artifactId>
143 <version>4.2.0.Final</version> 145 <version>4.2.0.Final</version>
144 </dependency> 146 </dependency>
145 - 147 + <dependency>
  148 + <groupId>org.json</groupId>
  149 + <artifactId>json</artifactId>
  150 + <version>20140107</version>
  151 +</dependency>
146 </dependencies> 152 </dependencies>
147 <build> 153 <build>
148 <finalName>ases</finalName> 154 <finalName>ases</finalName>