From c39565d515c4838b05b8f44d3e0d53e5d4b9e54e Mon Sep 17 00:00:00 2001 From: Cleverson Sacramento Date: Tue, 29 Apr 2014 13:01:48 -0300 Subject: [PATCH] Criação da extensão REST --- archetype/jsf-jpa/.gitignore | 1 + archetype/jsf-jpa/pom.xml | 2 +- archetype/minimal/pom.xml | 2 +- documentation/quickstart/.gitignore | 1 + documentation/quickstart/pom.xml | 2 +- documentation/reference/.gitignore | 1 + documentation/reference/pom.xml | 2 +- impl/core/.gitignore | 1 + impl/core/pom.xml | 4 ++-- impl/extension/jdbc/.gitignore | 1 + impl/extension/jdbc/pom.xml | 2 +- impl/extension/jmx/.gitignore | 1 + impl/extension/jmx/pom.xml | 2 +- impl/extension/jpa/.gitignore | 1 + impl/extension/jpa/pom.xml | 2 +- impl/extension/jsf/.gitignore | 1 + impl/extension/jsf/pom.xml | 2 +- impl/extension/jta/.gitignore | 1 + impl/extension/jta/pom.xml | 2 +- impl/extension/rest/.gitignore | 9 +++++++++ impl/extension/rest/pom.xml | 144 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionMapper.java | 17 +++++++++++++++++ impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionMapper.java | 18 ++++++++++++++++++ impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultExceptionMapper.java | 33 +++++++++++++++++++++++++++++++++ impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/NotLoggedInExceptionMapper.java | 31 +++++++++++++++++++++++++++++++ impl/extension/rest/src/main/resources/demoiselle-rest-bundle.properties | 36 ++++++++++++++++++++++++++++++++++++ impl/extension/se/.gitignore | 1 + impl/extension/se/pom.xml | 2 +- impl/extension/servlet/.gitignore | 1 + impl/extension/servlet/pom.xml | 2 +- impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/BasicAuthFilter.java | 4 +++- parent/archetype/pom.xml | 2 +- parent/bom/pom.xml | 31 ++++++++++++++++++++++--------- parent/extension/pom.xml | 4 ++-- parent/framework/pom.xml | 2 +- parent/jsf/pom.xml | 2 +- parent/minimal/pom.xml | 4 ++-- parent/rest/.gitignore | 7 +++++++ parent/rest/pom.xml | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ parent/se/pom.xml | 2 +- parent/servlet/pom.xml | 2 +- pom.xml | 4 +++- 42 files changed, 494 insertions(+), 33 deletions(-) create mode 100644 impl/extension/rest/.gitignore create mode 100755 impl/extension/rest/pom.xml create mode 100644 impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionMapper.java create mode 100644 impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionMapper.java create mode 100644 impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultExceptionMapper.java create mode 100644 impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/NotLoggedInExceptionMapper.java create mode 100644 impl/extension/rest/src/main/resources/demoiselle-rest-bundle.properties create mode 100644 parent/rest/.gitignore create mode 100755 parent/rest/pom.xml diff --git a/archetype/jsf-jpa/.gitignore b/archetype/jsf-jpa/.gitignore index 9a3ab1b..8cf413e 100644 --- a/archetype/jsf-jpa/.gitignore +++ b/archetype/jsf-jpa/.gitignore @@ -5,3 +5,4 @@ /.settings /.externalToolBuilders /.DS_Store +/target diff --git a/archetype/jsf-jpa/pom.xml b/archetype/jsf-jpa/pom.xml index c09038e..fce420c 100755 --- a/archetype/jsf-jpa/pom.xml +++ b/archetype/jsf-jpa/pom.xml @@ -45,7 +45,7 @@ br.gov.frameworkdemoiselle demoiselle-archetype-parent - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT ../../parent/archetype diff --git a/archetype/minimal/pom.xml b/archetype/minimal/pom.xml index 6766f52..ea48e2c 100755 --- a/archetype/minimal/pom.xml +++ b/archetype/minimal/pom.xml @@ -45,7 +45,7 @@ br.gov.frameworkdemoiselle demoiselle-archetype-parent - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT ../../parent/archetype diff --git a/documentation/quickstart/.gitignore b/documentation/quickstart/.gitignore index 9a3ab1b..8cf413e 100644 --- a/documentation/quickstart/.gitignore +++ b/documentation/quickstart/.gitignore @@ -5,3 +5,4 @@ /.settings /.externalToolBuilders /.DS_Store +/target diff --git a/documentation/quickstart/pom.xml b/documentation/quickstart/pom.xml index f8cd1d4..2ef6b5c 100755 --- a/documentation/quickstart/pom.xml +++ b/documentation/quickstart/pom.xml @@ -40,7 +40,7 @@ demoiselle-framework-quickstart jdocbook - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT br.gov.frameworkdemoiselle diff --git a/documentation/reference/.gitignore b/documentation/reference/.gitignore index 9a3ab1b..8cf413e 100644 --- a/documentation/reference/.gitignore +++ b/documentation/reference/.gitignore @@ -5,3 +5,4 @@ /.settings /.externalToolBuilders /.DS_Store +/target diff --git a/documentation/reference/pom.xml b/documentation/reference/pom.xml index 3322d23..0c6babd 100755 --- a/documentation/reference/pom.xml +++ b/documentation/reference/pom.xml @@ -40,7 +40,7 @@ demoiselle-framework-reference jdocbook - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT br.gov.frameworkdemoiselle diff --git a/impl/core/.gitignore b/impl/core/.gitignore index 4a7c932..10bbbdf 100644 --- a/impl/core/.gitignore +++ b/impl/core/.gitignore @@ -6,3 +6,4 @@ /.settings /.externalToolBuilders /.DS_Store +/target diff --git a/impl/core/pom.xml b/impl/core/pom.xml index 70894b6..6fea308 100755 --- a/impl/core/pom.xml +++ b/impl/core/pom.xml @@ -44,7 +44,7 @@ br.gov.frameworkdemoiselle demoiselle-framework-parent - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT ../../parent/framework @@ -72,7 +72,7 @@ br.gov.frameworkdemoiselle demoiselle-framework-bom - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT import pom diff --git a/impl/extension/jdbc/.gitignore b/impl/extension/jdbc/.gitignore index db604bc..4958e38 100644 --- a/impl/extension/jdbc/.gitignore +++ b/impl/extension/jdbc/.gitignore @@ -7,3 +7,4 @@ /.externalToolBuilders /.DS_Store /hsql.* +/target diff --git a/impl/extension/jdbc/pom.xml b/impl/extension/jdbc/pom.xml index 7b57308..572a982 100755 --- a/impl/extension/jdbc/pom.xml +++ b/impl/extension/jdbc/pom.xml @@ -44,7 +44,7 @@ br.gov.frameworkdemoiselle demoiselle-extension-parent - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT ../../../parent/extension diff --git a/impl/extension/jmx/.gitignore b/impl/extension/jmx/.gitignore index 4a7c932..10bbbdf 100644 --- a/impl/extension/jmx/.gitignore +++ b/impl/extension/jmx/.gitignore @@ -6,3 +6,4 @@ /.settings /.externalToolBuilders /.DS_Store +/target diff --git a/impl/extension/jmx/pom.xml b/impl/extension/jmx/pom.xml index ec0feac..edc30fb 100644 --- a/impl/extension/jmx/pom.xml +++ b/impl/extension/jmx/pom.xml @@ -44,7 +44,7 @@ demoiselle-extension-parent br.gov.frameworkdemoiselle - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT ../../../parent/extension diff --git a/impl/extension/jpa/.gitignore b/impl/extension/jpa/.gitignore index 754489a..bb5da2a 100644 --- a/impl/extension/jpa/.gitignore +++ b/impl/extension/jpa/.gitignore @@ -7,3 +7,4 @@ /.externalToolBuilders /.DS_Store /hsql:* +/target diff --git a/impl/extension/jpa/pom.xml b/impl/extension/jpa/pom.xml index c11998f..31253c3 100755 --- a/impl/extension/jpa/pom.xml +++ b/impl/extension/jpa/pom.xml @@ -44,7 +44,7 @@ br.gov.frameworkdemoiselle demoiselle-extension-parent - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT ../../../parent/extension diff --git a/impl/extension/jsf/.gitignore b/impl/extension/jsf/.gitignore index 4a7c932..10bbbdf 100644 --- a/impl/extension/jsf/.gitignore +++ b/impl/extension/jsf/.gitignore @@ -6,3 +6,4 @@ /.settings /.externalToolBuilders /.DS_Store +/target diff --git a/impl/extension/jsf/pom.xml b/impl/extension/jsf/pom.xml index c5d01a1..d3d5491 100755 --- a/impl/extension/jsf/pom.xml +++ b/impl/extension/jsf/pom.xml @@ -44,7 +44,7 @@ br.gov.frameworkdemoiselle demoiselle-extension-parent - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT ../../../parent/extension diff --git a/impl/extension/jta/.gitignore b/impl/extension/jta/.gitignore index 4a7c932..10bbbdf 100644 --- a/impl/extension/jta/.gitignore +++ b/impl/extension/jta/.gitignore @@ -6,3 +6,4 @@ /.settings /.externalToolBuilders /.DS_Store +/target diff --git a/impl/extension/jta/pom.xml b/impl/extension/jta/pom.xml index b5ca202..3dc84f6 100755 --- a/impl/extension/jta/pom.xml +++ b/impl/extension/jta/pom.xml @@ -44,7 +44,7 @@ br.gov.frameworkdemoiselle demoiselle-extension-parent - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT ../../../parent/extension diff --git a/impl/extension/rest/.gitignore b/impl/extension/rest/.gitignore new file mode 100644 index 0000000..10bbbdf --- /dev/null +++ b/impl/extension/rest/.gitignore @@ -0,0 +1,9 @@ +/bin +/*.log +/target +/.project +/.classpath +/.settings +/.externalToolBuilders +/.DS_Store +/target diff --git a/impl/extension/rest/pom.xml b/impl/extension/rest/pom.xml new file mode 100755 index 0000000..0e60b2d --- /dev/null +++ b/impl/extension/rest/pom.xml @@ -0,0 +1,144 @@ + + + + 4.0.0 + + demoiselle-rest + jar + + + br.gov.frameworkdemoiselle + demoiselle-extension-parent + 2.5.0-SNAPSHOT + ../../../parent/extension + + + Demoiselle Framework REST Extension + + REST Extension + + http://www.frameworkdemoiselle.gov.br + + + + GNU Lesser General Public License, Version 3 + http://www.gnu.org/licenses/lgpl-3.0.txt + + + + + SERPRO - Serviço Federal de Processamento de Dados + http://www.serpro.gov.br + + + + + br.gov.frameworkdemoiselle + demoiselle-servlet + + + javax.ws.rs + jsr311-api + + + + + org.jboss.arquillian.container + arquillian-glassfish-embedded-3.1 + test + + + org.glassfish.main.extras + glassfish-embedded-all + test + + + org.apache.httpcomponents + httpclient + 4.3 + test + + + + + + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots + + true + + + false + + + + sonatype-nexus-releases + Sonatype Nexus Releases + https://oss.sonatype.org/content/repositories/releases + + false + + + true + + + + + + + arquillian-test + + + javax.ws.rs + jsr311-api + provided + + + + + diff --git a/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionMapper.java b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionMapper.java new file mode 100644 index 0000000..a45432f --- /dev/null +++ b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionMapper.java @@ -0,0 +1,17 @@ +package br.gov.frameworkdemoiselle.internal.implementation; + +import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; + +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import br.gov.frameworkdemoiselle.security.AuthenticationException; +@Provider +public class AuthenticationExceptionMapper implements ExceptionMapper { + + @Override + public Response toResponse(AuthenticationException exception) { + return Response.status(SC_UNAUTHORIZED).entity(exception.getMessage()).build(); + } +} diff --git a/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionMapper.java b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionMapper.java new file mode 100644 index 0000000..cb4b9a3 --- /dev/null +++ b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionMapper.java @@ -0,0 +1,18 @@ +package br.gov.frameworkdemoiselle.internal.implementation; + +import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; + +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import br.gov.frameworkdemoiselle.security.AuthorizationException; + +@Provider +public class AuthorizationExceptionMapper implements ExceptionMapper { + + @Override + public Response toResponse(AuthorizationException exception) { + return Response.status(SC_FORBIDDEN).build(); + } +} diff --git a/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultExceptionMapper.java b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultExceptionMapper.java new file mode 100644 index 0000000..20b5842 --- /dev/null +++ b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultExceptionMapper.java @@ -0,0 +1,33 @@ +//package br.gov.frameworkdemoiselle.internal.implementation; +// +//import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +// +//import java.util.ResourceBundle; +// +//import javax.inject.Inject; +//import javax.ws.rs.core.Response; +//import javax.ws.rs.ext.ExceptionMapper; +//import javax.ws.rs.ext.Provider; +// +//import org.slf4j.Logger; +// +//import br.gov.frameworkdemoiselle.annotation.Name; +// +//@Provider +//public class DefaultExceptionMapper implements ExceptionMapper { +// +// @Inject +// @Name("demoiselle-rest-bundle") +// private ResourceBundle bundle; +// +// @Inject +// private Logger logger; +// +// @Override +// public Response toResponse(Throwable throwable) { +// logger.error(throwable.getMessage(), throwable); +// +// String message = bundle.getString("internal.server.error"); +// return Response.status(SC_INTERNAL_SERVER_ERROR).entity(message).build(); +// } +//} diff --git a/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/NotLoggedInExceptionMapper.java b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/NotLoggedInExceptionMapper.java new file mode 100644 index 0000000..bdc18a8 --- /dev/null +++ b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/NotLoggedInExceptionMapper.java @@ -0,0 +1,31 @@ +package br.gov.frameworkdemoiselle.internal.implementation; + +import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; + +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +import br.gov.frameworkdemoiselle.security.NotLoggedInException; + +@Provider +public class NotLoggedInExceptionMapper implements ExceptionMapper { + + @Override + public Response toResponse(NotLoggedInException exception) { + // HttpServletRequest request = Beans.getReference(HttpServletRequest.class); + // String path = request.getRequestURI().substring(request.getContextPath().length()); + // + // Response response; + // + // if (path.indexOf("/api") > -1) { + // response = Response.status(SC_UNAUTHORIZED).header("WWW-Authenticate", "Basic realm=default").build(); + // } else { + // response = Response.status(SC_UNAUTHORIZED).build(); + // } + // + // return response; + + return Response.status(SC_UNAUTHORIZED).build(); + } +} diff --git a/impl/extension/rest/src/main/resources/demoiselle-rest-bundle.properties b/impl/extension/rest/src/main/resources/demoiselle-rest-bundle.properties new file mode 100644 index 0000000..64d381c --- /dev/null +++ b/impl/extension/rest/src/main/resources/demoiselle-rest-bundle.properties @@ -0,0 +1,36 @@ +# Demoiselle Framework +# Copyright (C) 2010 SERPRO +# ---------------------------------------------------------------------------- +# This file is part of Demoiselle Framework. +# +# Demoiselle Framework is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License version 3 +# as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License version 3 +# along with this program; if not, see +# or write to the Free Software Foundation, Inc., 51 Franklin Street, +# Fifth Floor, Boston, MA 02110-1301, USA. +# ---------------------------------------------------------------------------- +# Este arquivo é parte do Framework Demoiselle. +# +# O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou +# modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação +# do Software Livre (FSF). +# +# Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA +# GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou +# APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português +# para maiores detalhes. +# +# Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título +# "LICENCA.txt", junto com esse programa. Se não, acesse +# ou escreva para a Fundação do Software Livre (FSF) Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. + +internal.server.error=Erro interno do servidor diff --git a/impl/extension/se/.gitignore b/impl/extension/se/.gitignore index 4a7c932..10bbbdf 100644 --- a/impl/extension/se/.gitignore +++ b/impl/extension/se/.gitignore @@ -6,3 +6,4 @@ /.settings /.externalToolBuilders /.DS_Store +/target diff --git a/impl/extension/se/pom.xml b/impl/extension/se/pom.xml index 22eb980..bda94d6 100755 --- a/impl/extension/se/pom.xml +++ b/impl/extension/se/pom.xml @@ -44,7 +44,7 @@ br.gov.frameworkdemoiselle demoiselle-extension-parent - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT ../../../parent/extension diff --git a/impl/extension/servlet/.gitignore b/impl/extension/servlet/.gitignore index 4a7c932..10bbbdf 100644 --- a/impl/extension/servlet/.gitignore +++ b/impl/extension/servlet/.gitignore @@ -6,3 +6,4 @@ /.settings /.externalToolBuilders /.DS_Store +/target diff --git a/impl/extension/servlet/pom.xml b/impl/extension/servlet/pom.xml index 0131733..ce97681 100755 --- a/impl/extension/servlet/pom.xml +++ b/impl/extension/servlet/pom.xml @@ -44,7 +44,7 @@ br.gov.frameworkdemoiselle demoiselle-extension-parent - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT ../../../parent/extension diff --git a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/BasicAuthFilter.java b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/BasicAuthFilter.java index cd9621b..03c4f24 100644 --- a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/BasicAuthFilter.java +++ b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/BasicAuthFilter.java @@ -81,6 +81,7 @@ public class BasicAuthFilter implements Filter { } private boolean performLogin(String header, HttpServletRequest request) { + boolean result = false; SecurityContext securityContext = Beans.getReference(SecurityContext.class); if (header != null) { @@ -91,9 +92,10 @@ public class BasicAuthFilter implements Filter { credentials.setPassword(basicCredentials[1]); securityContext.login(); + result = securityContext.isLoggedIn(); } - return securityContext.isLoggedIn(); + return result; } private void performLogout() { diff --git a/parent/archetype/pom.xml b/parent/archetype/pom.xml index 2e703c7..839d3a3 100755 --- a/parent/archetype/pom.xml +++ b/parent/archetype/pom.xml @@ -44,7 +44,7 @@ br.gov.frameworkdemoiselle demoiselle-framework-parent - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT ../framework diff --git a/parent/bom/pom.xml b/parent/bom/pom.xml index c57a31a..1b9ce29 100755 --- a/parent/bom/pom.xml +++ b/parent/bom/pom.xml @@ -44,7 +44,7 @@ br.gov.frameworkdemoiselle demoiselle-framework-parent - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT ../framework @@ -72,42 +72,47 @@ br.gov.frameworkdemoiselle demoiselle-core - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT br.gov.frameworkdemoiselle demoiselle-jta - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT br.gov.frameworkdemoiselle demoiselle-jdbc - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT br.gov.frameworkdemoiselle demoiselle-jpa - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT br.gov.frameworkdemoiselle demoiselle-servlet - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT + + + br.gov.frameworkdemoiselle + demoiselle-rest + 2.5.0-SNAPSHOT br.gov.frameworkdemoiselle demoiselle-jsf - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT br.gov.frameworkdemoiselle demoiselle-se - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT br.gov.frameworkdemoiselle demoiselle-jmx - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT + + javax.ws.rs + jsr311-api + ${rest.version} + + org.slf4j @@ -410,6 +422,7 @@ 2.2 2.5 2.0.0 + 1.1.1 4.1.7.Final 4.2.0.Final diff --git a/parent/extension/pom.xml b/parent/extension/pom.xml index b2a025e..805b715 100755 --- a/parent/extension/pom.xml +++ b/parent/extension/pom.xml @@ -44,7 +44,7 @@ br.gov.frameworkdemoiselle demoiselle-framework-parent - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT ../framework @@ -71,7 +71,7 @@ br.gov.frameworkdemoiselle demoiselle-framework-bom - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT import pom diff --git a/parent/framework/pom.xml b/parent/framework/pom.xml index 38a2717..ad24f27 100755 --- a/parent/framework/pom.xml +++ b/parent/framework/pom.xml @@ -39,7 +39,7 @@ 4.0.0 demoiselle-framework-parent - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT pom diff --git a/parent/jsf/pom.xml b/parent/jsf/pom.xml index 3e57406..6371d78 100755 --- a/parent/jsf/pom.xml +++ b/parent/jsf/pom.xml @@ -44,7 +44,7 @@ br.gov.frameworkdemoiselle demoiselle-servlet-parent - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT ../servlet diff --git a/parent/minimal/pom.xml b/parent/minimal/pom.xml index 8eccacb..ecc81f1 100755 --- a/parent/minimal/pom.xml +++ b/parent/minimal/pom.xml @@ -44,7 +44,7 @@ br.gov.frameworkdemoiselle demoiselle-framework-parent - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT ../framework @@ -72,7 +72,7 @@ br.gov.frameworkdemoiselle demoiselle-framework-bom - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT import pom diff --git a/parent/rest/.gitignore b/parent/rest/.gitignore new file mode 100644 index 0000000..9a3ab1b --- /dev/null +++ b/parent/rest/.gitignore @@ -0,0 +1,7 @@ +/bin +/target +/.project +/.classpath +/.settings +/.externalToolBuilders +/.DS_Store diff --git a/parent/rest/pom.xml b/parent/rest/pom.xml new file mode 100755 index 0000000..9d871a2 --- /dev/null +++ b/parent/rest/pom.xml @@ -0,0 +1,138 @@ + + + + 4.0.0 + + demoiselle-rest-parent + pom + + + br.gov.frameworkdemoiselle + demoiselle-servlet-parent + 2.5.0-SNAPSHOT + ../servlet + + + Demoiselle Framework REST Parent + + Especialização do POM mínimo, contendo configurações úteis para todas as aplicações REST que utilizam o framework. + + http://www.frameworkdemoiselle.gov.br + + + + GNU Lesser General Public License, Version 3 + http://www.gnu.org/licenses/lgpl-3.0.txt + + + + + SERPRO - Serviço Federal de Processamento de Dados + http://www.serpro.gov.br + + + + + br.gov.frameworkdemoiselle + demoiselle-rest + compile + + + javax.ws.rs + jsr311-api + + + + + + + + tomcat6 + + + tomcat7 + + + glassfish3 + + + weblogic12 + + + jboss6 + + + jboss7 + + true + + + + javax.ws.rs + jsr311-api + provided + + + + + + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots + + true + + + false + + + + sonatype-nexus-releases + Sonatype Nexus Releases + https://oss.sonatype.org/content/repositories/releases + + false + + + true + + + + diff --git a/parent/se/pom.xml b/parent/se/pom.xml index 0ac0e10..c9d31a3 100755 --- a/parent/se/pom.xml +++ b/parent/se/pom.xml @@ -44,7 +44,7 @@ br.gov.frameworkdemoiselle demoiselle-extension-parent - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT ../extension diff --git a/parent/servlet/pom.xml b/parent/servlet/pom.xml index 5eadf6e..6a81b1b 100755 --- a/parent/servlet/pom.xml +++ b/parent/servlet/pom.xml @@ -44,7 +44,7 @@ br.gov.frameworkdemoiselle demoiselle-extension-parent - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT ../extension diff --git a/pom.xml b/pom.xml index efc1beb..07f0b97 100755 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 4.0.0 demoiselle-framework-build - 2.4.1-SNAPSHOT + 2.5.0-SNAPSHOT pom @@ -62,6 +62,7 @@ parent/extension parent/jsf parent/servlet + parent/rest parent/se parent/archetype impl/core @@ -71,6 +72,7 @@ impl/extension/jta impl/extension/se impl/extension/servlet + impl/extension/rest impl/extension/jmx