Skip to content

Commit 952ce50

Browse files
author
mmccurrey@gmail.com
committed
More changes resulting from the rename. Fixed SchemaValidator
1 parent ace667f commit 952ce50

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+110
-110
lines changed

‎src/MyBatis.Common.Test/App.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Register a section handler for the log4net section -->
44
<configSections>
55
<sectionGroup name="iBATIS">
6-
<section name="logging" type="Apache.Ibatis.Common.Logging.ConfigurationSectionHandler, Apache.Ibatis.Common" />
6+
<section name="logging" type="MyBatis.Common.Logging.ConfigurationSectionHandler, MyBatis.Common" />
77
</sectionGroup>
88
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
99
</configSections>
@@ -25,7 +25,7 @@
2525

2626
<iBATIS>
2727
<logging>
28-
<logFactoryAdapter type="Apache.Ibatis.Common.Logging.Impl.ConsoleOutLoggerFA, Apache.Ibatis.Common">
28+
<logFactoryAdapter type="MyBatis.Common.Logging.Impl.ConsoleOutLoggerFA, MyBatis.Common">
2929
<arg key="showLogName" value="true" />
3030
<arg key="showDateTime" value="true" />
3131
<arg key="level" value="All" />

‎src/MyBatis.Common.Test/Fixtures/Resources/ResourcesTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void TestEmbeddedResource()
4343
{
4444
XmlDocument doc = null;
4545
46-
doc = Resources.GetEmbeddedResourceAsXmlDocument("Apache.Ibatis.Common.Test.properties.xml, Apache.Ibatis.Common.Test");
46+
doc = Resources.GetEmbeddedResourceAsXmlDocument("Apache.Ibatis.Common.Test.properties.xml, MyBatis.Common.Test");
4747
4848
Assert.IsNotNull(doc);
4949
Assert.IsTrue(doc.HasChildNodes);

‎src/MyBatis.Common/Logging/ConfigurationSectionHandler.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ namespace MyBatis.Common.Logging
4444
/// <configuration>
4545
/// <configSections>
4646
/// <sectionGroup name="iBATIS">
47-
/// <section name="logging" type="Apache.Ibatis.Common.Logging.ConfigurationSectionHandler, Apache.Ibatis.Common" />
47+
/// <section name="logging" type="MyBatis.Common.Logging.ConfigurationSectionHandler, MyBatis.Common" />
4848
/// </sectionGroup>
4949
/// </configSections>
5050
/// <iBATIS>
5151
/// <logging>
52-
/// <logFactoryAdapter type="Apache.Ibatis.Common.Logging.Impl.ConsoleOutLoggerFA, Apache.Ibatis.Common">
52+
/// <logFactoryAdapter type="MyBatis.Common.Logging.Impl.ConsoleOutLoggerFA, MyBatis.Common">
5353
/// <arg key="showLogName" value="true" />
5454
/// <arg key="showDataTime" value="true" />
5555
/// <arg key="level" value="ALL" />
@@ -64,9 +64,9 @@ namespace MyBatis.Common.Logging
6464
/// The following aliases are recognized for the type attribute of logFactoryAdapter:
6565
/// </para>
6666
/// <list type="table">
67-
/// <item><term>CONSOLE</term><description>Alias for Apache.Ibatis.Common.Logging.Impl.ConsoleOutLoggerFA, Apache.Ibatis.Common</description></item>
68-
/// <item><term>TRACE</term><description>Alias for Apache.Ibatis.Common.Logging.Impl.TraceLoggerFA, Apache.Ibatis.Common</description></item>
69-
/// <item><term>NOOP</term><description>Alias Apache.Ibatis.Common.Logging.Impl.NoOpLoggerFA, Apache.Ibatis.Common</description></item>
67+
/// <item><term>CONSOLE</term><description>Alias for Apache.Ibatis.Common.Logging.Impl.ConsoleOutLoggerFA, MyBatis.Common</description></item>
68+
/// <item><term>TRACE</term><description>Alias for Apache.Ibatis.Common.Logging.Impl.TraceLoggerFA, MyBatis.Common</description></item>
69+
/// <item><term>NOOP</term><description>Alias Apache.Ibatis.Common.Logging.Impl.NoOpLoggerFA, MyBatis.Common</description></item>
7070
/// </list>
7171
/// </remarks>
7272
public class ConfigurationSectionHandler: IConfigurationSectionHandler

‎src/MyBatis.Common/Resources/AssemblyResourceLoader.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ namespace MyBatis.Common.Resources
4343
/// </remarks>
4444
/// <example>
4545
/// iBATIS V1
46-
/// "Apache.Ibatis.Common.Test.properties.xml, Apache.Ibatis.Common.Test"
46+
/// "Apache.Ibatis.Common.Test.properties.xml, MyBatis.Common.Test"
4747
///
4848
/// iBATIS V2
4949
/// assembly://Apache.Ibatis.Common.Test/Apache.Ibatis.Common.Test/properties.xml

‎src/MyBatis.DataMapper.SqlClient.Test/App.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Register a section handler for the log4net section -->
44
<configSections>
55
<sectionGroup name="iBATIS">
6-
<section name="logging" type="Apache.Ibatis.Common.Logging.ConfigurationSectionHandler, Apache.Ibatis.Common" />
6+
<section name="logging" type="MyBatis.Common.Logging.ConfigurationSectionHandler, MyBatis.Common" />
77
</sectionGroup>
88
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
99
</configSections>
@@ -15,20 +15,20 @@
1515
<iBATIS>
1616
<logging>
1717
<!--
18-
<logFactoryAdapter type="Apache.Ibatis.Common.Logging.Impl.ConsoleOutLoggerFA, Apache.Ibatis.Common">
18+
<logFactoryAdapter type="MyBatis.Common.Logging.Impl.ConsoleOutLoggerFA, MyBatis.Common">
1919
<arg key="showLogName" value="true" />
2020
<arg key="showDataTime" value="true" />
2121
<arg key="level" value="ALL" />
2222
<arg key="dateTimeFormat" value="yyyy/MM/dd HH:mm:ss:SSS" />
2323
</logFactoryAdapter>
2424
-->
25-
<!-- <logFactoryAdapter type="Apache.Ibatis.Common.Logging.Impl.Log4NetLoggerFA, Apache.Ibatis.Common.Logging.Log4Net">
25+
<!-- <logFactoryAdapter type="MyBatis.Common.Logging.Impl.Log4NetLoggerFA, MyBatis.Common.Logging.Log4Net">
2626
<arg key="configType" value="inline" />
2727
</logFactoryAdapter>
2828
-->
2929

3030

31-
<logFactoryAdapter type="Apache.Ibatis.Common.Logging.Impl.NoOpLoggerFA, Apache.Ibatis.Common" />
31+
<logFactoryAdapter type="MyBatis.Common.Logging.Impl.NoOpLoggerFA, MyBatis.Common" />
3232

3333

3434
</logging>

‎src/MyBatis.DataMapper.SqlClient.Test/Fixtures/BaseTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ protected virtual void SetUpFixture()
4545
//DateTime start = DateTime.Now;
4646

4747
configurationSetting = new ConfigurationSetting();
48-
configurationSetting.Properties.Add("collection2Namespace", "Apache.Ibatis.DataMapper.SqlClient.Test.Domain.LineItemCollection2, Apache.Ibatis.DataMapper.SqlClient.Test");
48+
configurationSetting.Properties.Add("collection2Namespace", "MyBatis.DataMapper.SqlClient.Test.Domain.LineItemCollection2, MyBatis.DataMapper.SqlClient.Test");
4949
configurationSetting.Properties.Add("nullableInt", "int?");
5050

5151
string resource = "sqlmap.config";

‎src/MyBatis.DataMapper.SqlClient.Test/Fixtures/ConfigureTest.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public void Test_XmlConfigurationInterpreter_via_FilePath_WithProtocol()
118118
[Test]
119119
public void Test_XmlConfigurationInterpreter_via_AssemblyUri()
120120
{
121-
string uri = "assembly://Apache.Ibatis.DataMapper.SqlClient.Test/bin.Debug/SqlMap_Test_Configure.config";
121+
string uri = "assembly://MyBatis.DataMapper.SqlClient.Test/bin.Debug/SqlMap_Test_Configure.config";
122122

123123
IConfigurationStore store = new DefaultConfigurationStore();
124124

@@ -136,7 +136,7 @@ public void Test_XmlConfigurationInterpreter_via_AssemblyUri()
136136
[Test]
137137
public void Test_DefaultConfigurationEngine_via_Assembly_Resource()
138138
{
139-
string uri = "assembly://Apache.Ibatis.DataMapper.SqlClient.Test/bin.Debug/SqlMap_Test_Configure.config";
139+
string uri = "assembly://MyBatis.DataMapper.SqlClient.Test/bin.Debug/SqlMap_Test_Configure.config";
140140
IResource resource = ResourceLoaderRegistry.GetResource(uri);
141141

142142
IConfigurationEngine engine = new DefaultConfigurationEngine();
@@ -195,7 +195,7 @@ private void CheckResource(IConfigurationStore store)
195195
Assert.That(datasource.Type, Is.EqualTo(DataConstants.ELEMENT_DATASOURCE));
196196

197197
Assert.That(store.Alias.Length, Is.EqualTo(12));
198-
Assert.That(store.GetAliasConfiguration("Account").Value, Is.EqualTo("Apache.Ibatis.DataMapper.SqlClient.Test.Domain.Account, Apache.Ibatis.DataMapper.SqlClient.Test"));
198+
Assert.That(store.GetAliasConfiguration("Account").Value, Is.EqualTo("MyBatis.DataMapper.SqlClient.Test.Domain.Account, MyBatis.DataMapper.SqlClient.Test"));
199199

200200
Assert.That(store.TypeHandlers.Length, Is.EqualTo(2));
201201
Assert.That(store.GetTypeHandlerConfiguration("bool").Attributes.Count, Is.EqualTo(3));
@@ -276,7 +276,7 @@ private void CheckResource(IConfigurationStore store)
276276
// DomSqlMapBuilder builder = new DomSqlMapBuilder();
277277

278278
// NameValueCollection properties = new NameValueCollection();
279-
// properties.Add("collection2Namespace", "Apache.Ibatis.DataMapper.SqlClient.Test.Domain.LineItemCollection, Apache.Ibatis.DataMapper.SqlClient.Test");
279+
// properties.Add("collection2Namespace", "MyBatis.DataMapper.SqlClient.Test.Domain.LineItemCollection, MyBatis.DataMapper.SqlClient.Test");
280280
// properties.Add("nullableInt", "int");
281281

282282
// builder.Properties = properties;
@@ -298,7 +298,7 @@ private void CheckResource(IConfigurationStore store)
298298
// DomSqlMapBuilder builder = new DomSqlMapBuilder();
299299

300300
// NameValueCollection properties = new NameValueCollection();
301-
// properties.Add("collection2Namespace", "Apache.Ibatis.DataMapper.SqlClient.Test.Domain.LineItemCollection, Apache.Ibatis.DataMapper.SqlClient.Test");
301+
// properties.Add("collection2Namespace", "MyBatis.DataMapper.SqlClient.Test.Domain.LineItemCollection, MyBatis.DataMapper.SqlClient.Test");
302302
// properties.Add("nullableInt", "int");
303303

304304
// builder.Properties = properties;
@@ -320,7 +320,7 @@ private void CheckResource(IConfigurationStore store)
320320
// DomSqlMapBuilder builder = new DomSqlMapBuilder();
321321

322322
// NameValueCollection properties = new NameValueCollection();
323-
// properties.Add("collection2Namespace", "Apache.Ibatis.DataMapper.SqlClient.Test.Domain.LineItemCollection, Apache.Ibatis.DataMapper.SqlClient.Test");
323+
// properties.Add("collection2Namespace", "MyBatis.DataMapper.SqlClient.Test.Domain.LineItemCollection, MyBatis.DataMapper.SqlClient.Test");
324324
// properties.Add("nullableInt", "int");
325325

326326
// builder.Properties = properties;
@@ -344,7 +344,7 @@ private void CheckResource(IConfigurationStore store)
344344
// DomSqlMapBuilder builder = new DomSqlMapBuilder();
345345

346346
// NameValueCollection properties = new NameValueCollection();
347-
// properties.Add("collection2Namespace", "Apache.Ibatis.DataMapper.SqlClient.Test.Domain.LineItemCollection, Apache.Ibatis.DataMapper.SqlClient.Test");
347+
// properties.Add("collection2Namespace", "MyBatis.DataMapper.SqlClient.Test.Domain.LineItemCollection, MyBatis.DataMapper.SqlClient.Test");
348348
// properties.Add("nullableInt", "int");
349349

350350
// builder.Properties = properties;
@@ -373,7 +373,7 @@ private void CheckResource(IConfigurationStore store)
373373
// DomSqlMapBuilder builder = new DomSqlMapBuilder();
374374

375375
// NameValueCollection properties = new NameValueCollection();
376-
// properties.Add("collection2Namespace", "Apache.Ibatis.DataMapper.SqlClient.Test.Domain.LineItemCollection, Apache.Ibatis.DataMapper.SqlClient.Test");
376+
// properties.Add("collection2Namespace", "MyBatis.DataMapper.SqlClient.Test.Domain.LineItemCollection, MyBatis.DataMapper.SqlClient.Test");
377377
// properties.Add("nullableInt", "int");
378378

379379
// builder.Properties = properties;
@@ -417,7 +417,7 @@ private void CheckResource(IConfigurationStore store)
417417
// DomSqlMapBuilder builder = new DomSqlMapBuilder();
418418

419419
// NameValueCollection properties = new NameValueCollection();
420-
// properties.Add("collection2Namespace", "Apache.Ibatis.DataMapper.SqlClient.Test.Domain.LineItemCollection, Apache.Ibatis.DataMapper.SqlClient.Test");
420+
// properties.Add("collection2Namespace", "MyBatis.DataMapper.SqlClient.Test.Domain.LineItemCollection, MyBatis.DataMapper.SqlClient.Test");
421421
// properties.Add("nullableInt", "int");
422422

423423
// builder.Properties = properties;

‎src/MyBatis.DataMapper.SqlClient.Test/Fixtures/DefaultConfigurationEngineTest.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private void FileResourceEventHandler(object sender, FileResourceLoadEventArgs e
5353
[Test]
5454
public void ResultMap_configuration_via_code_should_override_file_configuration()
5555
{
56-
string uri = "assembly://Apache.Ibatis.DataMapper.SqlClient.Test/bin.Debug/SqlMap_Test_Configure.config";
56+
string uri = "assembly://MyBatis.DataMapper.SqlClient.Test/bin.Debug/SqlMap_Test_Configure.config";
5757
IResource resource = ResourceLoaderRegistry.GetResource(uri);
5858

5959
// Before have 4 properties
@@ -81,7 +81,7 @@ public void ResultMap_configuration_via_code_should_override_file_configuration(
8181
[Test]
8282
public void Should_contains_ResultMap_DocumentBook_with_5_properties()
8383
{
84-
string uri = "assembly://Apache.Ibatis.DataMapper.SqlClient.Test/bin.Debug/SqlMap_Test_Configure.config";
84+
string uri = "assembly://MyBatis.DataMapper.SqlClient.Test/bin.Debug/SqlMap_Test_Configure.config";
8585
IResource resource = ResourceLoaderRegistry.GetResource(uri);
8686

8787
IConfigurationEngine engine = new DefaultConfigurationEngine();
@@ -101,7 +101,7 @@ public void Should_contains_ResultMap_DocumentBook_with_5_properties()
101101
[Test]
102102
public void Should_contains_ParameterMap_OrderInsertExtend_with_10_properties()
103103
{
104-
string uri = "assembly://Apache.Ibatis.DataMapper.SqlClient.Test/bin.Debug/SqlMap_Test_Configure.config";
104+
string uri = "assembly://MyBatis.DataMapper.SqlClient.Test/bin.Debug/SqlMap_Test_Configure.config";
105105
IResource resource = ResourceLoaderRegistry.GetResource(uri);
106106

107107
IConfigurationEngine engine = new DefaultConfigurationEngine();
@@ -127,7 +127,7 @@ public void Should_contains_ParameterMap_OrderInsertExtend_with_10_properties()
127127
[Test]
128128
public void Should_contains_statement_GetAllAccountsOrderByName_with_2_child()
129129
{
130-
string uri = "assembly://Apache.Ibatis.DataMapper.SqlClient.Test/bin.Debug/SqlMap_Test_Configure.config";
130+
string uri = "assembly://MyBatis.DataMapper.SqlClient.Test/bin.Debug/SqlMap_Test_Configure.config";
131131
IResource resource = ResourceLoaderRegistry.GetResource(uri);
132132

133133
IConfigurationEngine engine = new DefaultConfigurationEngine();
@@ -147,7 +147,7 @@ public void Should_contains_statement_GetAllAccountsOrderByName_with_2_child()
147147
[Test]
148148
public void Can_plug_HybridWebThreadSessionStore()
149149
{
150-
string uri = "assembly://Apache.Ibatis.DataMapper.SqlClient.Test/bin.Debug/SqlMap_Test_Configure.config";
150+
string uri = "assembly://MyBatis.DataMapper.SqlClient.Test/bin.Debug/SqlMap_Test_Configure.config";
151151
IResource resource = ResourceLoaderRegistry.GetResource(uri);
152152

153153
ConfigurationSetting setting = new ConfigurationSetting();

‎src/MyBatis.DataMapper.SqlClient.Test/Fixtures/DefaultModelBuilderTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ private void CheckModelStore(IModelStore store)
6464
//Assert.That(datasource.Type, Is.EqualTo(DataConstants.ELEMENT_DATASOURCE));
6565

6666
//Assert.That(store.Alias.Length, Is.EqualTo(12));
67-
//Assert.That(store.GetAliasConfiguration("Account").Value, Is.EqualTo("Apache.Ibatis.DataMapper.SqlClient.Test.Domain.Account, Apache.Ibatis.DataMapper.SqlClient.Test"));
67+
//Assert.That(store.GetAliasConfiguration("Account").Value, Is.EqualTo("MyBatis.DataMapper.SqlClient.Test.Domain.Account, MyBatis.DataMapper.SqlClient.Test"));
6868

6969
//Assert.That(store.TypeHandlers.Length, Is.EqualTo(2));
7070
//Assert.That(store.GetTypeHandlerConfiguration("bool").Attributes.Count, Is.EqualTo(3));

‎src/MyBatis.DataMapper.SqlClient.Test/Fixtures/Modules/AliasModule.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace MyBatis.DataMapper.SqlClient.Test.Fixtures.Modules
66
class AliasModule: Module
77
{
88
/// <summary>
9-
/// Override to add code configuration mapping to the <see cref="Apache.Ibatis.DataMapper.Configuration.IConfigurationEngine"/>.
9+
/// Override to add code configuration mapping to the <see cref="MyBatis.DataMapper.Configuration.IConfigurationEngine"/>.
1010
/// </summary>
1111
public override void Load()
1212
{

0 commit comments

Comments
 (0)