You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2005/06/29 23:43:47 UTC
svn commit: r202437 - in /struts/sandbox/trunk/overdrive/PhoneBook: Core/
Test/ Test/Resources/ Test/Resources/Command/ Web/ Web/Resources/
Web/Resources/Command/
Author: husted
Date: Wed Jun 29 14:43:45 2005
New Revision: 202437
URL: http://svn.apache.org/viewcvs?rev=202437&view=rev
Log:
OVR-5
* Move Message Resource file to Core assembly, where it can be shared.
]
Added:
struts/sandbox/trunk/overdrive/PhoneBook/Core/Messages.resx
Removed:
struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Messages.resx
struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Messages.resx
Modified:
struts/sandbox/trunk/overdrive/PhoneBook/Core/Core.csproj
struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/AppBase.xml
struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/AppConfig.xml
struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/Catalog.xml
struts/sandbox/trunk/overdrive/PhoneBook/Test/Test.csproj
struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/AppConfig.xml
struts/sandbox/trunk/overdrive/PhoneBook/Web/Web.csproj
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Core/Core.csproj
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/Core.csproj?rev=202437&r1=202436&r2=202437&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/Core.csproj (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/Core.csproj Wed Jun 29 14:43:45 2005
@@ -29,7 +29,7 @@
CheckForOverflowUnderflow = "false"
ConfigurationOverrideFile = ""
DefineConstants = "DEBUG;TRACE"
- DocumentationFile = ""
+ DocumentationFile = "PhoneBook.Core.xml"
DebugSymbols = "true"
FileAlignment = "4096"
IncrementalBuild = "false"
@@ -127,6 +127,10 @@
RelPath = "AssemblyInfo.cs"
SubType = "Code"
BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Messages.resx"
+ BuildAction = "EmbeddedResource"
/>
<File
RelPath = "TelephoneProcessor.cs"
Added: struts/sandbox/trunk/overdrive/PhoneBook/Core/Messages.resx
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/Messages.resx?rev=202437&view=auto
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/Messages.resx (added)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/Messages.resx Wed Jun 29 14:43:45 2005
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="ResMimeType">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="Version">
+ <value>1.0.0.0</value>
+ </resheader>
+ <resheader name="Reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="Writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+
+
+ <!-- command labels -->
+
+ <data name="list_all_command">
+ <value>SHOW ALL</value>
+ </data>
+
+
+ <!-- field alerts -->
+
+ <data name="_alert">
+ <value>{0} is invalid.</value>
+ </data>
+
+ <data name="_required">
+ <value>{0} is required.</value>
+ </data>
+
+ <data name="DateTimeProcessor_alert">
+ <value>{0} must be a valid date.</value>
+ </data>
+
+ <data name="TelephoneProcessor_alert">
+ <value>{0} must be a telephone extension.</value>
+ </data>
+
+
+ <!-- field labels -->
+
+ <data name="last_name_label">
+ <value>Last Name</value>
+ </data>
+
+ <data name="first_name_label">
+ <value>First Name</value>
+ </data>
+
+ <data name="extension_label">
+ <value>Extension</value>
+ </data>
+
+ <data name="user_name_label">
+ <value>User Name</value>
+ </data>
+
+ <data name="hired_label">
+ <value>Hired</value>
+ </data>
+
+ <data name="hours_label">
+ <value>Hours</value>
+ </data>
+
+ <data name="editor_label">
+ <value>Editor?</value>
+ </data>
+
+
+ <!-- prompts -->
+
+ <data name="greeting">
+ <value>Welcome, </value>
+ </data>
+
+ <data name="directory_title">
+ <value>Directory (2)</value>
+ </data>
+
+ <data name="directory_heading">
+ <value>Directory</value>
+ </data>
+
+ <data name="directory_prompt">
+ <value>Select a filter to display fewer entries</value>
+ </data>
+
+
+</root>
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/AppBase.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/AppBase.xml?rev=202437&r1=202436&r2=202437&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/AppBase.xml (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/AppBase.xml Wed Jun 29 14:43:45 2005
@@ -16,7 +16,7 @@
<object id="BaseKeyValueProcessor" type="Nexus.Core.Validators.KeyValueProcessor"/>
<!-- All child helpers must also specify singleton=false; otherwise, Context is shared. -->
- <object id="BaseHelper" type="Nexus.Web.Helpers.WebViewHelper, Nexus.Web" singleton="false">
+ <object id="BaseHelper" type="Nexus.Web.WebViewHelper, Nexus.Web" singleton="false">
<property name="Catalog">
<ref object="Catalog" />
</property>
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/AppConfig.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/AppConfig.xml?rev=202437&r1=202436&r2=202437&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/AppConfig.xml (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/AppConfig.xml Wed Jun 29 14:43:45 2005
@@ -8,14 +8,22 @@
<object id="messageSource" type="Spring.Context.Support.ResourceSetMessageSource, Spring.Core">
<property name="ResourceManagers">
<list>
+ <value>PhoneBook.Core.Messages, PhoneBook.Core</value>
<value>Nexus.Web.Messages, Nexus.Web</value>
- <value>PhoneBook.Web.Resources.Messages, PhoneBook.Web</value>
</list>
</property>
</object>
<!-- FieldTable -->
-
+
+ <!-- Strict is not enabled, so we only need to list fields that are
+ (1) used by a GridViewHelper,
+ (2) need special formatting (via a Processor),
+ (3) represent a list with fields that need a Processor (fields listed because of (2))).
+ The default processing will apply .ToString() to any unregistered fields,
+ and pass through any unregistered lists verbatim
+ (which is cool if all the fields on the list are strings that don't need formatting).
+ -->
<object id="FieldTable" type="Nexus.Core.Tables.FieldTable">
<property name="AddFieldContexts">
<list>
@@ -55,12 +63,12 @@
<object id="extension" parent="BaseFieldContext">
<property name="ID"><value>extension</value></property>
- <property name="ProcessorID"><value>TelephoneProcessor</value></property>
+ <property name="Processor"><ref object="TelephoneProcessor"/></property>
</object>
<object id="hired" parent="BaseFieldContext">
<property name="ID"><value>hired</value></property>
- <property name="ProcessorID"><value>DateTimeProcessor</value></property>
+ <property name="Processor"><ref object="DateTimeProcessor"/></property>
</object>
<object id="hours" parent="BaseFieldContext">
@@ -70,21 +78,22 @@
<object id="editor" parent="BaseFieldContext">
<property name="ID"><value>editor</value></property>
</object>
+ <!-- property name="ControlTypeName"><value>CheckBox</value></property -->
<!-- We need to "hash" the name with "_" to avoid conflict with the filter Command -->
<object id="_entry_list" parent="BaseFieldContext">
<property name="ID"><value>entry_list</value></property>
- <property name="ProcessorID"><value>EntryListProcessor</value></property>
+ <property name="Processor"><ref object="EntryListProcessor"/></property>
</object>
<object id="_extension_list" parent="BaseFieldContext">
<property name="ID"><value>extension_list</value></property>
- <property name="ProcessorID"><value>ExtensionListProcessor</value></property>
+ <property name="Processor"><ref object="ExtensionListProcessor"/></property>
</object>
<object id="_hired_list" parent="BaseFieldContext">
<property name="ID"><value>hired_list</value></property>
- <property name="ProcessorID"><value>HiredListProcessor</value></property>
+ <property name="Processor"><ref object="HiredListProcessor"/></property>
</object>
<!-- "d" is .NET for "short date" -->
@@ -111,24 +120,17 @@
<property name="Key"><value>hired</value></property>
</object>
- <!-- Catalog -->
-
- <object id="Catalog" type="Nexus.Extras.Spring.Catalog"/>
-
-
-<!-- Request Processors -->
+ <!-- Request Processors -->
<object id="convert_input" type="Nexus.Core.Validators.ConvertInput">
<property name="ID"><value>ConvertInput</value></property>
- <property name="Required"><value>{0} is required.</value></property>
</object>
<object id="format_output" type="Nexus.Core.Validators.FormatOutput">
<property name="ID"><value>FormatOutput</value></property>
- <property name="Required"><value>{0} is required.</value></property>
</object>
-<!-- pre-op -->
+ <!-- pre-op -->
<object id="pre-op" parent="BaseChain">
<property name="AddCommands">
@@ -137,9 +139,8 @@
</list>
</property>
</object>
-
-<!-- post-op -->
+ <!-- post-op -->
<object id="post-op" parent="BaseChain">
<property name="AddCommands">
@@ -149,5 +150,12 @@
</property>
</object>
+ <!-- Catalog -->
+
+ <object id="Catalog" type="Nexus.Extras.Spring.Catalog">
+ <property name="PreOp"><ref object="pre-op"/></property>
+ <property name="PostOp"><ref object="post-op"/></property>
+ </object>
+
</objects>
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/Catalog.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/Catalog.xml?rev=202437&r1=202436&r2=202437&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/Catalog.xml (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/Catalog.xml Wed Jun 29 14:43:45 2005
@@ -113,8 +113,12 @@
<property name="Catalog">
<ref object="Catalog" />
</property>
+ <property name="MessageSource">
+ <ref object="messageSource" />
+ </property>
</object>
+ <!-- Note that the FieldSet refers to FieldContext objects (AppField.xml) -->
<object id="directory_grid_helper" parent="BaseGridHelper" singleton="false">
<property name="FindHelper">
<ref object="directory_find_helper"/>
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Test/Test.csproj
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Test.csproj?rev=202437&r1=202436&r2=202437&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Test.csproj (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Test.csproj Wed Jun 29 14:43:45 2005
@@ -29,7 +29,7 @@
CheckForOverflowUnderflow = "false"
ConfigurationOverrideFile = ""
DefineConstants = "DEBUG;TRACE"
- DocumentationFile = ""
+ DocumentationFile = "PhoneBook.Test.xml"
DebugSymbols = "true"
FileAlignment = "4096"
IncrementalBuild = "false"
@@ -174,10 +174,6 @@
RelPath = "Forms\DirectoryTest.cs"
SubType = "Code"
BuildAction = "Compile"
- />
- <File
- RelPath = "Resources\Messages.resx"
- BuildAction = "EmbeddedResource"
/>
<File
RelPath = "Resources\Command\AppBase.xml"
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/AppConfig.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/AppConfig.xml?rev=202437&r1=202436&r2=202437&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/AppConfig.xml (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/AppConfig.xml Wed Jun 29 14:43:45 2005
@@ -8,7 +8,7 @@
<object id="messageSource" type="Spring.Context.Support.ResourceSetMessageSource, Spring.Core">
<property name="ResourceManagers">
<list>
- <value>PhoneBook.Web.Resources.Messages, PhoneBook.Web</value>
+ <value>PhoneBook.Core.Messages, PhoneBook.Core</value>
<value>Nexus.Web.Messages, Nexus.Web</value>
</list>
</property>
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Web.csproj
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Web.csproj?rev=202437&r1=202436&r2=202437&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Web.csproj (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Web.csproj Wed Jun 29 14:43:45 2005
@@ -29,7 +29,7 @@
CheckForOverflowUnderflow = "false"
ConfigurationOverrideFile = ""
DefineConstants = "DEBUG;TRACE"
- DocumentationFile = ""
+ DocumentationFile = "PhoneBook.Web.xml"
DebugSymbols = "true"
FileAlignment = "4096"
IncrementalBuild = "false"
@@ -232,10 +232,6 @@
<File
RelPath = "Forms\Web.config"
BuildAction = "Content"
- />
- <File
- RelPath = "Resources\Messages.resx"
- BuildAction = "EmbeddedResource"
/>
<File
RelPath = "Resources\Command\AppBase.xml"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org