User: mzywitza
Date: 2010/01/04 10:21 AM

Removed:
 /ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests/Config/
  ConfigureTests.cs, StorageConfigurationTests.cs
 /ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/
  Configure.cs, DefaultActiveRecordConfiguration.cs, 
DefaultStorageConfiguration.cs, FluentActiveRecordConfiguration.cs, 
FluentNHibernateMapping.cs, FluentStorageConfiguration.cs, 
FluentStorageTypeSelection.cs, IActiveRecordConfiguration.cs, 
IDatabaseConfiguration.cs, IMappingSpecification.cs, IStorageConfiguration.cs, 
MsSqlServer2000Configuration.cs, MsSqlServer2005Configuration.cs, 
StorageTypeSelection.cs, XmlNhibernateMapping.cs

Modified:
 /ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests/
  Castle.ActiveRecord.Tests-vs2008.csproj
 /ActiveRecord/branches/2.x/src/Castle.ActiveRecord/
  Castle.ActiveRecord-vs2008.csproj

Log:
 Removed fluent configuration spike intended for 3.0 only.

File Changes:

Directory: /ActiveRecord/branches/2.x/src/Castle.ActiveRecord/
==============================================================

File [modified]: Castle.ActiveRecord-vs2008.csproj
Delta lines: +0 -40
===================================================================

--- 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/Configure.cs 
    2010-01-04 16:46:20 UTC (rev 6564)
+++ 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/Configure.cs 
    2010-01-04 17:21:36 UTC (rev 6565)
@@ -1,40 +0,0 @@
-// Copyright 2004-2009 Castle Project - http://www.castleproject.org/
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-using System;
-
-namespace Castle.ActiveRecord.Framework.Config
-{
-       /// <summary>
-       /// Enables the fluent configuration of ActiveRecord.
-       /// </summary>
-       public static class Configure
-       {
-               /// <summary>
-               /// Builds a fluent configuration for general ActiveRecord 
settings.
-               /// </summary>
-               public static FluentActiveRecordConfiguration ActiveRecord
-               {
-                       get { return new FluentActiveRecordConfiguration(); }
-               }
-
-               /// <summary>
-               /// Builds an ActiveRecord storage specifiaction fluently.
-               /// </summary>
-               public static FluentStorageConfiguration Storage        
-               {
-                       get { return new FluentStorageConfiguration(); }
-               }
-       }
-}

Directory: /ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests/
====================================================================

File [modified]: Castle.ActiveRecord.Tests-vs2008.csproj
Delta lines: +0 -106
===================================================================

--- 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests/Config/ConfigureTests.cs
    2010-01-04 16:46:20 UTC (rev 6564)
+++ 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests/Config/ConfigureTests.cs
    2010-01-04 17:21:36 UTC (rev 6565)
