Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[4873] trunk/nhibernate/src/NHibernate
|
From: <fab...@us...> - 2009-11-29 16:09:03
|
Revision: 4873
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4873&view=rev
Author: fabiomaulo
Date: 2009-11-29 16:08:44 +0000 (Sun, 29 Nov 2009)
Log Message:
-----------
Preparing other binders refactoring
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmClass.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoinedSubclass.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSubclass.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmUnionSubclass.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/IEntityMapping.cs
trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/Binder.cs
trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs
trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs
trunk/nhibernate/src/NHibernate/NHibernate.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmAny.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmArray.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBag.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmComponent.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIdbag.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmList.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmManyToOne.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMap.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmNaturalId.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmOneToOne.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmPrimitiveArray.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmProperty.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSet.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/ICollectionPropertyMapping.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/IEntityPropertyMapping.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/IPropertiesContainerMapping.cs
Added: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmAny.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmAny.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmAny.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -0,0 +1,14 @@
+namespace NHibernate.Cfg.MappingSchema
+{
+ public partial class HbmAny : IEntityPropertyMapping
+ {
+ #region Implementation of IEntityPropertyMapping
+
+ public string Name
+ {
+ get { return name; }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmArray.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmArray.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmArray.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -0,0 +1,14 @@
+namespace NHibernate.Cfg.MappingSchema
+{
+ public partial class HbmArray : ICollectionPropertyMapping
+ {
+ #region Implementation of IEntityPropertyMapping
+
+ public string Name
+ {
+ get { return name; }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBag.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBag.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBag.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -0,0 +1,14 @@
+namespace NHibernate.Cfg.MappingSchema
+{
+ public partial class HbmBag : ICollectionPropertyMapping
+ {
+ #region Implementation of IEntityPropertyMapping
+
+ public string Name
+ {
+ get { return name; }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmClass.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmClass.cs 2009-11-29 13:10:49 UTC (rev 4872)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmClass.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -1,3 +1,7 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
namespace NHibernate.Cfg.MappingSchema
{
partial class HbmClass : AbstractDecoratable, IEntityMapping, IEntityDiscriminableMapping
@@ -128,5 +132,14 @@
}
#endregion
+
+ #region Implementation of IPropertiesContainerMapping
+
+ public IEnumerable<IEntityPropertyMapping> Properties
+ {
+ get { return Items.Cast<IEntityPropertyMapping>(); }
+ }
+
+ #endregion
}
}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmComponent.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmComponent.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmComponent.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace NHibernate.Cfg.MappingSchema
+{
+ public partial class HbmComponent : IEntityPropertyMapping, IPropertiesContainerMapping
+ {
+ #region Implementation of IEntityPropertyMapping
+
+ public string Name
+ {
+ get { return name; }
+ }
+
+ #endregion
+
+ #region Implementation of IPropertiesContainerMapping
+
+ public IEnumerable<IEntityPropertyMapping> Properties
+ {
+ get { return Items.Cast<IEntityPropertyMapping>(); }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIdbag.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIdbag.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIdbag.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -0,0 +1,14 @@
+namespace NHibernate.Cfg.MappingSchema
+{
+ public partial class HbmIdbag : ICollectionPropertyMapping
+ {
+ #region Implementation of IEntityPropertyMapping
+
+ public string Name
+ {
+ get { return name; }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoinedSubclass.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoinedSubclass.cs 2009-11-29 13:10:49 UTC (rev 4872)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoinedSubclass.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -1,3 +1,6 @@
+using System.Collections.Generic;
+using System.Linq;
+
namespace NHibernate.Cfg.MappingSchema
{
public partial class HbmJoinedSubclass : AbstractDecoratable, IEntityMapping
@@ -102,5 +105,14 @@
}
#endregion
+
+ #region Implementation of IPropertiesContainerMapping
+
+ public IEnumerable<IEntityPropertyMapping> Properties
+ {
+ get { return Items.Cast<IEntityPropertyMapping>(); }
+ }
+
+ #endregion
}
}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmList.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmList.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmList.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -0,0 +1,14 @@
+namespace NHibernate.Cfg.MappingSchema
+{
+ public partial class HbmList : ICollectionPropertyMapping
+ {
+ #region Implementation of IEntityPropertyMapping
+
+ public string Name
+ {
+ get { return name; }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmManyToOne.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmManyToOne.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmManyToOne.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -0,0 +1,14 @@
+namespace NHibernate.Cfg.MappingSchema
+{
+ public partial class HbmManyToOne : IEntityPropertyMapping
+ {
+ #region Implementation of IEntityPropertyMapping
+
+ public string Name
+ {
+ get { return name; }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMap.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMap.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMap.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -0,0 +1,14 @@
+namespace NHibernate.Cfg.MappingSchema
+{
+ public partial class HbmMap : ICollectionPropertyMapping
+ {
+ #region Implementation of IEntityPropertyMapping
+
+ public string Name
+ {
+ get { return name; }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmNaturalId.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmNaturalId.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmNaturalId.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace NHibernate.Cfg.MappingSchema
+{
+ public partial class HbmNaturalId: IPropertiesContainerMapping
+ {
+ #region Implementation of IPropertiesContainerMapping
+
+ public IEnumerable<IEntityPropertyMapping> Properties
+ {
+ get { return Items.Cast<IEntityPropertyMapping>(); }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmOneToOne.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmOneToOne.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmOneToOne.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -0,0 +1,14 @@
+namespace NHibernate.Cfg.MappingSchema
+{
+ public partial class HbmOneToOne : IEntityPropertyMapping
+ {
+ #region Implementation of IEntityPropertyMapping
+
+ public string Name
+ {
+ get { return name; }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmPrimitiveArray.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmPrimitiveArray.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmPrimitiveArray.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -0,0 +1,15 @@
+namespace NHibernate.Cfg.MappingSchema
+{
+ public partial class HbmPrimitiveArray : ICollectionPropertyMapping
+ {
+ #region Implementation of IEntityPropertyMapping
+
+ public string Name
+ {
+ get { return name; }
+ }
+
+ #endregion
+
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmProperty.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmProperty.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmProperty.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -0,0 +1,14 @@
+namespace NHibernate.Cfg.MappingSchema
+{
+ public partial class HbmProperty : IEntityPropertyMapping
+ {
+ #region Implementation of IEntityPropertyMapping
+
+ public string Name
+ {
+ get { return name; }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSet.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSet.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSet.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -0,0 +1,14 @@
+namespace NHibernate.Cfg.MappingSchema
+{
+ public partial class HbmSet : ICollectionPropertyMapping
+ {
+ #region Implementation of IEntityPropertyMapping
+
+ public string Name
+ {
+ get { return name; }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSubclass.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSubclass.cs 2009-11-29 13:10:49 UTC (rev 4872)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSubclass.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -1,3 +1,6 @@
+using System.Collections.Generic;
+using System.Linq;
+
namespace NHibernate.Cfg.MappingSchema
{
public partial class HbmSubclass : AbstractDecoratable, IEntityMapping, IEntityDiscriminableMapping
@@ -113,5 +116,13 @@
#endregion
+ #region Implementation of IPropertiesContainerMapping
+
+ public IEnumerable<IEntityPropertyMapping> Properties
+ {
+ get { return Items.Cast<IEntityPropertyMapping>(); }
+ }
+
+ #endregion
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmUnionSubclass.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmUnionSubclass.cs 2009-11-29 13:10:49 UTC (rev 4872)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmUnionSubclass.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -1,3 +1,6 @@
+using System.Collections.Generic;
+using System.Linq;
+
namespace NHibernate.Cfg.MappingSchema
{
public partial class HbmUnionSubclass : AbstractDecoratable, IEntityMapping
@@ -104,5 +107,13 @@
#endregion
+ #region Implementation of IPropertiesContainerMapping
+
+ public IEnumerable<IEntityPropertyMapping> Properties
+ {
+ get { return Items.Cast<IEntityPropertyMapping>(); }
+ }
+
+ #endregion
}
}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/ICollectionPropertyMapping.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/ICollectionPropertyMapping.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/ICollectionPropertyMapping.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -0,0 +1,7 @@
+namespace NHibernate.Cfg.MappingSchema
+{
+ public interface ICollectionPropertyMapping: IEntityPropertyMapping
+ {
+
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/IEntityMapping.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/IEntityMapping.cs 2009-11-29 13:10:49 UTC (rev 4872)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/IEntityMapping.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -1,6 +1,6 @@
namespace NHibernate.Cfg.MappingSchema
{
- public interface IEntityMapping : IDecoratable, IEntitySqlsMapping
+ public interface IEntityMapping : IDecoratable, IEntitySqlsMapping, IPropertiesContainerMapping
{
string EntityName { get; }
string Name { get; }
Added: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/IEntityPropertyMapping.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/IEntityPropertyMapping.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/IEntityPropertyMapping.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -0,0 +1,7 @@
+namespace NHibernate.Cfg.MappingSchema
+{
+ public interface IEntityPropertyMapping
+ {
+ string Name { get; }
+ }
+}
\ No newline at end of file
Added: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/IPropertiesContainerMapping.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/IPropertiesContainerMapping.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/IPropertiesContainerMapping.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -0,0 +1,8 @@
+using System.Collections.Generic;
+namespace NHibernate.Cfg.MappingSchema
+{
+ public interface IPropertiesContainerMapping
+ {
+ IEnumerable<IEntityPropertyMapping> Properties { get; }
+ }
+}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/Binder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/Binder.cs 2009-11-29 13:10:49 UTC (rev 4872)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/Binder.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -148,7 +148,14 @@
protected static XmlNode Serialize<T>(T hbmElement)
{
// TODO : this method is only for TEMPORAL usage; should be removed after refactorize all binders
- var serializer = new XmlSerializer(typeof (T));
+ var xmlTypeMapping = typeof (T);
+ return Serialize(xmlTypeMapping, hbmElement);
+ }
+
+ protected static XmlNode Serialize(System.Type xmlTypeMapping, object hbmElement)
+ {
+ // TODO : this method is only for TEMPORAL usage; should be removed after refactorize all binders
+ var serializer = new XmlSerializer(xmlTypeMapping);
using (var memStream = new MemoryStream(2000))
using (var xmlWriter = XmlWriter.Create(memStream))
{
Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs 2009-11-29 13:10:49 UTC (rev 4872)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/CollectionBinder.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -7,14 +7,30 @@
using NHibernate.Util;
using Array = NHibernate.Mapping.Array;
+using NHibernate.Cfg.MappingSchema;
namespace NHibernate.Cfg.XmlHbmBinding
{
public class CollectionBinder : ClassBinder
{
+ private static readonly HashSet<System.Type> SupportedCollections = new HashSet<System.Type>
+ {
+ typeof (HbmMap),
+ typeof (HbmBag),
+ typeof (HbmIdbag),
+ typeof (HbmSet),
+ typeof (HbmList),
+ typeof (HbmArray),
+ typeof (HbmPrimitiveArray)
+ };
private readonly IDictionary<string, CreateCollectionCommand> createCollectionCommands =
new Dictionary<string, CreateCollectionCommand>();
+ public static bool IsSupported(System.Type type)
+ {
+ return SupportedCollections.Contains(type);
+ }
+
public CollectionBinder(ClassBinder parent)
: base(parent)
{
@@ -37,6 +53,49 @@
return createCollectionCommands.ContainsKey(xmlTagName);
}
+ public Mapping.Collection Create(ICollectionPropertyMapping collectionMapping, string className,
+ string path, PersistentClass owner, System.Type containingType, IDictionary<string, MetaAttribute> inheritedMetas)
+ {
+ var collectionType = collectionMapping.GetType();
+ if (collectionType == typeof (HbmBag))
+ {
+ return createCollectionCommands["bag"](Serialize(typeof (HbmBag), collectionMapping), className, path, owner,
+ containingType, inheritedMetas);
+ }
+ else if (collectionType == typeof (HbmSet))
+ {
+ return createCollectionCommands["set"](Serialize(typeof(HbmSet), collectionMapping), className, path, owner,
+ containingType, inheritedMetas);
+ }
+ else if (collectionType == typeof (HbmList))
+ {
+ return createCollectionCommands["list"](Serialize(typeof(HbmList), collectionMapping), className, path, owner,
+ containingType, inheritedMetas);
+ }
+ else if (collectionType == typeof (HbmMap))
+ {
+ return createCollectionCommands["map"](Serialize(typeof(HbmMap), collectionMapping), className, path, owner,
+ containingType, inheritedMetas);
+ }
+ else if (collectionType == typeof (HbmIdbag))
+ {
+ return createCollectionCommands["idbag"](Serialize(typeof(HbmIdbag), collectionMapping), className, path, owner,
+ containingType, inheritedMetas);
+ }
+ else if (collectionType == typeof (HbmArray))
+ {
+ return createCollectionCommands["array"](Serialize(typeof(HbmArray), collectionMapping), className, path, owner,
+ containingType, inheritedMetas);
+ }
+ else if (collectionType == typeof (HbmPrimitiveArray))
+ {
+ return createCollectionCommands["primitive-array"](Serialize(typeof(HbmPrimitiveArray), collectionMapping), className, path, owner,
+ containingType, inheritedMetas);
+ }
+ throw new MappingException("Not supported collection mapping element:" + collectionType);
+ }
+
+
public Mapping.Collection Create(string xmlTagName, XmlNode node, string className,
string path, PersistentClass owner, System.Type containingType, IDictionary<string, MetaAttribute> inheritedMetas)
{
Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs 2009-11-29 13:10:49 UTC (rev 4872)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs 2009-11-29 16:08:44 UTC (rev 4873)
@@ -55,7 +55,6 @@
BindVersion(classSchema.Version, rootClass, table, inheritedMetas);
rootClass.CreatePrimaryKey(dialect);
-
PropertiesFromXML(node, rootClass, inheritedMetas);
mappings.AddClass(rootClass);
}
Modified: trunk/nhibernate/src/NHibernate/NHibernate.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate/NHibernate.csproj 2009-11-29 13:10:49 UTC (rev 4872)
+++ trunk/nhibernate/src/NHibernate/NHibernate.csproj 2009-11-29 16:08:44 UTC (rev 4873)
@@ -494,14 +494,30 @@
<Compile Include="Cfg\Loquacious\ITypeDefConfiguration.cs" />
<Compile Include="Cfg\Loquacious\MappingsConfiguration.cs" />
<Compile Include="Cfg\Loquacious\ProxyConfiguration.cs" />
+ <Compile Include="Cfg\MappingSchema\HbmAny.cs" />
+ <Compile Include="Cfg\MappingSchema\HbmArray.cs" />
+ <Compile Include="Cfg\MappingSchema\HbmBag.cs" />
+ <Compile Include="Cfg\MappingSchema\HbmComponent.cs" />
<Compile Include="Cfg\MappingSchema\HbmDefinition.cs" />
<Compile Include="Cfg\MappingSchema\HbmExtensions.cs" />
+ <Compile Include="Cfg\MappingSchema\HbmIdbag.cs" />
<Compile Include="Cfg\MappingSchema\HbmJoinedSubclass.cs" />
+ <Compile Include="Cfg\MappingSchema\HbmList.cs" />
+ <Compile Include="Cfg\MappingSchema\HbmManyToOne.cs" />
+ <Compile Include="Cfg\MappingSchema\HbmMap.cs" />
+ <Compile Include="Cfg\MappingSchema\HbmNaturalId.cs" />
+ <Compile Include="Cfg\MappingSchema\HbmOneToOne.cs" />
+ <Compile Include="Cfg\MappingSchema\HbmPrimitiveArray.cs" />
+ <Compile Include="Cfg\MappingSchema\HbmProperty.cs" />
+ <Compile Include="Cfg\MappingSchema\HbmSet.cs" />
<Compile Include="Cfg\MappingSchema\HbmSubclass.cs" />
<Compile Include="Cfg\MappingSchema\HbmUnionSubclass.cs" />
+ <Compile Include="Cfg\MappingSchema\ICollectionPropertyMapping.cs" />
<Compile Include="Cfg\MappingSchema\IEntityDiscriminableMapping.cs" />
<Compile Include="Cfg\MappingSchema\IEntityMapping.cs" />
+ <Compile Include="Cfg\MappingSchema\IEntityPropertyMapping.cs" />
<Compile Include="Cfg\MappingSchema\IEntitySqlsMapping.cs" />
+ <Compile Include="Cfg\MappingSchema\IPropertiesContainerMapping.cs" />
<Compile Include="Cfg\SchemaAutoAction.cs" />
<Compile Include="Cfg\SessionFactoryConfigurationBase.cs" />
<Compile Include="Cfg\ISessionFactoryConfiguration.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
