You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shale.apache.org by cr...@apache.org on 2006/09/30 00:41:31 UTC
svn commit: r451484 - in /shale/framework/trunk: shale-apps/shale-blank/
shale-apps/shale-mailreader-jpa/ shale-apps/shale-mailreader/
shale-apps/shale-test-core/ shale-apps/shale-usecases/
shale-apps/shale-usecases/src/main/webapp/subview/ shale-apps/...
Author: craigmcc
Date: Fri Sep 29 15:41:29 2006
New Revision: 451484
URL: http://svn.apache.org/viewvc?view=rev&rev=451484
Log:
First step at refactoring the functionality of shale-core, pulling out
all of the view controller functionality. As of this change, web
applications wanting to use this feature should make two changes:
* Add a dependency on shale-view-xxx.jar. For Maven2 users, that
means adding the following dependency:
<dependency>
<groupId>org.apache.shale</groupId>
<artifactId>shale-view</artifactId>
<version>${version}</version>
</dependency>
* If you are using the <s:subview> tag in JSP pages, declare a new
tag library, and switch to the new (vc:) version of the subview tag.
The new taglib declaration you need is:
<%@ taglib prefix="vc" uri="http://shale.apache.org/view" %>
(as with all tag libraries, the prefix is arbitrary, but "vc"
is the default.)
SHALE-299
Added:
shale/framework/trunk/shale-view/
shale/framework/trunk/shale-view/pom.xml
shale/framework/trunk/shale-view/src/
shale/framework/trunk/shale-view/src/main/
shale/framework/trunk/shale-view/src/main/java/
shale/framework/trunk/shale-view/src/main/java/org/
shale/framework/trunk/shale-view/src/main/java/org/apache/
shale/framework/trunk/shale-view/src/main/java/org/apache/shale/
shale/framework/trunk/shale-view/src/main/java/org/apache/shale/view/
- copied from r451365, shale/framework/trunk/shale-core/src/main/java/org/apache/shale/view/
shale/framework/trunk/shale-view/src/main/java/org/apache/shale/view/faces/LifecycleListener.java
- copied unchanged from r451376, shale/framework/trunk/shale-core/src/main/java/org/apache/shale/view/faces/LifecycleListener.java
shale/framework/trunk/shale-view/src/main/java/org/apache/shale/view/faces/SubviewComponent.java
- copied, changed from r451365, shale/framework/trunk/shale-core/src/main/java/org/apache/shale/component/Subview.java
shale/framework/trunk/shale-view/src/main/java/org/apache/shale/view/faces/SubviewTag.java
- copied, changed from r451365, shale/framework/trunk/shale-core/src/main/java/org/apache/shale/taglib/SubviewTag.java
shale/framework/trunk/shale-view/src/main/java/overview.html
- copied, changed from r451365, shale/framework/trunk/shale-core/src/main/java/overview.html
shale/framework/trunk/shale-view/src/main/resources/
shale/framework/trunk/shale-view/src/main/resources/META-INF/
shale/framework/trunk/shale-view/src/main/resources/META-INF/LICENSE.txt
shale/framework/trunk/shale-view/src/main/resources/META-INF/NOTICE.txt
shale/framework/trunk/shale-view/src/main/resources/META-INF/faces-config.xml
shale/framework/trunk/shale-view/src/main/resources/META-INF/taglib.tld
shale/framework/trunk/shale-view/src/main/resources/org/
shale/framework/trunk/shale-view/src/main/resources/org/apache/
shale/framework/trunk/shale-view/src/main/resources/org/apache/shale/
shale/framework/trunk/shale-view/src/main/resources/org/apache/shale/view/
shale/framework/trunk/shale-view/src/main/resources/org/apache/shale/view/resources/
shale/framework/trunk/shale-view/src/main/resources/org/apache/shale/view/resources/Bundle.properties
shale/framework/trunk/shale-view/src/test/
shale/framework/trunk/shale-view/src/test/java/
shale/framework/trunk/shale-view/src/test/java/org/
shale/framework/trunk/shale-view/src/test/java/org/apache/
shale/framework/trunk/shale-view/src/test/java/org/apache/shale/
shale/framework/trunk/shale-view/src/test/java/org/apache/shale/view/
- copied from r451365, shale/framework/trunk/shale-core/src/test/java/org/apache/shale/view/
shale/framework/trunk/shale-view/src/test/resources/
Removed:
shale/framework/trunk/shale-core/src/main/java/org/apache/shale/component/Subview.java
shale/framework/trunk/shale-core/src/main/java/org/apache/shale/taglib/SubviewTag.java
shale/framework/trunk/shale-core/src/main/java/org/apache/shale/view/
shale/framework/trunk/shale-core/src/test/java/org/apache/shale/view/
Modified:
shale/framework/trunk/shale-apps/shale-blank/pom.xml
shale/framework/trunk/shale-apps/shale-mailreader-jpa/pom.xml
shale/framework/trunk/shale-apps/shale-mailreader/pom.xml
shale/framework/trunk/shale-apps/shale-test-core/pom.xml
shale/framework/trunk/shale-apps/shale-usecases/pom.xml
shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/subview/first.jsp
shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/subview/second.jsp
shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/validator/test.jsp
shale/framework/trunk/shale-clay/pom.xml
shale/framework/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleConstants.java
shale/framework/trunk/shale-core/src/main/resources/META-INF/faces-config.xml
shale/framework/trunk/shale-core/src/main/resources/META-INF/taglib.tld
shale/framework/trunk/shale-core/src/main/resources/org/apache/shale/resources/Bundle.properties
shale/framework/trunk/shale-core/src/test/java/org/apache/shale/validator/CommonsValidatorTestCase.java
shale/framework/trunk/shale-tiger/pom.xml
shale/framework/trunk/shale-view/src/main/java/org/apache/shale/view/faces/ViewViewHandler.java
Modified: shale/framework/trunk/shale-apps/shale-blank/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-blank/pom.xml?view=diff&rev=451484&r1=451483&r2=451484
==============================================================================
--- shale/framework/trunk/shale-apps/shale-blank/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-blank/pom.xml Fri Sep 29 15:41:29 2006
@@ -89,6 +89,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-view</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
Modified: shale/framework/trunk/shale-apps/shale-mailreader-jpa/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-mailreader-jpa/pom.xml?view=diff&rev=451484&r1=451483&r2=451484
==============================================================================
--- shale/framework/trunk/shale-apps/shale-mailreader-jpa/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-mailreader-jpa/pom.xml Fri Sep 29 15:41:29 2006
@@ -34,42 +34,47 @@
<dependencies>
<dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-core</artifactId>
- <version>${version}</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
</dependency>
<dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-test</artifactId>
- <version>${version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
- <groupId>org.apache.shale.extras</groupId>
- <artifactId>mailreader-jpa</artifactId>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-core</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-view</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
+ <groupId>org.apache.shale.extras</groupId>
+ <artifactId>mailreader-jpa</artifactId>
+ <version>${version}</version>
</dependency>
</dependencies>
Modified: shale/framework/trunk/shale-apps/shale-mailreader/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-mailreader/pom.xml?view=diff&rev=451484&r1=451483&r2=451484
==============================================================================
--- shale/framework/trunk/shale-apps/shale-mailreader/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-mailreader/pom.xml Fri Sep 29 15:41:29 2006
@@ -47,6 +47,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-view</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.1.2</version>
Modified: shale/framework/trunk/shale-apps/shale-test-core/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-core/pom.xml?view=diff&rev=451484&r1=451483&r2=451484
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-core/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-test-core/pom.xml Fri Sep 29 15:41:29 2006
@@ -88,6 +88,12 @@
<scope>test</scope>
</dependency>
+ <!-- FIXME: Temporary until view controller stuff abstracted out -->
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-view</artifactId>
+ <version>${version}</version>
+ </dependency>
<dependency>
<groupId>taglibs</groupId>
Modified: shale/framework/trunk/shale-apps/shale-usecases/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-usecases/pom.xml?view=diff&rev=451484&r1=451483&r2=451484
==============================================================================
--- shale/framework/trunk/shale-apps/shale-usecases/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-usecases/pom.xml Fri Sep 29 15:41:29 2006
@@ -40,6 +40,35 @@
</dependency>
<dependency>
+ <groupId>htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>1.8</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>pull-parser</groupId>
+ <artifactId>pull-parser</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml</groupId>
+ <artifactId>jsr173</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.shale</groupId>
<artifactId>shale-core</artifactId>
<version>${version}</version>
@@ -65,38 +94,9 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- </dependency>
-
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.1.2</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>1.8</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>pull-parser</groupId>
- <artifactId>pull-parser</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml</groupId>
- <artifactId>jsr173</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-view</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
@@ -105,11 +105,18 @@
<version>0.8</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-ant</artifactId>
<version>0.8</version>
<scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
</dependency>
</dependencies>
Modified: shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/subview/first.jsp
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/subview/first.jsp?view=diff&rev=451484&r1=451483&r2=451484
==============================================================================
--- shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/subview/first.jsp (original)
+++ shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/subview/first.jsp Fri Sep 29 15:41:29 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="vc" uri="http://shale.apache.org/view" %>
<%--
@@ -36,13 +37,13 @@
<h:panelGrid id="grid"
columns="1">
- <s:subview id="subview_alpha">
+ <vc:subview id="subview_alpha">
<jsp:include page="/subview/alpha.jsp"/>
- </s:subview>
+ </vc:subview>
- <s:subview id="subview_beta">
+ <vc:subview id="subview_beta">
<jsp:include page="/subview/beta.jsp"/>
- </s:subview>
+ </vc:subview>
<h:panelGroup>
<h:outputText value="#{messages['subview.expected']}"/>
Modified: shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/subview/second.jsp
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/subview/second.jsp?view=diff&rev=451484&r1=451483&r2=451484
==============================================================================
--- shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/subview/second.jsp (original)
+++ shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/subview/second.jsp Fri Sep 29 15:41:29 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="vc" uri="http://shale.apache.org/view" %>
<%--
@@ -35,13 +36,13 @@
<h:panelGrid columns="1">
- <s:subview id="subview_gamma">
+ <vc:subview id="subview_gamma">
<jsp:include page="/subview/gamma.jsp"/>
- </s:subview>
+ </vc:subview>
- <s:subview id="subview_delta">
+ <vc:subview id="subview_delta">
<jsp:include page="/subview/delta.jsp"/>
- </s:subview>
+ </vc:subview>
<h:panelGroup>
<h:outputText value="#{messages['subview.expected']}"/>
Modified: shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/validator/test.jsp
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/validator/test.jsp?view=diff&rev=451484&r1=451483&r2=451484
==============================================================================
--- shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/validator/test.jsp (original)
+++ shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/validator/test.jsp Fri Sep 29 15:41:29 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="vc" uri="http://shale.apache.org/view" %>
<%--
@@ -30,7 +31,7 @@
</title>
</head>
<body>
- <f:subview id="subview">
+ <vc:subview id="subview">
<h:form id="form"
onsubmit="return validateForm(this);">
@@ -158,7 +159,7 @@
</h:form>
-</f:subview>
+</vc:subview>
<br/><br/>
<p>
@@ -173,7 +174,7 @@
variables used in the validation of each row are defined using a value
binding expression and are specific to the procedure.</p>
-<f:subview id="cptSubview">
+<vc:subview id="cptSubview">
<h:form id="cptForm" onsubmit="return validateForm(this);">
<h:dataTable var="e" rows="3" value="#{validate$test.procedures}">
<h:column>
@@ -215,7 +216,7 @@
action="usecases$toplevel"/>
</h:form>
-</f:subview>
+</vc:subview>
<s:validatorScript functionName="validateForm"/>
Modified: shale/framework/trunk/shale-clay/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-clay/pom.xml?view=diff&rev=451484&r1=451483&r2=451484
==============================================================================
--- shale/framework/trunk/shale-clay/pom.xml (original)
+++ shale/framework/trunk/shale-clay/pom.xml Fri Sep 29 15:41:29 2006
@@ -92,6 +92,12 @@
<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-core/src/main/java/org/apache/shale/faces/ShaleConstants.java
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleConstants.java?view=diff&rev=451484&r1=451483&r2=451484
==============================================================================
--- shale/framework/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleConstants.java (original)
+++ shale/framework/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleConstants.java Fri Sep 29 15:41:29 2006
@@ -17,9 +17,6 @@
package org.apache.shale.faces;
import org.apache.shale.util.TokenProcessor;
-import org.apache.shale.view.ViewController;
-import org.apache.shale.view.ViewControllerMapper;
-
/**
* <p>{@link ShaleConstants} are manifest constants defining global identifiers shared across
Modified: shale/framework/trunk/shale-core/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-core/src/main/resources/META-INF/faces-config.xml?view=diff&rev=451484&r1=451483&r2=451484
==============================================================================
--- shale/framework/trunk/shale-core/src/main/resources/META-INF/faces-config.xml (original)
+++ shale/framework/trunk/shale-core/src/main/resources/META-INF/faces-config.xml Fri Sep 29 15:41:29 2006
@@ -34,9 +34,6 @@
<!-- Custom JSF Application Objects -->
<application>
- <action-listener>
- org.apache.shale.view.faces.ViewActionListener
- </action-listener>
<navigation-handler>
org.apache.shale.dialog.faces.DialogNavigationHandler
</navigation-handler>
@@ -46,33 +43,11 @@
<variable-resolver>
org.apache.shale.faces.ShaleVariableResolver
</variable-resolver>
- <view-handler>
- org.apache.shale.view.faces.ViewViewHandler
- </view-handler>
</application>
- <!-- Custom JSF Lifecycle Objects -->
- <lifecycle>
- <phase-listener>org.apache.shale.view.faces.ViewPhaseListener</phase-listener>
- <!-- Loaded from shale-remoting.jar now
- <phase-listener>org.apache.shale.remoting.faces.RemotingPhaseListener</phase-listener>
- -->
- </lifecycle>
-
<!-- Custom Components -->
<component>
<description>
- The "Subview" component performs the same services provided by the
- "subview" tag in the JSF Core Tag Library, plus it provides
- ViewController event callback services for the ViewController
- whose managed bean name is the same as the "id" value of this component.
- </description>
- <display-name>Subview</display-name>
- <component-type>org.apache.shale.Subview</component-type>
- <component-class>org.apache.shale.component.Subview</component-class>
- </component>
- <component>
- <description>
The "Token" component emits a transactional token that is then
validated (on a subsequent form submit) to catch cases where the
same form was submitted more than once.
@@ -102,38 +77,6 @@
</description>
<managed-bean-name>org.apache.shale.TAG_UTILITY_BEAN</managed-bean-name>
<managed-bean-class>org.apache.shale.util.Tags</managed-bean-class>
- <managed-bean-scope>application</managed-bean-scope>
- </managed-bean>
-
- <managed-bean>
- <description>
- Default implementation of org.apache.shale.view.ExceptionHandler
- used to process application-triggered exceptions.
- </description>
- <managed-bean-name>org$apache$shale$view$EXCEPTION_HANDLER</managed-bean-name>
- <managed-bean-class>org.apache.shale.view.impl.DefaultExceptionHandler</managed-bean-class>
- <managed-bean-scope>application</managed-bean-scope>
- </managed-bean>
-
- <managed-bean>
- <description>
- Default implementation of org.apache.shale.view.faces.ViewContollerCallbacks
- used to perform callbacks to the ViewController corresponding to the
- current view identifier.
- </description>
- <managed-bean-name>org$apache$shale$view$VIEW_CALLBACKS</managed-bean-name>
- <managed-bean-class>org.apache.shale.view.faces.ViewControllerCallbacks</managed-bean-class>
- <managed-bean-scope>application</managed-bean-scope>
- </managed-bean>
-
- <managed-bean>
- <description>
- Default implementation of org.apache.shale.view.ViewControllerMapper
- used to map from view identifiers to the managed bean name of the
- corresponding view controller bean.
- </description>
- <managed-bean-name>org$apache$shale$view$VIEW_MAPPER</managed-bean-name>
- <managed-bean-class>org.apache.shale.view.impl.DefaultViewControllerMapper</managed-bean-class>
<managed-bean-scope>application</managed-bean-scope>
</managed-bean>
Modified: shale/framework/trunk/shale-core/src/main/resources/META-INF/taglib.tld
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-core/src/main/resources/META-INF/taglib.tld?view=diff&rev=451484&r1=451483&r2=451484
==============================================================================
--- shale/framework/trunk/shale-core/src/main/resources/META-INF/taglib.tld (original)
+++ shale/framework/trunk/shale-core/src/main/resources/META-INF/taglib.tld Fri Sep 29 15:41:29 2006
@@ -34,26 +34,23 @@
</description>
- <!-- ===================== Servlet Listeners ============================= -->
-
-
- <listener>
- <listener-class>org.apache.shale.view.faces.LifecycleListener</listener-class>
- </listener>
-
-
<!-- ================= JSF Component Tags ================================ -->
<tag>
<name>subview</name>
- <tag-class>org.apache.shale.taglib.SubviewTag</tag-class>
+ <tag-class>org.apache.shale.view.faces.SubviewTag</tag-class>
<body-content>JSP</body-content>
<display-name>Subview</display-name>
<description>
Provide ViewController support functionality for the nested content
(typically a JSP dynamic include) of this component.
+
+ @deprecated Use the "subview" tag from tag library
+ "http://shale.apache.org/view" (in shale-view-xxx.jar)
+ instead of this tag.
+
</description>
<!-- Custom -->
Modified: shale/framework/trunk/shale-core/src/main/resources/org/apache/shale/resources/Bundle.properties
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-core/src/main/resources/org/apache/shale/resources/Bundle.properties?view=diff&rev=451484&r1=451483&r2=451484
==============================================================================
--- shale/framework/trunk/shale-core/src/main/resources/org/apache/shale/resources/Bundle.properties (original)
+++ shale/framework/trunk/shale-core/src/main/resources/org/apache/shale/resources/Bundle.properties Fri Sep 29 15:41:29 2006
@@ -24,24 +24,9 @@
filter.initializing=Initializing Shale Application Filter
filter.parsingResource=Parsing default resource {0}
-# org.apache.shale.view.faces.ViewViewHandler
-view.evalException=Evaluation exception creating a managed bean named {1} for viewId {0}
-view.notViewController=Bean for viewId {0} under name {1} is not a ViewController
-view.noViewController=No ViewController for viewId {0} found under name {1}
-view.noViewControllerMapper=No ViewControllerMapper has been configured for this application
-view.vcmAccess=ViewControllerMapper class {0} does not have a public no-args constructor
-view.vcmCast=Class {0} does not implement ViewControllerMapper
-view.vcmClass=Cannot find ViewControllerMapper class {0}
-view.vcmInstantiate=ViewControllerMapper class {0} instance cannot be instantiated
-
# org.apache.shale.application.ShaleWebContext
context.requestWrapper=Must be an HttpServletRequestWrapper
context.responseWrapper=Must be an HttpServletResponseWrapper
-
-# org.apache.shale.component.Subview
-subview.noBean=No managed bean for subview {0}
-subview.noPhase=Not currently in a JSF phase, so no subview support provided
-subview.noType=Managed bean for subview {0} is not a ViewController
# org.apache.shale.component.Token
token.summary.invalid=Invalid resubmit of the same form
Modified: shale/framework/trunk/shale-core/src/test/java/org/apache/shale/validator/CommonsValidatorTestCase.java
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-core/src/test/java/org/apache/shale/validator/CommonsValidatorTestCase.java?view=diff&rev=451484&r1=451483&r2=451484
==============================================================================
--- shale/framework/trunk/shale-core/src/test/java/org/apache/shale/validator/CommonsValidatorTestCase.java (original)
+++ shale/framework/trunk/shale-core/src/test/java/org/apache/shale/validator/CommonsValidatorTestCase.java Fri Sep 29 15:41:29 2006
@@ -34,7 +34,6 @@
import junit.framework.TestSuite;
import org.apache.commons.validator.ValidatorAction;
-import org.apache.shale.component.Subview;
import org.apache.shale.component.ValidatorScript;
import org.apache.shale.test.base.AbstractJsfTestCase;
import org.apache.shale.util.Messages;
@@ -50,7 +49,7 @@
*/
private static Messages messages =
new Messages("org.apache.shale.validator.messages",
- Subview.class.getClassLoader());
+ CommonsValidatorTestCase.class.getClassLoader());
protected static final Object[] COMPONENTS = {
new String[] {"javax.faces.NamingContainer", "javax.faces.component.UINamingContainer"},
Modified: shale/framework/trunk/shale-tiger/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-tiger/pom.xml?view=diff&rev=451484&r1=451483&r2=451484
==============================================================================
--- shale/framework/trunk/shale-tiger/pom.xml (original)
+++ shale/framework/trunk/shale-tiger/pom.xml Fri Sep 29 15:41:29 2006
@@ -158,6 +158,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-view</artifactId>
+ <version>${version}</version>
+ </dependency>
+
</dependencies>
</project>
Added: shale/framework/trunk/shale-view/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-view/pom.xml?view=auto&rev=451484
==============================================================================
--- shale/framework/trunk/shale-view/pom.xml (added)
+++ shale/framework/trunk/shale-view/pom.xml Fri Sep 29 15:41:29 2006
@@ -0,0 +1,75 @@
+<!--
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Id: pom.xml 160258 2006-05-21 01:56:12Z wsmoak $
+ */
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-parent</artifactId>
+ <version>1.0.4-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>shale-view</artifactId>
+ <packaging>jar</packaging>
+ <name>Shale View Controller Support</name>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Copied: shale/framework/trunk/shale-view/src/main/java/org/apache/shale/view/faces/SubviewComponent.java (from r451365, shale/framework/trunk/shale-core/src/main/java/org/apache/shale/component/Subview.java)
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-view/src/main/java/org/apache/shale/view/faces/SubviewComponent.java?view=diff&rev=451484&p1=shale/framework/trunk/shale-core/src/main/java/org/apache/shale/component/Subview.java&r1=451365&p2=shale/framework/trunk/shale-view/src/main/java/org/apache/shale/view/faces/SubviewComponent.java&r2=451484
==============================================================================
--- shale/framework/trunk/shale-core/src/main/java/org/apache/shale/component/Subview.java (original)
+++ shale/framework/trunk/shale-view/src/main/java/org/apache/shale/view/faces/SubviewComponent.java Fri Sep 29 15:41:29 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.component;
+package org.apache.shale.view.faces;
import java.io.IOException;
import java.util.ArrayList;
@@ -40,7 +40,7 @@
*
* $Id$
*/
-public class Subview extends UINamingContainer {
+public class SubviewComponent extends UINamingContainer {
// -------------------------------------------------------- Static Variables
@@ -49,18 +49,28 @@
/**
* <p>Log instance for this class.</p>
*/
- private static final Log log = LogFactory.getLog(Subview.class);
+ private static final Log log = LogFactory.getLog(SubviewComponent.class);
/**
* <p>Message resources for this class.</p>
*/
private static Messages messages =
- new Messages("org.apache.shale.resources.Bundle",
- Subview.class.getClassLoader());
+ new Messages("org.apache.shale.view.resources.Bundle",
+ SubviewComponent.class.getClassLoader());
// ----------------------------------------------------- UIComponent Methods
+
+
+ /**
+ * <p>Return the component family for this component.</p>
+ */
+ public String getFamily() {
+
+ return "org.apache.shale.view.Subview";
+
+ }
/**
Copied: shale/framework/trunk/shale-view/src/main/java/org/apache/shale/view/faces/SubviewTag.java (from r451365, shale/framework/trunk/shale-core/src/main/java/org/apache/shale/taglib/SubviewTag.java)
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-view/src/main/java/org/apache/shale/view/faces/SubviewTag.java?view=diff&rev=451484&p1=shale/framework/trunk/shale-core/src/main/java/org/apache/shale/taglib/SubviewTag.java&r1=451365&p2=shale/framework/trunk/shale-view/src/main/java/org/apache/shale/view/faces/SubviewTag.java&r2=451484
==============================================================================
--- shale/framework/trunk/shale-core/src/main/java/org/apache/shale/taglib/SubviewTag.java (original)
+++ shale/framework/trunk/shale-view/src/main/java/org/apache/shale/view/faces/SubviewTag.java Fri Sep 29 15:41:29 2006
@@ -14,14 +14,12 @@
* limitations under the License.
*/
-package org.apache.shale.taglib;
+package org.apache.shale.view.faces;
import javax.faces.webapp.UIComponentTag;
-import org.apache.shale.component.Subview;
-
/**
- * <p>JSP custom tag for the {@link Subview} component.</p>
+ * <p>JSP custom tag for the {@link SubviewComponent} component.</p>
*
* $Id$
*/
@@ -32,7 +30,7 @@
* <p>Return the required component type.</p>
*/
public String getComponentType() {
- return "org.apache.shale.Subview";
+ return "org.apache.shale.view.Subview";
}
Modified: shale/framework/trunk/shale-view/src/main/java/org/apache/shale/view/faces/ViewViewHandler.java
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-view/src/main/java/org/apache/shale/view/faces/ViewViewHandler.java?view=diff&rev=451484&r1=451365&r2=451484
==============================================================================
--- shale/framework/trunk/shale-view/src/main/java/org/apache/shale/view/faces/ViewViewHandler.java (original)
+++ shale/framework/trunk/shale-view/src/main/java/org/apache/shale/view/faces/ViewViewHandler.java Fri Sep 29 15:41:29 2006
@@ -80,7 +80,7 @@
* <p>Message resources for this class.</p>
*/
private static Messages messages =
- new Messages("org.apache.shale.resources.Bundle",
+ new Messages("org.apache.shale.view.resources.Bundle",
ViewViewHandler.class.getClassLoader());
Copied: shale/framework/trunk/shale-view/src/main/java/overview.html (from r451365, shale/framework/trunk/shale-core/src/main/java/overview.html)
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-view/src/main/java/overview.html?view=diff&rev=451484&p1=shale/framework/trunk/shale-core/src/main/java/overview.html&r1=451365&p2=shale/framework/trunk/shale-view/src/main/java/overview.html&r2=451484
==============================================================================
--- shale/framework/trunk/shale-core/src/main/java/overview.html (original)
+++ shale/framework/trunk/shale-view/src/main/java/overview.html Fri Sep 29 15:41:29 2006
@@ -1,5 +1,5 @@
<!--
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Copyright 2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,24 +14,14 @@
* limitations under the License.
-->
-<!-- $Id$ -->
-
<html>
<head>
-<title>Shale Framework Overview</title>
+<title>Shale View Controller Support</title>
</head>
<body>
-<p>The <strong>Shale Framework</strong> is a loosely coupled set of value
-added services focused on providing improved functionality and ease of
-development for applications based on the
-<a href="http://java.sun.com/j2ee/javaserverfaces/">JavaServer Faces</a>
-(JSF) standard API. In addition to providing API for building user
-interface components, JSF provides a <em>front controller</em> MVC
-architecture, similar to what you see in many other Java based web
-frameworks. Shale leverages the extensibility points that are also
-built into JSF, and avoids the redundant implementation of features
-that JSF already provides.</p>
+<p>This library contains the <em>View Controller</em> support for the
+<a href="http://shale.apache.org/">Shale Framework</a>.</p>
</body>
</html>
Added: shale/framework/trunk/shale-view/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-view/src/main/resources/META-INF/LICENSE.txt?view=auto&rev=451484
==============================================================================
--- shale/framework/trunk/shale-view/src/main/resources/META-INF/LICENSE.txt (added)
+++ shale/framework/trunk/shale-view/src/main/resources/META-INF/LICENSE.txt Fri Sep 29 15:41:29 2006
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Added: shale/framework/trunk/shale-view/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-view/src/main/resources/META-INF/NOTICE.txt?view=auto&rev=451484
==============================================================================
--- shale/framework/trunk/shale-view/src/main/resources/META-INF/NOTICE.txt (added)
+++ shale/framework/trunk/shale-view/src/main/resources/META-INF/NOTICE.txt Fri Sep 29 15:41:29 2006
@@ -0,0 +1,6 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+This product contains code written by David Geary and Cay Horstmann
+for the first edition of Core JavaServer Faces.
+
Added: shale/framework/trunk/shale-view/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-view/src/main/resources/META-INF/faces-config.xml?view=auto&rev=451484
==============================================================================
--- shale/framework/trunk/shale-view/src/main/resources/META-INF/faces-config.xml (added)
+++ shale/framework/trunk/shale-view/src/main/resources/META-INF/faces-config.xml Fri Sep 29 15:41:29 2006
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+
+
+<!DOCTYPE faces-config PUBLIC
+ "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+
+
+<!--
+
+ Copyright 2006 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Id: faces-config.xml 429262 2006-08-07 07:18:25Z craigmcc $
+
+-->
+
+
+<!-- ====================== SHALE CONFIGURATION FILE ======================= -->
+
+
+<faces-config>
+
+ <!-- Custom JSF Application Objects -->
+ <application>
+ <action-listener>
+ org.apache.shale.view.faces.ViewActionListener
+ </action-listener>
+ <view-handler>
+ org.apache.shale.view.faces.ViewViewHandler
+ </view-handler>
+ </application>
+
+ <!-- Custom JSF Lifecycle Objects -->
+ <lifecycle>
+ <phase-listener>org.apache.shale.view.faces.ViewPhaseListener</phase-listener>
+ </lifecycle>
+
+ <!-- Custom JSF Components -->
+ <component>
+ <description>
+ The "Subview" component performs the same services provided by the
+ "subview" tag in the JSF Core Tag Library, plus it provides
+ ViewController event callback services for the ViewController
+ whose managed bean name is the same as the "id" value of this component.
+ </description>
+ <display-name>Subview</display-name>
+ <component-type>org.apache.shale.view.Subview</component-type>
+ <component-class>org.apache.shale.view.faces.SubviewComponent</component-class>
+ </component>
+
+ <!-- Default Implementation Managed Beans -->
+ <managed-bean>
+ <description>
+ Default implementation of org.apache.shale.view.ExceptionHandler
+ used to process application-triggered exceptions.
+ </description>
+ <managed-bean-name>org$apache$shale$view$EXCEPTION_HANDLER</managed-bean-name>
+ <managed-bean-class>org.apache.shale.view.impl.DefaultExceptionHandler</managed-bean-class>
+ <managed-bean-scope>application</managed-bean-scope>
+ </managed-bean>
+
+ <managed-bean>
+ <description>
+ Default implementation of org.apache.shale.view.faces.ViewContollerCallbacks
+ used to perform callbacks to the ViewController corresponding to the
+ current view identifier.
+ </description>
+ <managed-bean-name>org$apache$shale$view$VIEW_CALLBACKS</managed-bean-name>
+ <managed-bean-class>org.apache.shale.view.faces.ViewControllerCallbacks</managed-bean-class>
+ <managed-bean-scope>application</managed-bean-scope>
+ </managed-bean>
+
+ <managed-bean>
+ <description>
+ Default implementation of org.apache.shale.view.ViewControllerMapper
+ used to map from view identifiers to the managed bean name of the
+ corresponding view controller bean.
+ </description>
+ <managed-bean-name>org$apache$shale$view$VIEW_MAPPER</managed-bean-name>
+ <managed-bean-class>org.apache.shale.view.impl.DefaultViewControllerMapper</managed-bean-class>
+ <managed-bean-scope>application</managed-bean-scope>
+ </managed-bean>
+
+</faces-config>
Added: shale/framework/trunk/shale-view/src/main/resources/META-INF/taglib.tld
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-view/src/main/resources/META-INF/taglib.tld?view=auto&rev=451484
==============================================================================
--- shale/framework/trunk/shale-view/src/main/resources/META-INF/taglib.tld (added)
+++ shale/framework/trunk/shale-view/src/main/resources/META-INF/taglib.tld Fri Sep 29 15:41:29 2006
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright 2006 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!DOCTYPE taglib PUBLIC
+ "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+ "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+
+<taglib>
+
+
+ <tlib-version>1.0</tlib-version>
+ <jsp-version>1.2</jsp-version>
+ <short-name>s</short-name>
+ <uri>http://shale.apache.org/view</uri>
+ <display-name>Shale View Controller JSF Components and Tags</display-name>
+ <description>
+ This tag library contains tags for the core JSF components supported by
+ the Shale Framework, plus additional custom tag handlers as required.
+ </description>
+
+
+ <!-- ===================== Servlet Listeners ============================= -->
+
+
+ <listener>
+ <listener-class>org.apache.shale.view.faces.LifecycleListener</listener-class>
+ </listener>
+
+
+ <!-- ================= JSF Component Tags ================================ -->
+
+
+ <tag>
+
+ <name>subview</name>
+ <tag-class>org.apache.shale.view.faces.SubviewTag</tag-class>
+ <body-content>JSP</body-content>
+ <display-name>Subview</display-name>
+ <description>
+ Provide ViewController support functionality for the nested content
+ (typically a JSP dynamic include) of this component.
+ </description>
+
+ <!-- Custom -->
+
+ <!-- JSF -->
+
+ <attribute>
+ <name>binding</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <description>
+ Value binding expression used to bind this component instance
+ to a backing bean property.
+ </description>
+ </attribute>
+
+ <attribute>
+ <name>id</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ <description>
+ Component identifier of this component. If specified, this identifier
+ must be unique within the context of the closest parent UIComponent
+ that is a NamingContainer.
+ </description>
+ </attribute>
+
+ <attribute>
+ <name>rendered</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <description>
+ Flag indicating whether this component should be rendered.
+ Default value is true.
+ </description>
+ </attribute>
+
+ </tag>
+
+
+</taglib>
Added: shale/framework/trunk/shale-view/src/main/resources/org/apache/shale/view/resources/Bundle.properties
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-view/src/main/resources/org/apache/shale/view/resources/Bundle.properties?view=auto&rev=451484
==============================================================================
--- shale/framework/trunk/shale-view/src/main/resources/org/apache/shale/view/resources/Bundle.properties (added)
+++ shale/framework/trunk/shale-view/src/main/resources/org/apache/shale/view/resources/Bundle.properties Fri Sep 29 15:41:29 2006
@@ -0,0 +1,32 @@
+# Resource Strings for Shale View Controller Support
+#
+# Copyright 2006 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# org.apache.shale.view.faces.SubviewComponent
+subview.noBean=No managed bean for subview {0}
+subview.noPhase=Not currently in a JSF phase, so no subview support provided
+subview.noType=Managed bean for subview {0} is not a ViewController
+
+# org.apache.shale.view.faces.ViewViewHandler
+view.evalException=Evaluation exception creating a managed bean named {1} for viewId {0}
+view.notViewController=Bean for viewId {0} under name {1} is not a ViewController
+view.noViewController=No ViewController for viewId {0} found under name {1}
+view.noViewControllerMapper=No ViewControllerMapper has been configured for this application
+view.vcmAccess=ViewControllerMapper class {0} does not have a public no-args constructor
+view.vcmCast=Class {0} does not implement ViewControllerMapper
+view.vcmClass=Cannot find ViewControllerMapper class {0}
+view.vcmInstantiate=ViewControllerMapper class {0} instance cannot be instantiated
+