Author: rahul
Date: Mon Oct 16 15:51:49 2006
New Revision: 464707
URL: http://svn.apache.org/viewvc?view=rev&rev=464707
Log:
Fix some files with inconsistent line endings (worse than just missing the
eol-style prop, so potentially larger diffs).
SHALE-310
Modified:
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/WEB-INF/faces-config.xml
(contents, props changed)
shale/framework/trunk/shale-clay/src/main/resources/org/apache/shale/clay/parser/builder/chain/shale-builder-config.xml
(contents, props changed)
shale/framework/trunk/src/site/resources/catalog.xml (props changed)
Modified:
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/WEB-INF/faces-config.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/WEB-INF/faces-config.xml?view=diff&rev=464707&r1=464706&r2=464707
==============================================================================
---
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/WEB-INF/faces-config.xml
(original)
+++
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/WEB-INF/faces-config.xml
Mon Oct 16 15:51:49 2006
@@ -89,7 +89,7 @@
</navigation-case>
</navigation-rule>
-
+
<navigation-rule>
@@ -121,7 +121,7 @@
<to-view-id>/rolodex/jsprolodex.faces</to-view-id>
</navigation-case>
<navigation-case>
- <from-outcome>home</from-outcome>
+ <from-outcome>home</from-outcome>
<to-view-id>/usecases.faces</to-view-id>
<redirect />
</navigation-case>
@@ -160,7 +160,7 @@
</navigation-case>
<navigation-case>
<from-action>home</from-action>
- <from-outcome>home</from-outcome>
+ <from-outcome>home</from-outcome>
<to-view-id>/usecases.faces</to-view-id>
<redirect />
</navigation-case>
@@ -201,7 +201,7 @@
<to-view-id>/rolodex/xhrolodex.html</to-view-id>
</navigation-case>
<navigation-case>
- <from-action>home</from-action>
+ <from-action>home</from-action>
<from-outcome>home</from-outcome>
<to-view-id>/usecases.faces</to-view-id>
<redirect />
@@ -244,7 +244,7 @@
<to-view-id>/rolodex/rolodex.xml</to-view-id>
</navigation-case>
<navigation-case>
- <from-action>home</from-action>
+ <from-action>home</from-action>
<from-outcome>home</from-outcome>
<to-view-id>/usecases.faces</to-view-id>
<redirect />
@@ -283,7 +283,7 @@
<to-view-id>/rolodex/jrolodex.html</to-view-id>
</navigation-case>
<navigation-case>
- <from-action>home</from-action>
+ <from-action>home</from-action>
<from-outcome>home</from-outcome>
<to-view-id>/usecases.faces</to-view-id>
<redirect />
@@ -452,15 +452,15 @@
</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
-
- <managed-bean>
- <managed-bean-name>symbols$page4</managed-bean-name>
- <managed-bean-class>
- org.apache.shale.usecases.symbols.RegistrationForm
- </managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- </managed-bean>
-
+
+ <managed-bean>
+ <managed-bean-name>symbols$page4</managed-bean-name>
+ <managed-bean-class>
+ org.apache.shale.usecases.symbols.RegistrationForm
+ </managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
+
<managed-bean>
<managed-bean-name>basicPerson</managed-bean-name>
@@ -487,17 +487,17 @@
</managed-bean>
<!-- Symbols Navigation Rules -->
-
- <navigation-rule>
- <from-view-id>/symbols/home.html</from-view-id>
- <navigation-case>
- <from-action>home</from-action>
- <from-outcome>home</from-outcome>
- <to-view-id>/usecases.faces</to-view-id>
- <redirect/>
- </navigation-case>
- </navigation-rule>
-
+
+ <navigation-rule>
+ <from-view-id>/symbols/home.html</from-view-id>
+ <navigation-case>
+ <from-action>home</from-action>
+ <from-outcome>home</from-outcome>
+ <to-view-id>/usecases.faces</to-view-id>
+ <redirect/>
+ </navigation-case>
+ </navigation-rule>
+
<navigation-rule>
<from-view-id>/symbols/nameReuse*</from-view-id>
@@ -547,16 +547,16 @@
</navigation-case>
</navigation-rule>
- <navigation-rule>
- <from-view-id>/symbols/page4*</from-view-id>
- <navigation-case>
- <from-outcome>save</from-outcome>
- <to-view-id>/symbols/page4.xml</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>home</from-outcome>
- <to-view-id>/symbols/home.html</to-view-id>
- </navigation-case>
- </navigation-rule>
+ <navigation-rule>
+ <from-view-id>/symbols/page4*</from-view-id>
+ <navigation-case>
+ <from-outcome>save</from-outcome>
+ <to-view-id>/symbols/page4.xml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>home</from-outcome>
+ <to-view-id>/symbols/home.html</to-view-id>
+ </navigation-case>
+ </navigation-rule>
</faces-config>
Propchange:
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/WEB-INF/faces-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
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=464707&r1=464706&r2=464707
==============================================================================
---
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 16 15:51:49 2006
@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
- $Id: shale-builder-config.xml 410710 2006-06-01 01:21:43Z gvanmatre $
+ $Id$
-->
@@ -35,11 +35,11 @@
<command
className="org.apache.shale.clay.parser.builder.chain.DefaultBuilderRule"/>
</chain>
- <chain name="unknown-namespace">
- <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
- catalogName = "clayCustomization"
- name = "#{requestScope.XMLNS}"
- optional = "true"/>
+ <chain name="unknown-namespace">
+ <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
+ catalogName = "clayCustomization"
+ name = "#{requestScope.XMLNS}"
+ optional = "true"/>
<command
className="org.apache.shale.clay.parser.builder.chain.DefaultBuilderRule"/>
</chain>
@@ -55,14 +55,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/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"/>
@@ -71,10 +71,10 @@
<chain name="http://shale.apache.org/clay";>
<command
className="org.apache.shale.clay.parser.builder.chain.JsfDefaultBuilderRule"
prefix="clay"/>
</chain>
-
- <chain name="http://myfaces.apache.org/tomahawk";>
- <command
className="org.apache.shale.clay.parser.builder.chain.JsfDefaultBuilderRule"
prefix="t"/>
- </chain>
+
+ <chain name="http://myfaces.apache.org/tomahawk";>
+ <command
className="org.apache.shale.clay.parser.builder.chain.JsfDefaultBuilderRule"
prefix="t"/>
+ </chain>
</catalog>
Propchange:
shale/framework/trunk/shale-clay/src/main/resources/org/apache/shale/clay/parser/builder/chain/shale-builder-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
shale/framework/trunk/shale-clay/src/main/resources/org/apache/shale/clay/parser/builder/chain/shale-builder-config.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: shale/framework/trunk/src/site/resources/catalog.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: shale/framework/trunk/src/site/resources/catalog.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