@@ -1,106 +0,0 @@
-// Copyright 2004-2009 Castle Project - http://www.castleproject.org/
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-namespace Castle.ActiveRecord.Tests.Config
-{
-       using Castle.ActiveRecord.Framework;
-       using Castle.ActiveRecord.Framework.Scopes;
-       using NUnit.Framework;
-       using Castle.ActiveRecord.Framework.Config;
-       using NHibernate.ByteCode.Castle;
-       using NHibernate.Connection;
-       using NHibernate.Dialect;
-       using NHibernate.Driver;
-
-       [TestFixture]
-       public class ConfigureTests
-       {
-               [Test]
-               public void BasicConfigurationApi()
-               {
-                       IActiveRecordConfiguration configuration = 
Configure.ActiveRecord
-                               .ForWeb()
-                               .Flush(DefaultFlushType.Leave)
-                               .UseThreadScopeInfo<SampleThreadScopeInfo>()
-                               
.UseSessionFactoryHolder<SampleSessionFactoryHolder>()
-                               .MakeLazyByDefault()
-                               .VerifyModels()
-                               .RegisterSearch();
-
-                       
Assert.That(configuration.ThreadScopeInfoImplementation, Is.EqualTo(typeof 
(SampleThreadScopeInfo)));
-                       
Assert.That(configuration.SessionfactoryHolderImplementation, Is.EqualTo(typeof 
(SampleSessionFactoryHolder)));
-                       Assert.That(configuration.DefaultFlushType, 
Is.EqualTo(DefaultFlushType.Leave));
-                       Assert.That(configuration.WebEnabled, Is.True);
-                       Assert.That(configuration.Lazy, Is.True);
-                       Assert.That(configuration.Verification, Is.True);
-                       Assert.That(configuration.Searchable, Is.True);
-               }
-
-               [Test]
-               public void BasicSyntaxStorageConfiguration()
-               {
-                       IStorageConfiguration configuration = Configure.Storage
-                               .For
-                               .AllOtherTypes()
-                               .MappedBy(new 
XmlNhibernateMapping().InAssemblyOf<OneOfMyEntities>())
-                               .As
-                               .ConnectionStringName("a_string")
-                               .Driver<SqlClientDriver>()
-                               .ConnectionProvider<DriverConnectionProvider>()
-                               .Dialect<MsSql2005Dialect>()
-                               .ProxiedBy<ProxyFactoryFactory>()
-                               .ShowSql();
-
-                       IStorageConfiguration auditConfiguration = 
Configure.Storage
-                               .For
-                               .SubtypesOf<AuditType>()
-                               .InNamespaceOf<DefaultAuditorType>() // Logical 
and - we are narrowing our 
-                               .MappedBy(new 
FluentNHibernateMapping().InAssemblyOf<MyMappingClass>())
-                               .And // Logical or - we start the next 
StorageTypeSelection
-                               .TypesInAssemblyOf<MessagingImpl>()
-                               // No MappedBy defaults to ActiveRecord 
attributes
-                               .As
-                               .DefaultsFor<MsSqlServer2000Configuration>()
-                               .ConnectionString("server=bla;...");
-               }
-       }
-
-       public class SampleThreadScopeInfo : HybridWebThreadScopeInfo
-       {
-       }
-
-       public class SampleSessionFactoryHolder : SessionFactoryHolder
-       {
-       }
-
-       public abstract class AuditType
-       {
-       }
-
-       public class DefaultAuditorType : AuditType
-       {
-       }
-
-       public class MessagingImpl
-       {
-       }
-
-       public class OneOfMyEntities
-       {
-       }
-
-       public class MyMappingClass
-       {
-       }
-}

Directory: /ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/
===============================================================================

File [removed]: Configure.cs
Delta lines: +0 -60
===================================================================

--- 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/DefaultActiveRecordConfiguration.cs
      2010-01-04 16:46:20 UTC (rev 6564)
+++ 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/DefaultActiveRecordConfiguration.cs
      2010-01-04 17:21:36 UTC (rev 6565)
@@ -1,60 +0,0 @@
-// Copyright 2004-2009 Castle Project - http://www.castleproject.org/
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-namespace Castle.ActiveRecord.Framework.Config
-{
-       using System;
-
-       ///<summary>
-       /// Default configuration class for <see 
cref="IActiveRecordConfiguration"/>.
-       ///</summary>
-       public class DefaultActiveRecordConfiguration : 
IActiveRecordConfiguration
-       {
-               /// <summary>
-               /// The <see cref="IThreadScopeInfo"/> to use in ActiveRecord.
-               /// </summary>
-               public virtual Type ThreadScopeInfoImplementation { get; set; }
-
-               /// <summary>
-               /// The <see cref="ISessionFactoryHolder"/> to use in 
ActiveRecord.
-               /// </summary>
-               public virtual Type SessionfactoryHolderImplementation { get; 
set; }
-
-               /// <summary>
-               /// Determines the default Flush-behaviour of <see 
cref="ISessionScope"/>.
-               /// </summary>
-               public virtual DefaultFlushType DefaultFlushType { get; set; }
-
-               /// <summary>
-               /// Determines whether ActiveRecord is configured for use in 
web apps.
-               /// </summary>
-               public virtual bool WebEnabled { get; set; }
-
-               /// <summary>
-               /// Determines whether collections should be loaded lazily by 
default.
-               /// </summary>
-               public virtual bool Lazy { get; set; }
-
-               /// <summary>
-               /// Determines whether the models should be verified against 
the chosem data stores
-               /// at initialization.
-               /// </summary>
-               public virtual bool Verification { get; set; }
-
-               /// <summary>
-               /// Determines whether event listeners for NHibernate.Search 
should be registered.
-               /// </summary>
-               public virtual bool Searchable { get; set; }
-       }
-}

File [removed]: DefaultActiveRecordConfiguration.cs
Delta lines: +0 -63
===================================================================

--- 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/DefaultStorageConfiguration.cs
   2010-01-04 16:46:20 UTC (rev 6564)
+++ 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/DefaultStorageConfiguration.cs
   2010-01-04 17:21:36 UTC (rev 6565)
