8:18 a.m.
Author: akazakov
Date: 2008-03-17 09:18:13 -0400 (Mon, 17 Mar 2008)
New Revision: 6953
Modified:
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithRILibs/JavaSource/demo/Person.java
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithRILibs/WebContent/WEB-INF/web.xml
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithRILibs/WebContent/pages/greeting.xhtml
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithRILibs/WebContent/pages/inputname.xhtml
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/JavaSource/demo/Person.java
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/WebContent/index.jsp
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/WebContent/pages/greeting.xhtml
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/WebContent/pages/inputname.xhtml
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/WebContent/templates/common.xhtml
Log:
http://jira.jboss.com/jira/browse/JBIDE-1848
Modified:
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithRILibs/JavaSource/demo/Person.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithRILibs/JavaSource/demo/Person.java 2008-03-17
13:03:46 UTC (rev 6952)
+++
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithRILibs/JavaSource/demo/Person.java 2008-03-17
13:18:13 UTC (rev 6953)
@@ -11,8 +11,7 @@
package demo;
/**
- * @author sim
- *
+ * Created by JBoss Tools
*/
public class Person {
private String name;
@@ -20,11 +19,11 @@
public Person() {
}
- public String getName() {
+ public String getName() {
return name;
}
- public void setName(String name) {
+ public void setName(String name) {
this.name = name;
}
-}
+}
\ No newline at end of file
Modified:
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithRILibs/WebContent/WEB-INF/web.xml
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithRILibs/WebContent/WEB-INF/web.xml 2008-03-17
13:03:46 UTC (rev 6952)
+++
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithRILibs/WebContent/WEB-INF/web.xml 2008-03-17
13:18:13 UTC (rev 6953)
@@ -1,17 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
#if ($servlet_version == "2.4")
<web-app version="2.4"
xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-#else
+#elseif ($servlet_version == "2.5")
<web-app version="2.5"
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+#else
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
#end
+
+#if ($servlet_version == "2.4" || $servlet_version == "2.5")
<description>Facelets StarterKit</description>
- <display-name>jsf12KickStart</display-name>
+ <display-name>Facelets</display-name>
+#else
+ <display-name>Facelets</display-name>
+ <description>Facelets StarterKit</description>
+#end
<context-param>
<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
Modified:
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithRILibs/WebContent/pages/greeting.xhtml
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithRILibs/WebContent/pages/greeting.xhtml 2008-03-17
13:03:46 UTC (rev 6952)
+++
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithRILibs/WebContent/pages/greeting.xhtml 2008-03-17
13:18:13 UTC (rev 6953)
@@ -6,7 +6,7 @@
<f:loadBundle basename="resources" var="msg" />
<ui:composition template="/templates/common.xhtml">
- <ui:define name="pageTitle">JSF 1.2 and Facelets under Tomcat.
KickStart Application</ui:define>
+ <ui:define name="pageTitle">Greeting to User</ui:define>
<ui:define name="pageHeader">Greeting Page</ui:define>
<ui:define name="body">
#{msg.greeting} #{person.name}!
Modified:
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithRILibs/WebContent/pages/inputname.xhtml
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithRILibs/WebContent/pages/inputname.xhtml 2008-03-17
13:03:46 UTC (rev 6952)
+++
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithRILibs/WebContent/pages/inputname.xhtml 2008-03-17
13:18:13 UTC (rev 6953)
@@ -9,9 +9,9 @@
<ui:composition template="/templates/common.xhtml">
- <ui:define name="pageTitle">JSF 1.2 and Facelets under Tomcat.
KickStart Application</ui:define>
+ <ui:define name="pageTitle">Input User Name</ui:define>
- <ui:define name="pageHeader">JSF 1.2 Hello
Application</ui:define>
+ <ui:define name="pageHeader"Facelets Hello Application</ui:define>
<ui:define name="body">
<h:message showSummary="true" showDetail="false"
style="color: red; font-weight: bold;" for="name" />
Modified:
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/JavaSource/demo/Person.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/JavaSource/demo/Person.java 2008-03-17
13:03:46 UTC (rev 6952)
+++
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/JavaSource/demo/Person.java 2008-03-17
13:18:13 UTC (rev 6953)
@@ -11,8 +11,7 @@
package demo;
/**
- * Created by JBoss Developer Studio
-*
+ * Created by JBoss Tools
*/
public class Person {
private String name;
Modified:
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/WebContent/index.jsp
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/WebContent/index.jsp 2008-03-17
13:03:46 UTC (rev 6952)
+++
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/WebContent/index.jsp 2008-03-17
13:18:13 UTC (rev 6953)
@@ -2,6 +2,6 @@
<html>
<head></head>
<body>
- <jsp:forward page="/pages/inputname.jsf" />
+ <jsp:forward page="pages/inputname.jsf" />
</body>
</html>
\ No newline at end of file
Modified:
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/WebContent/pages/greeting.xhtml
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/WebContent/pages/greeting.xhtml 2008-03-17
13:03:46 UTC (rev 6952)
+++
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/WebContent/pages/greeting.xhtml 2008-03-17
13:18:13 UTC (rev 6953)
@@ -7,7 +7,7 @@
<f:loadBundle basename="resources" var="msg" />
<ui:composition template="/templates/common.xhtml">
<ui:define name="pageTitle">Greeting to User</ui:define>
- <ui:define name="pageHeader">Facelets Greeting Page</ui:define>
+ <ui:define name="pageHeader">Greeting Page</ui:define>
<ui:define name="body">
#{msg.greeting} #{person.name}!
</ui:define>
Modified:
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/WebContent/pages/inputname.xhtml
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/WebContent/pages/inputname.xhtml 2008-03-17
13:03:46 UTC (rev 6952)
+++
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/WebContent/pages/inputname.xhtml 2008-03-17
13:18:13 UTC (rev 6953)
@@ -2,7 +2,8 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core">
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core">
<f:loadBundle basename="resources" var="msg" />
@@ -10,16 +11,17 @@
<ui:define name="pageTitle">Input User Name</ui:define>
- <ui:define name="pageHeader">Facelets Hello
Application</ui:define>
+ <ui:define name="pageHeader"Facelets Hello Application</ui:define>
<ui:define name="body">
<h:message showSummary="true" showDetail="false"
style="color: red; font-weight: bold;" for="name" />
<form jsfc="h:form" id="helloForm">
- #{msg.prompt}
- <input jsfc="h:inputText" required="true" id="name"
value="#{person.name}" />
- <input type="submit" jsfc="h:commandButton"
id="submit"
+ ${msg.prompt}
+ <input label="Name" jsfc="h:inputText"
required="true" id="name" value="#{person.name}" />
+ <input type="submit" jsfc="h:commandButton"
id="submit"
action="greeting" value="Say Hello" />
</form>
+
</ui:define>
</ui:composition>
</html>
Modified:
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/WebContent/templates/common.xhtml
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/WebContent/templates/common.xhtml 2008-03-17
13:03:46 UTC (rev 6952)
+++
trunk/common/plugins/org.jboss.tools.common.projecttemplates/templates/jsf-1.2-facelets/FaceletsKickStartWithoutLibs/WebContent/templates/common.xhtml 2008-03-17
13:18:13 UTC (rev 6953)
@@ -10,17 +10,56 @@
<style type="text/css">
body {
font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 14px;
}
- h1 {
+ .header {
font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 16px;
+ font-size: 18px;
}
+ .bottom {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 9px;
+ text-align: center;
+ vertical-align: middle;
+ color: #8E969D;
+ }
</style>
</head>
- <body>
- <h1><ui:insert name="pageHeader">Page
Header</ui:insert></h1>
- <p><ui:insert name="body">Page Body</ui:insert></p>
- </body>
+<body bgcolor="#ffffff">
+<table style="border:1px solid #CAD6E0" align="center"
cellpadding="0" cellspacing="0" border="0"
width="400">
+<tbody>
+
+ <tr>
+ <td class="header" height="42" align="center"
valign="middle" width="100%" bgcolor="#E4EBEB">
+ <ui:insert name="pageHeader">Page Header</ui:insert>
+ </td>
+ </tr>
+ <tr>
+ <td height="1" width="100%"
bgcolor="#CAD6E0"></td>
+ </tr>
+
+ <tr>
+ <td width="100%" colspan="2">
+ <table width="100%" style="height:150px" align="left"
cellpadding="0" cellspacing="0" border="0">
+ <tbody>
+ <tr>
+ <td align="center" width="100%"
valign="middle">
+
+ <ui:insert name="body">Page Body</ui:insert>
+
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2" valign="bottom" height="1"
width="100%" bgcolor="#CAD6E0"></td>
+ </tr>
+</tbody>
+</table>
+</body>
+
</html>
\ No newline at end of file