Author: gvanmatre
Date: Fri Oct 6 19:27:20 2006
New Revision: 453840
URL: http://svn.apache.org/viewvc?view=rev&rev=453840
Log:
A few minor updates to reflect the core reorg and a few new features.
Modified:
shale/sandbox/shale-clay-mailreader/pom.xml
shale/sandbox/shale-clay-mailreader/src/main/webapp/WEB-INF/web.xml
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/index_nsjsp.html
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/layout_nsjsp.html
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/layout_tap.html
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/logon_nsjsp.html
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/logon_tap.html
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/mainMenu_nsjsp.html
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/registration_nsjsp.html
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/subscription_nsjsp.html
Modified: shale/sandbox/shale-clay-mailreader/pom.xml
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-clay-mailreader/pom.xml?view=diff&rev=453840&r1=453839&r2=453840
==============================================================================
--- shale/sandbox/shale-clay-mailreader/pom.xml (original)
+++ shale/sandbox/shale-clay-mailreader/pom.xml Fri Oct 6 19:27:20 2006
@@ -58,6 +58,18 @@
<dependency>
<groupId>org.apache.shale</groupId>
+ <artifactId>shale-view</artifactId>
+ <version>1.0.4-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-validator</artifactId>
+ <version>1.0.4-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
<version>1.0.4-SNAPSHOT</version>
<scope>test</scope>
@@ -83,35 +95,36 @@
</dependency>
<dependency>
- <groupId>org.apache.struts.action</groupId>
+ <groupId>org.apache.struts</groupId>
<artifactId>struts-mailreader-dao</artifactId>
- <version>1.3.4</version>
+ <version>1.3.5</version>
</dependency>
<dependency>
- <groupId>myfaces</groupId>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk</artifactId>
<version>1.1.3</version>
</dependency>
-
- <dependency>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>1.1.3</version>
- </dependency>
- <dependency>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>1.1.3</version>
- <scope>runtime</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.1.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>1.1.4</version>
+ </dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
<version>2.0</version>
<scope>provided</scope>
</dependency>
+
<!-- These should be specified in the myfaces pom -->
<dependency>
<groupId>commons-codec</groupId>
@@ -174,4 +187,18 @@
</plugins>
</build>
+ <repositories>
+ <repository>
+ <id>apache-repo</id>
+ <name>apache-repo</name>
+
<url>http://myfaces.zones.apache.org/dist/maven-repository</url>
+ </repository>
+
+ <repository>
+ <id>ibiblio</id>
+ <name>ibiblio</name>
+ <url>http://www.ibiblio.org/maven2</url>
+ </repository>
+
+ </repositories>
</project>
Modified: shale/sandbox/shale-clay-mailreader/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-clay-mailreader/src/main/webapp/WEB-INF/web.xml?view=diff&rev=453840&r1=453839&r2=453840
==============================================================================
--- shale/sandbox/shale-clay-mailreader/src/main/webapp/WEB-INF/web.xml
(original)
+++ shale/sandbox/shale-clay-mailreader/src/main/webapp/WEB-INF/web.xml Fri Oct
6 19:27:20 2006
@@ -135,14 +135,12 @@
<load-on-startup>1</load-on-startup>
</servlet>
- <!--
<servlet>
<servlet-name>SourceCodeServlet</servlet-name>
<servlet-class>
- org.apache.myfaces.util.servlet.SourceCodeServlet
+
org.apache.myfaces.shared_tomahawk.util.servlet.SourceCodeServlet
</servlet-class>
</servlet>
- -->
<!-- JavaServer Faces Servlet Mapping -->
<servlet-mapping>
@@ -150,12 +148,10 @@
<url-pattern>*.cxv</url-pattern>
</servlet-mapping>
- <!--
<servlet-mapping>
<servlet-name>SourceCodeServlet</servlet-name>
<url-pattern>*.source</url-pattern>
</servlet-mapping>
- -->
<error-page>
<error-code>404</error-code>
Modified:
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/index_nsjsp.html
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/index_nsjsp.html?view=diff&rev=453840&r1=453839&r2=453840
==============================================================================
--- shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/index_nsjsp.html
(original)
+++ shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/index_nsjsp.html
Fri Oct 6 19:27:20 2006
@@ -1,7 +1,16 @@
-<span jsfid="void" xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"
- xmlns:f="http://java.sun.com/jsf/core";
+<!-- ### clay:page charset="UTF-8" /### -->
+<!-- ### clay:remove ### -->
+<html>
+<head>
+<title>Mock Logon Title</title>
+</head>
+<body>
+<!-- ### /clay:remove ### -->
+<span jsfid="void" xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en"
+ lang="en" xmlns:f="http://java.sun.com/jsf/core";
xmlns:h="http://java.sun.com/jsf/html";
- xmlns:t="http://myfaces.apache.org/tomahawk";> <h:form id="indexForm">
+ xmlns:t="http://myfaces.apache.org/tomahawk";> <h:form
+ id="indexForm">
<t:panelGrid columns="1">
@@ -20,3 +29,8 @@
</t:panelGrid>
</h:form> </span>
+<!-- ### clay:remove ### -->
+</body>
+</html>
+<!-- ### /clay:remove ### -->
+
Modified:
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/layout_nsjsp.html
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/layout_nsjsp.html?view=diff&rev=453840&r1=453839&r2=453840
==============================================================================
--- shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/layout_nsjsp.html
(original)
+++ shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/layout_nsjsp.html
Fri Oct 6 19:27:20 2006
@@ -1,15 +1,17 @@
-<html xmlns:c="http://shale.apache.org/clay";>
+<!-- ### clay:page charset="UTF-8" /### -->
+<!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:c="http://shale.apache.org/clay xml:lang="en" lang="en">
<head>
- <title>
+<title>
<c:clay jsfid="clay" clayJsfid="@title">
Mock Title
- </c:clay>
- </title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+ </c:clay></title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
</head>
<body>
<c:clay jsfid="clay" clayJsfid="@bodycontent">
Mock body goes here
</c:clay>
</body>
-</html>
\ No newline at end of file
+</html>
Modified:
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/layout_tap.html
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/layout_tap.html?view=diff&rev=453840&r1=453839&r2=453840
==============================================================================
--- shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/layout_tap.html
(original)
+++ shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/layout_tap.html
Fri Oct 6 19:27:20 2006
@@ -1,11 +1,13 @@
-<html>
+<!-- ### clay:page charset="UTF-8" /### -->
+<!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"; xml:lang="en" lang="en">
<head>
<title>
<span jsfid="clay" clayJsfid="@title" allowBody="false">
Mock Title
</span>
</title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
</head>
<body>
<span jsfid="clay" clayJsfid="@bodycontent" allowBody="false">
Modified:
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/logon_nsjsp.html
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/logon_nsjsp.html?view=diff&rev=453840&r1=453839&r2=453840
==============================================================================
--- shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/logon_nsjsp.html
(original)
+++ shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/logon_nsjsp.html
Fri Oct 6 19:27:20 2006
@@ -1,3 +1,11 @@
+<!-- ### clay:page charset="UTF-8" /### -->
+<!-- ### clay:remove ### -->
+<html>
+<head>
+ <title>Mock Logon Title</title>
+</head>
+<body>
+<!-- ### /clay:remove ### -->
<span jsfid="void" xmlns="http://www.w3.org/1999/xhtml";
xmlns:f="http://java.sun.com/jsf/core";
xmlns:h="http://java.sun.com/jsf/html";
@@ -44,3 +52,8 @@
</h:form>
</span>
+<!-- ### clay:remove ### -->
+</body>
+</html>
+<!-- ### /clay:remove ### -->
+
Modified:
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/logon_tap.html
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/logon_tap.html?view=diff&rev=453840&r1=453839&r2=453840
==============================================================================
--- shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/logon_tap.html
(original)
+++ shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/logon_tap.html
Fri Oct 6 19:27:20 2006
@@ -1,3 +1,4 @@
+<!-- ### clay:page charset="UTF-8" /### -->
<!-- ### clay:remove ### -->
<html>
<head>
Modified:
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/mainMenu_nsjsp.html
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/mainMenu_nsjsp.html?view=diff&rev=453840&r1=453839&r2=453840
==============================================================================
---
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/mainMenu_nsjsp.html
(original)
+++
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/mainMenu_nsjsp.html
Fri Oct 6 19:27:20 2006
@@ -1,3 +1,11 @@
+<!-- ### clay:page charset="UTF-8" /### -->
+<!-- ### clay:remove ### -->
+<html>
+<head>
+ <title>Mock Logon Title</title>
+</head>
+<body>
+<!-- ### /clay:remove ### -->
<span jsfid="void" xmlns:face="http://java.sun.com/jsf/core";
xmlns:html="http://java.sun.com/jsf/html";
xmlns:tom="http://myfaces.apache.org/tomahawk";>
@@ -34,3 +42,8 @@
</html:form>
</span>
+<!-- ### clay:remove ### -->
+</body>
+</html>
+<!-- ### /clay:remove ### -->
+
Modified:
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/registration_nsjsp.html
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/registration_nsjsp.html?view=diff&rev=453840&r1=453839&r2=453840
==============================================================================
---
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/registration_nsjsp.html
(original)
+++
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/registration_nsjsp.html
Fri Oct 6 19:27:20 2006
@@ -1,7 +1,16 @@
+<!-- ### clay:page charset="UTF-8" /### -->
+<!-- ### clay:remove ### -->
+<html>
+<head>
+ <title>Mock Logon Title</title>
+</head>
+<body>
+<!-- ### /clay:remove ### -->
<span jsfid="void" xmlns:f="http://java.sun.com/jsf/core";
xmlns:h="http://java.sun.com/jsf/html";
xmlns:t="http://myfaces.apache.org/tomahawk";
- xmlns:s="http://shale.apache.org/core";>
+ xmlns:s="http://shale.apache.org/core";
+ xmlns:v="http://shale.apache.org/validator";>
<t:messages globalOnly="true"/>
@@ -32,13 +41,13 @@
size="16"
value="#{registration.username}">
- <s:commonsValidator type="minlength"
+ <v:commonsValidator type="minlength"
server="true"
client="true" >
- <s:validatorVar name="minlength" value="3" />
- <s:validatorVar name="arg" value="#{messages['prompt.username']}"
/>
- <s:validatorVar name="bogus" value="bogus" />
- </s:commonsValidator>
+ <v:validatorVar name="minlength" value="3" />
+ <v:validatorVar name="arg" value="#{messages['prompt.username']}"
/>
+ <v:validatorVar name="bogus" value="bogus" />
+ </v:commonsValidator>
</t:inputText>
<t:outputText value="#{registration.username}"
@@ -217,4 +226,8 @@
</h:form>
<s:validatorScript functionName="validateForm"/>
-</span>
\ No newline at end of file
+</span>
+<!-- ### clay:remove ### -->
+</body>
+</html>
+<!-- ### /clay:remove ### -->
Modified:
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/subscription_nsjsp.html
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/subscription_nsjsp.html?view=diff&rev=453840&r1=453839&r2=453840
==============================================================================
---
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/subscription_nsjsp.html
(original)
+++
shale/sandbox/shale-clay-mailreader/src/main/webapp/pages/subscription_nsjsp.html
Fri Oct 6 19:27:20 2006
@@ -1,3 +1,11 @@
+<!-- ### clay:page charset="UTF-8" /### -->
+<!-- ### clay:remove ### -->
+<html>
+<head>
+ <title>Mock Logon Title</title>
+</head>
+<body>
+<!-- ### /clay:remove ### -->
<span jsfid="void" xmlns:f="http://java.sun.com/jsf/core";
xmlns:h="http://java.sun.com/jsf/html";
xmlns:t="http://myfaces.apache.org/tomahawk";>
@@ -124,3 +132,8 @@
</h:form>
</span>
+<!-- ### clay:remove ### -->
+</body>
+</html>
+<!-- ### /clay:remove ### -->
+
