Commit 652c2cb17518cc51844b3c39556f6b3c77011867
1 parent
e46765ee
Exists in
master
and in
1 other branch
Adiciona arquivo -ds que declara os datasources
Adicionado arquivo sei-broker-ds.xml que declara os datasource utilizados pela aplicação, configurações para deploy automatico pelo Maven, remoção de libs que foram importadas automaticamente na criação dos stubs e declaração dessas dependências no pom.xml.
Showing
12 changed files
with
164 additions
and
63 deletions
Show diff stats
.classpath
... | ... | @@ -21,6 +21,7 @@ |
21 | 21 | <attributes> |
22 | 22 | <attribute name="maven.pomderived" value="true"/> |
23 | 23 | <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/> |
24 | + <attribute name="owner.project.facets" value="jboss.m2"/> | |
24 | 25 | </attributes> |
25 | 26 | </classpathentry> |
26 | 27 | <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"> |
... | ... | @@ -28,11 +29,6 @@ |
28 | 29 | <attribute name="maven.pomderived" value="true"/> |
29 | 30 | </attributes> |
30 | 31 | </classpathentry> |
31 | - <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss EAP 7"> | |
32 | - <attributes> | |
33 | - <attribute name="owner.project.facets" value="#system#;jst.jsf;jst.web"/> | |
34 | - </attributes> | |
35 | - </classpathentry> | |
36 | 32 | <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> |
37 | 33 | <attributes> |
38 | 34 | <attribute name="maven.pomderived" value="true"/> | ... | ... |
.project
... | ... | @@ -67,6 +67,5 @@ |
67 | 67 | <nature>org.jboss.tools.jst.web.kb.kbnature</nature> |
68 | 68 | <nature>org.jboss.tools.cdi.core.cdinature</nature> |
69 | 69 | <nature>org.hibernate.eclipse.console.hibernateNature</nature> |
70 | - <nature>org.jboss.tools.jsf.jsfnature</nature> | |
71 | 70 | </natures> |
72 | 71 | </projectDescription> | ... | ... |
pom.xml
... | ... | @@ -4,10 +4,10 @@ |
4 | 4 | <modelVersion>4.0.0</modelVersion> |
5 | 5 | <groupId>br.gov.ans</groupId> |
6 | 6 | <artifactId>sei-broker</artifactId> |
7 | - <version>2.4.2</version> | |
7 | + <version>2.5</version> | |
8 | 8 | <packaging>war</packaging> |
9 | 9 | <name>sei-broker</name> |
10 | - <description>Projeto demonstrativo de webservice Rest</description> | |
10 | + <description>Camada de integração REST para comunicação com o SEI</description> | |
11 | 11 | |
12 | 12 | <properties> |
13 | 13 | <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
... | ... | @@ -24,6 +24,58 @@ |
24 | 24 | <target>1.8</target> |
25 | 25 | </configuration> |
26 | 26 | </plugin> |
27 | + <plugin> | |
28 | + <groupId>org.wildfly.plugins</groupId> | |
29 | + <artifactId>wildfly-maven-plugin</artifactId> | |
30 | + <version>1.0.2.Final</version> | |
31 | + <configuration> | |
32 | + <timeout>60000</timeout> | |
33 | + <username>${username}</username> | |
34 | + <password>${password}</password> | |
35 | + <hostname>${hostname}</hostname> | |
36 | + <port>${port}</port> | |
37 | + </configuration> | |
38 | + | |
39 | + <executions> | |
40 | + <!-- Remover war implantado --> | |
41 | + <execution> | |
42 | + <id>remover-pacote-impantado</id> | |
43 | + <phase>install</phase> | |
44 | + <goals> | |
45 | + <goal>undeploy</goal> | |
46 | + </goals> | |
47 | + <configuration> | |
48 | + <domain> | |
49 | + <serverGroups> | |
50 | + <server-group>${domain.group}</server-group> | |
51 | + </serverGroups> | |
52 | + </domain> | |
53 | + <ignoreMissingDeployment>true</ignoreMissingDeployment> | |
54 | + <match-pattern>${project.name}.*</match-pattern> | |
55 | + <matchPatternStrategy>fail</matchPatternStrategy> | |
56 | + </configuration> | |
57 | + </execution> | |
58 | + | |
59 | + <!-- Implantar war --> | |
60 | + <execution> | |
61 | + <id>implantar-novo-pacote</id> | |
62 | + <phase>install</phase> | |
63 | + <goals> | |
64 | + <goal>deploy</goal> | |
65 | + </goals> | |
66 | + <configuration> | |
67 | + <runtimeName>${project.name}</runtimeName> | |
68 | + <deployEnabled>true</deployEnabled> | |
69 | + <force>true</force> | |
70 | + <domain> | |
71 | + <server-groups> | |
72 | + <server-group>${domain.group}</server-group> | |
73 | + </server-groups> | |
74 | + </domain> | |
75 | + </configuration> | |
76 | + </execution> | |
77 | + </executions> | |
78 | + </plugin> | |
27 | 79 | </plugins> |
28 | 80 | </build> |
29 | 81 | |
... | ... | @@ -56,11 +108,11 @@ |
56 | 108 | <artifactId>resteasy-jaxb-provider</artifactId> |
57 | 109 | <version>3.1.0.Final</version> |
58 | 110 | </dependency> |
59 | - | |
111 | + | |
60 | 112 | <dependency> |
61 | - <groupId>org.jboss.resteasy</groupId> | |
62 | - <artifactId>resteasy-wadl</artifactId> | |
63 | - <version>3.1.0.Final</version> | |
113 | + <groupId>org.jboss.resteasy</groupId> | |
114 | + <artifactId>resteasy-wadl</artifactId> | |
115 | + <version>3.1.0.Final</version> | |
64 | 116 | </dependency> |
65 | 117 | |
66 | 118 | <!-- SERVLET --> |
... | ... | @@ -101,7 +153,6 @@ |
101 | 153 | <dependency> |
102 | 154 | <groupId>org.jboss.weld</groupId> |
103 | 155 | <artifactId>weld-core</artifactId> |
104 | -<!-- <version>2.2.15.Final</version> --> | |
105 | 156 | <version>2.4.1.Final</version> |
106 | 157 | </dependency> |
107 | 158 | |
... | ... | @@ -112,32 +163,38 @@ |
112 | 163 | <version>1.4</version> |
113 | 164 | </dependency> |
114 | 165 | |
166 | + <dependency> | |
167 | + <groupId>wsdl4j</groupId> | |
168 | + <artifactId>wsdl4j</artifactId> | |
169 | + <version>1.6.2</version> | |
170 | + </dependency> | |
171 | + | |
115 | 172 | <!-- COMMONS --> |
116 | 173 | <dependency> |
117 | 174 | <groupId>org.apache.commons</groupId> |
118 | 175 | <artifactId>commons-lang3</artifactId> |
119 | 176 | <version>3.4</version> |
120 | 177 | </dependency> |
121 | - | |
178 | + | |
122 | 179 | <dependency> |
123 | - <groupId>commons-io</groupId> | |
124 | - <artifactId>commons-io</artifactId> | |
125 | - <version>2.4</version> | |
180 | + <groupId>commons-io</groupId> | |
181 | + <artifactId>commons-io</artifactId> | |
182 | + <version>2.4</version> | |
126 | 183 | </dependency> |
127 | - | |
184 | + | |
128 | 185 | <dependency> |
129 | - <groupId>commons-discovery</groupId> | |
130 | - <artifactId>commons-discovery</artifactId> | |
131 | - <version>0.5</version> | |
186 | + <groupId>commons-discovery</groupId> | |
187 | + <artifactId>commons-discovery</artifactId> | |
188 | + <version>0.5</version> | |
132 | 189 | </dependency> |
133 | - | |
190 | + | |
134 | 191 | <!-- GSON --> |
135 | 192 | <dependency> |
136 | - <groupId>com.google.code.gson</groupId> | |
137 | - <artifactId>gson</artifactId> | |
138 | - <version>2.6.2</version> | |
193 | + <groupId>com.google.code.gson</groupId> | |
194 | + <artifactId>gson</artifactId> | |
195 | + <version>2.6.2</version> | |
139 | 196 | </dependency> |
140 | - | |
197 | + | |
141 | 198 | <!-- HASH --> |
142 | 199 | <dependency> |
143 | 200 | <groupId>br.gov.ans.commons</groupId> |
... | ... | @@ -147,56 +204,56 @@ |
147 | 204 | |
148 | 205 | <!-- PDF --> |
149 | 206 | <dependency> |
150 | - <groupId>org.xhtmlrenderer</groupId> | |
151 | - <artifactId>flying-saucer-pdf</artifactId> | |
152 | - <version>9.0.9</version> | |
207 | + <groupId>org.xhtmlrenderer</groupId> | |
208 | + <artifactId>flying-saucer-pdf</artifactId> | |
209 | + <version>9.0.9</version> | |
153 | 210 | </dependency> |
154 | - | |
211 | + | |
155 | 212 | <dependency> |
156 | - <groupId>net.sf.jtidy</groupId> | |
157 | - <artifactId>jtidy</artifactId> | |
158 | - <version>r938</version> | |
213 | + <groupId>net.sf.jtidy</groupId> | |
214 | + <artifactId>jtidy</artifactId> | |
215 | + <version>r938</version> | |
159 | 216 | </dependency> |
160 | - | |
217 | + | |
161 | 218 | <!-- JAVAX SECURITY --> |
162 | 219 | <dependency> |
163 | 220 | <groupId>javax.security.jacc</groupId> |
164 | 221 | <artifactId>javax.security.jacc-api</artifactId> |
165 | 222 | <version>1.5</version> |
166 | 223 | </dependency> |
167 | - | |
224 | + | |
168 | 225 | <!-- Template MUSTACHE --> |
169 | 226 | <dependency> |
170 | - <groupId>com.github.spullara.mustache.java</groupId> | |
171 | - <artifactId>compiler</artifactId> | |
172 | - <version>0.8.18</version> | |
227 | + <groupId>com.github.spullara.mustache.java</groupId> | |
228 | + <artifactId>compiler</artifactId> | |
229 | + <version>0.8.18</version> | |
173 | 230 | </dependency> |
174 | - | |
231 | + | |
175 | 232 | <!-- BASE64 --> |
176 | 233 | <dependency> |
177 | - <groupId>commons-codec</groupId> | |
178 | - <artifactId>commons-codec</artifactId> | |
179 | - <version>1.10</version> | |
234 | + <groupId>commons-codec</groupId> | |
235 | + <artifactId>commons-codec</artifactId> | |
236 | + <version>1.10</version> | |
180 | 237 | </dependency> |
181 | - | |
238 | + | |
182 | 239 | <!-- REST Assure --> |
183 | - <dependency> | |
184 | - <groupId>junit</groupId> | |
185 | - <artifactId>junit</artifactId> | |
186 | - <version>4.12</version> | |
187 | - <scope>test</scope> | |
188 | - </dependency> | |
189 | - <dependency> | |
190 | - <groupId>org.hamcrest</groupId> | |
191 | - <artifactId>hamcrest-all</artifactId> | |
192 | - <version>1.3</version> | |
193 | - <scope>test</scope> | |
194 | - </dependency> | |
195 | - <dependency> | |
196 | - <groupId>com.jayway.restassured</groupId> | |
197 | - <artifactId>rest-assured</artifactId> | |
198 | - <version>2.9.0</version> | |
199 | - <scope>test</scope> | |
200 | - </dependency> | |
240 | + <dependency> | |
241 | + <groupId>junit</groupId> | |
242 | + <artifactId>junit</artifactId> | |
243 | + <version>4.12</version> | |
244 | + <scope>test</scope> | |
245 | + </dependency> | |
246 | + <dependency> | |
247 | + <groupId>org.hamcrest</groupId> | |
248 | + <artifactId>hamcrest-all</artifactId> | |
249 | + <version>1.3</version> | |
250 | + <scope>test</scope> | |
251 | + </dependency> | |
252 | + <dependency> | |
253 | + <groupId>com.jayway.restassured</groupId> | |
254 | + <artifactId>rest-assured</artifactId> | |
255 | + <version>2.9.0</version> | |
256 | + <scope>test</scope> | |
257 | + </dependency> | |
201 | 258 | </dependencies> |
202 | 259 | </project> | ... | ... |
src/main/resources/config.properties
src/main/webapp/WEB-INF/lib/axis.jar
No preview for this file type
src/main/webapp/WEB-INF/lib/commons-discovery-0.2.jar
No preview for this file type
src/main/webapp/WEB-INF/lib/commons-logging.jar
No preview for this file type
src/main/webapp/WEB-INF/lib/jaxrpc.jar
No preview for this file type
src/main/webapp/WEB-INF/lib/saaj.jar
No preview for this file type
src/main/webapp/WEB-INF/lib/wsdl4j.jar
No preview for this file type
... | ... | @@ -0,0 +1,49 @@ |
1 | +<?xml version="1.0" encoding="UTF-8"?> | |
2 | +<datasources> | |
3 | + <datasource jta="true" jndi-name="java:/jdbc/sei-broker" pool-name="jdbc/sei-broker" enabled="true" use-java-context="true" use-ccm="false"> | |
4 | + <connection-url>${br.gov.ans.seiBroker.db.oracle.connectionUrl}</connection-url> | |
5 | + <driver>ans</driver> | |
6 | + <pool> | |
7 | + <min-pool-size>5</min-pool-size> | |
8 | + <max-pool-size>500</max-pool-size> | |
9 | + <prefill>true</prefill> | |
10 | + </pool> | |
11 | + <security> | |
12 | + <user-name>USUARIO_SEI</user-name> | |
13 | + <password>${br.gov.ans.seiBroker.db.oracle.password}</password> | |
14 | + </security> | |
15 | + <validation> | |
16 | + <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleValidConnectionChecker"/> | |
17 | + <validate-on-match>true</validate-on-match> | |
18 | + <background-validation>false</background-validation> | |
19 | + <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.oracle.OracleExceptionSorter"/> | |
20 | + </validation> | |
21 | + <timeout> | |
22 | + <idle-timeout-minutes>2</idle-timeout-minutes> | |
23 | + </timeout> | |
24 | + <statement> | |
25 | + <share-prepared-statements>false</share-prepared-statements> | |
26 | + </statement> | |
27 | + </datasource> | |
28 | + <datasource jta="false" jndi-name="java:/jdbc/sei-mysql" pool-name="jdbc/sei-mysql" enabled="true" use-java-context="true" use-ccm="false" statistics-enabled="true"> | |
29 | + <connection-url>${br.gov.ans.seiBroker.db.mysql.connectionUrl}</connection-url> | |
30 | + <driver-class>com.mysql.jdbc.Driver</driver-class> | |
31 | + <driver>com.mysql</driver> | |
32 | + <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> | |
33 | + <pool> | |
34 | + <min-pool-size>1</min-pool-size> | |
35 | + <max-pool-size>30</max-pool-size> | |
36 | + <prefill>true</prefill> | |
37 | + </pool> | |
38 | + <security> | |
39 | + <user-name>${br.gov.ans.seiBroker.db.mysql.user}</user-name> | |
40 | + <password>${br.gov.ans.seiBroker.db.mysql.password}</password> | |
41 | + </security> | |
42 | + <validation> | |
43 | + <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"/> | |
44 | + <validate-on-match>true</validate-on-match> | |
45 | + <background-validation>false</background-validation> | |
46 | + <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter"/> | |
47 | + </validation> | |
48 | + </datasource> | |
49 | +</datasources> | |
0 | 50 | \ No newline at end of file | ... | ... |
src/test/java/br/gov/ans/integracao/sei/testes/FunctionalTest.java
... | ... | @@ -7,7 +7,7 @@ import com.jayway.restassured.RestAssured; |
7 | 7 | public class FunctionalTest { |
8 | 8 | |
9 | 9 | protected final String USUARIO = "andre.guimaraes"; |
10 | - protected final String SENHA = "Merda de senha!"; | |
10 | + protected final String SENHA = "*****"; | |
11 | 11 | protected static final Boolean DESENVOLVIMENTO = true; |
12 | 12 | |
13 | 13 | @BeforeClass | ... | ... |