You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ws...@apache.org on 2006/05/18 07:12:46 UTC
svn commit: r407457 - in /struts/shale/trunk: clay-plugin/src/conf/
clay-plugin/src/java/org/apache/shale/clay/component/chain/
clay-plugin/src/java/org/apache/shale/clay/parser/builder/chain/
clay-plugin/src/test/org/apache/shale/clay/config/ core-lib...
Author: wsmoak
Date: Wed May 17 22:12:45 2006
New Revision: 407457
URL: http://svn.apache.org/viewvc?rev=407457&view=rev
Log:
Fix inconsistent line endings, add svn eol-style native property.
Modified:
struts/shale/trunk/clay-plugin/src/conf/faces-config.xml (contents, props changed)
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/shale-clay-config.xml (contents, props changed)
struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/parser/builder/chain/shale-builder-config.xml (contents, props changed)
struts/shale/trunk/clay-plugin/src/test/org/apache/shale/clay/config/duplicate2.html (contents, props changed)
struts/shale/trunk/core-library/src/java/org/apache/shale/validator/Globals.java
struts/shale/trunk/use-cases/src/web/WEB-INF/chain-config.xml (contents, props changed)
struts/shale/trunk/use-cases/src/web/WEB-INF/faces-config.xml (contents, props changed)
struts/shale/trunk/use-cases/src/web/usecases.jsp (contents, props changed)
Modified: struts/shale/trunk/clay-plugin/src/conf/faces-config.xml
URL: http://svn.apache.org/viewvc/struts/shale/trunk/clay-plugin/src/conf/faces-config.xml?rev=407457&r1=407456&r2=407457&view=diff
==============================================================================
--- struts/shale/trunk/clay-plugin/src/conf/faces-config.xml (original)
+++ struts/shale/trunk/clay-plugin/src/conf/faces-config.xml Wed May 17 22:12:45 2006
@@ -48,25 +48,25 @@
<component-type>org.apache.shale.clay.component.Clay</component-type>
<component-class>org.apache.shale.clay.component.Clay</component-class>
</component>
-
- <component>
- <description>
- The "LoadBundle" component is meant to simulate the JSF loadBundle
- JSP tag for full Clay HTML views.
- </description>
- <display-name>LoadBundle</display-name>
- <component-type>org.apache.shale.clay.component.LoadBundle</component-type>
- <component-class>org.apache.shale.clay.component.LoadBundle</component-class>
- </component>
-
- <managed-bean>
- <description>
- The utility class used by the "Clay" component for extending runtime
- capabilities.
- </description>
- <managed-bean-name>ClayAmalgam</managed-bean-name>
- <managed-bean-class>org.apache.shale.clay.utils.ClayAmalgam</managed-bean-class>
- <managed-bean-scope>application</managed-bean-scope>
- </managed-bean>
+
+ <component>
+ <description>
+ The "LoadBundle" component is meant to simulate the JSF loadBundle
+ JSP tag for full Clay HTML views.
+ </description>
+ <display-name>LoadBundle</display-name>
+ <component-type>org.apache.shale.clay.component.LoadBundle</component-type>
+ <component-class>org.apache.shale.clay.component.LoadBundle</component-class>
+ </component>
+
+ <managed-bean>
+ <description>
+ The utility class used by the "Clay" component for extending runtime
+ capabilities.
+ </description>
+ <managed-bean-name>ClayAmalgam</managed-bean-name>
+ <managed-bean-class>org.apache.shale.clay.utils.ClayAmalgam</managed-bean-class>
+ <managed-bean-scope>application</managed-bean-scope>
+ </managed-bean>
</faces-config>
Propchange: struts/shale/trunk/clay-plugin/src/conf/faces-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/shale-clay-config.xml
URL: http://svn.apache.org/viewvc/struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/shale-clay-config.xml?rev=407457&r1=407456&r2=407457&view=diff
==============================================================================
--- struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/shale-clay-config.xml (original)
+++ struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/shale-clay-config.xml Wed May 17 22:12:45 2006
@@ -23,23 +23,23 @@
<catalog name="clay">
<chain name="addComponent">
-
- <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
- catalogName = "clayCustomization"
- name = "preprocessAddComponent"
- optional = "true"/>
+
+ <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
+ catalogName = "clayCustomization"
+ name = "preprocessAddComponent"
+ optional = "true"/>
<command className = "org.apache.shale.clay.utils.FalseLookupCommand"
catalogName = "clay"
name = "createComponent"
optional = "false"/>
- <command className="org.apache.shale.clay.component.chain.AssignChildrenCommand"/>
-
- <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
- catalogName = "clayCustomization"
- name = "postprocessAddComponent"
- optional = "true"/>
+ <command className="org.apache.shale.clay.component.chain.AssignChildrenCommand"/>
+
+ <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
+ catalogName = "clayCustomization"
+ name = "postprocessAddComponent"
+ optional = "true"/>
</chain>
@@ -50,7 +50,7 @@
<command className="org.apache.shale.clay.component.chain.CreateComponentCommand"/>
<command className="org.apache.shale.clay.component.chain.AssignValidatorsCommand"/>
<command className="org.apache.shale.clay.component.chain.AssignValueChangeListenersCommand"/>
- <command className="org.apache.shale.clay.component.chain.AssignActionListenersCommand"/>
+ <command className="org.apache.shale.clay.component.chain.AssignActionListenersCommand"/>
<command className="org.apache.shale.clay.component.chain.AssignPropertiesCommand"/>
<command className="org.apache.shale.clay.component.chain.AssignConverterCommand"/>
@@ -58,73 +58,73 @@
<chain name="addConverter">
-
- <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
- catalogName = "clayCustomization"
- name = "preprocessAddConverter"
- optional = "true"/>
+
+ <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
+ catalogName = "clayCustomization"
+ name = "preprocessAddConverter"
+ optional = "true"/>
<command className="org.apache.shale.clay.component.chain.CreateConverterCommand"/>
<command className="org.apache.shale.clay.component.chain.AssignPropertiesCommand"/>
-
- <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
- catalogName = "clayCustomization"
- name = "postprocessAddConverter"
- optional = "true"/>
+
+ <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
+ catalogName = "clayCustomization"
+ name = "postprocessAddConverter"
+ optional = "true"/>
</chain>
<chain name="addValidator">
-
- <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
- catalogName = "clayCustomization"
- name = "preprocessAddValidator"
- optional = "true"/>
+
+ <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
+ catalogName = "clayCustomization"
+ name = "preprocessAddValidator"
+ optional = "true"/>
<command className="org.apache.shale.clay.component.chain.CreateValidatorCommand"/>
<command className="org.apache.shale.clay.component.chain.AssignPropertiesCommand"/>
-
- <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
- catalogName = "clayCustomization"
- name = "postprocessAddValidator"
- optional = "true"/>
+
+ <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
+ catalogName = "clayCustomization"
+ name = "postprocessAddValidator"
+ optional = "true"/>
</chain>
<chain name="addValueChangeListener">
-
- <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
- catalogName = "clayCustomization"
- name = "preprocessAddValueChangeListener"
- optional = "true"/>
+
+ <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
+ catalogName = "clayCustomization"
+ name = "preprocessAddValueChangeListener"
+ optional = "true"/>
<command className="org.apache.shale.clay.component.chain.CreateValueChangeListenerCommand"/>
<command className="org.apache.shale.clay.component.chain.AssignPropertiesCommand"/>
-
- <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
- catalogName = "clayCustomization"
- name = "postprocessAddValueChangeListener"
- optional = "true"/>
+
+ <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
+ catalogName = "clayCustomization"
+ name = "postprocessAddValueChangeListener"
+ optional = "true"/>
</chain>
<chain name="addActionListener">
-
- <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
- catalogName = "clayCustomization"
- name = "preprocessAddActionListener"
- optional = "true"/>
+
+ <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
+ catalogName = "clayCustomization"
+ name = "preprocessAddActionListener"
+ optional = "true"/>
<command className="org.apache.shale.clay.component.chain.CreateActionListenerCommand"/>
<command className="org.apache.shale.clay.component.chain.AssignPropertiesCommand"/>
-
- <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
- catalogName = "clayCustomization"
- name = "postprocessAddActionListener"
- optional = "true"/>
+
+ <command className = "org.apache.shale.clay.utils.PluggableLookupCommand"
+ catalogName = "clayCustomization"
+ name = "postprocessAddActionListener"
+ optional = "true"/>
</chain>
@@ -132,26 +132,26 @@
<chain name="setAttribute">
<command className="org.apache.shale.clay.component.chain.PropertyValueCommand"/>
</chain>
-
- <chain name="action">
- <command className="org.apache.shale.clay.component.chain.PropertyActionCommand"/>
- </chain>
-
- <chain name="actionListener">
- <command className="org.apache.shale.clay.component.chain.PropertyActionListenerCommand"/>
- </chain>
-
- <chain name="validator">
- <command className="org.apache.shale.clay.component.chain.PropertyValidatorCommand"/>
- </chain>
-
- <chain name="valueChangeListener">
- <command className="org.apache.shale.clay.component.chain.PropertyValueChangeListenerCommand"/>
- </chain>
-
- <chain name="converter">
- <command className="org.apache.shale.clay.component.chain.PropertyConverterCommand"/>
- </chain>
-
+
+ <chain name="action">
+ <command className="org.apache.shale.clay.component.chain.PropertyActionCommand"/>
+ </chain>
+
+ <chain name="actionListener">
+ <command className="org.apache.shale.clay.component.chain.PropertyActionListenerCommand"/>
+ </chain>
+
+ <chain name="validator">
+ <command className="org.apache.shale.clay.component.chain.PropertyValidatorCommand"/>
+ </chain>
+
+ <chain name="valueChangeListener">
+ <command className="org.apache.shale.clay.component.chain.PropertyValueChangeListenerCommand"/>
+ </chain>
+
+ <chain name="converter">
+ <command className="org.apache.shale.clay.component.chain.PropertyConverterCommand"/>
+ </chain>
+
</catalog>
Propchange: struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/component/chain/shale-clay-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/parser/builder/chain/shale-builder-config.xml
URL: http://svn.apache.org/viewvc/struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/parser/builder/chain/shale-builder-config.xml?rev=407457&r1=407456&r2=407457&view=diff
==============================================================================
--- struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/parser/builder/chain/shale-builder-config.xml (original)
+++ struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/parser/builder/chain/shale-builder-config.xml Wed May 17 22:12:45 2006
@@ -23,17 +23,17 @@
<catalog name="builder">
<chain name="findBuilder">
-
+
<command className="org.apache.shale.clay.parser.builder.chain.DirectiveBuilderRule"/>
<command className="org.apache.shale.clay.parser.builder.chain.InputBuilderRule"/>
<command className="org.apache.shale.clay.parser.builder.chain.FormBuilderRule"/>
<command className="org.apache.shale.clay.parser.builder.chain.SelectBuilderRule"/>
<command className="org.apache.shale.clay.parser.builder.chain.OptionBuilderRule"/>
<command className="org.apache.shale.clay.parser.builder.chain.LabelBuilderRule"/>
- <command className="org.apache.shale.clay.parser.builder.chain.AnchorBuilderRule"/>
- <command className="org.apache.shale.clay.parser.builder.chain.TextareaBuilderRule"/>
+ <command className="org.apache.shale.clay.parser.builder.chain.AnchorBuilderRule"/>
+ <command className="org.apache.shale.clay.parser.builder.chain.TextareaBuilderRule"/>
- <command className="org.apache.shale.clay.parser.builder.chain.SpanBuilderRule"/>
+ <command className="org.apache.shale.clay.parser.builder.chain.SpanBuilderRule"/>
<command className="org.apache.shale.clay.parser.builder.chain.DefaultBuilderRule"/>
</chain>
Propchange: struts/shale/trunk/clay-plugin/src/java/org/apache/shale/clay/parser/builder/chain/shale-builder-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/shale/trunk/clay-plugin/src/test/org/apache/shale/clay/config/duplicate2.html
URL: http://svn.apache.org/viewvc/struts/shale/trunk/clay-plugin/src/test/org/apache/shale/clay/config/duplicate2.html?rev=407457&r1=407456&r2=407457&view=diff
==============================================================================
--- struts/shale/trunk/clay-plugin/src/test/org/apache/shale/clay/config/duplicate2.html (original)
+++ struts/shale/trunk/clay-plugin/src/test/org/apache/shale/clay/config/duplicate2.html Wed May 17 22:12:45 2006
@@ -5,9 +5,9 @@
<input id=street1 value="#{@managed-bean-name.street1}" type=text size=45>
</span>
<span jsfid="subview" allowBody="true">
- <input id=street1 value="#{@managed-bean-name.street1}" type=text size=45>
- <input id=@myId value="#{@managed-bean-name.street1}" type=text size=45>
- <input id=@myId value="#{@managed-bean-name.street1}" type=text size=45>
+ <input id=street1 value="#{@managed-bean-name.street1}" type=text size=45>
+ <input id=@myId value="#{@managed-bean-name.street1}" type=text size=45>
+ <input id=@myId value="#{@managed-bean-name.street1}" type=text size=45>
</span>
</form>
Propchange: struts/shale/trunk/clay-plugin/src/test/org/apache/shale/clay/config/duplicate2.html
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/validator/Globals.java
URL: http://svn.apache.org/viewvc/struts/shale/trunk/core-library/src/java/org/apache/shale/validator/Globals.java?rev=407457&r1=407456&r2=407457&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/validator/Globals.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/validator/Globals.java Wed May 17 22:12:45 2006
@@ -19,7 +19,7 @@
/**
* <p>Manifest constants that are global to the validator implementation.</p>
*
- * $Id:$
+ * $Id$
*/
public class Globals {
Modified: struts/shale/trunk/use-cases/src/web/WEB-INF/chain-config.xml
URL: http://svn.apache.org/viewvc/struts/shale/trunk/use-cases/src/web/WEB-INF/chain-config.xml?rev=407457&r1=407456&r2=407457&view=diff
==============================================================================
--- struts/shale/trunk/use-cases/src/web/WEB-INF/chain-config.xml (original)
+++ struts/shale/trunk/use-cases/src/web/WEB-INF/chain-config.xml Wed May 17 22:12:45 2006
@@ -36,14 +36,14 @@
<!-- This filter command wakes up the watchdog monitoring the Clay configuration files for change. -->
- <command className="org.apache.shale.clay.config.beans.ConfigDefinitionsWatchdogFilter"
- includes="\S*\.faces,\S*\.html,/index\.jsp,\S*\.xml"/>
+ <command className="org.apache.shale.clay.config.beans.ConfigDefinitionsWatchdogFilter"
+ includes="\S*\.faces,\S*\.html,/index\.jsp,\S*\.xml"/>
<!-- Disallow direct access to JSP and JSFP resources -->
- <command className="org.apache.shale.application.ContextRelativePathFilter"
- includes="\S*\.xml,\S*\.faces,\S*\.html,\S*\.gif,\S*\.jpg,/index\.jsp"
- excludes="\S*\.jsp,\S*\.jspf"/>
+ <command className="org.apache.shale.application.ContextRelativePathFilter"
+ includes="\S*\.xml,\S*\.faces,\S*\.html,\S*\.gif,\S*\.jpg,/index\.jsp"
+ excludes="\S*\.jsp,\S*\.jspf"/>
</chain>
</catalog>
Propchange: struts/shale/trunk/use-cases/src/web/WEB-INF/chain-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/shale/trunk/use-cases/src/web/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/struts/shale/trunk/use-cases/src/web/WEB-INF/faces-config.xml?rev=407457&r1=407456&r2=407457&view=diff
==============================================================================
--- struts/shale/trunk/use-cases/src/web/WEB-INF/faces-config.xml (original)
+++ struts/shale/trunk/use-cases/src/web/WEB-INF/faces-config.xml Wed May 17 22:12:45 2006
@@ -71,7 +71,7 @@
<navigation-case>
<from-action>#{locale$select.select}</from-action>
<from-outcome>locale$failure</from-outcome>
- <to-view-id>/usecases.faces</to-view-id>
+ <to-view-id>/usecases.faces</to-view-id>
<redirect/>
</navigation-case>
</navigation-rule>
@@ -106,7 +106,7 @@
<from-view-id>/ajax/completion.jsp</from-view-id>
<navigation-case>
<from-outcome>exit</from-outcome>
- <to-view-id>/usecases.faces</to-view-id>
+ <to-view-id>/usecases.faces</to-view-id>
<redirect/>
</navigation-case>
</navigation-rule>
@@ -167,7 +167,7 @@
</navigation-case>
<navigation-case>
<from-outcome>usecases$toplevel</from-outcome>
- <to-view-id>/usecases.faces</to-view-id>
+ <to-view-id>/usecases.faces</to-view-id>
<redirect/>
</navigation-case>
</navigation-rule>
Propchange: struts/shale/trunk/use-cases/src/web/WEB-INF/faces-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/shale/trunk/use-cases/src/web/usecases.jsp
URL: http://svn.apache.org/viewvc/struts/shale/trunk/use-cases/src/web/usecases.jsp?rev=407457&r1=407456&r2=407457&view=diff
==============================================================================
--- struts/shale/trunk/use-cases/src/web/usecases.jsp (original)
+++ struts/shale/trunk/use-cases/src/web/usecases.jsp Wed May 17 22:12:45 2006
@@ -182,12 +182,12 @@
</h:panelGrid>
- <h1><h:outputText value="#{messages['usecases.clay']}"/></h1>
+ <h1><h:outputText value="#{messages['usecases.clay']}"/></h1>
<h:panelGrid columns="2">
-
- <h:commandLink id="symbols" action="symbols" title="#{messages['usecases.symbols.title']}">
- <h:outputText value="#{messages['usecases.symbols']}"/>
- </h:commandLink>
+
+ <h:commandLink id="symbols" action="symbols" title="#{messages['usecases.symbols.title']}">
+ <h:outputText value="#{messages['usecases.symbols']}"/>
+ </h:commandLink>
<f:verbatim> </f:verbatim>
<h:commandLink id="rolodex1"
action="rolodex$test1" title="#{messages['usecases.rolodex1.title']}">
Propchange: struts/shale/trunk/use-cases/src/web/usecases.jsp
------------------------------------------------------------------------------
svn:eol-style = native