Author: vrubezhny
Date: 2009-07-30 09:31:41 -0400 (Thu, 30 Jul 2009)
New Revision: 16898
Added:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.jboss.tools.jst.web.xml
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting1.xhtml
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting.jsp
Log:
JBIDE-4660 Update and correct the CA-related JUnit tests after the new-style CA is
applyed.
Rolling back the test projects for JUnit Test JsfJbide1704Test
Added:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.jboss.tools.jst.web.xml
===================================================================
---
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.jboss.tools.jst.web.xml
(rev 0)
+++
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.jboss.tools.jst.web.xml 2009-07-30
13:31:41 UTC (rev 16898)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<file-systems VERSION="2.0.0" application-name="JsfJbide1704Test"
+ model-entity="FileSystems"
workspace-home="./WebContent/WEB-INF">
+ <file-system NAME="WEB-INF" location="%workspace.home%"
model-entity="FileSystemFolder"/>
+ <file-system NAME="WEB-ROOT" info="Content-Type=Web"
+ location="%workspace.home%/.."
model-entity="FileSystemFolder"/>
+ <file-system NAME="src"
location="%workspace.home%/../../JavaSource"
model-entity="FileSystemFolder"/>
+ <file-system NAME="lib" location="%workspace.home%/lib"
model-entity="FileSystemFolder"/>
+ <file-system NAME="classes" location="%workspace.home%/classes"
model-entity="FileSystemFolder"/>
+ <file-system NAME="lib-commons-beanutils.jar" info="hidden=yes"
+ location="%workspace.home%/lib/commons-beanutils.jar"
model-entity="FileSystemJar"/>
+ <file-system NAME="lib-commons-collections.jar"
info="hidden=yes"
+ location="%workspace.home%/lib/commons-collections.jar"
model-entity="FileSystemJar"/>
+ <file-system NAME="lib-commons-digester.jar" info="hidden=yes"
+ location="%workspace.home%/lib/commons-digester.jar"
model-entity="FileSystemJar"/>
+ <file-system NAME="lib-commons-logging.jar" info="hidden=yes"
+ location="%workspace.home%/lib/commons-logging.jar"
model-entity="FileSystemJar"/>
+ <file-system NAME="lib-jstl.jar" info="hidden=yes"
+ location="%workspace.home%/lib/jstl.jar"
model-entity="FileSystemJar"/>
+ <file-system NAME="lib-standard.jar" info="hidden=yes"
+ location="%workspace.home%/lib/standard.jar"
model-entity="FileSystemJar"/>
+ <file-system NAME="lib-jsf-facelets.jar"
+ location="%workspace.home%/lib/jsf-facelets.jar"
model-entity="FileSystemJar"/>
+ <file-system NAME="flet001" location="%eclipse.project%"
model-entity="FileSystemFolder"/>
+ <file-system NAME="lib-common-annotations.jar" info="hidden=yes"
+ location="%workspace.home%/lib/common-annotations.jar"
model-entity="FileSystemJar"/>
+ <file-system NAME="lib-jsf-tlds.jar" info="hidden=yes"
+ location="%workspace.home%/lib/jsf-tlds.jar"
model-entity="FileSystemJar"/>
+ <web SERVLET_VERSION="2.5" model-entity="JstWeb"
model-path="/web.xml">
+ <module URI="/WEB-INF/faces-config.xml"
model-entity="WebJSFModule"
+ model-path="/faces-config.xml" root="WEB-ROOT"
src="src"/>
+ </web>
+</file-systems>
Property changes on:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.jboss.tools.jst.web.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting.jsp
===================================================================
---
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting.jsp 2009-07-30
13:21:46 UTC (rev 16897)
+++
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting.jsp 2009-07-30
13:31:41 UTC (rev 16898)
@@ -1,20 +1,20 @@
<%@ taglib
uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib
uri="http://java.sun.com/jsf/html" prefix="h" %>
-
-<html>
-<head>
- <title>Facelets Greeting Page</title>
-</head>
-<body>
- <f:view>
- <f:loadBundle basename="resources" var="msg" />
-
- <strong>
- <h:outputText value="#{msg.greeting}" />
-
- <h:outputText value="#{person.name}" />
- <h:outputText value="!" />
- </strong>
- </f:view>
-</body>
+
+<html>
+<head>
+ <title>Facelets Greeting Page</title>
+</head>
+<body>
+ <f:view>
+ <f:loadBundle basename="resources" var="msg" />
+
+ <strong>
+ <h:outputText value="#{msg.greeting}" />
+
+ <h:outputText value="#{person.name}" />
+ <h:outputText value="!" />
+ </strong>
+ </f:view>
+</body>
</html>
\ No newline at end of file
Added:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting1.xhtml
===================================================================
---
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting1.xhtml
(rev 0)
+++
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting1.xhtml 2009-07-30
13:31:41 UTC (rev 16898)
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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">
+
+ <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="body">
+ <h:outputText value="#{msg.greeting}" />
+ #{msg.greeting} #{person.name}!
+ </ui:define>
+ </ui:composition>
+</html>
\ No newline at end of file
Property changes on:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting1.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain