fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conversão ADM para maven 

bug#15923
dev:trevezani
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@97830 d1611594-4594-4d17-8e1d-87c2c4800839
master
alberto 2019-09-25 18:47:01 +00:00
parent 52562fd3e7
commit e5c9de19c0
5 changed files with 218 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

208
pom.xml 100644
View File

@ -0,0 +1,208 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>war</packaging>
<dependencies>
<dependency>
<groupId>br.com.rjconsultores</groupId>
<artifactId>modelWeb</artifactId>
<version>0.0.1-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
<exclusion>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
</exclusion>
<exclusion>
<groupId>jdbc</groupId>
<artifactId>jdbc-stdext</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
</exclusion>
<exclusion>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>br.com.rjconsultores</groupId>
<artifactId>IntegracaoReceitaDespesa</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>br.com.rjconsultores</groupId>
<artifactId>WSTotvs</artifactId>
<version>0.0.1-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
</exclusion>
<exclusion>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>br.com.rjconsultores</groupId>
<artifactId>WSAG</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>br.com.rjconsultores</groupId>
<artifactId>Flyway</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>br.com.rjconsultores</groupId>
<artifactId>GeneradorBoletosCNAB</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.8.2</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.10</version>
</dependency>
<dependency>
<groupId>org.zkoss.common</groupId>
<artifactId>zcommon</artifactId>
<version>5.0.9</version>
</dependency>
<dependency>
<groupId>org.zkoss.zk</groupId>
<artifactId>zhtml</artifactId>
<version>5.0.9</version>
</dependency>
<dependency>
<groupId>org.zkoss.zk</groupId>
<artifactId>zk</artifactId>
<version>5.0.9</version>
</dependency>
<dependency>
<groupId>org.zkoss.zk</groupId>
<artifactId>zkplus</artifactId>
<version>5.0.9</version>
</dependency>
<dependency>
<groupId>org.zkoss.zk</groupId>
<artifactId>zul</artifactId>
<version>5.0.9</version>
</dependency>
<dependency>
<groupId>org.zkoss.common</groupId>
<artifactId>zweb</artifactId>
<version>5.0.9</version>
</dependency>
<dependency>
<groupId>org.zkoss.zkforge</groupId>
<artifactId>ckez</artifactId>
<version>3.6.0.0</version>
</dependency>
<dependency>
<groupId>org.zkoss.zkforge</groupId>
<artifactId>fckez</artifactId>
<version>2.6.1_1</version>
</dependency>
<dependency>
<groupId>org.zkoss.zk</groupId>
<artifactId>zkspring-security</artifactId>
<version>3.0RC</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.9.9</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.9</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.2</version>
</dependency>
<!-- <dependency> -->
<!-- <groupId>org.jboss.resteasy</groupId> -->
<!-- <artifactId>resteasy-jaxrs</artifactId> -->
<!-- <version>2.3.1.GA</version> -->
<!-- </dependency> -->
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<version>2.2.1.GA</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-multipart-provider</artifactId>
<version>2.2.0.GA</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson-provider</artifactId>
<version>2.3.1.GA</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-all-6.0</artifactId>
<version>3.0.3.Final</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<sourceDirectory>src/java</sourceDirectory>
<resources>
<resource>
<directory>src/java</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<configuration>
<warSourceDirectory>web</warSourceDirectory>
<outputFileNameMapping>@{artifactId}@.@{extension}@</outputFileNameMapping>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
</plugins>
</build>
</project>

4
src/java/com/rjconsultores/ventaboletos/rest/SecurityInterceptor.java
View File

@ -13,6 +13,7 @@ import javax.annotation.security.RolesAllowed;
import javax.ws.rs.WebApplicationException; import javax.ws.rs.WebApplicationException;
import javax.ws.rs.ext.Provider; import javax.ws.rs.ext.Provider;
import org.apache.commons.codec.binary.Base64;
import org.jboss.resteasy.annotations.interception.ServerInterceptor; import org.jboss.resteasy.annotations.interception.ServerInterceptor;
import org.jboss.resteasy.core.Headers; import org.jboss.resteasy.core.Headers;
import org.jboss.resteasy.core.ResourceMethod; import org.jboss.resteasy.core.ResourceMethod;
@ -20,7 +21,6 @@ import org.jboss.resteasy.core.ServerResponse;
import org.jboss.resteasy.spi.Failure; import org.jboss.resteasy.spi.Failure;
import org.jboss.resteasy.spi.HttpRequest; import org.jboss.resteasy.spi.HttpRequest;
import org.jboss.resteasy.spi.interception.PreProcessInterceptor; import org.jboss.resteasy.spi.interception.PreProcessInterceptor;
import org.jboss.util.Base64;
import org.mindrot.jbcrypt.BCrypt; import org.mindrot.jbcrypt.BCrypt;
@Provider @Provider
@ -66,7 +66,7 @@ public class SecurityInterceptor implements PreProcessInterceptor {
String infoUserPassword = null; String infoUserPassword = null;
try { try {
infoUserPassword = new String(Base64.decode(encodedUserPassword)); infoUserPassword = new String(Base64.decodeBase64(encodedUserPassword.getBytes()));
} catch (Exception e) { } catch (Exception e) {
return SERVER_ERROR; return SERVER_ERROR;
} }

1
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaPuntoVentaController.java
View File

@ -10,7 +10,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.codehaus.groovy.runtime.dgmimpl.arrays.IntegerArrayGetAtMetaMethod;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

2
src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java
View File

@ -65,7 +65,7 @@ public class MyAppInit implements org.zkoss.zk.ui.util.WebAppInit {
@Override @Override
public void init(WebApp wapp) throws Exception { public void init(WebApp wapp) throws Exception {
Labels.register(new MyLabelLocatorGeneral((ServletContext) wapp.getNativeContext())); Labels.register(new MyLabelLocatorGeneral((ServletContext) wapp.getNativeContext()));
Labels.register(new MyLabelLocatorCliente((ServletContext) wapp.getNativeContext())); // Labels.register(new MyLabelLocatorCliente((ServletContext) wapp.getNativeContext()));
boolean ipBloqueadoGeracaoServico = ipBloqueadoGeracaoServico(); boolean ipBloqueadoGeracaoServico = ipBloqueadoGeracaoServico();

15
web/WEB-INF/jboss-deployment-structure.xml
View File

@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<jboss-deployment-structure> <jboss-deployment-structure>
<deployment> <deployment>
<exclusions> <exclusions>
<module name="org.apache.log4j" /> <module name="org.apache.log4j" />
</exclusions> </exclusions>
<dependencies> </deployment>
<module name="br.com.rjconsultores.adm" export="true" meta-inf="export"/>
</dependencies>
</deployment>
</jboss-deployment-structure> </jboss-deployment-structure>