@@ -1,63 +0,0 @@
-// Copyright 2004-2009 Castle Project - http://www.castleproject.org/
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-namespace Castle.ActiveRecord.Framework.Config
-{
-       using System;
-       using System.Collections.Generic;
-
-       /// <summary>
-       /// Default implementation for <see cref="IStorageConfiguration"/>.
-       /// </summary>
-       public class DefaultStorageConfiguration : IStorageConfiguration
-       {
-               private readonly IDictionary<string, string> 
_configurationValues = new Dictionary<string, string>();
-
-               /// <summary>
-               /// The type selections writable store.
-               /// </summary>
-               protected readonly List<StorageTypeSelection> TypeSelectionList 
= new List<StorageTypeSelection>();
-
-               #region IStorageConfiguration Members
-
-               /// <summary>
-               /// The type selections for that storage.
-               /// </summary>
-               public IEnumerable<StorageTypeSelection> TypeSelections
-               {
-                       get { return TypeSelectionList; }
-               }
-
-               /// <summary>
-               /// Contains the name-value-pairs for the NHibernate 
configuration
-               /// </summary>
-               public IDictionary<string, string> ConfigurationValues
-               {
-                       get { return _configurationValues; }
-               }
-
-               #endregion
-
-               /// <summary>
-               /// Creates a type name in the form Type.Fullname, 
Assembly.Simple.Name
-               /// </summary>
-               /// <typeparam name="T">The type for which to create the 
name</typeparam>
-               /// <returns>The created name</returns>
-               protected static string GetTypeName<T>()
-               {
-                       Type t = typeof (T);
-                       return string.Format("{0}, {1}", t.FullName, 
t.Assembly.GetName().Name);
-               }
-       }
-}

File [removed]: DefaultStorageConfiguration.cs
Delta lines: +0 -106
===================================================================

--- 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/FluentActiveRecordConfiguration.cs
       2010-01-04 16:46:20 UTC (rev 6564)
+++ 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/FluentActiveRecordConfiguration.cs
       2010-01-04 17:21:36 UTC (rev 6565)
@@ -1,106 +0,0 @@
-// Copyright 2004-2009 Castle Project - http://www.castleproject.org/
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-namespace Castle.ActiveRecord.Framework.Config
-{
-       /// <summary>
-       /// Allows to configure ActiveRecord fluently.
-       /// </summary>
-       public class FluentActiveRecordConfiguration : 
DefaultActiveRecordConfiguration
-       {
-               /// <summary>
-               /// Enables ActiveRecord to be used in a ASP.NET scenario by 
registering a proper
-               /// <see cref="IThreadScopeInfo"/>. By default, ActiveRecord 
cannot be used in
-               /// web applications.
-               /// </summary>
-               /// <returns>The fluent configuration itself.</returns>
-               public FluentActiveRecordConfiguration ForWeb()
-               {
-                       WebEnabled = true;
-                       return this;
-               }
-
-               /// <summary>
-               /// Sets the flush behaviour for <see cref="ISessionScope"/> 
when no
-               /// other behaviour is specified in the scope itself. The 
default for
-               /// this configuration is <see 
cref="DefaultFlushType.Classic"/>. See
-               /// <see cref="DefaultFlushType"/> for what the options mean.
-               /// </summary>
-               /// <param name="flushType">The default flushing behaviour to 
set.</param>
-               /// <returns>The fluent configuration itself.</returns>
-               public FluentActiveRecordConfiguration Flush(DefaultFlushType 
flushType)
-               {
-                       DefaultFlushType = flushType;
-                       return this;
-               }
-
-               /// <summary>
-               /// Sets the <see cref="IThreadScopeInfo"/> to use. Normally, 
this type is
-               /// set when ActiveRecord is used in web application. You 
should set this
-               /// value only if you need a custom implementation of that 
interface.
-               /// </summary>
-               /// <typeparam name="T">The implementation to use.</typeparam>
-               /// <returns>The fluent configuration itself.</returns>
-               public FluentActiveRecordConfiguration UseThreadScopeInfo<T>() 
where T : IThreadScopeInfo
-               {
-                       ThreadScopeInfoImplementation = typeof (T);
-                       return this;
-               }
-
-               /// <summary>
-               /// Sets the <see cref="ISessionFactoryHolder"/> to use. You 
should set this if you need to
-               /// use a custom implementation of that interface.
-               /// </summary>
-               /// <typeparam name="T">The implementation to use.</typeparam>
-               /// <returns>The fluent configuration itself.</returns>
-               public FluentActiveRecordConfiguration 
UseSessionFactoryHolder<T>() where T : ISessionFactoryHolder
-               {
-                       SessionfactoryHolderImplementation = typeof (T);
-                       return this;
-               }
-
-               /// <summary>
-               /// Instructs ActiveRecord to use lazy loading unless otherwise 
specified on the collection.
-               /// By default, lazy loading is not used.
-               /// </summary>
-               /// <returns>The fluent configuration itself.</returns>
-               public FluentActiveRecordConfiguration MakeLazyByDefault()
-               {
-                       Lazy = true;
-                       return this;
-               }
-
-               /// <summary>
-               /// Instructs ActiveRecord to verify the models against the 
data stores on initialization.
-               /// By default, there is no verification
-               /// </summary>
-               /// <returns>The fluent configuration itself.</returns>
-               public FluentActiveRecordConfiguration VerifyModels()
-               {
-                       Verification = true;
-                       return this;
-               }
-
-               /// <summary>
-               /// Instructs ActiveRecord to register NHibernate.Search event 
listeners to allow full text search.
-               /// By default, there is no registration of these listeners.
-               /// </summary>
-               /// <returns>The fluent configuration itself.</returns>
-               public FluentActiveRecordConfiguration RegisterSearch()
-               {
-                       Searchable = true;
-                       return this;
-               }
-       }
-}

