From 652c2cb17518cc51844b3c39556f6b3c77011867 Mon Sep 17 00:00:00 2001 From: andre.guimaraes Date: Tue, 24 Apr 2018 12:44:50 -0300 Subject: [PATCH] Adiciona arquivo -ds que declara os datasources --- .classpath | 6 +----- .project | 1 - pom.xml | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------- src/main/resources/config.properties | 2 +- src/main/webapp/WEB-INF/lib/axis.jar | Bin 1599570 -> 0 bytes src/main/webapp/WEB-INF/lib/commons-discovery-0.2.jar | Bin 71442 -> 0 bytes src/main/webapp/WEB-INF/lib/commons-logging.jar | Bin 74243 -> 0 bytes src/main/webapp/WEB-INF/lib/jaxrpc.jar | Bin 31191 -> 0 bytes src/main/webapp/WEB-INF/lib/saaj.jar | Bin 18979 -> 0 bytes src/main/webapp/WEB-INF/lib/wsdl4j.jar | Bin 168201 -> 0 bytes src/main/webapp/WEB-INF/sei-broker-ds.xml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ src/test/java/br/gov/ans/integracao/sei/testes/FunctionalTest.java | 2 +- 12 files changed, 164 insertions(+), 63 deletions(-) delete mode 100644 src/main/webapp/WEB-INF/lib/axis.jar delete mode 100644 src/main/webapp/WEB-INF/lib/commons-discovery-0.2.jar delete mode 100644 src/main/webapp/WEB-INF/lib/commons-logging.jar delete mode 100644 src/main/webapp/WEB-INF/lib/jaxrpc.jar delete mode 100644 src/main/webapp/WEB-INF/lib/saaj.jar delete mode 100644 src/main/webapp/WEB-INF/lib/wsdl4j.jar create mode 100644 src/main/webapp/WEB-INF/sei-broker-ds.xml diff --git a/.classpath b/.classpath index 63cfcbe..8893b9e 100644 --- a/.classpath +++ b/.classpath @@ -21,6 +21,7 @@ + @@ -28,11 +29,6 @@ - - - - - diff --git a/.project b/.project index f9921f7..76535f0 100644 --- a/.project +++ b/.project @@ -67,6 +67,5 @@ org.jboss.tools.jst.web.kb.kbnature org.jboss.tools.cdi.core.cdinature org.hibernate.eclipse.console.hibernateNature - org.jboss.tools.jsf.jsfnature diff --git a/pom.xml b/pom.xml index 0c38e01..3116114 100644 --- a/pom.xml +++ b/pom.xml @@ -4,10 +4,10 @@ 4.0.0 br.gov.ans sei-broker - 2.4.2 + 2.5 war sei-broker - Projeto demonstrativo de webservice Rest + Camada de integração REST para comunicação com o SEI UTF-8 @@ -24,6 +24,58 @@ 1.8 + + org.wildfly.plugins + wildfly-maven-plugin + 1.0.2.Final + + 60000 + ${username} + ${password} + ${hostname} + ${port} + + + + + + remover-pacote-impantado + install + + undeploy + + + + + ${domain.group} + + + true + ${project.name}.* + fail + + + + + + implantar-novo-pacote + install + + deploy + + + ${project.name} + true + true + + + ${domain.group} + + + + + + @@ -56,11 +108,11 @@ resteasy-jaxb-provider 3.1.0.Final - + - org.jboss.resteasy - resteasy-wadl - 3.1.0.Final + org.jboss.resteasy + resteasy-wadl + 3.1.0.Final @@ -101,7 +153,6 @@ org.jboss.weld weld-core - 2.4.1.Final @@ -112,32 +163,38 @@ 1.4 + + wsdl4j + wsdl4j + 1.6.2 + + org.apache.commons commons-lang3 3.4 - + - commons-io - commons-io - 2.4 + commons-io + commons-io + 2.4 - + - commons-discovery - commons-discovery - 0.5 + commons-discovery + commons-discovery + 0.5 - + - com.google.code.gson - gson - 2.6.2 + com.google.code.gson + gson + 2.6.2 - + br.gov.ans.commons @@ -147,56 +204,56 @@ - org.xhtmlrenderer - flying-saucer-pdf - 9.0.9 + org.xhtmlrenderer + flying-saucer-pdf + 9.0.9 - + - net.sf.jtidy - jtidy - r938 + net.sf.jtidy + jtidy + r938 - + javax.security.jacc javax.security.jacc-api 1.5 - + - com.github.spullara.mustache.java - compiler - 0.8.18 + com.github.spullara.mustache.java + compiler + 0.8.18 - + - commons-codec - commons-codec - 1.10 + commons-codec + commons-codec + 1.10 - + - - junit - junit - 4.12 - test - - - org.hamcrest - hamcrest-all - 1.3 - test - - - com.jayway.restassured - rest-assured - 2.9.0 - test - + + junit + junit + 4.12 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + com.jayway.restassured + rest-assured + 2.9.0 + test + diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties index 685ce42..1175999 100644 --- a/src/main/resources/config.properties +++ b/src/main/resources/config.properties @@ -1 +1 @@ -versao.sistema = V_2.4.2 \ No newline at end of file +versao.sistema = V_2.5 \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/lib/axis.jar b/src/main/webapp/WEB-INF/lib/axis.jar deleted file mode 100644 index 20b09a5..0000000 Binary files a/src/main/webapp/WEB-INF/lib/axis.jar and /dev/null differ diff --git a/src/main/webapp/WEB-INF/lib/commons-discovery-0.2.jar b/src/main/webapp/WEB-INF/lib/commons-discovery-0.2.jar deleted file mode 100644 index b885548..0000000 Binary files a/src/main/webapp/WEB-INF/lib/commons-discovery-0.2.jar and /dev/null differ diff --git a/src/main/webapp/WEB-INF/lib/commons-logging.jar b/src/main/webapp/WEB-INF/lib/commons-logging.jar deleted file mode 100644 index d6fbeda..0000000 Binary files a/src/main/webapp/WEB-INF/lib/commons-logging.jar and /dev/null differ diff --git a/src/main/webapp/WEB-INF/lib/jaxrpc.jar b/src/main/webapp/WEB-INF/lib/jaxrpc.jar deleted file mode 100644 index a2c13d9..0000000 Binary files a/src/main/webapp/WEB-INF/lib/jaxrpc.jar and /dev/null differ diff --git a/src/main/webapp/WEB-INF/lib/saaj.jar b/src/main/webapp/WEB-INF/lib/saaj.jar deleted file mode 100644 index 4ea696e..0000000 Binary files a/src/main/webapp/WEB-INF/lib/saaj.jar and /dev/null differ diff --git a/src/main/webapp/WEB-INF/lib/wsdl4j.jar b/src/main/webapp/WEB-INF/lib/wsdl4j.jar deleted file mode 100644 index 3e73b63..0000000 Binary files a/src/main/webapp/WEB-INF/lib/wsdl4j.jar and /dev/null differ diff --git a/src/main/webapp/WEB-INF/sei-broker-ds.xml b/src/main/webapp/WEB-INF/sei-broker-ds.xml new file mode 100644 index 0000000..483ead2 --- /dev/null +++ b/src/main/webapp/WEB-INF/sei-broker-ds.xml @@ -0,0 +1,49 @@ + + + + ${br.gov.ans.seiBroker.db.oracle.connectionUrl} + ans + + 5 + 500 + true + + + USUARIO_SEI + ${br.gov.ans.seiBroker.db.oracle.password} + + + + true + false + + + + 2 + + + false + + + + ${br.gov.ans.seiBroker.db.mysql.connectionUrl} + com.mysql.jdbc.Driver + com.mysql + TRANSACTION_READ_COMMITTED + + 1 + 30 + true + + + ${br.gov.ans.seiBroker.db.mysql.user} + ${br.gov.ans.seiBroker.db.mysql.password} + + + + true + false + + + + \ No newline at end of file diff --git a/src/test/java/br/gov/ans/integracao/sei/testes/FunctionalTest.java b/src/test/java/br/gov/ans/integracao/sei/testes/FunctionalTest.java index e27200e..2645ac5 100644 --- a/src/test/java/br/gov/ans/integracao/sei/testes/FunctionalTest.java +++ b/src/test/java/br/gov/ans/integracao/sei/testes/FunctionalTest.java @@ -7,7 +7,7 @@ import com.jayway.restassured.RestAssured; public class FunctionalTest { protected final String USUARIO = "andre.guimaraes"; - protected final String SENHA = "Merda de senha!"; + protected final String SENHA = "*****"; protected static final Boolean DESENVOLVIMENTO = true; @BeforeClass -- libgit2 0.21.2