From 2547297e4fe60baa341d326a229a7b2e3cdcca5a Mon Sep 17 00:00:00 2001
From: Cleverson Sacramento <cleverson.sacramento@gmail.com>
Date: Thu, 5 Jul 2012 16:03:39 -0300
Subject: [PATCH] Ajustes no arquétipo e no parent pom

---
 archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml       | 11 -----------
 archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml | 38 +++++++++++++++++++++++++++++++++++---
 archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/resources/demoiselle.properties    |  1 +
 archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml           | 11 +++++++++++
 parent/jsf/pom.xml                                                                                   | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 119 insertions(+), 14 deletions(-)
 delete mode 100644 archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
 create mode 100644 archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml

diff --git a/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml b/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
deleted file mode 100644
index d565263..0000000
--- a/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-
-	<alternatives>
-		<class>br.gov.frameworkdemoiselle.transaction.JPATransaction</class>
-		
-		<!--
-		<class>br.gov.frameworkdemoiselle.transaction.JTATransaction</class>
-		-->
-	</alternatives>
-</beans>
diff --git a/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml b/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
index 855fd84..a481000 100644
--- a/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
+++ b/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/resources/META-INF/persistence.xml
@@ -2,10 +2,41 @@
 <persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
 
-	<!-- If you are using jboss6 with non JTA transaction then use this persistence-unit -->
+	<!-- If you are using JBoss AS7 with non JTA transaction then use this persistence-unit -->
 	<!--
 	-->
 	<persistence-unit name="bookmark-ds" transaction-type="RESOURCE_LOCAL">
+		<non-jta-data-source>java:jboss/datasources/ExampleDS</non-jta-data-source>
+		
+		<class>${package}.domain.Bookmark</class>
+
+		<properties>
+			<property name="hibernate.show_sql" value="true" />
+			<property name="hibernate.format_sql" value="false" />
+			<property name="hibernate.hbm2ddl.auto" value="create-drop" />
+			<property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup" />
+		</properties>
+	</persistence-unit>
+	
+	<!-- If you are using JBoss AS7 with JTA transaction then use this persistence-unit -->
+	<!--
+	<persistence-unit name="bookmark-ds" transaction-type="JTA">
+		<jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source>
+		
+		<class>${package}.domain.Bookmark</class>
+
+		<properties>
+			<property name="hibernate.show_sql" value="true" />
+			<property name="hibernate.format_sql" value="false" />
+			<property name="hibernate.hbm2ddl.auto" value="update" />
+			<property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup" />
+		</properties>
+	</persistence-unit>
+	-->
+	
+	<!-- If you are using JBoss AS6 with non JTA transaction then use this persistence-unit -->
+	<!--
+	<persistence-unit name="bookmark-ds" transaction-type="RESOURCE_LOCAL">
 		<non-jta-data-source>java:/DefaultDS</non-jta-data-source>
 		
 		<class>${package}.domain.Bookmark</class>
@@ -17,8 +48,9 @@
 			<property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup" />
 		</properties>
 	</persistence-unit>
+	-->
 	
-	<!-- If you are using jboss6 with JTA transaction then use this persistence-unit -->
+	<!-- If you are using JBoss AS6 with JTA transaction then use this persistence-unit -->
 	<!--
 	<persistence-unit name="bookmark-ds" transaction-type="JTA">
 		<jta-data-source>java:/DefaultDS</jta-data-source>
@@ -34,7 +66,7 @@
 	</persistence-unit>
 	-->
 
-	<!-- If you are using tomcat6/tomcat7/junit then use this persistence-unit -->
+	<!-- If you are using Tomcat 6 / Tomcat 7 / JUnit then use this persistence-unit -->
 	<!--
 	<persistence-unit name="bookmark-ds" transaction-type="RESOURCE_LOCAL">
 
diff --git a/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/resources/demoiselle.properties b/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/resources/demoiselle.properties
index 2d3d565..fc74e6e 100755
--- a/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/resources/demoiselle.properties
+++ b/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/resources/demoiselle.properties
@@ -33,3 +33,4 @@
 # ou escreva para a Fundação do Software Livre (FSF) Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
 
+frameworkdemoiselle.transaction.class=br.gov.frameworkdemoiselle.transaction.JPATransaction
diff --git a/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml b/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
new file mode 100644
index 0000000..2354daf
--- /dev/null
+++ b/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
@@ -0,0 +1,11 @@
+<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+
+	<interceptors>
+		<class>br.gov.frameworkdemoiselle.internal.interceptor.ExceptionHandlerInterceptor</class>
+		<class>br.gov.frameworkdemoiselle.internal.interceptor.RequiredPermissionInterceptor</class>
+		<class>br.gov.frameworkdemoiselle.internal.interceptor.RequiredRoleInterceptor</class>
+		<class>br.gov.frameworkdemoiselle.internal.interceptor.TransactionalInterceptor</class>
+	</interceptors>
+
+</beans>
diff --git a/parent/jsf/pom.xml b/parent/jsf/pom.xml
index d56ac27..5042981 100755
--- a/parent/jsf/pom.xml
+++ b/parent/jsf/pom.xml
@@ -173,6 +173,78 @@
 		</profile>
 		<profile>
 			<id>jboss6</id>
+			<dependencies>
+				<dependency>
+					<groupId>br.gov.frameworkdemoiselle</groupId>
+					<artifactId>demoiselle-jsf</artifactId>
+					<scope>compile</scope>
+					<exclusions>
+						<exclusion>
+							<groupId>javax.servlet</groupId>
+							<artifactId>servlet-api</artifactId>
+						</exclusion>
+					</exclusions>
+				</dependency>
+				<dependency>
+					<groupId>javax.servlet</groupId>
+					<artifactId>javax.servlet-api</artifactId>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>javax.enterprise</groupId>
+					<artifactId>cdi-api</artifactId>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>javax.servlet</groupId>
+					<artifactId>jstl</artifactId>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<artifactId>validation-api</artifactId>
+					<groupId>javax.validation</groupId>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>javax.transaction</groupId>
+					<artifactId>jta</artifactId>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+					<scope>runtime</scope>
+				</dependency>
+				<dependency>
+					<groupId>org.eclipse.persistence</groupId>
+					<artifactId>javax.persistence</artifactId>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>com.sun.faces</groupId>
+					<artifactId>jsf-api</artifactId>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>com.sun.faces</groupId>
+					<artifactId>jsf-impl</artifactId>
+					<scope>provided</scope>
+				</dependency>
+				<dependency>
+					<groupId>hsqldb</groupId>
+					<artifactId>hsqldb</artifactId>
+					<scope>provided</scope>
+				</dependency>
+
+				<dependency>
+					<groupId>org.hibernate</groupId>
+					<artifactId>hibernate-entitymanager</artifactId>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>jboss7</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
--
libgit2 0.21.2