Skip to content
Browse files

Ear archetype : Fix compatibility with EAP ER6/7 repo

Signed-off-by: Fred Bricon <fbricon@gmail.com>
  • Loading branch information...
1 parent 00a1893 commit 2024eb5cfd8af00c36329693dec49b968c13b815 @fbricon fbricon committed May 11, 2012
View
2 jboss-javaee6-webapp-archetype/pom.xml
@@ -17,7 +17,7 @@
<name>Java EE 6 Webapp</name>
- <description>An archetype that generates a starter Java EE 6 webapp project for JBoss AS 7 (by default) or EAP 6 (if the "enterprise" property is true)</description>
+ <description>An archetype that generates a starter Java EE 6 webapp project for JBoss AS 7.1 (by default) or EAP 6 (if the "enterprise" property is true)</description>
<url>http://jboss.org/jbossas</url>
View
24 jboss-javaee6-webapp-ear-archetype/pom.xml
@@ -22,8 +22,8 @@
<version>7.1.1-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
- <name>JBoss AS 7 / Java EE 6 EAR Webapp</name>
- <description>An archetype that generates a starter Java EE 6 webapp project for JBoss AS 7 (by default) or EAP 6 (if the "enterprise" property is true). The project is an EAR, with an EJB-JAR and WAR</description>
+ <name>JBoss AS 7.1 / Java EE 6 EAR Webapp</name>
+ <description>An archetype that generates a starter Java EE 6 webapp project for JBoss AS 7.1 (by default) or EAP 6 (if the "enterprise" property is true). The project is an EAR, with an EJB-JAR and WAR</description>
<url>http://jboss.org/jbossas</url>
@@ -66,6 +66,13 @@
</licenses>
<build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
@@ -85,4 +92,17 @@
</pluginManagement>
</build>
+ <properties>
+ <enterprise.available>false</enterprise.available>
+ </properties>
+
+ <profiles>
+ <!-- Build with -Penterprise to test against an EAP repository -->
+ <profile>
+ <id>enterprise</id>
+ <properties>
+ <enterprise.available>true</enterprise.available>
+ </properties>
+ </profile>
+ </profiles>
</project>
View
2 ...ebapp-ear-archetype/src/main/resources/archetype-resources/__rootArtifactId__-web/pom.xml
@@ -44,7 +44,7 @@
in JBoss AS 7 -->
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
View
10 jboss-javaee6-webapp-ear-archetype/src/main/resources/archetype-resources/pom.xml
@@ -28,17 +28,17 @@ $symbol_escape = '\' )
to import. -->
#if ($enterprise == "true" || $enterprise == "y" || $enterprise == "yes" )
<!-- Certified version of the JBoss EAP components we want to use -->
- <jboss.bom.version>1.0.0.M6-redhat-1</jboss.bom.version>
+ <jboss.bom.version>1.0.0.M7-redhat-1</jboss.bom.version>
<!-- Alternatively, comment out the above line, and un-comment the
line below to use version 1.0.0M5 which is based on community built dependencies. -->
- <!-- <jboss.bom.version>1.0.0.M6</jboss.bom.version> -->
+ <!-- <jboss.bom.version>1.0.0.M7</jboss.bom.version> -->
#else
- <jboss.bom.version>1.0.0.M6</jboss.bom.version>
+ <jboss.bom.version>1.0.0.M7</jboss.bom.version>
<!-- Alternatively, comment out the above line, and un-comment the
- line below to use version 1.0.0.M6-redhat-1 which is a release certified
+ line below to use version 1.0.0.M7-redhat-1 which is a release certified
to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6
maven repository. -->
- <!-- <jboss.bom.version>1.0.0.M6-redhat-1</jboss.bom.version>> -->
+ <!-- <jboss.bom.version>1.0.0.M7-redhat-1</jboss.bom.version>> -->
#end
</properties>
View
5 ...-javaee6-webapp-ear-archetype/src/test/resources/projects/enterprise/archetype.properties
@@ -0,0 +1,5 @@
+groupId=foo.bar
+artifactId=enterprise
+version=0.0.1-SNAPSHOT
+package=foo.bar.enterprise
+enterprise=${enterprise.available}
View
1 jboss-javaee6-webapp-ear-archetype/src/test/resources/projects/enterprise/goal.txt
@@ -0,0 +1 @@
+verify
View
2 jboss-javaee6-webapp-ear-archetype/src/test/resources/projects/multi/goal.txt
@@ -1 +1 @@
-package
+verify

0 comments on commit 2024eb5

Please sign in to comment.
Something went wrong with that request. Please try again.