Author: gvanmatre
Date: Mon Oct 2 22:46:25 2006
New Revision: 452312
URL: http://svn.apache.org/viewvc?view=rev&rev=452312
Log:
A few minor changes to reflect the recent reorganization or core.
Modified:
shale/framework/trunk/shale-apps/shale-clay-usecases/pom.xml
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jrolodex.html
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jsprolodex.jsp
shale/framework/trunk/shale-clay/pom.xml
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java
shale/framework/trunk/shale-clay/src/main/resources/META-INF/clay-config.xml
shale/framework/trunk/shale-clay/src/main/resources/org/apache/shale/clay/parser/builder/chain/shale-builder-config.xml
Modified: shale/framework/trunk/shale-apps/shale-clay-usecases/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/pom.xml?view=diff&rev=452312&r1=452311&r2=452312
==============================================================================
--- shale/framework/trunk/shale-apps/shale-clay-usecases/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-clay-usecases/pom.xml Mon Oct 2
22:46:25 2006
@@ -56,14 +56,26 @@
<artifactId>shale-remoting</artifactId>
<version>${version}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-validator</artifactId>
+ <version>${version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
<version>${version}</version>
<scope>test</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-view</artifactId>
+ <version>${version}</version>
+ </dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
Modified:
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jrolodex.html
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jrolodex.html?view=diff&rev=452312&r1=452311&r2=452312
==============================================================================
---
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jrolodex.html
(original)
+++
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jrolodex.html
Mon Oct 2 22:46:25 2006
@@ -2,7 +2,8 @@
xmlns:f="http://java.sun.com/jsf/core";
xmlns:h="http://java.sun.com/jsf/html";
xmlns:clay="http://shale.apache.org/clay";
- xmlns:s="http://shale.apache.org/core";>
+ xmlns:s="http://shale.apache.org/core";
+ xmlns:val="http://shale.apache.org/validator";>
<head>
<clay:loadBundle basename="org.apache.shale.usecases.view.Bundle"
var="messages" />
@@ -178,7 +179,7 @@
<td><h:inputText id="contactEmail"
value="[EMAIL PROTECTED]"
required="false" size="30"
maxlength="50">
- <s:commonsValidatorEmail
client="true"
+ <val:commonsValidatorEmail
client="true"
server="true"
arg="#{messages['rolodex.email']}"/>
</h:inputText>
</td>
@@ -350,6 +351,6 @@
</table>
</div>
</form>
-<s:validatorScript functionName="validateForm"/>
+<val:validatorScript functionName="validateForm"/>
</body>
</html>
Modified:
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jsprolodex.jsp
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jsprolodex.jsp?view=diff&rev=452312&r1=452311&r2=452312
==============================================================================
---
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jsprolodex.jsp
(original)
+++
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jsprolodex.jsp
Mon Oct 2 22:46:25 2006
@@ -2,6 +2,7 @@
<%@ taglib prefix="f" uri="http://java.sun.com/jsf/core"%>
<%@ taglib prefix="h" uri="http://java.sun.com/jsf/html"%>
<%@ taglib prefix="s" uri="http://shale.apache.org/core"%>
+<%@ taglib prefix="val" uri="http://shale.apache.org/validator"%>
<%@ taglib prefix="clay"
uri="http://shale.apache.org/clay"%>
<html>
@@ -179,7 +180,7 @@
</h:panelGrid>
</h:panelGrid></div>
</h:form>
- <s:validatorScript functionName="validateForm"/>
+ <val:validatorScript functionName="validateForm"/>
</body>
</f:view>
</html>
Modified: shale/framework/trunk/shale-clay/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-clay/pom.xml?view=diff&rev=452312&r1=452311&r2=452312
==============================================================================
--- shale/framework/trunk/shale-clay/pom.xml (original)
+++ shale/framework/trunk/shale-clay/pom.xml Mon Oct 2 22:46:25 2006
@@ -92,12 +92,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-view</artifactId>
- <version>${version}</version>
- </dependency>
-
</dependencies>
<build>
Modified:
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java?view=diff&rev=452312&r1=452311&r2=452312
==============================================================================
---
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java
(original)
+++
shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/config/beans/ComponentConfigBean.java
Mon Oct 2 22:46:25 2006
@@ -1351,7 +1351,7 @@
"javax.faces.HtmlForm",
"javax.faces.HtmlDataTable",
"org.apache.shale.clay.component.Clay",
- "org.apache.shale.Subview",
+ "org.apache.shale.view.Subview",
"javax.faces.NamingContainer"};
/**
Modified:
shale/framework/trunk/shale-clay/src/main/resources/META-INF/clay-config.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-clay/src/main/resources/META-INF/clay-config.xml?view=diff&rev=452312&r1=452311&r2=452312
==============================================================================
---
shale/framework/trunk/shale-clay/src/main/resources/META-INF/clay-config.xml
(original)
+++
shale/framework/trunk/shale-clay/src/main/resources/META-INF/clay-config.xml
Mon Oct 2 22:46:25 2006
@@ -286,96 +286,131 @@
</attributes>
</component>
<component jsfid="s:commonsValidator" extends="commonsValidator" />
+ <component jsfid="val:commonsValidator" extends="s:commonsValidator" />
+
<component jsfid="s:commonsValidatorRequired" extends="commonsValidator">
<attributes>
<set name="type" value="required"/>
</attributes>
</component>
+ <component jsfid="val:commonsValidatorRequired"
extends="s:commonsValidatorRequired"/>
+
<component jsfid="s:commonsValidatorMaxlength" extends="commonsValidator">
<attributes>
<set name="type" value="maxlength"/>
</attributes>
</component>
+ <component jsfid="val:commonsValidatorMaxlength"
extends="s:commonsValidatorMaxlength"/>
+
<component jsfid="s:commonsValidatorMinlength" extends="commonsValidator" >
<attributes>
<set name="type" value="minlength"/>
</attributes>
</component>
+ <component jsfid="val:commonsValidatorMinlength"
extends="s:commonsValidatorMinlength" />
+
<component jsfid="s:commonsValidatorMask" extends="commonsValidator" >
<attributes>
<set name="type" value="mask"/>
</attributes>
</component>
+ <component jsfid="val:commonsValidatorMask" extends="s:commonsValidatorMask"
/>
+
<component jsfid="s:commonsValidatorByte" extends="commonsValidator" >
<attributes>
<set name="type" value="byte"/>
</attributes>
</component>
+ <component jsfid="val:commonsValidatorByte" extends="s:commonsValidatorByte"
/>
+
<component jsfid="s:commonsValidatorShort" extends="commonsValidator" >
<attributes>
<set name="type" value="short"/>
</attributes>
</component>
+ <component jsfid="val:commonsValidatorShort"
extends="s:commonsValidatorShort" />
+
<component jsfid="s:commonsValidatorInteger" extends="commonsValidator" >
<attributes>
<set name="type" value="integer"/>
</attributes>
</component>
+ <component jsfid="val:commonsValidatorInteger"
extends="s:commonsValidatorInteger" />
+
<component jsfid="s:commonsValidatorLong" extends="commonsValidator" >
<attributes>
<set name="type" value="long"/>
</attributes>
</component>
+ <component jsfid="val:commonsValidatorLong" extends="s:commonsValidatorLong"
/>
+
<component jsfid="s:commonsValidatorFloat" extends="commonsValidator" >
<attributes>
<set name="type" value="float"/>
</attributes>
</component>
+ <component jsfid="val:commonsValidatorFloat"
extends="s:commonsValidatorFloat" />
+
<component jsfid="s:commonsValidatorDouble" extends="commonsValidator" >
<attributes>
<set name="type" value="double"/>
</attributes>
</component>
+ <component jsfid="val:commonsValidatorDouble"
extends="s:commonsValidatorDouble" />
+
<component jsfid="s:commonsValidatorDate" extends="commonsValidator" >
<attributes>
<set name="type" value="date"/>
</attributes>
</component>
+ <component jsfid="val:commonsValidatorDate" extends="s:commonsValidatorDate"
/>
+
<component jsfid="s:commonsValidatorIntRange" extends="commonsValidator" >
<attributes>
<set name="type" value="intRange"/>
</attributes>
</component>
+ <component jsfid="val:commonsValidatorIntRange"
extends="s:commonsValidatorIntRange" />
+
<component jsfid="s:commonsValidatorFloatRange" extends="commonsValidator" >
<attributes>
<set name="type" value="floatRange"/>
</attributes>
</component>
+ <component jsfid="val:commonsValidatorFloatRange"
extends="s:commonsValidatorFloatRange" />
+
<component jsfid="s:commonsValidatorDoubleRange" extends="commonsValidator" >
<attributes>
<set name="type" value="doubleRange"/>
</attributes>
</component>
+ <component jsfid="val:commonsValidatorDoubleRange"
extends="s:commonsValidatorDoubleRange" />
+
<component jsfid="s:commonsValidatorCreditCard" extends="commonsValidator" >
<attributes>
<set name="type" value="creditCard"/>
</attributes>
</component>
+ <component jsfid="val:commonsValidatorCreditCard"
extends="s:commonsValidatorCreditCard" />
+
<component jsfid="s:commonsValidatorEmail" extends="commonsValidator" >
<attributes>
<set name="type" value="email"/>
</attributes>
</component>
+ <component jsfid="val:commonsValidatorEmail"
extends="s:commonsValidatorEmail" />
+
<component jsfid="s:commonsValidatorUrl" extends="commonsValidator" >
<attributes>
<set name="type" value="url"/>
</attributes>
</component>
+ <component jsfid="val:commonsValidatorUrl" extends="s:commonsValidatorUrl" />
<!-- Provide ViewController support functionality for the nested content
(typically a JSP dynamic include) of this component.
-->
- <component jsfid="subview" id="subview"
componentType="org.apache.shale.Subview" allowBody="true"
extends="baseComponent">
+ <component jsfid="subview" id="subview"
componentType="org.apache.shale.view.Subview" allowBody="true"
extends="baseComponent">
<description>
Provide ViewController support functionality for the nested content
(typically a JSP dynamic include) of this component. The id attribute
binds
@@ -383,6 +418,7 @@
</description>
</component>
<component jsfid="f:subview" extends="subview"/>
+ <component jsfid="view:subview" extends="f:subview"/>
<component jsfid="validatorScript" id="validatorScript"
componentType="org.apache.shale.ValidatorScript"
allowBody="false" extends="baseComponent">
@@ -396,6 +432,7 @@
</attributes>
</component>
<component jsfid="s:validatorScript" extends="validatorScript"/>
+ <component jsfid="val:validatorScript" extends="s:validatorScript"/>
<component jsfid="outputText" componentType="javax.faces.HtmlOutputText"
extends="baseHtml">
<description>Render readonly text.</description>
Modified:
shale/framework/trunk/shale-clay/src/main/resources/org/apache/shale/clay/parser/builder/chain/shale-builder-config.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-clay/src/main/resources/org/apache/shale/clay/parser/builder/chain/shale-builder-config.xml?view=diff&rev=452312&r1=452311&r2=452312
==============================================================================
---
shale/framework/trunk/shale-clay/src/main/resources/org/apache/shale/clay/parser/builder/chain/shale-builder-config.xml
(original)
+++
shale/framework/trunk/shale-clay/src/main/resources/org/apache/shale/clay/parser/builder/chain/shale-builder-config.xml
Mon Oct 2 22:46:25 2006
@@ -50,6 +50,14 @@
<chain name="http://shale.apache.org/core";>
<command
className="org.apache.shale.clay.parser.builder.chain.JsfDefaultBuilderRule"
prefix="s"/>
</chain>
+
+ <chain name="http://shale.apache.org/view";>
+ <command
className="org.apache.shale.clay.parser.builder.chain.JsfDefaultBuilderRule"
prefix="view"/>
+ </chain>
+
+ <chain name="http://shale.apache.org/validator";>
+ <command
className="org.apache.shale.clay.parser.builder.chain.JsfDefaultBuilderRule"
prefix="val"/>
+ </chain>
<chain name="http://shale.apache.org/xml/clay";>
<command
className="org.apache.shale.clay.parser.builder.chain.ClayNamespaceBuilderRule"/>
