Skip to content
Browse files

Update blank archetypes

  • Loading branch information...
1 parent 9fa5234 commit 5cb7a9b80ac17ceef0f91a6d698806d5fd7e1287 @pmuir pmuir committed May 25, 2012
View
24 jboss-javaee6-webapp-blank-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>
@@ -53,6 +53,13 @@
<build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
@@ -72,4 +79,19 @@
</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
6 jboss-javaee6-webapp-blank-archetype/src/main/resources/archetype-resources/README.md
@@ -4,7 +4,7 @@ ${artifactId}
What is it?
-----------
-This is your project! It is a sample, deployable Maven 3 project to help you get your foot in the door developing with Java EE 6 on JBoss Enterprise Application Platform 6 or JBoss AS 7.
+This is your project! It is a sample, deployable Maven 3 project to help you get your foot in the door developing with Java EE 6 on JBoss Enterprise Application Platform 6 or JBoss AS 7.1.
This project is setup to allow you to create a compliant Java EE 6 application using JSF 2.0, CDI 1.0, EJB 3.1, JPA 2.0 and Bean Validation 1.0. It includes a persistence unit and some sample persistence and transaction code to introduce you to database access in enterprise Java.
@@ -14,7 +14,7 @@ System requirements
All you need to build this project is Java 6.0 (Java SDK 1.6) or better, Maven 3.0 or better.
-The application this project produces is designed to be run on JBoss Enterprise Application Platform 6 or JBoss AS 7.
+The application this project produces is designed to be run on JBoss Enterprise Application Platform 6 or JBoss AS 7.1.
Configure Maven
@@ -23,7 +23,7 @@ Configure Maven
If you have not yet done so, you must [Configure Maven](../README.html/#mavenconfiguration) before testing the quickstarts.
-Start JBoss Enterprise Application Platform 6 or JBoss AS 7 with the Web Profile
+Start JBoss Enterprise Application Platform 6 or JBoss AS 7.1
-------------------------
1. Open a command line and navigate to the root of the JBoss server directory.
View
40 jboss-javaee6-webapp-blank-archetype/src/main/resources/archetype-resources/pom.xml
@@ -7,16 +7,10 @@
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<packaging>war</packaging>
-<<<<<<< HEAD
- #if ($name != "")
- <name>${name}</name>
- #end
-=======
#if ($name != "")
<name>${name}</name>
#end
->>>>>>> ed7c19b... Update blank archetype
- <description>A starter Java EE 6 webapp project for use on JBoss AS 7 / EAP 6, generated from the jboss-javaee6-webapp archetype</description>
+ <description>A starter Java EE 6 webapp project for use on JBoss AS 7.1 / EAP 6, generated from the jboss-javaee6-webapp archetype</description>
<properties>
<!-- Explicitly declaring the source encoding eliminates the following
@@ -26,38 +20,20 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Define the version of JBoss' Java EE 6 APIs and Tools we want
to import. -->
-<<<<<<< HEAD
- #if ($enterprise == "true" || $enterprise == "y" || $enterprise
- == "yes" )
- <!-- Certified version of the JBoss EAP components we want to use -->
- <jboss.bom.version>1.0.0.M5-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.M5</jboss.bom.version> -->
- #else
- <jboss.bom.version>1.0.0.M5</jboss.bom.version>
- <!-- Alternatively, comment out the above line, and un-comment the
- line below to use version 1.0.0.M5-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.M5-redhat-1</jboss.bom.version>> -->
- #end
-=======
#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> -->
+ line below to use version 1.0.0M7 which is based on community built dependencies. -->
+ <!-- <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
->>>>>>> ed7c19b... Update blank archetype
</properties>
@@ -152,7 +128,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
60 ...pe/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml
@@ -14,66 +14,6 @@
<img src="resources/gfx/dualbrand_logo.png" />
</div>
<div id="content">
-<<<<<<< HEAD
- <div id="sidebar">
- <h3>Find out more</h3>
- <p>Learn about JBoss AS 7.</p>
- <ul>
- <li><a
- href="https://docs.jboss.org/author/display/AS7/Getting+Started+Developing+Applications+Guide">JBoss
- AS 7 Getting Started Developing Applications Guide</a></li>
- <li><a href="http://www.jboss.org/jbossas">JBoss AS 7 project
- site</a></li>
- </ul>
- <p>Learn about the Java EE 6 platform and the component
- model it provides.</p>
- <ul>
- <li><a
- href="http://download.oracle.com/javaee/6/tutorial/doc">Java
- EE 6 tutorial</a></li>
- <li><a
- href="http://docs.jboss.org/cdi/spec/1.0/html">JSR-299:
- CDI specification</a></li>
- <li><a
- href="https://sites.google.com/site/cdipojo/get-started">CDI
- Source</a></li>
- </ul>
- <p>Dive into Weld, the CDI reference implementation, and
- discover portable extensions Seam 3 offers.</p>
- <ul>
- <li><a
- href="http://docs.jboss.org/weld/reference/latest/en-US/html">Weld
- reference guide</a></li>
- <li><a href="http://seamframework.org/Weld">Weld
- project</a></li>
- <li><a href="http://seamframework.org/Seam3">Seam
- 3 project</a></li>
- <li><a
- href="http://seamframework.org/Community/Forums">User
- forums</a></li>
- <li><a
- href="http://seamframework.org/Community/MailingLists">Mailing
- lists</a></li>
- <li><a
- href="https://issues.jboss.org/browse/WELDRAD">Archetype
- issue tracker</a></li>
- </ul>
- <p>Explore JavaServer Faces, the component-oriented UI
- framework in Java EE 6.</p>
- <ul>
- <li><a href="http://www.javaserverfaces.org">JSF
- community site</a></li>
- </ul>
- <p>
- If you have an add-on, please <a
- href="http://seamframework.org/Community/Forums">let
- us know</a> and consider <a
- href="http://seamframework.org/Seam3/GetInvolved">contributing</a>
- it back to the community!
- </p>
- </div>
-=======
->>>>>>> ed7c19b... Update blank archetype
<ui:insert name="content">
[Template content will be inserted here]
</ui:insert>
View
15 ...webapp-blank-archetype/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
@@ -7,12 +7,6 @@
<ui:define name="content">
<h1>Welcome to JBoss!</h1>
-<<<<<<< HEAD
- <p>You have successfully deployed a Java EE 6 web application on JBoss AS 7.</p>
-
- <h:form id="reg">
- <h2>Register (Bean Validation example)</h2>
-=======
<div>
<p>You have successfully deployed a Java EE 6 web application.</p>
<h3>Your application can run on:</h3>
@@ -21,7 +15,6 @@
<h:form id="reg">
<h2>Member Registration</h2>
->>>>>>> ed7c19b... Update blank archetype
<p>Enforces annotation-based constraints defined on the model class.</p>
<h:panelGrid columns="3" columnClasses="titleCell">
<h:outputLabel for="name" value="Name:"/>
@@ -39,11 +32,7 @@
<p>
<h:panelGrid columns="2">
-<<<<<<< HEAD
- <h:commandButton id="register" action="#{memberController.register}" value="Register"/>
-=======
<h:commandButton id="register" action="#{memberController.register}" value="Register" styleClass="register"/>
->>>>>>> ed7c19b... Update blank archetype
<h:messages styleClass="messages" errorClass="invalid" infoClass="valid" warnClass="warning"
globalOnly="true"/>
</h:panelGrid>
@@ -53,11 +42,7 @@
<h:panelGroup rendered="#{empty members}">
<em>No registered members.</em>
</h:panelGroup>
-<<<<<<< HEAD
- <h:dataTable var="_member" value="#{members}" rendered="#{not empty members}">
-=======
<h:dataTable var="_member" value="#{members}" rendered="#{not empty members}" styleClass="simpletablestyle">
->>>>>>> ed7c19b... Update blank archetype
<h:column>
<f:facet name="header">Id</f:facet>
#{_member.id}
View
18 ...archetype/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css
@@ -67,15 +67,6 @@ h1 {
color:#243446;
font-size: 2.25em;
}
-<<<<<<< HEAD
-
-.messages {
- list-style-type: none;
-}
-
-.invalid {
- color: red;
-=======
h2 {
font-size: 1em;
}
@@ -192,13 +183,4 @@ input {
.simpletablestyle td a:hover {
color:#3883ce;
text-decoration:none;
->>>>>>> ed7c19b... Update blank archetype
-}
-
-.warn {
- color: orange;
-}
-
-.valid {
- color: green;
}
View
2 jboss-javaee6-webapp-blank-archetype/src/test/resources/projects/basic/goal.txt
@@ -1 +1 @@
-clean package
+clean verify
View
24 jboss-javaee6-webapp-ear-blank-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
6 jboss-javaee6-webapp-ear-blank-archetype/src/main/resources/archetype-resources/README.md
@@ -4,7 +4,7 @@ ${rootArtifactId}
What is it?
-----------
-This is your project! It is a sample, deployable Maven 3 project to help you get your foot in the door developing with Java EE 6 on JBoss Enterprise Application Platform 6 or JBoss AS 7.
+This is your project! It is a sample, deployable Maven 3 project to help you get your foot in the door developing with Java EE 6 on JBoss Enterprise Application Platform 6 or JBoss AS 7.1.
This project is setup to allow you to create a compliant Java EE 6 application using JSF 2.0, CDI 1.0, EJB 3.1, JPA 2.0 and Bean Validation 1.0. It includes a persistence unit and some sample persistence and transaction code to introduce you to database access in enterprise Java.
@@ -13,7 +13,7 @@ System requirements
All you need to build this project is Java 6.0 (Java SDK 1.6) or better, Maven 3.0 or better.
-The application this project produces is designed to be run on JBoss Enterprise Application Platform 6 or JBoss AS 7.
+The application this project produces is designed to be run on JBoss Enterprise Application Platform 6 or JBoss AS 7.1.
Configure Maven
@@ -22,7 +22,7 @@ Configure Maven
If you have not yet done so, you must [Configure Maven](../README.html/#mavenconfiguration) before testing the quickstarts.
-Start JBoss Enterprise Application Platform 6 or JBoss AS 7 with the Web Profile
+Start JBoss Enterprise Application Platform 6 or JBoss AS 7.1
-------------------------
1. Open a command line and navigate to the root of the JBoss server directory.
View
2 ...ear-blank-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-blank-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
2 jboss-javaee6-webapp-ear-blank-archetype/src/test/resources/projects/multi/goal.txt
@@ -1 +1 @@
-package
+verify

0 comments on commit 5cb7a9b

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