Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Various fixes to archetypes

* Rebrand
* Merge in changes from quickstarts
  • Loading branch information...
commit 7bb2312deb31b934ca238fbad12644e3a3ae8cb5 1 parent 94ca33d
@pmuir pmuir authored
Showing with 1,801 additions and 1,144 deletions.
  1. +5 −5 jboss-javaee6-webapp-archetype/src/main/resources/archetype-resources/pom.xml
  2. +18 −59 ...ee6-webapp-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml
  3. +9 −5 jboss-javaee6-webapp-archetype/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
  4. +170 −36 jboss-javaee6-webapp-archetype/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css
  5. BIN  ...-javaee6-webapp-archetype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/asidebkg.png
  6. BIN  ...ee6-webapp-archetype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/bkg-blkheader.png
  7. BIN  ...-webapp-archetype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/dualbrand_as7eap.png
  8. BIN  ...type/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/dualbrand_catapillarbutterfly.png
  9. BIN  ...e6-webapp-archetype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/dualbrand_logo.png
  10. BIN  ...javaee6-webapp-archetype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/headerbkg.png
  11. BIN  ...avaee6-webapp-archetype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/icon_large.png
  12. BIN  ...vaee6-webapp-archetype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/icon_medium.png
  13. BIN  ...avaee6-webapp-archetype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/icon_small.png
  14. +23 −0 jboss-javaee6-webapp-blank-archetype/src/main/resources/archetype-resources/pom.xml
  15. +21 −2 ...bapp-blank-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml
  16. +20 −1 jboss-javaee6-webapp-blank-archetype/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
  17. +180 −28 ...aee6-webapp-blank-archetype/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css
  18. BIN  ...e6-webapp-blank-archetype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/asidebkg.png
  19. BIN  ...bapp-blank-archetype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/bkg-blkheader.png
  20. BIN  ...p-blank-archetype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/dualbrand_as7eap.png
  21. BIN  ...type/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/dualbrand_catapillarbutterfly.png
  22. BIN  ...app-blank-archetype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/dualbrand_logo.png
  23. BIN  ...6-webapp-blank-archetype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/headerbkg.png
  24. BIN  ...-webapp-blank-archetype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/icon_large.png
  25. BIN  ...webapp-blank-archetype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/icon_medium.png
  26. BIN  ...-webapp-blank-archetype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/icon_small.png
  27. +1 −1  jboss-javaee6-webapp-ear-archetype/pom.xml
  28. +102 −96 jboss-javaee6-webapp-ear-archetype/src/main/resources/META-INF/maven/archetype-metadata-blank.xml
  29. +113 −110 jboss-javaee6-webapp-ear-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
  30. +4 −10 jboss-javaee6-webapp-ear-archetype/src/main/resources/archetype-resources/README.md
  31. +21 −0 ...esources/archetype-resources/__rootArtifactId__-ear/src/main/application/META-INF/__rootArtifactId__-ds.xml
  32. +0 −74 jboss-javaee6-webapp-ear-archetype/src/main/resources/archetype-resources/__rootArtifactId__-ejb/pom.xml
  33. +32 −0 ...src/main/resources/archetype-resources/__rootArtifactId__-ejb/src/main/java/service/MemberRegistration.java
  34. +2 −2 ...e/src/main/resources/archetype-resources/__rootArtifactId__-ejb/src/main/resources/META-INF/persistence.xml
  35. +12 −8 ...rc/main/resources/archetype-resources/__rootArtifactId__-ejb/src/test/java/test/MemberRegistrationTest.java
  36. +20 −0 .../main/resources/archetype-resources/__rootArtifactId__-ejb/src/test/resources/META-INF/test-persistence.xml
  37. +21 −0 ...-ear-archetype/src/main/resources/archetype-resources/__rootArtifactId__-ejb/src/test/resources/test-ds.xml
  38. +8 −0 jboss-javaee6-webapp-ear-archetype/src/main/resources/archetype-resources/__rootArtifactId__-web/pom.xml
  39. +11 −12 ...oller/MemberRegistration.java → __rootArtifactId__-web/src/main/java/controller/MemberController.java}
  40. +35 −0 ...rchetype/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/util/WebResources.java
  41. +18 −59 ...c/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/WEB-INF/templates/default.xhtml
  42. +29 −37 ...app-ear-archetype/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/index.xhtml
  43. +176 −30 ...type/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/resources/css/screen.css
  44. BIN  ...pe/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/resources/gfx/asidebkg.png
  45. BIN  ...c/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/resources/gfx/bkg-blkheader.png
  46. BIN  ...ain/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/resources/gfx/dualbrand_as7eap.png
  47. BIN  .../archetype-resources/__rootArtifactId__-web/src/main/webapp/resources/gfx/dualbrand_catapillarbutterfly.png
  48. BIN  .../main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/resources/gfx/dualbrand_logo.png
  49. BIN  ...e/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/resources/gfx/headerbkg.png
  50. BIN  .../src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/resources/gfx/icon_large.png
  51. BIN  ...src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/resources/gfx/icon_medium.png
  52. BIN  .../src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/resources/gfx/icon_small.png
  53. +129 −120 jboss-javaee6-webapp-ear-archetype/src/main/resources/archetype-resources/pom.xml
  54. +1 −1  jboss-javaee6-webapp-ear-blank-archetype/pom.xml
  55. +102 −96 jboss-javaee6-webapp-ear-blank-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
  56. +4 −10 jboss-javaee6-webapp-ear-blank-archetype/src/main/resources/archetype-resources/README.md
  57. +21 −0 ...esources/archetype-resources/__rootArtifactId__-ear/src/main/application/META-INF/__rootArtifactId__-ds.xml
  58. +0 −74 jboss-javaee6-webapp-ear-blank-archetype/src/main/resources/archetype-resources/__rootArtifactId__-ejb/pom.xml
  59. +32 −0 ...src/main/resources/archetype-resources/__rootArtifactId__-ejb/src/main/java/service/MemberRegistration.java
  60. +2 −2 ...e/src/main/resources/archetype-resources/__rootArtifactId__-ejb/src/main/resources/META-INF/persistence.xml
  61. +12 −8 ...rc/main/resources/archetype-resources/__rootArtifactId__-ejb/src/test/java/test/MemberRegistrationTest.java
  62. +20 −0 .../main/resources/archetype-resources/__rootArtifactId__-ejb/src/test/resources/META-INF/test-persistence.xml
  63. +21 −0 ...lank-archetype/src/main/resources/archetype-resources/__rootArtifactId__-ejb/src/test/resources/test-ds.xml
  64. +8 −0 jboss-javaee6-webapp-ear-blank-archetype/src/main/resources/archetype-resources/__rootArtifactId__-web/pom.xml
  65. +11 −12 ...oller/MemberRegistration.java → __rootArtifactId__-web/src/main/java/controller/MemberController.java}
  66. +35 −0 ...rchetype/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/util/WebResources.java
  67. +18 −59 ...c/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/WEB-INF/templates/default.xhtml
  68. +29 −37 ...r-blank-archetype/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/index.xhtml
  69. +176 −30 ...type/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/resources/css/screen.css
  70. BIN  ...pe/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/resources/gfx/asidebkg.png
  71. BIN  ...c/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/resources/gfx/bkg-blkheader.png
  72. BIN  ...ain/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/resources/gfx/dualbrand_as7eap.png
  73. BIN  .../archetype-resources/__rootArtifactId__-web/src/main/webapp/resources/gfx/dualbrand_catapillarbutterfly.png
  74. BIN  .../main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/resources/gfx/dualbrand_logo.png
  75. BIN  ...e/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/resources/gfx/headerbkg.png
  76. BIN  .../src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/resources/gfx/icon_large.png
  77. BIN  ...src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/resources/gfx/icon_medium.png
  78. BIN  .../src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/resources/gfx/icon_small.png
  79. +129 −120 jboss-javaee6-webapp-ear-blank-archetype/src/main/resources/archetype-resources/pom.xml
