Author: husted Date: Wed Jan 10 12:00:57 2007 New Revision: 494958 URL: http://svn.apache.org/viewvc?view=rev&rev=494958 Log: PhoneBook2 - Add tab container to separate lister and editor.
Modified: struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/Test.csproj struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/bin/Debug/providers.config struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/bin/Debug/sqlmap.config struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/bin/Debug/sqlmap.config.xml struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.ashx struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.html struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/sqlmap.config.xml Modified: struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/Test.csproj URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/Test.csproj?view=diff&rev=494958&r1=494957&r2=494958 ============================================================================== --- struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/Test.csproj (original) +++ struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/Test.csproj Wed Jan 10 12:00:57 2007 @@ -48,6 +48,10 @@ <SpecificVersion>False</SpecificVersion> <HintPath>..\..\..\local-cache\Agility\Agility.Core.dll</HintPath> </Reference> + <Reference Include="MySql.Data, Version=1.0.7.30072, Culture=neutral, PublicKeyToken=c5687fc88969c44d"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\..\local-cache\iBatisNet\MySql.Data.dll</HintPath> + </Reference> <Reference Include="Nexus.Core, Version=1.0.2539.22197, Culture=neutral"> <SpecificVersion>False</SpecificVersion> <HintPath>..\..\..\local-cache\Nexus\Nexus.Core.dll</HintPath> @@ -60,7 +64,7 @@ <SpecificVersion>False</SpecificVersion> <HintPath>..\..\..\local-cache\Nexus\Nexus.Web.dll</HintPath> </Reference> - <Reference Include="nunit.framework, Version=2.2.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" /> + <Reference Include="nunit.framework, Version=2.2.9.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" /> <Reference Include="Spring.Core, Version=1.1.0.2, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> <HintPath>..\..\..\local-cache\SpringNet\Spring.Core.dll</HintPath> Modified: struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/bin/Debug/providers.config URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/bin/Debug/providers.config?view=diff&rev=494958&r1=494957&r2=494958 ============================================================================== --- struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/bin/Debug/providers.config (original) +++ struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/bin/Debug/providers.config Wed Jan 10 12:00:57 2007 @@ -1,224 +1,224 @@ <?xml version="1.0" encoding="utf-8"?> -<providers -xmlns="http://ibatis.apache.org/providers" +<providers +xmlns="http://ibatis.apache.org/providers" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> -<clear/> -<provider - name="sqlServer1.0" - description="Microsoft SQL Server, provider V1.0.3300.0 in framework .NET V1.0" - enabled="false" - assemblyName="System.Data, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" connectionClass="System.Data.SqlClient.SqlConnection" - commandClass="System.Data.SqlClient.SqlCommand" - parameterClass="System.Data.SqlClient.SqlParameter" - parameterDbTypeClass="System.Data.SqlDbType" - parameterDbTypeProperty="SqlDbType" - dataAdapterClass="System.Data.SqlClient.SqlDataAdapter" - commandBuilderClass="System.Data.SqlClient.SqlCommandBuilder" - usePositionalParameters="false" - useParameterPrefixInSql="true" - useParameterPrefixInParameter="true" - parameterPrefix="@" - allowMARS="false" + <clear/> + <provider + name="sqlServer1.0" + description="Microsoft SQL Server, provider V1.0.3300.0 in framework .NET V1.0" + enabled="false" + assemblyName="System.Data, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" connectionClass="System.Data.SqlClient.SqlConnection" + commandClass="System.Data.SqlClient.SqlCommand" + parameterClass="System.Data.SqlClient.SqlParameter" + parameterDbTypeClass="System.Data.SqlDbType" + parameterDbTypeProperty="SqlDbType" + dataAdapterClass="System.Data.SqlClient.SqlDataAdapter" + commandBuilderClass="System.Data.SqlClient.SqlCommandBuilder" + usePositionalParameters="false" + useParameterPrefixInSql="true" + useParameterPrefixInParameter="true" + parameterPrefix="@" + allowMARS="false" /> -<provider - name="sqlServer1.1" - description="Microsoft SQL Server, provider V1.0.5000.0 in framework .NET V1.1" - enabled="true" - default="true" - assemblyName="System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" - connectionClass="System.Data.SqlClient.SqlConnection" - commandClass="System.Data.SqlClient.SqlCommand" - parameterClass="System.Data.SqlClient.SqlParameter" - parameterDbTypeClass="System.Data.SqlDbType" - parameterDbTypeProperty="SqlDbType" - dataAdapterClass="System.Data.SqlClient.SqlDataAdapter" - commandBuilderClass="System.Data.SqlClient.SqlCommandBuilder" - usePositionalParameters="false" - useParameterPrefixInSql="true" - useParameterPrefixInParameter="true" - parameterPrefix="@" - allowMARS="false" + <provider + name="sqlServer1.1" + description="Microsoft SQL Server, provider V1.0.5000.0 in framework .NET V1.1" + enabled="true" + default="true" + assemblyName="System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" + connectionClass="System.Data.SqlClient.SqlConnection" + commandClass="System.Data.SqlClient.SqlCommand" + parameterClass="System.Data.SqlClient.SqlParameter" + parameterDbTypeClass="System.Data.SqlDbType" + parameterDbTypeProperty="SqlDbType" + dataAdapterClass="System.Data.SqlClient.SqlDataAdapter" + commandBuilderClass="System.Data.SqlClient.SqlCommandBuilder" + usePositionalParameters="false" + useParameterPrefixInSql="true" + useParameterPrefixInParameter="true" + parameterPrefix="@" + allowMARS="false" /> -<provider - name="sqlServer2.0" - enabled="false" - description="Microsoft SQL Server, provider V2.0.0.0 in framework .NET V2.0" - assemblyName="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" - connectionClass="System.Data.SqlClient.SqlConnection" - commandClass="System.Data.SqlClient.SqlCommand" - parameterClass="System.Data.SqlClient.SqlParameter" - parameterDbTypeClass="System.Data.SqlDbType" - parameterDbTypeProperty="SqlDbType" - dataAdapterClass="System.Data.SqlClient.SqlDataAdapter" - commandBuilderClass=" System.Data.SqlClient.SqlCommandBuilder" - usePositionalParameters = "false" - useParameterPrefixInSql = "true" - useParameterPrefixInParameter = "true" - parameterPrefix="@" - allowMARS="false" + <provider + name="sqlServer2.0" + enabled="false" + description="Microsoft SQL Server, provider V2.0.0.0 in framework .NET V2.0" + assemblyName="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" + connectionClass="System.Data.SqlClient.SqlConnection" + commandClass="System.Data.SqlClient.SqlCommand" + parameterClass="System.Data.SqlClient.SqlParameter" + parameterDbTypeClass="System.Data.SqlDbType" + parameterDbTypeProperty="SqlDbType" + dataAdapterClass="System.Data.SqlClient.SqlDataAdapter" + commandBuilderClass=" System.Data.SqlClient.SqlCommandBuilder" + usePositionalParameters = "false" + useParameterPrefixInSql = "true" + useParameterPrefixInParameter = "true" + parameterPrefix="@" + allowMARS="false" /> -<provider name="OleDb1.1" - description="OleDb, provider V1.0.5000.0 in framework .NET V1.1" - enabled="true" - assemblyName="System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" - connectionClass="System.Data.OleDb.OleDbConnection" - commandClass="System.Data.OleDb.OleDbCommand" - parameterClass="System.Data.OleDb.OleDbParameter" - parameterDbTypeClass="System.Data.OleDb.OleDbType" - parameterDbTypeProperty="OleDbType" - dataAdapterClass="System.Data.OleDb.OleDbDataAdapter" - commandBuilderClass="System.Data.OleDb.OleDbCommandBuilder" - usePositionalParameters="true" - useParameterPrefixInSql="false" - useParameterPrefixInParameter="false" - parameterPrefix="" - allowMARS="false" + <provider name="OleDb1.1" + description="OleDb, provider V1.0.5000.0 in framework .NET V1.1" + enabled="true" + assemblyName="System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" + connectionClass="System.Data.OleDb.OleDbConnection" + commandClass="System.Data.OleDb.OleDbCommand" + parameterClass="System.Data.OleDb.OleDbParameter" + parameterDbTypeClass="System.Data.OleDb.OleDbType" + parameterDbTypeProperty="OleDbType" + dataAdapterClass="System.Data.OleDb.OleDbDataAdapter" + commandBuilderClass="System.Data.OleDb.OleDbCommandBuilder" + usePositionalParameters="true" + useParameterPrefixInSql="false" + useParameterPrefixInParameter="false" + parameterPrefix="" + allowMARS="false" /> - <provider name="OleDb2.0" - description="OleDb, provider V2.0.0.0 in framework .NET V2" + <provider name="OleDb2.0" + description="OleDb, provider V2.0.0.0 in framework .NET V2" enabled="false" - assemblyName="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" - connectionClass="System.Data.OleDb.OleDbConnection" - commandClass="System.Data.OleDb.OleDbCommand" - parameterClass="System.Data.OleDb.OleDbParameter" - parameterDbTypeClass="System.Data.OleDb.OleDbType" - parameterDbTypeProperty="OleDbType" - dataAdapterClass="System.Data.OleDb.OleDbDataAdapter" - commandBuilderClass="System.Data.OleDb.OleDbCommandBuilder" - usePositionalParameters="true" - useParameterPrefixInSql="false" - useParameterPrefixInParameter="false" + assemblyName="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" + connectionClass="System.Data.OleDb.OleDbConnection" + commandClass="System.Data.OleDb.OleDbCommand" + parameterClass="System.Data.OleDb.OleDbParameter" + parameterDbTypeClass="System.Data.OleDb.OleDbType" + parameterDbTypeProperty="OleDbType" + dataAdapterClass="System.Data.OleDb.OleDbDataAdapter" + commandBuilderClass="System.Data.OleDb.OleDbCommandBuilder" + usePositionalParameters="true" + useParameterPrefixInSql="false" + useParameterPrefixInParameter="false" parameterPrefix="" allowMARS="false" - /> - <provider - name="Odbc1.1" - description="Odbc, provider V1.0.5000.0 in framework .NET V1.1" - enabled="true" - assemblyName="System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" - connectionClass="System.Data.Odbc.OdbcConnection" - commandClass="System.Data.Odbc.OdbcCommand" - parameterClass="System.Data.Odbc.OdbcParameter" - parameterDbTypeClass="System.Data.Odbc.OdbcType" - parameterDbTypeProperty="OdbcType" - dataAdapterClass="System.Data.Odbc.OdbcDataAdapter" - commandBuilderClass="System.Data.Odbc.OdbcCommandBuilder" - usePositionalParameters="true" - useParameterPrefixInSql="false" - useParameterPrefixInParameter="false" + /> + <provider + name="Odbc1.1" + description="Odbc, provider V1.0.5000.0 in framework .NET V1.1" + enabled="true" + assemblyName="System.Data, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" + connectionClass="System.Data.Odbc.OdbcConnection" + commandClass="System.Data.Odbc.OdbcCommand" + parameterClass="System.Data.Odbc.OdbcParameter" + parameterDbTypeClass="System.Data.Odbc.OdbcType" + parameterDbTypeProperty="OdbcType" + dataAdapterClass="System.Data.Odbc.OdbcDataAdapter" + commandBuilderClass="System.Data.Odbc.OdbcCommandBuilder" + usePositionalParameters="true" + useParameterPrefixInSql="false" + useParameterPrefixInParameter="false" parameterPrefix="@" - allowMARS="false" + allowMARS="false" /> - <provider - name="Odbc2.0" - description="Odbc, provider V2.0.0.0 in framework .NET V2" - enabled="false" - assemblyName="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" - connectionClass="System.Data.Odbc.OdbcConnection" - commandClass="System.Data.Odbc.OdbcCommand" - parameterClass="System.Data.Odbc.OdbcParameter" - parameterDbTypeClass="System.Data.Odbc.OdbcType" - parameterDbTypeProperty="OdbcType" - dataAdapterClass="System.Data.Odbc.OdbcDataAdapter" - commandBuilderClass="System.Data.Odbc.OdbcCommandBuilder" - usePositionalParameters="true" - useParameterPrefixInSql="false" - useParameterPrefixInParameter="false" + <provider + name="Odbc2.0" + description="Odbc, provider V2.0.0.0 in framework .NET V2" + enabled="false" + assemblyName="System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" + connectionClass="System.Data.Odbc.OdbcConnection" + commandClass="System.Data.Odbc.OdbcCommand" + parameterClass="System.Data.Odbc.OdbcParameter" + parameterDbTypeClass="System.Data.Odbc.OdbcType" + parameterDbTypeProperty="OdbcType" + dataAdapterClass="System.Data.Odbc.OdbcDataAdapter" + commandBuilderClass="System.Data.Odbc.OdbcCommandBuilder" + usePositionalParameters="true" + useParameterPrefixInSql="false" + useParameterPrefixInParameter="false" parameterPrefix="@" - allowMARS="false" - /> - <provider - name="oracle9.2" - description="Oracle, Oracle provider V9.2.0.401" - enabled="false" - assemblyName="Oracle.DataAccess, Version=9.2.0.401, Culture=neutral, PublicKeyToken=89b483f429c47342" connectionClass="Oracle.DataAccess.Client.OracleConnection" - commandClass="Oracle.DataAccess.Client.OracleCommand" - parameterClass="Oracle.DataAccess.Client.OracleParameter" - parameterDbTypeClass="Oracle.DataAccess.Client.OracleDbType" - parameterDbTypeProperty="OracleDbType" - dataAdapterClass="Oracle.DataAccess.Client.OracleDataAdapter" - commandBuilderClass="Oracle.DataAccess.Client.OracleCommandBuilder" + allowMARS="false" + /> + <provider + name="oracle9.2" + description="Oracle, Oracle provider V9.2.0.401" + enabled="false" + assemblyName="Oracle.DataAccess, Version=9.2.0.401, Culture=neutral, PublicKeyToken=89b483f429c47342" connectionClass="Oracle.DataAccess.Client.OracleConnection" + commandClass="Oracle.DataAccess.Client.OracleCommand" + parameterClass="Oracle.DataAccess.Client.OracleParameter" + parameterDbTypeClass="Oracle.DataAccess.Client.OracleDbType" + parameterDbTypeProperty="OracleDbType" + dataAdapterClass="Oracle.DataAccess.Client.OracleDataAdapter" + commandBuilderClass="Oracle.DataAccess.Client.OracleCommandBuilder" usePositionalParameters="false" - useParameterPrefixInSql="true" - useParameterPrefixInParameter="false" - parameterPrefix=":" + useParameterPrefixInSql="true" + useParameterPrefixInParameter="false" + parameterPrefix=":" useDeriveParameters="false" - allowMARS="false" + allowMARS="false" /> - <provider - name="oracle10.1" + <provider + name="oracle10.1" description="Oracle, oracle provider V10.1.0.301" - enabled="false" - assemblyName="Oracle.DataAccess, Version=10.1.0.301, Culture=neutral, PublicKeyToken=89b483f429c47342" connectionClass="Oracle.DataAccess.Client.OracleConnection" - commandClass="Oracle.DataAccess.Client.OracleCommand" - parameterClass="Oracle.DataAccess.Client.OracleParameter" - parameterDbTypeClass="Oracle.DataAccess.Client.OracleDbType" - parameterDbTypeProperty="OracleDbType" - dataAdapterClass="Oracle.DataAccess.Client.OracleDataAdapter" - commandBuilderClass="Oracle.DataAccess.Client.OracleCommandBuilder" - usePositionalParameters="true" + enabled="false" + assemblyName="Oracle.DataAccess, Version=10.1.0.301, Culture=neutral, PublicKeyToken=89b483f429c47342" connectionClass="Oracle.DataAccess.Client.OracleConnection" + commandClass="Oracle.DataAccess.Client.OracleCommand" + parameterClass="Oracle.DataAccess.Client.OracleParameter" + parameterDbTypeClass="Oracle.DataAccess.Client.OracleDbType" + parameterDbTypeProperty="OracleDbType" + dataAdapterClass="Oracle.DataAccess.Client.OracleDataAdapter" + commandBuilderClass="Oracle.DataAccess.Client.OracleCommandBuilder" + usePositionalParameters="true" useParameterPrefixInSql="true" - useParameterPrefixInParameter="true" - parameterPrefix=":" + useParameterPrefixInParameter="true" + parameterPrefix=":" useDeriveParameters="false" - allowMARS="false" + allowMARS="false" /> - <provider - name="oracleClient1.0" - description="Oracle, Microsoft provider V1.0.5000.0" - enabled="false" - assemblyName="System.Data.OracleClient, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" connectionClass="System.Data.OracleClient.OracleConnection" - commandClass="System.Data.OracleClient.OracleCommand" - parameterClass="System.Data.OracleClient.OracleParameter" - parameterDbTypeClass="System.Data.OracleClient.OracleType" - parameterDbTypeProperty="OracleType" - dataAdapterClass="System.Data.OracleClient.OracleDataAdapter" - commandBuilderClass="System.Data.OracleClient.OracleCommandBuilder" - usePositionalParameters="false" - useParameterPrefixInSql="true" - useParameterPrefixInParameter="false" + <provider + name="oracleClient1.0" + description="Oracle, Microsoft provider V1.0.5000.0" + enabled="false" + assemblyName="System.Data.OracleClient, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" connectionClass="System.Data.OracleClient.OracleConnection" + commandClass="System.Data.OracleClient.OracleCommand" + parameterClass="System.Data.OracleClient.OracleParameter" + parameterDbTypeClass="System.Data.OracleClient.OracleType" + parameterDbTypeProperty="OracleType" + dataAdapterClass="System.Data.OracleClient.OracleDataAdapter" + commandBuilderClass="System.Data.OracleClient.OracleCommandBuilder" + usePositionalParameters="false" + useParameterPrefixInSql="true" + useParameterPrefixInParameter="false" parameterPrefix=":" - allowMARS="false" + allowMARS="false" /> - <provider - name="ByteFx" - description="MySQL, ByteFx provider V0.7.6.15073" - enabled="false" - assemblyName="ByteFX.MySqlClient, Version=0.7.6.15073, Culture=neutral, PublicKeyToken=f2fef6fed1732fc1" connectionClass="ByteFX.Data.MySqlClient.MySqlConnection" - commandClass="ByteFX.Data.MySqlClient.MySqlCommand" - parameterClass="ByteFX.Data.MySqlClient.MySqlParameter" - parameterDbTypeClass="ByteFX.Data.MySqlClient.MySqlDbType" - parameterDbTypeProperty="MySqlDbType" - dataAdapterClass="ByteFX.Data.MySqlClient.MySqlDataAdapter" - commandBuilderClass="ByteFX.Data.MySqlClient.MySqlCommandBuilder" - usePositionalParameters="false" - useParameterPrefixInSql="true" - useParameterPrefixInParameter="true" + <provider + name="ByteFx" + description="MySQL, ByteFx provider V0.7.6.15073" + enabled="false" + assemblyName="ByteFX.MySqlClient, Version=0.7.6.15073, Culture=neutral, PublicKeyToken=f2fef6fed1732fc1" connectionClass="ByteFX.Data.MySqlClient.MySqlConnection" + commandClass="ByteFX.Data.MySqlClient.MySqlCommand" + parameterClass="ByteFX.Data.MySqlClient.MySqlParameter" + parameterDbTypeClass="ByteFX.Data.MySqlClient.MySqlDbType" + parameterDbTypeProperty="MySqlDbType" + dataAdapterClass="ByteFX.Data.MySqlClient.MySqlDataAdapter" + commandBuilderClass="ByteFX.Data.MySqlClient.MySqlCommandBuilder" + usePositionalParameters="false" + useParameterPrefixInSql="true" + useParameterPrefixInParameter="true" parameterPrefix="@" - allowMARS="false" + allowMARS="false" /> - <provider - name="MySql" - description="MySQL, MySQL provider 1.0.7.30072" - enabled="true" - assemblyName="MySql.Data, Version=1.0.7.30072, Culture=neutral, PublicKeyToken=c5687fc88969c44d" connectionClass="MySql.Data.MySqlClient.MySqlConnection" - commandClass="MySql.Data.MySqlClient.MySqlCommand" - parameterClass="MySql.Data.MySqlClient.MySqlParameter" - parameterDbTypeClass="MySql.Data.MySqlClient.MySqlDbType" - parameterDbTypeProperty="MySqlDbType" - dataAdapterClass="MySql.Data.MySqlClient.MySqlDataAdapter" - commandBuilderClass="MySql.Data.MySqlClient.MySqlCommandBuilder" - usePositionalParameters="false" - useParameterPrefixInSql="true" - useParameterPrefixInParameter="true" + <provider + name="MySql" + description="MySQL, MySQL provider 1.0.7.30072" + enabled="true" + assemblyName="MySql.Data, Version=1.0.7.30072, Culture=neutral, PublicKeyToken=c5687fc88969c44d" connectionClass="MySql.Data.MySqlClient.MySqlConnection" + commandClass="MySql.Data.MySqlClient.MySqlCommand" + parameterClass="MySql.Data.MySqlClient.MySqlParameter" + parameterDbTypeClass="MySql.Data.MySqlClient.MySqlDbType" + parameterDbTypeProperty="MySqlDbType" + dataAdapterClass="MySql.Data.MySqlClient.MySqlDataAdapter" + commandBuilderClass="MySql.Data.MySqlClient.MySqlCommandBuilder" + usePositionalParameters="false" + useParameterPrefixInSql="true" + useParameterPrefixInParameter="true" parameterPrefix="?" - allowMARS="false" + allowMARS="false" /> <provider name="SQLite3" description="SQLite, SQLite.NET provider V0.21.1869.3794" enabled="false" - assemblyName="SQLite.NET, Version=0.21.1869.3794, Culture=neutral, PublicKeyToken=c273bd375e695f9c" + assemblyName="SQLite.NET, Version=0.21.1869.3794, Culture=neutral, PublicKeyToken=c273bd375e695f9c" connectionClass="Finisar.SQLite.SQLiteConnection" commandClass="Finisar.SQLite.SQLiteCommand" parameterClass="Finisar.SQLite.SQLiteParameter" @@ -232,76 +232,76 @@ parameterPrefix="@" setDbParameterPrecision="false" setDbParameterScale="false" - allowMARS="false" + allowMARS="false" /> <provider - name="Firebird1.7" - description="Firebird, Firebird SQL .NET provider V1.7.0.33200" - enabled="false" - assemblyName="FirebirdSql.Data.Firebird, Version=1.7.0.33200, Culture=neutral, PublicKeyToken=fa843d180294369d" connectionClass="FirebirdSql.Data.Firebird.FbConnection" - commandClass="FirebirdSql.Data.Firebird.FbCommand" - parameterClass="FirebirdSql.Data.Firebird.FbParameter" - parameterDbTypeClass="FirebirdSql.Data.Firebird.FbDbType" - parameterDbTypeProperty="FbDbType" - dataAdapterClass="FirebirdSql.Data.Firebird.FbDataAdapter" - commandBuilderClass="FirebirdSql.Data.Firebird.FbCommandBuilder" - usePositionalParameters="false" - useParameterPrefixInSql="true" - useParameterPrefixInParameter="true" + name="Firebird1.7" + description="Firebird, Firebird SQL .NET provider V1.7.0.33200" + enabled="false" + assemblyName="FirebirdSql.Data.Firebird, Version=1.7.0.33200, Culture=neutral, PublicKeyToken=fa843d180294369d" connectionClass="FirebirdSql.Data.Firebird.FbConnection" + commandClass="FirebirdSql.Data.Firebird.FbCommand" + parameterClass="FirebirdSql.Data.Firebird.FbParameter" + parameterDbTypeClass="FirebirdSql.Data.Firebird.FbDbType" + parameterDbTypeProperty="FbDbType" + dataAdapterClass="FirebirdSql.Data.Firebird.FbDataAdapter" + commandBuilderClass="FirebirdSql.Data.Firebird.FbCommandBuilder" + usePositionalParameters="false" + useParameterPrefixInSql="true" + useParameterPrefixInParameter="true" parameterPrefix="@" - allowMARS="false" + allowMARS="false" /> <provider - name="PostgreSql0.99.1.0" - description="PostgreSql, Npgsql provider V0.99.1.0" - enabled="false" - assemblyName="Npgsql, Version=0.99.1.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7" - connectionClass="Npgsql.NpgsqlConnection" - commandClass="Npgsql.NpgsqlCommand" - parameterClass="Npgsql.NpgsqlParameter" - parameterDbTypeClass="NpgsqlTypes.NpgsqlDbType" - parameterDbTypeProperty="NpgsqlDbType" - dataAdapterClass="Npgsql.NpgsqlDataAdapter" - commandBuilderClass="Npgsql.NpgsqlCommandBuilder" - usePositionalParameters="false" - useParameterPrefixInSql="true" - useParameterPrefixInParameter="true" + name="PostgreSql0.99.1.0" + description="PostgreSql, Npgsql provider V0.99.1.0" + enabled="false" + assemblyName="Npgsql, Version=0.99.1.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7" + connectionClass="Npgsql.NpgsqlConnection" + commandClass="Npgsql.NpgsqlCommand" + parameterClass="Npgsql.NpgsqlParameter" + parameterDbTypeClass="NpgsqlTypes.NpgsqlDbType" + parameterDbTypeProperty="NpgsqlDbType" + dataAdapterClass="Npgsql.NpgsqlDataAdapter" + commandBuilderClass="Npgsql.NpgsqlCommandBuilder" + usePositionalParameters="false" + useParameterPrefixInSql="true" + useParameterPrefixInParameter="true" parameterPrefix=":" - allowMARS="true" - /> - <provider - name="iDb2.10" - description="IBM DB2 Provider, V 10.0" - enabled="false" - assemblyName="IBM.Data.DB2.iSeries, Version=10.0.0.0,Culture=neutral, PublicKeyToken=9cdb2ebfb1f93a26, Custom=null" connectionClass="IBM.Data.DB2.iSeries.iDB2Connection" - commandClass="IBM.Data.DB2.iSeries.iDB2Command" - parameterClass="IBM.Data.DB2.iSeries.iDB2Parameter" - parameterDbTypeClass="IBM.Data.DB2.iSeries.iDB2DbType" - parameterDbTypeProperty="iDB2DbType" - dataAdapterClass="IBM.Data.DB2.iSeries.iDB2DataAdapter" - commandBuilderClass="IBM.Data.DB2.iSeries.iDB2CommandBuilder" - usePositionalParameters="true" - useParameterPrefixInSql="false" - useParameterPrefixInParameter="false" + allowMARS="true" + /> + <provider + name="iDb2.10" + description="IBM DB2 Provider, V 10.0" + enabled="false" + assemblyName="IBM.Data.DB2.iSeries, Version=10.0.0.0,Culture=neutral, PublicKeyToken=9cdb2ebfb1f93a26, Custom=null" connectionClass="IBM.Data.DB2.iSeries.iDB2Connection" + commandClass="IBM.Data.DB2.iSeries.iDB2Command" + parameterClass="IBM.Data.DB2.iSeries.iDB2Parameter" + parameterDbTypeClass="IBM.Data.DB2.iSeries.iDB2DbType" + parameterDbTypeProperty="iDB2DbType" + dataAdapterClass="IBM.Data.DB2.iSeries.iDB2DataAdapter" + commandBuilderClass="IBM.Data.DB2.iSeries.iDB2CommandBuilder" + usePositionalParameters="true" + useParameterPrefixInSql="false" + useParameterPrefixInParameter="false" parameterPrefix="" - allowMARS="false" + allowMARS="false" /> - <provider - name="Informix" - description="Informix NET Provider, 2.81.0.0" - enabled="false" - assemblyName="IBM.Data.Informix, Version=2.81.0.0, Culture=neutral, PublicKeyToken=7c307b91aa13d208" - connectionClass="IBM.Data.Informix.IfxConnection" - commandClass="IBM.Data.Informix.IfxCommand" - parameterClass="IBM.Data.Informix.IfxParameter" - parameterDbTypeClass="IBM.Data.Informix.IfxType" - parameterDbTypeProperty="IfxType" - dataAdapterClass="IBM.Data.Informix.IfxDataAdapter" - commandBuilderClass="IBM.Data.Informix.IfxCommandBuilder" - usePositionalParameters = "true" - useParameterPrefixInSql = "false" - useParameterPrefixInParameter = "false" - useDeriveParameters="false" - allowMARS="false" + <provider + name="Informix" + description="Informix NET Provider, 2.81.0.0" + enabled="false" + assemblyName="IBM.Data.Informix, Version=2.81.0.0, Culture=neutral, PublicKeyToken=7c307b91aa13d208" + connectionClass="IBM.Data.Informix.IfxConnection" + commandClass="IBM.Data.Informix.IfxCommand" + parameterClass="IBM.Data.Informix.IfxParameter" + parameterDbTypeClass="IBM.Data.Informix.IfxType" + parameterDbTypeProperty="IfxType" + dataAdapterClass="IBM.Data.Informix.IfxDataAdapter" + commandBuilderClass="IBM.Data.Informix.IfxCommandBuilder" + usePositionalParameters = "true" + useParameterPrefixInSql = "false" + useParameterPrefixInParameter = "false" + useDeriveParameters="false" + allowMARS="false" /> </providers> Modified: struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/bin/Debug/sqlmap.config URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/bin/Debug/sqlmap.config?view=diff&rev=494958&r1=494957&r2=494958 ============================================================================== --- struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/bin/Debug/sqlmap.config (original) +++ struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/bin/Debug/sqlmap.config Wed Jan 10 12:00:57 2007 @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> <sqlMapConfig xmlns="http://ibatis.apache.org/dataMapper" xmlns:xsi=" http://www.w3.org/2001/XMLSchema-instance" > - <properties resource="sqlmap.config.xml"/> - - <settings> - <setting useStatementNamespaces="false"/> - <setting cacheModelsEnabled="true"/> - </settings> - - <database> - <provider name="${provider}"/> - <dataSource name="default" connectionString="${development}"/> - </database> + <properties resource="sqlmap.config.xml"/> - <sqlMaps> - <sqlMap resource="${root}/Resources/Queries.xml"/> - </sqlMaps> + <settings> + <setting useStatementNamespaces="false"/> + <setting cacheModelsEnabled="true"/> + </settings> + + <database> + <provider name="${provider}"/> + <dataSource name="default" connectionString="${development}"/> + </database> + + <sqlMaps> + <sqlMap resource="${root}/Resources/Queries.xml"/> + </sqlMaps> </sqlMapConfig> Modified: struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/bin/Debug/sqlmap.config.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/bin/Debug/sqlmap.config.xml?view=diff&rev=494958&r1=494957&r2=494958 ============================================================================== --- struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/bin/Debug/sqlmap.config.xml (original) +++ struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/bin/Debug/sqlmap.config.xml Wed Jan 10 12:00:57 2007 @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="utf-8" ?> +<?xml version="1.0" encoding="utf-8" ?> <settings> - <add key="root" value="../../" /> - <add key="provider" value="MySql" /> - <add key="development" value="Host=localhost;Database=phonebook;Username=phonebookApp;Password=p1nH34d" /> - <add key="production" value="Host=zippy;Database=phonebook;Username=phonebookApp;Password=p1nH34d" /> + <add key="root" value="../../" /> + <add key="provider" value="MySql" /> + <add key="development" value="Host=clifford;Database=phonebook;Username=phonebookApp;Password=p1nH34d" /> + <add key="production" value="Host=zippy;Database=phonebook;Username=phonebookApp;Password=p1nH34d" /> </settings> Modified: struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.ashx URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.ashx?view=diff&rev=494958&r1=494957&r2=494958 ============================================================================== --- struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.ashx (original) +++ struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.ashx Wed Jan 10 12:00:57 2007 @@ -2,6 +2,7 @@ using System; using System.Collections; +using System.Configuration; using Agility.Extras.Spring; using Jayrock.JsonRpc; using Jayrock.JsonRpc.Web; @@ -23,6 +24,8 @@ { IApplicationContext factory = Objects.Factory(); catalog = factory.GetObject(App.CATALOG_KEY) as IRequestCatalog; + if (catalog == null) + throw new ConfigurationErrorsException("PhoneBook: GetCatalog()==null"); } return catalog; } @@ -38,6 +41,8 @@ { RequestContext context = Execute(App.LAST_NAME_LIST); KeyValueList list = context.Outcome as KeyValueList; + if (list == null) return null; // FIXME: Better error handling + ArrayList names = new ArrayList(list.Count); foreach (KeyValue k in list) { @@ -52,7 +57,7 @@ { IViewHelper helper = GetCatalog().GetHelperFor(App.ENTRY_LIST); helper.Execute(); - // if helper.IsNominal ... + // if helper.IsNominal ... // FIXME: Better error handling AppEntryList list = helper.Outcome as AppEntryList; return list; } @@ -64,7 +69,7 @@ IViewHelper helper = GetCatalog().GetHelperFor(App.ENTRY); helper.Criteria[App.ENTRY_KEY] = key; helper.Execute(); - // if helper.IsNominal ... + // if helper.IsNominal ... // FIXME: Better error handling AppEntry entry = new AppEntry(helper.Criteria); return entry; } @@ -76,7 +81,7 @@ IViewHelper helper = GetCatalog().GetHelperFor(App.ENTRY_SAVE); helper.Read(input,true); helper.Execute(); - // if helper.IsNominal ... + // if helper.IsNominal ... // FIXME: Better error handling AppEntry entry = new AppEntry(helper.Criteria); return entry; } @@ -88,7 +93,7 @@ IViewHelper helper = GetCatalog().GetHelperFor(App.ENTRY_DELETE); helper.Criteria[App.ENTRY_KEY] = key; helper.Execute(); - // if helper.IsNominal ... + // if helper.IsNominal ... // FIXME: Better error handling AppEntry entry = new AppEntry(helper.Criteria); return entry; } Modified: struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.html URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.html?view=diff&rev=494958&r1=494957&r2=494958 ============================================================================== --- struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.html (original) +++ struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.html Wed Jan 10 12:00:57 2007 @@ -1,21 +1,21 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<html> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <title>PhoneBook</title> - <meta name="GENERATOR" content="Microsoft Visual Studio .NET 7.1"> - <meta name=ProgId content=VisualStudio.HTML> - <meta name=Originator content="Microsoft Visual Studio .NET 7.1"> - <script language="javascript" src="PhoneBook.ashx?proxy&v=2"></script> - <script language="javascript" src="js/dojo/dojo.js"></script> - <script language="javascript"> + <script type="text/javascript" src="PhoneBook.ashx?proxy&v=2"></script> + <script type="text/javascript" src="js/dojo/dojo.js"></script> + <script type="text/javascript"> + dojo.require("dojo.widget.TabContainer"); + dojo.require("dojo.widget.ContentPane"); + dojo.require("dojo.widget.LayoutContainer"); dojo.require("dojo.io.*"); dojo.require("dojo.event.*"); dojo.require("dojo.html.*"); dojo.require("dojo.json"); dojo.require("dojo.widget.FilteringTable"); dojo.hostenv.writeIncludes(); - - /* call server */ + + /* call server */ function server(call) { @@ -31,31 +31,46 @@ dojo.event return req; } + + var container_id = "container"; - /* lister */ + function view_select(id) { + var w = dojo.widget.byId(container_id); + w.selectChild(id); + } + /* lister */ + + var lister_id = "lister"; + var entry_list_id = "entry_list"; + + function lister_select() { + view_select(lister_id); + } + + function entry_list() { + return dojo.widget.byId(entry_list_id); + } + function entry_list_result(type, data, evt) { - var w = dojo.widget.byId("entry_list"); - w.store.setData(data.result); + entry_list().store.setData(data.result); } - function entry_list() + function entry_list_load() { PhoneBook.rpc.entry_list(entry_list_result).call(server); } - dojo.addOnLoad(entry_list); + dojo.addOnLoad(entry_list_load); function entry_list_select_edit(evt) { - var table = dojo.widget.byId("entry_list"); - entry_edit(table.getSelectedData().entry_key); + entry_edit(entry_list().getSelectedData().entry_key); } function entry_list_select_delete(evt) { - var table = dojo.widget.byId("entry_list"); - entry_delete(table.getSelectedData().entry_key); + entry_delete(entry_list().getSelectedData().entry_key); } function entry_list_select() { - dojo.event.connect(dojo.byId("entry_list"), "onSelect", entry_list_select_edit); + dojo.event.connect(entry_list(), "onSelect", entry_list_select_edit); } dojo.addOnLoad(entry_list_select); @@ -80,20 +95,33 @@ } function reloadData(id){ dojo.widget.byId(id).store.clearData(); - entry_list(); + entry_list_load(); } /* editor */ + var editor_id = "editor"; + + function editor_select() { + view_select(editor_id); + } + + var entry_form_id = "entry_form"; + + function entry_form() { + return dojo.widget.byId(entry_form_id); + } + + var dpHired_id = "dpHired"; + function setHired(hired) { - var dpHired = dojo.widget.byId("dpHired"); + var dpHired = dojo.widget.byId(dpHired_id); dpHired.setDate(hired); } function entry_edit_result(type, data, evt) { - var w = dojo.widget.byId("entry_form"); - w.setValues(data.result); + entry_form().setValues(data.result); var part = new Array(); part = data.result.hired.split('/',3); // mm/dd/yyyy var yyyy = part[2]; @@ -103,6 +131,8 @@ if (dd.length==1) dd = new String().concat('0',dd); var hired = new String().concat( yyyy,'-',mm,'-',dd ); setHired(hired); + + editor_select(); } function entry_edit(entry_key) { @@ -110,8 +140,10 @@ } function entry_save_result() { - reloadData('entry_list'); + reloadData(entry_list_id); entry_reset(); + lister_select(); + } function entry_save_update_result(type, data, evt) { @@ -125,24 +157,27 @@ } function entry_save() { - var w = dojo.widget.byId("entry_form"); - var values = w.getValues(); + var values = entry_form().getValues(); if (values.entry_key) PhoneBook.rpc.entry_save(values,entry_save_update_result).call(server); else PhoneBook.rpc.entry_save(values,entry_save_insert_result).call(server); - } + } + + function entry_quit() { + entry_reset(); + lister_select(); + } function entry_reset() { - var w = dojo.widget.byId("entry_form"); - var values = w.getValues(); + var values = entry_form().getValues(); values.first_name = ""; values.last_name = ""; values.extension = ""; values.user_name = ""; values.hours = "37.5"; values.entry_key = ""; - w.setValues(values); + entry_form().setValues(values); var today = new Date(); setHired(today); } @@ -150,6 +185,7 @@ function entry_add() { entry_reset(); + editor_select(); } function entry_delete_result(type, data, evt) @@ -160,13 +196,24 @@ function entry_delete(entry_key) { if (entry_key) { - confirm ( "Delete entry?" ); - PhoneBook.rpc.entry_delete(entry_key,entry_delete_result).call(server); + var ok = confirm ( "Delete entry?" ); + if (ok) + PhoneBook.rpc.entry_delete(entry_key,entry_delete_result).call(server); } } </script> + <style type="text/css"> + body { + font-family : sans-serif; + } + .dojoTabPaneWrapper { + padding : 10px 10px 10px 10px; + } + + </style> + <style type="text/css"> /*** The following is just an example of how to use the table. @@ -230,10 +277,9 @@ </head> <body> - <div id="finder" /> - - <div id="lister"> - + <div id="container" dojoType="TabContainer" style="width:100%; height:70%;" selectedChild="lister"> + + <div id="lister" dojoType="ContentPane" label="PhoneBook Directory" > <table id="filter_menu"><tr><td> <input type="button" onclick="applyDate('entry_list');" value="Show only hires between 1/1/1984 and 1/1/1987" /> <input type="button" onclick="applyName('entry_list');" value="Show only names between M and Z" /> @@ -256,16 +302,12 @@ </table> <table id="edit_menu"><tr><td> - <input type="button" value="Edit Entry" onclick="entry_list_select_edit('entry_list');" /> <input type="button" value="Add Entry" onclick="entry_add('entry_list');" /> - <input type="button" value="Delete Entry" onclick="entry_list_select_delete('entry_list');" /> </td></tr></table> </div> - <div id="viewer" /> - - <div id="editor"> + <div id="editor" dojoType="ContentPane" label="Entry Editor"> <form id="entry_form" dojoType="Form"> <table><tr> @@ -281,12 +323,16 @@ </tr><tr> <td>Hours</td><td><input name="hours" /></td> </tr><tr> - <td rowspan="2"><input type="button" onClick="entry_save();" value="SAVE" /> + <td rowspan="2"> + <input type="button" value="SAVE" onClick="entry_save();" /> + <input type="button" value="CANCEL" onClick="entry_quit();" /> + <input type="button" value="DELETE" onclick="entry_list_select_delete('entry_list');" /> <input type="hidden" name="editor" value="1" /> <input type="hidden" name="entry_key" /> </td> </tr></table> </form> + </div> </div> </body> Modified: struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/sqlmap.config.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/sqlmap.config.xml?view=diff&rev=494958&r1=494957&r2=494958 ============================================================================== --- struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/sqlmap.config.xml (original) +++ struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/sqlmap.config.xml Wed Jan 10 12:00:57 2007 @@ -2,6 +2,6 @@ <settings> <add key="root" value="./" /> <add key="provider" value="MySql" /> - <add key="development" value="Host=localhost;Database=phonebook;Username=phonebookApp;Password=p1nH34d" /> + <add key="development" value="Host=clifford;Database=phonebook;Username=phonebookApp;Password=p1nH34d" /> <add key="production" value="Host=zippy;Database=phonebook;Username=phonebookApp;Password=p1nH34d" /> </settings>