File [removed]: FluentActiveRecordConfiguration.cs
Delta lines: +0 -33
===================================================================

--- 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/FluentNHibernateMapping.cs
       2010-01-04 16:46:20 UTC (rev 6564)
+++ 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/FluentNHibernateMapping.cs
       2010-01-04 17:21:36 UTC (rev 6565)
@@ -1,33 +0,0 @@
-// Copyright 2004-2009 Castle Project - http://www.castleproject.org/
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-namespace Castle.ActiveRecord.Framework.Config
-{
-       /// <summary>
-       /// Extension of <see cref="IMappingSpecification"/> to add FNH-mapped
-       /// NHibernate types.
-       /// </summary>
-       public class FluentNHibernateMapping : IMappingSpecification
-       {
-               /// <summary>
-               /// Searches for the ClassMap-types in the assembly of the 
specified type.
-               /// </summary>
-               /// <typeparam name="T">The type whose assembly will be 
searched.</typeparam>
-               /// <returns>The mapping object itself.</returns>
-               public FluentNHibernateMapping InAssemblyOf<T>()
-               {
-                       return this;
-               }
-       }
-}

File [removed]: FluentNHibernateMapping.cs
Delta lines: +0 -138
===================================================================

--- 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/FluentStorageConfiguration.cs
    2010-01-04 16:46:20 UTC (rev 6564)
+++ 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/FluentStorageConfiguration.cs
    2010-01-04 17:21:36 UTC (rev 6565)
