Author: husted
Date: Thu Oct 13 12:04:03 2005
New Revision: 320873
URL: http://svn.apache.org/viewcvs?rev=320873&view=rev
Log:
OVR-22
* Condense Resource files.
Removed:
struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/FilterLists.xml
struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/SelectAll.xml
struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/FilterLists.xml
struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/SelectAll.xml
Modified:
struts/sandbox/trunk/overdrive/PhoneBook/Test/Objects.xml
struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/AppConfig.xml
struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Catalog.xml
struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Queries.xml
struts/sandbox/trunk/overdrive/PhoneBook/Test/Test.csproj
struts/sandbox/trunk/overdrive/PhoneBook/Test/bin/Debug/sqlmap.config
struts/sandbox/trunk/overdrive/PhoneBook/Web/Objects.xml
struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Catalog.xml
struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Queries.xml
struts/sandbox/trunk/overdrive/PhoneBook/Web/Web.csproj
struts/sandbox/trunk/overdrive/PhoneBook/Web/sqlmap.config
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Test/Objects.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Objects.xml?rev=320873&r1=320872&r2=320873&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Objects.xml (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Objects.xml Thu Oct 13
12:04:03 2005
@@ -5,9 +5,9 @@
<object id="Base" />
- <import resource="Resources/Command/AppBase.xml"/>
- <import resource="Resources/Command/AppConfig.xml"/>
- <import resource="Resources/Command/AppFields.xml"/>
- <import resource="Resources/Command/Catalog.xml"/>
+ <import resource="Resources/AppBase.xml"/>
+ <import resource="Resources/AppConfig.xml"/>
+ <import resource="Resources/AppFields.xml"/>
+ <import resource="Resources/Catalog.xml"/>
</objects>
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/AppConfig.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/AppConfig.xml?rev=320873&r1=320872&r2=320873&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/AppConfig.xml
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/AppConfig.xml Thu
Oct 13 12:04:03 2005
@@ -55,7 +55,7 @@
<property name="FieldTable"><ref object="FieldTable"/></property>
<property name="PreOp"><ref object="pre-op"/></property>
<property name="PostOp"><ref object="post-op"/></property>
- <property name="ViewHelper"><object type="Nexus.Web.WebHelper"
singleton="false"/></property>
+ <property name="ViewHelper"><object type="Nexus.Web.WebHelper,
Nexus.Web" singleton="false"/></property>
</object>
</objects>
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Catalog.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Catalog.xml?rev=320873&r1=320872&r2=320873&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Catalog.xml
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Catalog.xml Thu Oct
13 12:04:03 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE objects PUBLIC "-//SPRING//DTD OBJECT//EN"
- "http://www.springframework.net/dtd/spring-objects.dtd";>
-<objects>
+<objects xmlns="http://www.springframework.net";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.springframework.net
http://www.springframework.net/xsd/spring-objects.xsd";>
<!-- entry commands -->
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Queries.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Queries.xml?rev=320873&r1=320872&r2=320873&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Queries.xml
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Queries.xml Thu Oct
13 12:04:03 2005
@@ -5,10 +5,130 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="SqlMap.xsd" >
-<!--
- <alias>
- <typeAlias alias="KeyValue" type="Nexus.Core.KeyValue,
Nexus.Core" />
- </alias>
--->
+ Â <parameterMaps>
+
+Â Â <parameterMap id="entry_save_param">
+ <parameter property="last_name"/>
+ <parameter property="first_name"/>
+ <parameter property="extension"/>
+ <parameter property="user_name"/>
+ <parameter property="hired"/>
+ <parameter property="hours"/>
+ <parameter property="editor"/>
+Â Â <parameter property="entry_key"/>Â Â
+Â Â Â Â </parameterMap> Â Â
+Â
+Â </parameterMaps>
+
+ <statements>
+
+ <select id="last_name_list" resultClass="string">
+ SELECT DISTINCT
+ last_name
+ FROM entry
+ ORDER BY last_name
+ </select>
+
+ <select id="first_name_list" resultClass="string">
+ SELECT DISTINCT
+ first_name
+ FROM entry
+ ORDER BY first_name
+ </select>
+
+ <select id="extension_list" resultClass="string">
+ SELECT DISTINCT
+ extension
+ FROM entry
+ ORDER BY extension
+ </select>
+ <select id="user_name_list" resultClass="string">
+ SELECT DISTINCT
+ user_name
+ FROM entry
+ ORDER BY user_name
+ </select>
+
+ <select id="hired_list" resultClass="date">
+ SELECT DISTINCT
+ hired
+ FROM entry
+ ORDER BY hired
+ </select>
+
+ <select id="hours_list" resultClass="string">
+ SELECT DISTINCT
+ hours
+ FROM entry
+ ORDER BY hours
+ </select>
+
+ <select id="entry" paramClass="Hashtable"
resultClass="Hashtable">
+ SELECT
+ last_name,
+ first_name,
+ extension,
+ user_name,
+ hired,
+ hours,
+ editor,
+ pk_entry AS entry_key
+ FROM entry
+ <dynamic prepend="WHERE">
+ <isNotNull property="last_name" prepend="AND">
+ last_name=#last_name#
+ </isNotNull>
+ <isNotNull property="first_name" prepend="AND">
+ first_name=#first_name#
+ </isNotNull>
+ <isNotNull property="extension" prepend="AND">
+ extension=#extension#
+ </isNotNull>
+ <isNotNull property="user_name" prepend="AND">
+ user_name=#user_name#
+ </isNotNull>
+ <isNotNull property="hired" prepend="AND">
+ hired=#hired#
+ </isNotNull>
+ <isNotNull property="hours" prepend="AND">
+ hours=#hours#
+ </isNotNull>
+ <isNotNull property="editor" prepend="AND">
+ hours=#editor#
+ </isNotNull>
+ <isNotNull property="entry_key" prepend="AND">
+ pk_entry=#entry_key#
+ </isNotNull>
+ </dynamic>
+ </select>
+
+ <insert id="entry_insert" parameterMap="entry_save_param">
+ Â Â INSERT INTO entry ( Â Â
+ last_name,
+ first_name,
+ extension,
+ user_name,
+ hired,
+ hours,
+ editor,
+ pk_entry
+ )
+ VALUES (?,?,?,?, ?,?,?,?)
+ </insert>
+
+ <update id="entry_update" parameterMap="entry_save_param">
+ UPDATE entry SET
+ last_name=?,
+ first_name=?,
+ extension=?,
+ user_name=?,
+ hired=?,
+ hours=?,
+ editor=?
+ WHERE
+ pk_entry=?
+ </update>
+
+ </statements>
</sqlMap>
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Test/Test.csproj
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Test.csproj?rev=320873&r1=320872&r2=320873&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Test.csproj (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Test.csproj Thu Oct 13
12:04:03 2005
@@ -115,6 +115,16 @@
AssemblyName = "Nexus.Web"
HintPath = "..\..\local-cache\Nexus\Nexus.Web.dll"
/>
+ <Reference
+ Name = "Nexus.Extras"
+ AssemblyName = "Nexus.Extras"
+ HintPath = "..\..\local-cache\Nexus\Nexus.Extras.dll"
+ />
+ <Reference
+ Name = "Web"
+ Project = "{948EE344-D033-4358-88E8-77FDE080D93C}"
+ Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+ />
</References>
</Build>
<Files>
@@ -166,31 +176,23 @@
BuildAction = "Compile"
/>
<File
- RelPath = "Resources\Command\AppBase.xml"
- BuildAction = "Content"
- />
- <File
- RelPath = "Resources\Command\AppConfig.xml"
- BuildAction = "Content"
- />
- <File
- RelPath = "Resources\Command\AppFields.xml"
+ RelPath = "Resources\AppBase.xml"
BuildAction = "Content"
/>
<File
- RelPath = "Resources\Command\Catalog.xml"
+ RelPath = "Resources\AppConfig.xml"
BuildAction = "Content"
/>
<File
- RelPath = "Resources\Query\default.xml"
+ RelPath = "Resources\AppFields.xml"
BuildAction = "Content"
/>
<File
- RelPath = "Resources\Query\FilterLists.xml"
+ RelPath = "Resources\Catalog.xml"
BuildAction = "Content"
/>
<File
- RelPath = "Resources\Query\SelectAll.xml"
+ RelPath = "Resources\Queries.xml"
BuildAction = "Content"
/>
</Include>
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Test/bin/Debug/sqlmap.config
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/bin/Debug/sqlmap.config?rev=320873&r1=320872&r2=320873&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/bin/Debug/sqlmap.config
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/bin/Debug/sqlmap.config Thu
Oct 13 12:04:03 2005
@@ -16,9 +16,7 @@
</database>
<sqlMaps>
- <sqlMap resource="${root}/Resources/Query/default.xml"/>
- <sqlMap resource="${root}/Resources/Query/SelectAll.xml"/>
- <sqlMap resource="${root}/Resources/Query/FilterLists.xml"/>
+ <sqlMap resource="${root}/Resources/Queries.xml"/>
</sqlMaps>
</sqlMapConfig>
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Objects.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Objects.xml?rev=320873&r1=320872&r2=320873&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Objects.xml (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Objects.xml Thu Oct 13
12:04:03 2005
@@ -5,9 +5,9 @@
<object id="Base" />
- <import resource="Resources/Command/AppBase.xml"/>
- <import resource="Resources/Command/AppConfig.xml"/>
- <import resource="Resources/Command/AppFields.xml"/>
- <import resource="Resources/Command/Catalog.xml"/>
+ <import resource="Resources/AppBase.xml"/>
+ <import resource="Resources/AppConfig.xml"/>
+ <import resource="Resources/AppFields.xml"/>
+ <import resource="Resources/Catalog.xml"/>
</objects>
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Catalog.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Catalog.xml?rev=320873&r1=320872&r2=320873&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Catalog.xml
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Catalog.xml Thu Oct
13 12:04:03 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE objects PUBLIC "-//SPRING//DTD OBJECT//EN"
- "http://www.springframework.net/dtd/spring-objects.dtd";>
-<objects>
+<objects xmlns="http://www.springframework.net";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.springframework.net
http://www.springframework.net/xsd/spring-objects.xsd";>
<!-- entry commands -->
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Queries.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Queries.xml?rev=320873&r1=320872&r2=320873&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Queries.xml
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Queries.xml Thu Oct
13 12:04:03 2005
@@ -5,10 +5,130 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="SqlMap.xsd" >
-<!--
- <alias>
- <typeAlias alias="KeyValue" type="Nexus.Core.KeyValue,
Nexus.Core" />
- </alias>
--->
+ Â <parameterMaps>
+
+Â Â <parameterMap id="entry_save_param">
+ <parameter property="last_name"/>
+ <parameter property="first_name"/>
+ <parameter property="extension"/>
+ <parameter property="user_name"/>
+ <parameter property="hired"/>
+ <parameter property="hours"/>
+ <parameter property="editor"/>
+Â Â <parameter property="entry_key"/>Â Â
+Â Â Â Â </parameterMap> Â Â
+Â
+Â </parameterMaps>
+
+ <statements>
+
+ <select id="last_name_list" resultClass="string">
+ SELECT DISTINCT
+ last_name
+ FROM entry
+ ORDER BY last_name
+ </select>
+
+ <select id="first_name_list" resultClass="string">
+ SELECT DISTINCT
+ first_name
+ FROM entry
+ ORDER BY first_name
+ </select>
+
+ <select id="extension_list" resultClass="string">
+ SELECT DISTINCT
+ extension
+ FROM entry
+ ORDER BY extension
+ </select>
+ <select id="user_name_list" resultClass="string">
+ SELECT DISTINCT
+ user_name
+ FROM entry
+ ORDER BY user_name
+ </select>
+
+ <select id="hired_list" resultClass="date">
+ SELECT DISTINCT
+ hired
+ FROM entry
+ ORDER BY hired
+ </select>
+
+ <select id="hours_list" resultClass="string">
+ SELECT DISTINCT
+ hours
+ FROM entry
+ ORDER BY hours
+ </select>
+
+ <select id="entry" paramClass="Hashtable"
resultClass="Hashtable">
+ SELECT
+ last_name,
+ first_name,
+ extension,
+ user_name,
+ hired,
+ hours,
+ editor,
+ pk_entry AS entry_key
+ FROM entry
+ <dynamic prepend="WHERE">
+ <isNotNull property="last_name" prepend="AND">
+ last_name=#last_name#
+ </isNotNull>
+ <isNotNull property="first_name" prepend="AND">
+ first_name=#first_name#
+ </isNotNull>
+ <isNotNull property="extension" prepend="AND">
+ extension=#extension#
+ </isNotNull>
+ <isNotNull property="user_name" prepend="AND">
+ user_name=#user_name#
+ </isNotNull>
+ <isNotNull property="hired" prepend="AND">
+ hired=#hired#
+ </isNotNull>
+ <isNotNull property="hours" prepend="AND">
+ hours=#hours#
+ </isNotNull>
+ <isNotNull property="editor" prepend="AND">
+ hours=#editor#
+ </isNotNull>
+ <isNotNull property="entry_key" prepend="AND">
+ pk_entry=#entry_key#
+ </isNotNull>
+ </dynamic>
+ </select>
+
+ <insert id="entry_insert" parameterMap="entry_save_param">
+ Â Â INSERT INTO entry ( Â Â
+ last_name,
+ first_name,
+ extension,
+ user_name,
+ hired,
+ hours,
+ editor,
+ pk_entry
+ )
+ VALUES (?,?,?,?, ?,?,?,?)
+ </insert>
+
+ <update id="entry_update" parameterMap="entry_save_param">
+ UPDATE entry SET
+ last_name=?,
+ first_name=?,
+ extension=?,
+ user_name=?,
+ hired=?,
+ hours=?,
+ editor=?
+ WHERE
+ pk_entry=?
+ </update>
+
+ </statements>
</sqlMap>
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Web.csproj
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Web.csproj?rev=320873&r1=320872&r2=320873&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Web.csproj (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Web.csproj Thu Oct 13 12:04:03
2005
@@ -299,31 +299,23 @@
BuildAction = "Content"
/>
<File
- RelPath = "Resources\Command\AppBase.xml"
+ RelPath = "Resources\AppBase.xml"
BuildAction = "Content"
/>
<File
- RelPath = "Resources\Command\AppConfig.xml"
+ RelPath = "Resources\AppConfig.xml"
BuildAction = "Content"
/>
<File
- RelPath = "Resources\Command\AppFields.xml"
+ RelPath = "Resources\AppFields.xml"
BuildAction = "Content"
/>
<File
- RelPath = "Resources\Command\Catalog.xml"
+ RelPath = "Resources\Catalog.xml"
BuildAction = "Content"
/>
<File
- RelPath = "Resources\Query\default.xml"
- BuildAction = "Content"
- />
- <File
- RelPath = "Resources\Query\FilterLists.xml"
- BuildAction = "Content"
- />
- <File
- RelPath = "Resources\Query\SelectAll.xml"
+ RelPath = "Resources\Queries.xml"
BuildAction = "Content"
/>
</Include>
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/sqlmap.config
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/sqlmap.config?rev=320873&r1=320872&r2=320873&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/sqlmap.config (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/sqlmap.config Thu Oct 13
12:04:03 2005
@@ -16,9 +16,7 @@
</database>
<sqlMaps>
- <sqlMap resource="${root}/Resources/Query/default.xml"/>
- <sqlMap resource="${root}/Resources/Query/SelectAll.xml"/>
- <sqlMap resource="${root}/Resources/Query/FilterLists.xml"/>
+ <sqlMap resource="${root}/Resources/Queries.xml"/>
</sqlMaps>
</sqlMapConfig>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
