Skip to content

Commit

Permalink
Various fixes to archetypes
Browse files Browse the repository at this point in the history
* Rebrand
* Merge in changes from quickstarts
  • Loading branch information
pmuir committed Mar 30, 2012
1 parent 94ca33d commit 7bb2312
Show file tree
Hide file tree
Showing 79 changed files with 1,801 additions and 1,144 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:"/>
Expand All @@ -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>
Expand All @@ -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}
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 7bb2312

Please sign in to comment.