View
10 jboss-javaee6-webapp-archetype/src/main/resources/archetype-resources/pom.xml
@@ -22,17 +22,17 @@
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.M5-redhat-1</jboss.bom.version>
+ <jboss.bom.version>1.0.0.M6-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> -->
+ <!-- <jboss.bom.version>1.0.0.M6</jboss.bom.version> -->
#else
- <jboss.bom.version>1.0.0.M5</jboss.bom.version>
+ <jboss.bom.version>1.0.0.M6</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
+ line below to use version 1.0.0.M6-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>> -->
+ <!-- <jboss.bom.version>1.0.0.M6-redhat-1</jboss.bom.version>> -->
#end
</properties>
View
77 ...pe/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml
@@ -10,70 +10,29 @@
</h:head>
<h:body>
<div id="container">
+ <div class="dualbrand">
+ <img src="resources/gfx/dualbrand_logo.png" />
+ </div>
<div id="content">
- <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>
<ui:insert name="content">
[Template content will be inserted here]
- </ui:insert>
+ </ui:insert>
+ </div>
+ <div id="aside">
+ <p>Learn more about JBoss Enterprise Application Platform 6.</p>
+ <ul>
+ <li><a
+ href="http://red.ht/jbeap-6-docs">Documentation</a></li>
+ <li><a href="http://red.ht/jbeap-6">Product Information</a></li>
+ </ul>
+ <p>Learn more about JBoss AS 7.</p>
+ <ul>
+ <li><a
+ href="https://docs.jboss.org/author/display/AS7/Getting+Started+Developing+Applications+Guide">Getting Started Developing Applications Guide</a></li>
+ <li><a href="http://jboss.org/jbossas">Community Project Information</a></li>
+ </ul>
</div>
<div id="footer">
- <h:graphicImage value="/resources/gfx/logo.png" alt="Weld logo" />
<p>
This project was generated from a Maven archetype from
JBoss.<br />
View
14 ...vaee6-webapp-archetype/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
@@ -5,12 +5,16 @@
xmlns:h="http://java.sun.com/jsf/html"
template="/WEB-INF/templates/default.xhtml">
<ui:define name="content">
- <h1>Welcome to JBoss AS 7!</h1>
+ <h1>Welcome to JBoss!</h1>
- <p>You have successfully deployed a Java EE 6 web application on JBoss AS 7.</p>
+ <div>
+ <p>You have successfully deployed a Java EE 6 web application.</p>
+ <h3>Your application can run on:</h3>
+ <img src="resources/gfx/dualbrand_as7eap.png"/>
+ </div>
<h:form id="reg">
- <h2>Register (Bean Validation example)</h2>
+ <h2>Member Registration</h2>
<p>Enforces annotation-based constraints defined on the model class.</p>
<h:panelGrid columns="3" columnClasses="titleCell">
<h:outputLabel for="name" value="Name:"/>
@@ -28,7 +32,7 @@
<p>
<h:panelGrid columns="2">
- <h:commandButton id="register" action="#{memberController.register}" value="Register"/>
+ <h:commandButton id="register" action="#{memberController.register}" value="Register" styleClass="register"/>
<h:messages styleClass="messages" errorClass="invalid" infoClass="valid" warnClass="warning"
globalOnly="true"/>
</h:panelGrid>
@@ -38,7 +42,7 @@
<h:panelGroup rendered="#{empty members}">
<em>No registered members.</em>
</h:panelGroup>
- <h:dataTable var="_member" value="#{members}" rendered="#{not empty members}">
+ <h:dataTable var="_member" value="#{members}" rendered="#{not empty members}" styleClass="simpletablestyle">
<h:column>
<f:facet name="header">Id</f:facet>
#{_member.id}
View
206 ...archetype/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css
@@ -1,52 +1,186 @@
+/* Core styles for the page */
body {
- margin: 0;
- padding: 0;
- background-color: #EAECEE;
- font-family: Verdana, sans-serif;
- font-size: 0.9em;
+ margin: 0;
+ padding: 0;
+ background-color: #F1F1F1;
+ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
+ font-size: 0.8em;
+ color:#363636;
}
+
#container {
- margin: 0 auto;
- padding: 0 20px 10px 20px;
- border: 1px solid #666666;
- width: 865px; /* subtract 40px from banner width for padding */
- background: #FFFFFF url(#{request.contextPath}/resources/gfx/banner.png) no-repeat;
- padding-top: 110px;
-}
-#sidebar {
- font-size: 0.9em;
- width: 225px;
- float: right;
- border: 1px solid #666666;
- background: #EAECEE;
- padding: 0 15px 5px 15px;
-}
-#sidebar ul {
- padding-left: 30px;
+ margin: 0 auto;
+ padding: 0 20px 10px 20px;
+ border-top: 5px solid #000000;
+ border-left: 5px solid #8c8f91;
+ border-right: 5px solid #8c8f91;
+ border-bottom: 25px solid #8c8f91;
+ width: 865px; /* subtract 40px from banner width for padding */
+ background: #FFFFFF;
+ background-image: url(#{request.contextPath}/resources/gfx/headerbkg.png);
+ background-repeat: repeat-x;
+ padding-top: 30px;
+ box-shadow: 3px 3px 15px #d5d5d5;
+}
+#content {
+ float: left;
+ width: 500px;
+ margin: 20px;
+}
+#aside {
+ font-size: 0.9em;
+ width: 275px;
+ float: left;
+ margin: 20px 0px;
+ border: 1px solid #D5D5D5;
+ background: #F1F1F1;
+ background-image: url(#{request.contextPath}/resources/gfx/asidebkg.png);
+ background-repeat: repeat-x;
+ padding: 20px;
+}
+
+#aside ul {
+ padding-left: 30px;
+}
+.dualbrand {
+ float: right;
+ padding-right: 10px;
}
#footer {
- clear: both;
- text-align: center;
- color: #666666;
- font-size: 0.85em;
- padding: 3em 0 0 0;
+ clear: both;
+ text-align: center;
+ color: #666666;
+ font-size: 0.85em;
}
code {
- font-size: 1.1em;
+ font-size: 1.1em;
+}
+a {
+ color: #4a5d75;
+ text-decoration: none;
+}
+a:hover {
+ color: #369;
+ text-decoration: underline;
+}
+h1 {
+ color:#243446;
+ font-size: 2.25em;
+}
+h2 {
+ font-size: 1em;
+}
+h3 {
+ color:#243446;
+}
+h4 {
+}
+h5 {
+}
+h6 {
+}
+/* Member registration styles */
+span.invalid {
+ padding-left: 3px;
+ color: red;
+}
+form {
+ padding: 1em;
+ font: 80%/1 sans-serif;
+ width: 375px;
+ border: 1px solid #D5D5D5;
+}
+label {
+ float: left;
+ width: 15%;
+ margin-left: 20px;
+ margin-right: 0.5em;
+ padding-top: 0.2em;
+ text-align: right;
+ font-weight: bold;
+ color:#363636;
+}
+input {
+ margin-bottom: 8px;
+}
+.register {
+ float: left;
+ margin-left: 85px;
}
-.messages {
- list-style-type: none;
+/* ----- table style ------- */
+
+
+/* = Simple Table style (black header, grey/white stripes */
+
+.simpletablestyle {
+ background-color:#E6E7E8;
+ clear:both;
+ width: 550px;
+}
+
+.simpletablestyle img {
+ border:0px;
}
-.invalid {
- color: red;
+.simpletablestyle td {
+ height:2em;
+ padding-left: 6px;
+ font-size:11px;
+ padding:5px 5px;
}
-.warn {
- color: orange;
+.simpletablestyle th {
+ background: url(#{request.contextPath}/resources/gfx/bkg-blkheader.png) black repeat-x top left;
+ font-size:12px;
+ font-weight:normal;
+ padding:0 10px 0 5px;
+ border-bottom:#999999 dotted 1px;
+}
+
+.simpletablestyle thead {
+ background: url(#{request.contextPath}/resources/gfx/bkg-blkheader.png) black repeat-x top left;
+ height:31px;
+ font-size:10px;
+ font-weight:bold;
+ color:#FFFFFF;
+ text-align:left;
+}
+
+.simpletablestyle .header a {
+ color:#94aebd;
+}
+
+.simpletablestype tfoot {
+ height: 20px;
+ font-size: 10px;
+ font-weight: bold;
+ background-color: #EAECEE;
+ text-align: center;
+}
+
+.simpletablestyle tr.header td {
+ padding: 0px 10px 0px 5px;
+}
+
+
+.simpletablestyle .subheader {
+ background-color: #e6e7e8;
+ font-size:10px;
+ font-weight:bold;
+ color:#000000;
+ text-align:left;
+}
+
+/* Using new CSS3 selectors for styling*/
+.simpletablestyle tr:nth-child(odd) {
+ background: #f4f3f3;
+}
+.simpletablestyle tr:nth-child(even) {
+ background: #ffffff;
}
-.valid {
- color: green;
+.simpletablestyle td a:hover {
+ color:#3883ce;
+ text-decoration:none;
}
View
BIN  ...chetype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/asidebkg.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  ...pe/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/bkg-blkheader.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  ...src/main/resources/archetype-resources/src/main/webapp/resources/gfx/dualbrand_as7eap.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  ...urces/archetype-resources/src/main/webapp/resources/gfx/dualbrand_catapillarbutterfly.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  ...e/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/dualbrand_logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  ...hetype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/headerbkg.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  ...etype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/icon_large.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  ...type/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/icon_medium.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  ...etype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/icon_small.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
23 jboss-javaee6-webapp-blank-archetype/src/main/resources/archetype-resources/pom.xml
@@ -7,9 +7,15 @@
<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>
<properties>
@@ -20,6 +26,7 @@
<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 -->
@@ -35,6 +42,22 @@
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>
+ <!-- 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> -->
+#else
+ <jboss.bom.version>1.0.0.M6</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
+ 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>> -->
+#end
+>>>>>>> ed7c19b... Update blank archetype
</properties>
View
23 ...pe/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml
@@ -10,7 +10,11 @@
</h:head>
<h:body>
<div id="container">
+ <div class="dualbrand">
+ <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>
@@ -68,12 +72,27 @@
it back to the community!
</p>
</div>
+=======
+>>>>>>> ed7c19b... Update blank archetype
<ui:insert name="content">
[Template content will be inserted here]
- </ui:insert>
+ </ui:insert>
+ </div>
+ <div id="aside">
+ <p>Learn more about JBoss Enterprise Application Platform 6.</p>
+ <ul>
+ <li><a
+ href="http://red.ht/jbeap-6-docs">Documentation</a></li>
+ <li><a href="http://red.ht/jbeap-6">Product Information</a></li>
+ </ul>
+ <p>Learn more about JBoss AS 7.</p>
+ <ul>
+ <li><a
+ href="https://docs.jboss.org/author/display/AS7/Getting+Started+Developing+Applications+Guide">Getting Started Developing Applications Guide</a></li>
+ <li><a href="http://jboss.org/jbossas">Community Project Information</a></li>
+ </ul>
</div>
<div id="footer">
- <h:graphicImage value="/resources/gfx/logo.png" alt="Weld logo" />
<p>
This project was generated from a Maven archetype from
JBoss.<br />
View
21 ...webapp-blank-archetype/src/main/resources/archetype-resources/src/main/webapp/index.xhtml
@@ -5,12 +5,23 @@
xmlns:h="http://java.sun.com/jsf/html"
template="/WEB-INF/templates/default.xhtml">
<ui:define name="content">
- <h1>Welcome to JBoss AS 7!</h1>
+ <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>
+ <img src="resources/gfx/dualbrand_as7eap.png"/>
+ </div>
+
+ <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:"/>
@@ -28,7 +39,11 @@
<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>
@@ -38,7 +53,11 @@
<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
208 ...archetype/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css
@@ -1,39 +1,73 @@
+/* Core styles for the page */
body {
- margin: 0;
- padding: 0;
- background-color: #EAECEE;
- font-family: Verdana, sans-serif;
- font-size: 0.9em;
+ margin: 0;
+ padding: 0;
+ background-color: #F1F1F1;
+ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
+ font-size: 0.8em;
+ color:#363636;
}
+
#container {
- margin: 0 auto;
- padding: 0 20px 10px 20px;
- border: 1px solid #666666;
- width: 865px; /* subtract 40px from banner width for padding */
- background: #FFFFFF url(#{request.contextPath}/resources/gfx/banner.png) no-repeat;
- padding-top: 110px;
-}
-#sidebar {
- font-size: 0.9em;
- width: 225px;
- float: right;
- border: 1px solid #666666;
- background: #EAECEE;
- padding: 0 15px 5px 15px;
-}
-#sidebar ul {
- padding-left: 30px;
+ margin: 0 auto;
+ padding: 0 20px 10px 20px;
+ border-top: 5px solid #000000;
+ border-left: 5px solid #8c8f91;
+ border-right: 5px solid #8c8f91;
+ border-bottom: 25px solid #8c8f91;
+ width: 865px; /* subtract 40px from banner width for padding */
+ background: #FFFFFF;
+ background-image: url(#{request.contextPath}/resources/gfx/headerbkg.png);
+ background-repeat: repeat-x;
+ padding-top: 30px;
+ box-shadow: 3px 3px 15px #d5d5d5;
+}
+#content {
+ float: left;
+ width: 500px;
+ margin: 20px;
+}
+#aside {
+ font-size: 0.9em;
+ width: 275px;
+ float: left;
+ margin: 20px 0px;
+ border: 1px solid #D5D5D5;
+ background: #F1F1F1;
+ background-image: url(#{request.contextPath}/resources/gfx/asidebkg.png);
+ background-repeat: repeat-x;
+ padding: 20px;
+}
+
+#aside ul {
+ padding-left: 30px;
+}
+.dualbrand {
+ float: right;
+ padding-right: 10px;
}
#footer {
- clear: both;
- text-align: center;
- color: #666666;
- font-size: 0.85em;
- padding: 3em 0 0 0;
+ clear: both;
+ text-align: center;
+ color: #666666;
+ font-size: 0.85em;
}
code {
- font-size: 1.1em;
+ font-size: 1.1em;
}
+a {
+ color: #4a5d75;
+ text-decoration: none;
+}
+a:hover {
+ color: #369;
+ text-decoration: underline;
+}
+h1 {
+ color:#243446;
+ font-size: 2.25em;
+}
+<<<<<<< HEAD
.messages {
list-style-type: none;
@@ -41,6 +75,124 @@ code {
.invalid {
color: red;
+=======
+h2 {
+ font-size: 1em;
+}
+h3 {
+ color:#243446;
+}
+h4 {
+}
+h5 {
+}
+h6 {
+}
+/* Member registration styles */
+span.invalid {
+ padding-left: 3px;
+ color: red;
+}
+form {
+ padding: 1em;
+ font: 80%/1 sans-serif;
+ width: 375px;
+ border: 1px solid #D5D5D5;
+}
+label {
+ float: left;
+ width: 15%;
+ margin-left: 20px;
+ margin-right: 0.5em;
+ padding-top: 0.2em;
+ text-align: right;
+ font-weight: bold;
+ color:#363636;
+}
+input {
+ margin-bottom: 8px;
+}
+.register {
+ float: left;
+ margin-left: 85px;
+}
+
+/* ----- table style ------- */
+
+
+/* = Simple Table style (black header, grey/white stripes */
+
+.simpletablestyle {
+ background-color:#E6E7E8;
+ clear:both;
+ width: 550px;
+}
+
+.simpletablestyle img {
+ border:0px;
+}
+
+.simpletablestyle td {
+ height:2em;
+ padding-left: 6px;
+ font-size:11px;
+ padding:5px 5px;
+}
+
+.simpletablestyle th {
+ background: url(#{request.contextPath}/resources/gfx/bkg-blkheader.png) black repeat-x top left;
+ font-size:12px;
+ font-weight:normal;
+ padding:0 10px 0 5px;
+ border-bottom:#999999 dotted 1px;
+}
+
+.simpletablestyle thead {
+ background: url(#{request.contextPath}/resources/gfx/bkg-blkheader.png) black repeat-x top left;
+ height:31px;
+ font-size:10px;
+ font-weight:bold;
+ color:#FFFFFF;
+ text-align:left;
+}
+
+.simpletablestyle .header a {
+ color:#94aebd;
+}
+
+.simpletablestype tfoot {
+ height: 20px;
+ font-size: 10px;
+ font-weight: bold;
+ background-color: #EAECEE;
+ text-align: center;
+}
+
+.simpletablestyle tr.header td {
+ padding: 0px 10px 0px 5px;
+}
+
+
+.simpletablestyle .subheader {
+ background-color: #e6e7e8;
+ font-size:10px;
+ font-weight:bold;
+ color:#000000;
+ text-align:left;
+}
+
+/* Using new CSS3 selectors for styling*/
+.simpletablestyle tr:nth-child(odd) {
+ background: #f4f3f3;
+}
+.simpletablestyle tr:nth-child(even) {
+ background: #ffffff;
+}
+
+.simpletablestyle td a:hover {
+ color:#3883ce;
+ text-decoration:none;
+>>>>>>> ed7c19b... Update blank archetype
}
.warn {
View
BIN  ...chetype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/asidebkg.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  ...pe/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/bkg-blkheader.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  ...src/main/resources/archetype-resources/src/main/webapp/resources/gfx/dualbrand_as7eap.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  ...urces/archetype-resources/src/main/webapp/resources/gfx/dualbrand_catapillarbutterfly.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  ...e/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/dualbrand_logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  ...hetype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/headerbkg.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  ...etype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/icon_large.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  ...type/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/icon_medium.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  ...etype/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/icon_small.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
2  jboss-javaee6-webapp-ear-archetype/pom.xml
@@ -19,7 +19,7 @@
<groupId>org.jboss.spec.archetypes</groupId>
<artifactId>jboss-javaee6-webapp-ear-archetype</artifactId>
- <version>7.0.2-SNAPSHOT</version>
+ <version>7.1.1-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>JBoss AS 7 / Java EE 6 EAR Webapp</name>
View
198 ...vaee6-webapp-ear-archetype/src/main/resources/META-INF/maven/archetype-metadata-blank.xml
@@ -1,101 +1,107 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); you
+ may not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
+ required by applicable law or agreed to in writing, software distributed
+ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+ OR CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the License. -->
<archetype-descriptor name="multi-javaee6-archetype">
- <requiredProperties>
- <requiredProperty key="enterprise">
- <defaultValue>false</defaultValue>
- </requiredProperty>
- </requiredProperties>
- <fileSets>
- <fileSet filtered="false" packaged="false">
- <directory></directory>
- <includes>
- <include>.gitignore</include>
- </includes>
- </fileSet>
- </fileSets>
- <modules>
- <module id="${rootArtifactId}-ejb" dir="__rootArtifactId__-ejb" name="${rootArtifactId}-ejb">
- <fileSets>
- <fileSet encoding="UTF-8">
- <directory>src/main/java</directory>
- <excludes>
- <exclude>**/*</exclude>
- </excludes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory>src/test/java</directory>
- <excludes>
- <exclude>**/*</exclude>
- </excludes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </fileSet>
- <fileSet filtered="false" encoding="UTF-8">
- <directory>src/test/resources</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </fileSet>
- </fileSets>
- </module>
- <module id="${rootArtifactId}-web" dir="__rootArtifactId__-web" name="${rootArtifactId}-web">
- <fileSets>
- <fileSet encoding="UTF-8">
- <directory>src/main/java</directory>
- <excludes>
- <exclude>**/*</exclude>
- </excludes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory>src/test/java</directory>
- <excludes>
- <exclude>**/*</exclude>
- </excludes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*</exclude>
- </excludes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory>src/test/resources</directory>
- <excludes>
- <exclude>**/*</exclude>
- </excludes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/main/webapp</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory>src/main/webapp/resources</directory>
- <excludes>
- <exclude>**/*</exclude>
- </excludes>
+ <requiredProperties>
+ <requiredProperty key="enterprise">
+ <defaultValue>false</defaultValue>
+ </requiredProperty>
+ </requiredProperties>
+ <fileSets>
+ <fileSet filtered="false" packaged="false">
+ <directory></directory>
+ <includes>
+ <include>.gitignore</include>
+ </includes>
</fileSet>
- </fileSets>
- </module>
- <module id="${rootArtifactId}-ear" dir="__rootArtifactId__-ear" name="${rootArtifactId}-ear" />
- </modules>
+ </fileSets>
+ <modules>
+ <module id="${rootArtifactId}-ejb" dir="__rootArtifactId__-ejb"
+ name="${rootArtifactId}-ejb">
+ <fileSets>
+ <fileSet encoding="UTF-8">
+ <directory>src/main/java</directory>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>src/test/java</directory>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ </module>
+ <module id="${rootArtifactId}-web" dir="__rootArtifactId__-web"
+ name="${rootArtifactId}-web">
+ <fileSets>
+ <fileSet encoding="UTF-8">
+ <directory>src/main/java</directory>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>src/test/java</directory>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>src/test/resources</directory>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/main/webapp</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>src/main/webapp/resources</directory>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+ </module>
+ <module id="${rootArtifactId}-ear" dir="__rootArtifactId__-ear"
+ name="${rootArtifactId}-ear">
+ <fileSets>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/main/application</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ </module>
+ </modules>
</archetype-descriptor>
View
223 jboss-javaee6-webapp-ear-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -1,116 +1,119 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); you
+ may not use this file except in compliance with the License. You may obtain
+ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
+ required by applicable law or agreed to in writing, software distributed
+ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+ OR CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the License. -->
<archetype-descriptor name="multi-javaee6-archetype">
- <requiredProperties>
- <requiredProperty key="enterprise">
- <defaultValue>false</defaultValue>
- </requiredProperty>
- </requiredProperties>
- <fileSets>
- <fileSet filtered="true" packaged="false">
- <directory></directory>
- <includes>
- <include>README.md</include>
- </includes>
- </fileSet>
- <fileSet filtered="false" packaged="false">
- <directory></directory>
- <includes>
- <include>.gitignore</include>
- </includes>
- </fileSet>
- </fileSets>
- <modules>
- <module id="${rootArtifactId}-ejb" dir="__rootArtifactId__-ejb" name="${rootArtifactId}-ejb">
- <fileSets>
- <fileSet filtered="true" packaged="true" encoding="UTF-8">
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.java</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </fileSet>
- <fileSet filtered="false" encoding="UTF-8">
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.sql</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" packaged="true" encoding="UTF-8">
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.java</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/test/resources</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </fileSet>
- <fileSet filtered="false" encoding="UTF-8">
- <directory>src/test/resources</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </fileSet>
- </fileSets>
- </module>
- <module id="${rootArtifactId}-web" dir="__rootArtifactId__-web" name="${rootArtifactId}-web">
- <fileSets>
- <fileSet filtered="true" packaged="true" encoding="UTF-8">
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.java</include>
- </includes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory>src/main/resources</directory>
- <excludes>
- <exclude>**/*</exclude>
- </excludes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory>src/test/java</directory>
- <excludes>
- <exclude>**/*</exclude>
- </excludes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/main/webapp</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
+ <requiredProperties>
+ <requiredProperty key="enterprise">
+ <defaultValue>false</defaultValue>
+ </requiredProperty>
+ </requiredProperties>
+ <fileSets>
+ <fileSet filtered="true" packaged="false">
+ <directory></directory>
+ <includes>
+ <include>README.md</include>
+ </includes>
</fileSet>
- <fileSet filtered="false" encoding="UTF-8">
- <directory>src/main/webapp</directory>
- <includes>
- <include>**/*.html</include>
- <include>**/*.css</include>
- <include>**/*.png</include>
- <include>**/*.xhtml</include>
- </includes>
+ <fileSet filtered="false" packaged="false">
+ <directory></directory>
+ <includes>
+ <include>.gitignore</include>
+ </includes>
</fileSet>
- </fileSets>
- </module>
- <module id="${rootArtifactId}-ear" dir="__rootArtifactId__-ear" name="${rootArtifactId}-ear" />
- </modules>
+ </fileSets>
+ <modules>
+ <module id="${rootArtifactId}-ejb" dir="__rootArtifactId__-ejb"
+ name="${rootArtifactId}-ejb">
+ <fileSets>
+ <fileSet filtered="true" packaged="true"
+ encoding="UTF-8">
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="false" encoding="UTF-8">
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.sql</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" packaged="true"
+ encoding="UTF-8">
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ </module>
+ <module id="${rootArtifactId}-web" dir="__rootArtifactId__-web"
+ name="${rootArtifactId}-web">
+ <fileSets>
+ <fileSet filtered="true" packaged="true"
+ encoding="UTF-8">
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8" filtered="true">
+ <directory>src/test/java</directory>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/main/webapp</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="false" encoding="UTF-8">
+ <directory>src/main/webapp</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.css</include>
+ <include>**/*.png</include>
+ <include>**/*.xhtml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ </module>
+ <module id="${rootArtifactId}-ear" dir="__rootArtifactId__-ear"
+ name="${rootArtifactId}-ear">
+ <fileSets>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/main/application</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ </module>
+ </modules>
</archetype-descriptor>
View
14 jboss-javaee6-webapp-ear-archetype/src/main/resources/archetype-resources/README.md
@@ -4,12 +4,7 @@ ${rootArtifactId}
What is it?
-----------
-This is your project! It's a sample, deployable Maven 3 project to help you
-get your foot in the door developing with Java EE 6 on JBoss AS 7 or EAP 6. 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 help
-you get your feet wet with database access in enterprise Java.
+This is your project! It's 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 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 help you get your feet wet with database access in enterprise Java.
System requirements
-------------------
@@ -17,14 +12,14 @@ 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 a JBoss AS 7 or EAP 6.
+The application this project produces is designed to be run on a JBoss Enterprise Application Platform 6 or JBoss AS 7.
With the prerequisites out of the way, you're ready to build and deploy.
Deploying the application
-------------------------
-First you need to start JBoss A. To do this, run
+First you need to start JBoss Enterprise Application Platform 6 or JBoss AS 7. To do this, run
$JBOSS_HOME/bin/standalone.sh
@@ -49,8 +44,7 @@ To undeploy from JBoss AS, run this command:
mvn jboss-as:undeploy
-You can also start JBoss AS 7 and deploy the project using Eclipse. See the JBoss AS 7
-Getting Started Guide for Developers for more information.
+You can also start JBoss AS 7 and deploy the project using Eclipse. See the JBoss AS 7 <a href="https://docs.jboss.org/author/display/AS71/Getting+Started+Developing+Applications+Guide" title="Getting Started Developing Applications Guide">Getting Started Developing Applications Guide</a> for more information.
Running the Arquillian tests
============================
View
21 ...-resources/__rootArtifactId__-ear/src/main/application/META-INF/__rootArtifactId__-ds.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This is an unmanaged datasource. It should be used for proofs of concept
+ or testing only. It uses H2, an in memory database that ships with JBoss
+ AS. -->
+<datasources xmlns="http://www.jboss.org/ironjacamar/schema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/ironjacamar/schema http://docs.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+ <!-- The datasource is bound into JNDI at this location. We reference
+ this in META-INF/persistence.xml -->
+ <datasource jndi-name="java:jboss/datasources/${rootArtifactId}DS"
+ pool-name="${rootArtifactId}" enabled="true"
+ use-java-context="true">
+ <connection-url>jdbc:h2:mem:${rootArtifactId};DB_CLOSE_DELAY=-1</connection-url>
+ <driver>h2</driver>
+ <security>
+ <user-name>sa</user-name>
+ <password>sa</password>
+ </security>
+ </datasource>
+</datasources>
+
View
74 ...ebapp-ear-archetype/src/main/resources/archetype-resources/__rootArtifactId__-ejb/pom.xml
@@ -65,14 +65,12 @@
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
- <version>1.0.0.CR4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet</artifactId>
- <version>1.0.0.CR4</version>
<scope>test</scope>
</dependency>
@@ -115,41 +113,6 @@
</profile>
<profile>
- <!-- We add the JBoss repository as we need the JBoss AS connectors
- for Arquillian -->
- <repositories>
- <!-- The JBoss Community public repository is a composite repository
- of several major repositories -->
- <!-- see http://community.jboss.org/wiki/MavenGettingStarted-Users -->
- <repository>
- <id>jboss-public-repository</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/nexus/content/groups/public</url>
- <!-- These optional flags are designed to speed up your builds
- by reducing remote server calls -->
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>jboss-public-repository</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/nexus/content/groups/public</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
<!-- An optional Arquillian testing profile that executes tests
in your JBoss AS instance -->
<!-- This profile will start a new JBoss AS instance, and execute
@@ -160,48 +123,12 @@
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-managed</artifactId>
- <version>7.1.0.Beta1b</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
- <!-- We add the JBoss repository as we need the JBoss AS connectors
- for Arquillian -->
- <repositories>
- <!-- The JBoss Community public repository is a composite repository
- of several major repositories -->
- <!-- see http://community.jboss.org/wiki/MavenGettingStarted-Users -->
- <repository>
- <id>jboss-public-repository</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/nexus/content/groups/public</url>
- <!-- These optional flags are designed to speed up your builds
- by reducing remote server calls -->
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>jboss-public-repository</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/nexus/content/groups/public</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
<!-- An optional Arquillian testing profile that executes tests
in a remote JBoss AS instance -->
<!-- Run with: mvn clean test -Parq-jbossas-remote -->
@@ -210,7 +137,6 @@
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-remote</artifactId>
- <version>7.1.0.Beta1b</version>
<scope>test</scope>
</dependency>
</dependencies>
View
32 .../archetype-resources/__rootArtifactId__-ejb/src/main/java/service/MemberRegistration.java
@@ -0,0 +1,32 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+package ${package}.service;
+
+import ${package}.model.Member;
+
+import javax.ejb.Stateless;
+import javax.enterprise.event.Event;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+import java.util.logging.Logger;
+
+// The @Stateless annotation eliminates the need for manual transaction demarcation
+@Stateless
+public class MemberRegistration {
+
+ @Inject
+ private Logger log;
+
+ @Inject
+ private EntityManager em;
+
+ @Inject
+ private Event<Member> memberEventSrc;
+
+ public void register(Member member) throws Exception {
+ log.info("Registering " + member.getName());
+ em.persist(member);
+ memberEventSrc.fire(member);
+ }
+}
View
4 ...es/archetype-resources/__rootArtifactId__-ejb/src/main/resources/META-INF/persistence.xml
@@ -6,8 +6,8 @@
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
<persistence-unit name="primary">
<!-- If you are running in a production environment, add a managed
- data source, the example data source is just for proofs of concept! -->
- <jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source>
+ data source, the example data source is just for development and testing! -->
+ <jta-data-source>java:jboss/datasources/${rootArtifactId}DS</jta-data-source>
<properties>
<!-- Properties for Hibernate -->
<property name="hibernate.hbm2ddl.auto" value="create-drop" />
View
20 ...archetype-resources/__rootArtifactId__-ejb/src/test/java/test/MemberRegistrationTest.java
@@ -1,3 +1,6 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
package ${package}.test;
import static org.junit.Assert.assertNotNull;
@@ -8,6 +11,9 @@
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
+import ${package}.model.Member;
+import ${package}.service.MemberRegistration;
+import ${package}.util.Resources;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
@@ -15,18 +21,16 @@
import org.junit.Test;
import org.junit.runner.RunWith;
-import ${package}.controller.MemberRegistration;
-import ${package}.model.Member;
-import ${package}.util.Resources;
-
@RunWith(Arquillian.class)
public class MemberRegistrationTest {
@Deployment
public static Archive<?> createTestArchive() {
return ShrinkWrap.create(WebArchive.class, "test.war")
.addClasses(Member.class, MemberRegistration.class, Resources.class)
- .addAsResource("META-INF/persistence.xml", "META-INF/persistence.xml")
- .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+ .addAsResource("META-INF/test-persistence.xml", "META-INF/persistence.xml")
+ .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
+ // Deploy our test datasource
+ .addAsWebInfResource("test-ds.xml", "test-ds.xml");
}
@Inject
@@ -37,11 +41,11 @@
@Test
public void testRegister() throws Exception {
- Member newMember = memberRegistration.getNewMember();
+ Member newMember = new Member();
newMember.setName("Jane Doe");
newMember.setEmail("jane@mailinator.com");
newMember.setPhoneNumber("2125551234");
- memberRegistration.register();
+ memberRegistration.register(newMember);
assertNotNull(newMember.getId());
log.info(newMember.getName() + " was persisted with id " + newMember.getId());
}
View
20 ...chetype-resources/__rootArtifactId__-ejb/src/test/resources/META-INF/test-persistence.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+ <persistence-unit name="primary">
+ <!-- We use a different datasource for tests, so as to not overwrite
+ production data. This is an unmanaged data source, backed by H2, an in memory
+ database. Production applications should use a managed datasource. -->
+ <!-- The datasource is deployed as WEB-INF/test-ds.xml,
+ you can find it in the source at src/test/resources/test-ds.xml -->
+ <jta-data-source>java:jboss/datasources/${rootArtifactId}TestDS</jta-data-source>
+ <properties>
+ <!-- Properties for Hibernate -->
+ <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+ <property name="hibernate.show_sql" value="false" />
+ </properties>
+ </persistence-unit>
+</persistence>
View
21 .../main/resources/archetype-resources/__rootArtifactId__-ejb/src/test/resources/test-ds.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This is an unmanaged datasource. It should be used for proofs of concept
+ or testing only. It uses H2, an in memory database that ships with JBoss
+ AS. -->
+<datasources xmlns="http://www.jboss.org/ironjacamar/schema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/ironjacamar/schema http://docs.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+ <!-- The datasource is bound into JNDI at this location. We reference
+ this in META-INF/test-persistence.xml -->
+ <datasource jndi-name="java:jboss/datasources/${rootArtifactId}TestDS"
+ pool-name="${rootArtifactId}-test" enabled="true"
+ use-java-context="true">
+ <connection-url>jdbc:h2:mem:${rootArtifactId}-test;DB_CLOSE_DELAY=-1</connection-url>
+ <driver>h2</driver>
+ <security>
+ <user-name>sa</user-name>
+ <password>sa</password>
+ </security>
+ </datasource>
+</datasources>
+
View
8 ...ebapp-ear-archetype/src/main/resources/archetype-resources/__rootArtifactId__-web/pom.xml
@@ -39,6 +39,14 @@
<artifactId>cdi-api</artifactId>
<scope>provided</scope>
</dependency>
+
+ <!-- Import the JSF API, we use provided scope as the API is included
+ in JBoss AS 7 -->
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Import the JPA API, we use provided scope as the API is included
in JBoss AS 7 -->
View
23 ...n/java/controller/MemberRegistration.java → ...ain/java/controller/MemberController.java
@@ -1,35 +1,35 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
package ${package}.controller;
import java.util.logging.Logger;
import javax.annotation.PostConstruct;
-import javax.ejb.Stateful;
import javax.enterprise.event.Event;
import javax.enterprise.inject.Model;
import javax.enterprise.inject.Produces;
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
import javax.inject.Inject;
import javax.inject.Named;
import javax.persistence.EntityManager;
import ${package}.model.Member;
+import ${package}.service.MemberRegistration;
-// The @Stateful annotation eliminates the need for manual transaction demarcation
-@Stateful
// The @Model stereotype is a convenience mechanism to make this a request-scoped bean that has an
// EL name
// Read more about the @Model stereotype in this FAQ:
// http://sfwk.org/Documentation/WhatIsThePurposeOfTheModelAnnotation
@Model
-public class MemberRegistration {
+public class MemberController {
@Inject
- private Logger log;
+ private FacesContext facesContext;
@Inject
- private EntityManager em;
-
- @Inject
- private Event<Member> memberEventSrc;
+ private MemberRegistration memberRegistration;
private Member newMember;
@@ -40,9 +40,8 @@ public Member getNewMember() {
}
public void register() throws Exception {
- log.info("Registering " + newMember.getName());
- em.persist(newMember);
- memberEventSrc.fire(newMember);
+ memberRegistration.register(newMember);
+ facesContext.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "Registered!", "Registration successful"));
initNewMember();
}
View
35 ...resources/archetype-resources/__rootArtifactId__-web/src/main/java/util/WebResources.java
@@ -0,0 +1,35 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+package ${package}.util;
+
+import java.util.logging.Logger;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.faces.context.FacesContext;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+/**
+ * This class uses CDI to alias Java EE resources, such as the persistence context, to CDI beans
+ *
+ * <p>
+ * Example injection on a managed bean field:
+ * </p>
+ *
+ * <pre>
+ * &${symbol_pound}064;Inject
+ * private EntityManager em;
+ * </pre>
+ */
+public class WebResources {
+
+ @Produces
+ @RequestScoped
+ public FacesContext produceFacesContext() {
+ return FacesContext.getCurrentInstance();
+ }
+
+}
View
77 ...rchetype-resources/__rootArtifactId__-web/src/main/webapp/WEB-INF/templates/default.xhtml
@@ -10,70 +10,29 @@
</h:head>
<h:body>
<div id="container">
+ <div class="dualbrand">
+ <img src="resources/gfx/dualbrand_logo.png" />
+ </div>
<div id="content">
- <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="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>
<ui:insert name="content">
[Template content will be inserted here]
- </ui:insert>
+ </ui:insert>
+ </div>
+ <div id="aside">
+ <p>Learn more about JBoss Enterprise Application Platform 6.</p>
+ <ul>
+ <li><a
+ href="http://red.ht/jbeap-6-docs">Documentation</a></li>
+ <li><a href="http://red.ht/jbeap-6">Product Information</a></li>
+ </ul>
+ <p>Learn more about JBoss AS 7.</p>
+ <ul>
+ <li><a
+ href="https://docs.jboss.org/author/display/AS7/Getting+Started+Developing+Applications+Guide">Getting Started Developing Applications Guide</a></li>
+ <li><a href="http://jboss.org/jbossas">Community Project Information</a></li>
+ </ul>
</div>
<div id="footer">
- <h:graphicImage value="/resources/gfx/logo.png" alt="Weld logo" />
<p>
This project was generated from a Maven archetype from
JBoss.<br />
View
66 ...src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/webapp/index.xhtml
@@ -5,51 +5,44 @@
xmlns:h="http://java.sun.com/jsf/html"
template="/WEB-INF/templates/default.xhtml">
<ui:define name="content">
- <h1>Welcome to JBoss AS 7!</h1>
+ <h1>Welcome to JBoss!</h1>
- <p>You have successfully deployed a Java EE 6 Enterprise Application
- on JBoss AS 7.</p>
+ <div>
+ <p>You have successfully deployed a Java EE 6 Enterprise Application.</p>
+ <h3>Your application can run on:</h3>
+ <img src="resources/gfx/dualbrand_as7eap.png"/>
+ </div>
<h:form id="reg">
- <h2>Register (Bean Validation example)</h2>
- <p>Enforces annotation-based constraints defined on the
- model class.</p>
- <table>
- <tr>
- <th style="text-align: right;"><h:outputLabel
- for="name" value="Name:" /></th>
- <td><h:inputText id="name" value="#{newMember.name}" />
- <h:message for="name" errorClass="invalid" /></td>
- </tr>
- <tr>
- <th style="text-align: right;"><h:outputLabel
- for="email" value="Email:" /></th>
- <td><h:inputText id="email"
- value="#{newMember.email}" /> <h:message
- for="email" errorClass="invalid" /></td>
- </tr>
- <tr>
- <th style="text-align: right;"><h:outputLabel
- for="phoneNumber" value="Phone #:" /></th>
- <td><h:inputText id="phoneNumber"
- value="#{newMember.phoneNumber}" /> <h:message
- for="phoneNumber" errorClass="invalid" /></td>
- </tr>
- </table>
+ <h2>Member Registration</h2>
+ <p>Enforces annotation-based constraints defined on the model class.</p>
+ <h:panelGrid columns="3" columnClasses="titleCell">
+ <h:outputLabel for="name" value="Name:"/>
+ <h:inputText id="name" value="#{newMember.name}" />
+ <h:message for="name" errorClass="invalid"/>
+
+ <h:outputLabel for="email" value="Email:"/>
+ <h:inputText id="email" value="#{newMember.email}"/>
+ <h:message for="email" errorClass="invalid"/>
+
+ <h:outputLabel for="phoneNumber" value="Phone #:"/>
+ <h:inputText id="phoneNumber" value="#{newMember.phoneNumber}"/>
+ <h:message for="phoneNumber" errorClass="invalid"/>
+ </h:panelGrid>
+
<p>
- <h:commandButton id="register"
- action="#{memberRegistration.register}" value="Register" />
- <h:outputText value=" Registered!"
- rendered="#{facesContext.postback and empty facesContext.messageList}"
- style="color: green;" />
+ <h:panelGrid columns="2">
+ <h:commandButton id="register" action="#{memberController.register}" value="Register" styleClass="register"/>
+ <h:messages styleClass="messages" errorClass="invalid" infoClass="valid" warnClass="warning"
+ globalOnly="true"/>
+ </h:panelGrid>
</p>
</h:form>
<h2>Members</h2>
<h:panelGroup rendered="#{empty members}">
<em>No registered members.</em>
</h:panelGroup>
- <h:dataTable var="_member" value="#{members}"
- rendered="#{not empty members}">
+ <h:dataTable var="_member" value="#{members}" rendered="#{not empty members}" styleClass="simpletablestyle">
<h:column>
<f:facet name="header">Id</f:facet>
#{_member.id}
@@ -71,8 +64,7 @@
<a href="#{request.contextPath}/rest/members/#{_member.id}">/rest/members/#{_member.id}</a>
</h:column>
<f:facet name="footer">
- REST URL for all members: <a
- href="#{request.contextPath}/rest/members">/rest/members</a>
+ REST URL for all members: <a href="#{request.contextPath}/rest/members">/rest/members</a>
</f:facet>
</h:dataTable>
</ui:define>
View
206 ...urces/archetype-resources/__rootArtifactId__-web/src/main/webapp/resources/css/screen.css
@@ -1,40 +1,186 @@
+/* Core styles for the page */
body {
- margin: 0;
- padding: 0;
- background-color: #EAECEE;
- font-family: Verdana, sans-serif;
- font-size: 0.9em;
+ margin: 0;
+ padding: 0;
+ background-color: #F1F1F1;
+ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
+ font-size: 0.8em;
+ color:#363636;
}
+
#container {
- margin: 0 auto;
- padding: 0 20px 10px 20px;
- border: 1px solid #666666;
- width: 865px; /* subtract 40px from banner width for padding */
- background: #FFFFFF url(#{request.contextPath}/resources/gfx/banner.png) no-repeat;
- padding-top: 110px;
-}
-#sidebar {
- font-size: 0.9em;
- width: 225px;
- float: right;
- border: 1px solid #666666;
- background: #EAECEE;
- padding: 0 15px 5px 15px;
-}
-#sidebar ul {
- padding-left: 30px;
+ margin: 0 auto;
+ padding: 0 20px 10px 20px;
+ border-top: 5px solid #000000;
+ border-left: 5px solid #8c8f91;
+ border-right: 5px solid #8c8f91;
+ border-bottom: 25px solid #8c8f91;
+ width: 865px; /* subtract 40px from banner width for padding */
+ background: #FFFFFF;
+ background-image: url(#{request.contextPath}/resources/gfx/headerbkg.png);
+ background-repeat: repeat-x;
+ padding-top: 30px;
+ box-shadow: 3px 3px 15px #d5d5d5;
+}
+#content {
+ float: left;
+ width: 500px;
+ margin: 20px;
+}
+#aside {
+ font-size: 0.9em;
+ width: 275px;
+ float: left;
+ margin: 20px 0px;
+ border: 1px solid #D5D5D5;
+ background: #F1F1F1;
+ background-image: url(#{request.contextPath}/resources/gfx/asidebkg.png);
+ background-repeat: repeat-x;
+ padding: 20px;
+}
+
+#aside ul {
+ padding-left: 30px;
+}
+.dualbrand {
+ float: right;
+ padding-right: 10px;
}
#footer {
- clear: both;
- text-align: center;
- color: #666666;
- font-size: 0.85em;
- padding: 3em 0 0 0;
+ clear: both;
+ text-align: center;
+ color: #666666;
+ font-size: 0.85em;
}
code {
- font-size: 1.1em;