From db70c37c5ff1060a830736ff03543daf17a83f67 Mon Sep 17 00:00:00 2001 From: Cleverson Sacramento Date: Thu, 16 Aug 2012 16:14:03 -0300 Subject: [PATCH] Renomeando o web-parent para servlet-parent e ajustes nas dependências dos profiles jsf e servlet --- parent/jsf/pom.xml | 118 +++------------------------------------------------------------------------------------------------------------------- parent/pom.xml | 2 +- parent/servlet/.gitignore | 5 +++++ parent/servlet/pom.xml | 393 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ parent/web/.gitignore | 5 ----- parent/web/pom.xml | 151 ------------------------------------------------------------------------------------------------------------------------------------------------------- 6 files changed, 402 insertions(+), 272 deletions(-) create mode 100644 parent/servlet/.gitignore create mode 100755 parent/servlet/pom.xml delete mode 100644 parent/web/.gitignore delete mode 100755 parent/web/pom.xml diff --git a/parent/jsf/pom.xml b/parent/jsf/pom.xml index 0040ebe..62e61b6 100755 --- a/parent/jsf/pom.xml +++ b/parent/jsf/pom.xml @@ -34,8 +34,7 @@ ou escreva para a Fundação do Software Livre (FSF) Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. --> - + 4.0.0 @@ -44,9 +43,9 @@ br.gov.frameworkdemoiselle - demoiselle-minimal-parent + demoiselle-servlet-parent 2.3.0-BETA2-SNAPSHOT - ../minimal/pom.xml + ../servlet/pom.xml JSF Parent @@ -55,24 +54,6 @@ utilizam o framework. - - - - org.apache.maven.plugins - maven-war-plugin - - - - src/main/webapp/WEB-INF - WEB-INF - true - - - - - - - br.gov.frameworkdemoiselle @@ -81,28 +62,12 @@ - - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - - tomcat6 - javax.servlet - servlet-api - provided - - org.jboss.weld weld-core runtime @@ -143,22 +108,6 @@ tomcat7 - br.gov.frameworkdemoiselle - demoiselle-jsf - compile - - - javax.servlet - servlet-api - - - - - javax.servlet - javax.servlet-api - provided - - org.jboss.weld weld-core runtime @@ -211,11 +160,6 @@ - javax.servlet - servlet-api - provided - - org.jboss.weld weld-core runtime @@ -266,22 +210,6 @@ glassfish3 - br.gov.frameworkdemoiselle - demoiselle-jsf - compile - - - javax.servlet - servlet-api - - - - - javax.servlet - javax.servlet-api - provided - - javax.enterprise cdi-api provided @@ -317,16 +245,10 @@ provided - com.sun.faces - jsf-impl - provided - - hsqldb hsqldb provided - org.hibernate hibernate-entitymanager @@ -338,22 +260,6 @@ jboss6 - br.gov.frameworkdemoiselle - demoiselle-jsf - compile - - - javax.servlet - servlet-api - - - - - javax.servlet - javax.servlet-api - provided - - javax.enterprise cdi-api provided @@ -393,7 +299,6 @@ hsqldb provided - org.hibernate hibernate-entitymanager @@ -408,22 +313,6 @@ - br.gov.frameworkdemoiselle - demoiselle-jsf - compile - - - javax.servlet - servlet-api - - - - - javax.servlet - javax.servlet-api - provided - - javax.enterprise cdi-api provided @@ -463,7 +352,6 @@ hsqldb provided - org.hibernate hibernate-entitymanager diff --git a/parent/pom.xml b/parent/pom.xml index 46536e5..a735f7a 100755 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -52,7 +52,7 @@ archetype minimal extension - web + servlet jsf se diff --git a/parent/servlet/.gitignore b/parent/servlet/.gitignore new file mode 100644 index 0000000..221c8fc --- /dev/null +++ b/parent/servlet/.gitignore @@ -0,0 +1,5 @@ +/target +/.project +/.classpath +/.settings +/.externalToolBuilders diff --git a/parent/servlet/pom.xml b/parent/servlet/pom.xml new file mode 100755 index 0000000..1e6180a --- /dev/null +++ b/parent/servlet/pom.xml @@ -0,0 +1,393 @@ + + + + 4.0.0 + + demoiselle-servlet-parent + pom + + + br.gov.frameworkdemoiselle + demoiselle-minimal-parent + 2.3.0-BETA2-SNAPSHOT + ../minimal/pom.xml + + + Servlet Parent + + Especialização do POM mínimo, contendo configurações úteis para todas as aplicações Servlet que utilizam o framework. + + + + + + org.apache.maven.plugins + maven-war-plugin + + + + src/main/webapp/WEB-INF + WEB-INF + true + + + + + + + + + + + javax.servlet + javax.servlet-api + 3.0.1 + + + + + + + br.gov.frameworkdemoiselle + demoiselle-servlet + compile + + + javax.servlet + servlet-api + + + + + + + + tomcat6 + + + javax.servlet + servlet-api + provided + + + org.jboss.weld + weld-core + runtime + + + org.jboss.weld.servlet + weld-servlet-core + runtime + + + org.eclipse.persistence + eclipselink + runtime + + + org.hibernate + hibernate-validator + runtime + + + org.slf4j + slf4j-log4j12 + runtime + + + hsqldb + hsqldb + compile + + + + + tomcat7 + + + javax.servlet + javax.servlet-api + provided + + + org.jboss.weld + weld-core + runtime + + + org.jboss.weld.servlet + weld-servlet-core + runtime + + + org.eclipse.persistence + eclipselink + runtime + + + org.hibernate + hibernate-validator + runtime + + + org.slf4j + slf4j-log4j12 + runtime + + + hsqldb + hsqldb + compile + + + + + gae + + + + net.kindleit + maven-gae-plugin + ${kindleit.plugin.version} + + appengine.google.com + + + + + + + javax.servlet + servlet-api + provided + + + org.jboss.weld + weld-core + runtime + + + org.jboss.weld.servlet + weld-servlet-core + runtime + + + org.hibernate + hibernate-validator + runtime + + + org.slf4j + slf4j-log4j12 + runtime + + + com.google.appengine + appengine-api-1.0-sdk + ${gae.version} + + + + + objectify-appengine + http://objectify-appengine.googlecode.com/svn/maven + + + + 1.7.0 + 0.9.4 + + + + glassfish3 + + + javax.servlet + javax.servlet-api + provided + + + javax.enterprise + cdi-api + provided + + + javax.servlet + jstl + provided + + + validation-api + javax.validation + provided + + + javax.transaction + jta + provided + + + org.slf4j + slf4j-log4j12 + runtime + + + org.eclipse.persistence + javax.persistence + provided + + + hsqldb + hsqldb + provided + + + org.hibernate + hibernate-entitymanager + test + + + + + jboss6 + + + javax.servlet + javax.servlet-api + provided + + + javax.enterprise + cdi-api + provided + + + javax.servlet + jstl + provided + + + validation-api + javax.validation + provided + + + javax.transaction + jta + provided + + + org.slf4j + slf4j-api + provided + + + org.eclipse.persistence + javax.persistence + provided + + + hsqldb + hsqldb + provided + + + org.hibernate + hibernate-entitymanager + test + + + + + jboss7 + + true + + + + javax.servlet + javax.servlet-api + provided + + + javax.enterprise + cdi-api + provided + + + validation-api + javax.validation + provided + + + javax.transaction + jta + provided + + + org.slf4j + slf4j-api + provided + + + org.eclipse.persistence + javax.persistence + provided + + + hsqldb + hsqldb + provided + + + org.hibernate + hibernate-entitymanager + test + + + + + + + + demoiselle.sourceforge.net + Demoiselle Maven Repository + http://demoiselle.sourceforge.net/repository/release + + + diff --git a/parent/web/.gitignore b/parent/web/.gitignore deleted file mode 100644 index 221c8fc..0000000 --- a/parent/web/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/target -/.project -/.classpath -/.settings -/.externalToolBuilders diff --git a/parent/web/pom.xml b/parent/web/pom.xml deleted file mode 100755 index 37242d0..0000000 --- a/parent/web/pom.xml +++ /dev/null @@ -1,151 +0,0 @@ - - - - 4.0.0 - - demoiselle-web-parent - pom - - - br.gov.frameworkdemoiselle - demoiselle-minimal-parent - 2.3.0-BETA2-SNAPSHOT - ../minimal/pom.xml - - - Web Parent - - Especialização do POM mínimo, contendo configurações úteis para todas as aplicações Web que utilizam o framework. - - - - - - - - - - - - - - - - tomcat6 - - - org.jboss.weld - weld-core - runtime - - - org.jboss.weld.servlet - weld-servlet-core - runtime - - - org.eclipse.persistence - eclipselink - runtime - - - org.hibernate - hibernate-validator - runtime - - - org.slf4j - slf4j-log4j12 - runtime - - - - - tomcat7 - - - org.jboss.weld - weld-core - runtime - - - org.jboss.weld.servlet - weld-servlet-core - runtime - - - org.eclipse.persistence - eclipselink - runtime - - - org.hibernate - hibernate-validator - runtime - - - org.slf4j - slf4j-log4j12 - runtime - - - - - jboss6 - - true - - - - javax.enterprise - cdi-api - provided - - - javax.servlet - jstl - provided - - - validation-api - javax.validation - provided - - - javax.transaction - jta - provided - - - - - - - - org.eclipse.persistence - javax.persistence - provided - - - - - - - - demoiselle.sourceforge.net - Demoiselle Maven Repository - http://demoiselle.sourceforge.net/repository/release - - - -- libgit2 0.21.2