Author: sboscarine Date: 2009-11-29 22:42:28 -0500 (Sun, 29 Nov 2009) New Revision: 5174 Modified: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml Log: clean up Modified: archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml =================================================================== --- archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml 2009-11-29 23:11:26 UTC (rev 5173) +++ archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml 2009-11-30 03:42:28 UTC (rev 5174) @@ -7,14 +7,17 @@ <packaging>war</packaging> <name>${artifactId}</name> <version>${version}</version> - + <properties> <!-- eliminates [WARNING] Using platform encoding (UTF-8 actually) to copy filtered resources, i.e. build is platform dependent! --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <!-- To set the jboss.home environment variable the Maven way, set the jboss.home property in an active profile in the Maven 2 settings.xml file --> + <!-- + To set the jboss.home environment variable the Maven way, set the jboss.home property in an active profile in + the Maven 2 settings.xml file + --> <jboss.home>${env.JBOSS_HOME}</jboss.home> <jboss.domain>default</jboss.domain> <!-- The version of Weld extensions in use --> @@ -54,7 +57,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> <version>4.0.0.GA</version> - <scope>runtime</scope> + <!-- <scope>runtime</scope>--> </dependency> <!-- JSF 2.0 --> <dependency> @@ -64,12 +67,10 @@ </dependency> <!-- Optional, but pretty useful. --> - <!-- - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - </dependency> - --> + <!--<dependency>--> + <!-- <groupId>javax.servlet</groupId>--> + <!-- <artifactId>jstl</artifactId>--> + <!--</dependency>--> <!-- Optional, but highly recommended. --> <dependency> @@ -97,68 +98,52 @@ - <!-- Experimental Dependencies. --> - - - <!-- JPA Dependencies. --> - <!-- Dan, should this be provided? --> - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - </dependency> - <!-- Dan, should this be provided? --> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>3.2.6.ga</version> - <!-- why? --> - <exclusions> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- Dan, should this be provided? --> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.4.0.GA</version> - </dependency> - <!-- Dan, should this be provided? --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.4.2</version> - </dependency> -<!-- <dependency>--> -<!-- <groupId>c3p0</groupId>--> -<!-- <artifactId>c3p0</artifactId>--> -<!-- <version>0.9.1.2</version>--> -<!-- </dependency>--> - <!-- Hypersonic in-memory database. Replace with a driver that reflects your database. --> - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>1.8.0.10</version> - </dependency> - - - - - <!-- Bean Validation API (JSR 303) --> + <!-- + Experimental Dependencies. Still working through these. If these are incorrect, please change and notify + someone at weld-dev(a)lists.jboss.org They will be finalized soon. + --> + <!-- JPA Dependencies. --> + <!-- Should this be provided? --> <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> </dependency> - - <!-- Bean Validation Implementation --> + <!-- Should this be provided? --> <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>4.0.0.GA</version> + <artifactId>hibernate</artifactId> + <version>3.2.6.ga</version> + <!-- why? --> + <exclusions> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> + </exclusions> </dependency> - + <!-- Should this be provided? --> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.4.0.GA</version> + </dependency> + <!-- Should this be provided? --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.4.2</version> + </dependency> + <!--<dependency>--> + <!-- <groupId>c3p0</groupId>--> + <!-- <artifactId>c3p0</artifactId>--> + <!-- <version>0.9.1.2</version>--> + <!--</dependency>--> + <!-- Hypersonic in-memory database. Replace with a driver that reflects your database. --> + <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.10</version> + </dependency> </dependencies> <build> <finalName>${artifactId}</finalName> @@ -179,11 +164,11 @@ <artifactId>maven-eclipse-plugin</artifactId> <configuration> <wtpversion>2.0</wtpversion> -<!-- <downloadSources>true</downloadSources>--> -<!-- <downloadJavadocs>true</downloadJavadocs>--> + <!-- <downloadSources>true</downloadSources>--> + <!-- <downloadJavadocs>true</downloadJavadocs>--> </configuration> </plugin> - + <!-- Configure the JBoss Maven deploy plugin --> <plugin> <groupId>org.codehaus.mojo</groupId> Modified: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml =================================================================== --- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml 2009-11-29 23:11:26 UTC (rev 5173) +++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml 2009-11-30 03:42:28 UTC (rev 5174) @@ -45,17 +45,19 @@ <artifactId>jsr250-api</artifactId> <scope>provided</scope> </dependency> + <!-- Bean Validation API (JSR 303) --> <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> <scope>provided</scope> </dependency> + <!-- Bean Validation Implementation --> <!-- Provided on JBoss AS, not necessarily Java EE 6. Useful to give you extra built in constraints! --> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> <version>4.0.0.GA</version> - <scope>runtime</scope> +<!-- <scope>runtime</scope>--> </dependency> <!-- JSF 2.0 --> <dependency> @@ -96,20 +98,6 @@ </exclusions> </dependency> - - - <!-- Bean Validation API (JSR 303) --> - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - </dependency> - - <!-- Bean Validation Implementation --> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>4.0.0.GA</version> - </dependency> </dependencies> <build> <finalName>${artifactId}</finalName>