@@ -1,138 +0,0 @@
-// Copyright 2004-2009 Castle Project - http://www.castleproject.org/
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-namespace Castle.ActiveRecord.Framework.Config
-{
-       using NHibernate.Bytecode;
-       using NHibernate.ByteCode.Castle;
-       using NHibernate.Connection;
-       using NHibernate.Dialect;
-       using NHibernate.Driver;
-
-       /// <summary>
-       /// Fluent configuration of ActiveRecord storage options.
-       /// </summary>
-       public class FluentStorageConfiguration : DefaultStorageConfiguration
-       {
-               /// <summary>
-               /// Adds an inital <see cref="FluentStorageTypeSelection"/> 
that can be
-               /// used for specifying the types that use this storage 
configured.
-               /// </summary>
-               public FluentStorageTypeSelection For
-               {
-                       get
-                       {
-                               var selection = new 
FluentStorageTypeSelection(this);
-                               TypeSelectionList.Add(selection);
-                               return selection;
-                       }
-               }
-
-               /// <summary>
-               /// Sets reasonable defaults for the specified type of database.
-               /// </summary>
-               /// <typeparam name="T"></typeparam>
-               ///<returns>The fluent configuration itself.</returns>
-               public FluentStorageConfiguration DefaultsFor<T>() where T : 
IDatabaseConfiguration
-               {
-                       return this;
-               }
-
-               ///<summary>
-               /// Sets the connection string per name
-               ///</summary>
-               ///<param name="connecctionStringName">The name of the 
connection string</param>
-               ///<returns>The fluent configuration itself.</returns>
-               public FluentStorageConfiguration ConnectionStringName(string 
connecctionStringName)
-               {
-                       
ConfigurationValues.Add("connection.connection_string_name", 
connecctionStringName);
-                       return this;
-               }
-
-               ///<summary>
-               /// Sets the driver for the configuration
-               ///</summary>
-               ///<typeparam name="T">The driver class</typeparam>
-               ///<returns>The fluent configuration itself</returns>
-               public FluentStorageConfiguration Driver<T>() where T : IDriver
-               {
-                       ConfigurationValues.Add("connection.driver_class", 
typeof (T).FullName);
-                       return this;
-               }
-
-               /// <summary>
-               /// Sets the connection provider
-               /// </summary>
-               /// <typeparam name="T">The connection provider class to 
use.</typeparam>
-               /// <returns>The fluent configuration itself.</returns>
-               public FluentStorageConfiguration ConnectionProvider<T>() where 
T : IConnectionProvider
-               {
-                       ConfigurationValues.Add("connection.provider", typeof 
(T).FullName);
-                       return this;
-               }
-
-               /// <summary>
-               /// Sets the dialect.
-               /// </summary>
-               /// <typeparam name="T">The dialect type to use.</typeparam>
-               /// <returns>The fluent configuration itself.</returns>
-               public FluentStorageConfiguration Dialect<T>() where T : Dialect
-               {
-                       ConfigurationValues.Add("dialect", typeof (T).FullName);
-                       return this;
-               }
-
-               /// <summary>
-               /// The proxy factory to use. This value defaults to 
-               /// <see cref="ProxyFactoryFactory"/>.
-               /// </summary>
-               /// <typeparam name="T"></typeparam>
-               /// <returns></returns>
-               public FluentStorageConfiguration ProxiedBy<T>() where T : 
IProxyFactoryFactory
-               {
-                       ConfigurationValues.Add("proxyfactory.factory_class", 
GetTypeName<T>());
-                       return this;
-               }
-
-               /// <summary>
-               /// Sets the connection string
-               /// </summary>
-               /// <param name="connectionString">The connection string to 
use.</param>
-               /// <returns>The fluent configuration itself.</returns>
-               public FluentStorageConfiguration ConnectionString(string 
connectionString)
-               {
-                       ConfigurationValues.Add("connection.connection_string", 
connectionString);
-                       return this;
-               }
-
-               /// <summary>
-               /// Switches SQL console output on.
-               /// </summary>
-               /// <returns>The fluent configuration itself.</returns>
-               public FluentStorageConfiguration ShowSql()
-               {
-                       return ShowSql(true);
-               }
-
-               /// <summary>
-               /// Switches SQL console output on or off.
-               /// </summary>
-               /// <param name="showSql">Whether to show the Sql or 
not.</param>
-               /// <returns>The fluent configuration itself.</returns>
-               public FluentStorageConfiguration ShowSql(bool showSql)
-               {
-                       return this;
-               }
-       }
-}

File [removed]: FluentStorageConfiguration.cs
Delta lines: +0 -104
===================================================================

--- 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/FluentStorageTypeSelection.cs
    2010-01-04 16:46:20 UTC (rev 6564)
+++ 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/FluentStorageTypeSelection.cs
    2010-01-04 17:21:36 UTC (rev 6565)
@@ -1,104 +0,0 @@
-// Copyright 2004-2009 Castle Project - http://www.castleproject.org/
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-namespace Castle.ActiveRecord.Framework.Config
-{
-       ///<summary>
-       /// Fluent configuration of a storage type selection
-       ///</summary>
-       public class FluentStorageTypeSelection : StorageTypeSelection
-       {
-               /// <summary>
-               /// Internal storage of the configuration this selection 
belongs to.
-               /// </summary>
-               protected FluentStorageConfiguration StorageConfiguration;
-
-               /// <summary>
-               /// Creates a new fluent selection configuration.
-               /// </summary>
-               /// <param name="storageConfiguration">The object that creates 
and uses the selection.</param>
-               public FluentStorageTypeSelection(FluentStorageConfiguration 
storageConfiguration)
-               {
-                       StorageConfiguration = storageConfiguration;
-               }
-
-               /// <summary>
-               /// The storage configuration that created the current 
selection.
-               /// </summary>
-               public FluentStorageConfiguration As
-               {
-                       get { return StorageConfiguration; }
-               }
-
-               /// <summary>
-               /// Adds another selection to the storage configuration.
-               /// </summary>
-               public FluentStorageTypeSelection And
-               {
-                       get { return StorageConfiguration.For; }
-               }
-
-               /// <summary>
-               /// Sets the selection to be used for all types are not 
explicitly selected.
-               /// This may be used only on one storage configuration.
-               /// </summary>
-               /// <returns></returns>
-               public FluentStorageTypeSelection AllOtherTypes()
-               {
-                       Default = true;
-                       return this;
-               }
-
-               /// <summary>
-               /// Selects the type and all subtypes of the type to use the 
storage.
-               /// </summary>
-               /// <typeparam name="T">The type to choose.</typeparam>
-               /// <returns>The fluent selection itself.</returns>
-               public FluentStorageTypeSelection SubtypesOf<T>()
-               {
-                       return this;
-               }
-
-               /// <summary>
-               /// Selects all types in or below the namespace of the given 
type.
-               /// </summary>
-               /// <typeparam name="T">The type to select.</typeparam>
-               /// <returns>The fluent selection itself.</returns>
-               public FluentStorageTypeSelection InNamespaceOf<T>()
-               {
-                       return this;
-               }
-
-               /// <summary>
-               /// Sets the way the selected types are mapped. The default 
mapping is ActiveRecord
-               /// attributes.
-               /// </summary>
-               /// <param name="specification">The mapping 
specification</param>
-               /// <returns>The fluent selection itself.</returns>
-               public FluentStorageTypeSelection 
MappedBy(IMappingSpecification specification)
-               {
-                       return this;
-               }
-
-               /// <summary>
-               /// Selects all types in the assembly of the given type.
-               /// </summary>
-               /// <typeparam name="T">The type to select.</typeparam>
-               /// <returns>The fluent selection itself.</returns>
-               public FluentStorageTypeSelection TypesInAssemblyOf<T>()
-               {
-                       return this;
-               }
-       }
-}

File [removed]: FluentStorageTypeSelection.cs
Delta lines: +0 -64
===================================================================

--- 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/IActiveRecordConfiguration.cs
    2010-01-04 16:46:20 UTC (rev 6564)
+++ 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/IActiveRecordConfiguration.cs
    2010-01-04 17:21:36 UTC (rev 6565)
@@ -1,64 +0,0 @@
-// Copyright 2004-2009 Castle Project - http://www.castleproject.org/
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-namespace Castle.ActiveRecord.Framework.Config
-{
-       using System;
-
-       /// <summary>
-       /// New configuration interface for ActiveRecord basic functionality
-       /// </summary>
-       /// <remarks>
-       /// This interface is subject to further modification. If you need to 
implement
-       /// this interface, please inherit from <see 
cref="DefaultActiveRecordConfiguration"/>.
-       /// </remarks>
-       public interface IActiveRecordConfiguration
-       {
-               /// <summary>
-               /// The <see cref="IThreadScopeInfo"/> to use in ActiveRecord.
-               /// </summary>
-               Type ThreadScopeInfoImplementation { get; set; }
-
-               /// <summary>
-               /// The <see cref="ISessionFactoryHolder"/> to use in 
ActiveRecord.
-               /// </summary>
-               Type SessionfactoryHolderImplementation { get; set; }
-
-               /// <summary>
-               /// Determines the default Flush-behaviour of <see 
cref="ISessionScope"/>.
-               /// </summary>
-               DefaultFlushType DefaultFlushType { get; set; }
-
-               /// <summary>
-               /// Determines whether ActiveRecord is configured for use in 
web apps.
-               /// </summary>
-               bool WebEnabled { get; set; }
-
-               /// <summary>
-               /// Determines whether collections should be loaded lazily by 
default.
-               /// </summary>
-               bool Lazy { get; set; }
-
-               /// <summary>
-               /// Determines whether the models should be verified against 
the chosem data stores
-               /// at initialization.
-               /// </summary>
-               bool Verification { get; set; }
-
-               /// <summary>
-               /// Determines whether event listeners for NHibernate.Search 
should be registered.
-               /// </summary>
-               bool Searchable { get; set; }
-       }
-}

File [removed]: IActiveRecordConfiguration.cs
Delta lines: +0 -23
===================================================================

--- 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/IDatabaseConfiguration.cs
        2010-01-04 16:46:20 UTC (rev 6564)
+++ 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/IDatabaseConfiguration.cs
        2010-01-04 17:21:36 UTC (rev 6565)
@@ -1,23 +0,0 @@
-// Copyright 2004-2009 Castle Project - http://www.castleproject.org/
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-namespace Castle.ActiveRecord.Framework.Config
-{
-       /// <summary>
-       /// Defines basic NHibernate settings for a certain RDBMS.
-       /// </summary>
-       public interface IDatabaseConfiguration
-       {
-       }
-}

File [removed]: IDatabaseConfiguration.cs
Delta lines: +0 -23
===================================================================

--- 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/IMappingSpecification.cs
 2010-01-04 16:46:20 UTC (rev 6564)
+++ 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/IMappingSpecification.cs
 2010-01-04 17:21:36 UTC (rev 6565)
@@ -1,23 +0,0 @@
-// Copyright 2004-2009 Castle Project - http://www.castleproject.org/
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-namespace Castle.ActiveRecord.Framework.Config
-{
-       /// <summary>
-       /// Extension points for adding types mapped by different ways to 
ActiveRecord.
-       /// </summary>
-       public interface IMappingSpecification
-       {
-       }
-}

File [removed]: IMappingSpecification.cs
Delta lines: +0 -38
===================================================================

--- 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/IStorageConfiguration.cs
 2010-01-04 16:46:20 UTC (rev 6564)
+++ 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/IStorageConfiguration.cs
 2010-01-04 17:21:36 UTC (rev 6565)
@@ -1,38 +0,0 @@
-// Copyright 2004-2009 Castle Project - http://www.castleproject.org/
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-namespace Castle.ActiveRecord.Framework.Config
-{
-       using System.Collections.Generic;
-
-       /// <summary>
-       /// Interface for configuration of a database storage.
-       /// </summary>
-       /// <remarks>
-       /// This interface is subject to further modification. If you need to 
implement
-       /// this interface, please inherit from <see 
cref="DefaultStorageConfiguration"/>.
-       /// </remarks>
-       public interface IStorageConfiguration
-       {
-               /// <summary>
-               /// The type selections for that storage.
-               /// </summary>
-               IEnumerable<StorageTypeSelection> TypeSelections { get; }
-
-               /// <summary>
-               /// Contains the name-value-pairs for the NHibernate 
configuration
-               /// </summary>
-               IDictionary<string, string> ConfigurationValues { get; }
-       }
-}

File [removed]: IStorageConfiguration.cs
Delta lines: +0 -23
===================================================================

--- 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/MsSqlServer2000Configuration.cs
  2010-01-04 16:46:20 UTC (rev 6564)
+++ 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/MsSqlServer2000Configuration.cs
  2010-01-04 17:21:36 UTC (rev 6565)
@@ -1,23 +0,0 @@
-// Copyright 2004-2009 Castle Project - http://www.castleproject.org/
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-namespace Castle.ActiveRecord.Framework.Config
-{
-       /// <summary>
-       /// Defines the defaults for Sql Server 2000
-       /// </summary>
-       public class MsSqlServer2000Configuration : IDatabaseConfiguration
-       {
-       }
-}

File [removed]: MsSqlServer2000Configuration.cs
Delta lines: +0 -23
===================================================================

--- 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/MsSqlServer2005Configuration.cs
  2010-01-04 16:46:20 UTC (rev 6564)
+++ 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/MsSqlServer2005Configuration.cs
  2010-01-04 17:21:36 UTC (rev 6565)
@@ -1,23 +0,0 @@
-// Copyright 2004-2009 Castle Project - http://www.castleproject.org/
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-namespace Castle.ActiveRecord.Framework.Config
-{
-       /// <summary>
-       /// Defines the defaults for Sql Server 2005
-       /// </summary>
-       public class MsSqlServer2005Configuration : IDatabaseConfiguration
-       {
-       }
-}

File [removed]: MsSqlServer2005Configuration.cs
Delta lines: +0 -29
===================================================================

--- 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/StorageTypeSelection.cs
  2010-01-04 16:46:20 UTC (rev 6564)
+++ 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/StorageTypeSelection.cs
  2010-01-04 17:21:36 UTC (rev 6565)
@@ -1,29 +0,0 @@
-// Copyright 2004-2009 Castle Project - http://www.castleproject.org/
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-namespace Castle.ActiveRecord.Framework.Config
-{
-       /// <summary>
-       /// Configuration of the types that will use a storage.
-       /// </summary>
-       public class StorageTypeSelection
-       {
-               /// <summary>
-               /// Determines whether the selection contains all types are not
-               /// specified elsewhere. Only one storage configuration may have
-               /// a type selection with this property being true.
-               /// </summary>
-               public virtual bool Default { get; set; }
-       }
-}

File [removed]: StorageTypeSelection.cs
Delta lines: +0 -33
===================================================================

--- 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/XmlNhibernateMapping.cs
  2010-01-04 16:46:20 UTC (rev 6564)
+++ 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord/Framework/Config/XmlNhibernateMapping.cs
  2010-01-04 17:21:36 UTC (rev 6565)
@@ -1,33 +0,0 @@
-// Copyright 2004-2009 Castle Project - http://www.castleproject.org/
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-namespace Castle.ActiveRecord.Framework.Config
-{
-       /// <summary>
-       /// Extension of <see cref="IMappingSpecification"/> to add classically 
XML-mapped
-       /// NHibernate types.
-       /// </summary>
-       public class XmlNhibernateMapping : IMappingSpecification
-       {
-               /// <summary>
-               /// Searches for the XML files in the assembly of the specified 
type.
-               /// </summary>
-               /// <typeparam name="T">The type whose assembly will be 
searched.</typeparam>
-               /// <returns>The mapping object itself.</returns>
-               public XmlNhibernateMapping InAssemblyOf<T>()
-               {
-                       return this;
-               }
-       }
-}

File [removed]: XmlNhibernateMapping.cs
Delta lines: +0 -2
===================================================================

--- 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests/Castle.ActiveRecord.Tests-vs2008.csproj
     2010-01-04 16:46:20 UTC (rev 6564)
+++ 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests/Castle.ActiveRecord.Tests-vs2008.csproj
     2010-01-04 17:21:36 UTC (rev 6565)
@@ -328,8 +328,6 @@
     <Compile Include="AnyRelationTestCase.cs" />
     <Compile Include="CompositeNestedClassTestCase.cs" />
     <Compile Include="CompositeUserTypeTestCase.cs" />
-    <Compile Include="Config\ConfigureTests.cs" />
-    <Compile Include="Config\StorageConfigurationTests.cs" />
     <Compile Include="Model\CompositeUserType\BadProduct.cs" />
     <Compile Include="Model\ProductWithGuid.cs" />

Directory: /ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests/Config/
===========================================================================

File [removed]: ConfigureTests.cs
Delta lines: +0 -80
===================================================================

--- 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests/Config/StorageConfigurationTests.cs
 2010-01-04 16:46:20 UTC (rev 6564)
+++ 
ActiveRecord/branches/2.x/src/Castle.ActiveRecord.Tests/Config/StorageConfigurationTests.cs
 2010-01-04 17:21:36 UTC (rev 6565)
@@ -1,80 +0,0 @@
-// Copyright 2004-2009 Castle Project - http://www.castleproject.org/
-// 
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// 
-//     http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-namespace Castle.ActiveRecord.Tests.Config
-{
-       using Castle.ActiveRecord.Framework.Config;
-       using NHibernate.ByteCode.Castle;
-       using NHibernate.Connection;
-       using NHibernate.Dialect;
-       using NHibernate.Driver;
-       using NUnit.Framework;
-
-       [TestFixture]
-       public class StorageConfigurationDoesCreateCorrectConfigurationValues
-       {
-               private FluentStorageConfiguration _configuration;
-
-               [SetUp]
-               public void Setup()
-               {
-                       _configuration = Configure.Storage;
-               }
-
-               public void AssertConfiguration(IStorageConfiguration 
storageConfiguration, string name, string value)
-               {
-                       
Assert.That(storageConfiguration.ConfigurationValues.ContainsKey(name));
-                       
Assert.That(storageConfiguration.ConfigurationValues[name], Is.EqualTo(value));
-               }
-
-               [Test]
-               public void ConnectionStringNameIsAdded()
-               {
-                       
AssertConfiguration(_configuration.ConnectionStringName("foo"), 
"connection.connection_string_name", "foo");
-               }
-
-               [Test]
-               public void ConnectionStringIsAdded()
-               {
-                       
AssertConfiguration(_configuration.ConnectionString("foo"), 
"connection.connection_string", "foo");
-               }
-
-               [Test]
-               public void DriverClassIsAdded()
-               {
-                       
AssertConfiguration(_configuration.Driver<SqlClientDriver>(), 
"connection.driver_class",
-                                           
"NHibernate.Driver.SqlClientDriver");
-               }
-
-               [Test]
-               public void ConnectionProviderClassIsAdded()
-               {
-                       
AssertConfiguration(_configuration.ConnectionProvider<DriverConnectionProvider>(),
 "connection.provider",
-                                           
"NHibernate.Connection.DriverConnectionProvider");
-               }
-
-               [Test]
-               public void DialectIsAdded()
-               {
-                       
AssertConfiguration(_configuration.Dialect<MsSql2005Dialect>(), "dialect", 
"NHibernate.Dialect.MsSql2005Dialect");
-               }
-
-               [Test]
-               public void ProxyFactoryIsAdded()
-               {
-                       
AssertConfiguration(_configuration.ProxiedBy<ProxyFactoryFactory>(), 
"proxyfactory.factory_class",
-                                           
"NHibernate.ByteCode.Castle.ProxyFactoryFactory, NHibernate.ByteCode.Castle");
-               }
-       }
-}

File [removed]: StorageConfigurationTests.cs
Delta lines: +0 -0
===================================================================

--

You received this message because you are subscribed to the Google Groups 
"Castle Project Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/castle-project-commits?hl=en.


Reply via email to