Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

NH-615 - update configuration schema name to nhibernate-configuration…

…-2.2.

SVN: trunk@2405
  • Loading branch information...
commit 386dc5b4425c42b47e06ebecbe7e8de386541778 1 parent 3543cc9
Sergey Koshcheyev authored
View
2  Documentation/NHibernateEg/Tutorial1B/hibernate.cfg.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<hibernate-configuration xmlns="urn:nhibernate-configuration-2.0" >
+<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2" >
<session-factory name="NHibernateEg">
<property name="connection.provider">NHibernate.Connection.DriverConnectionProvider</property>
View
4 doc/reference/modules/configuration.xml
@@ -160,7 +160,7 @@ ISession session = sessions.OpenSession(conn);
<literal>hibernate-configuration</literal> and its handler set to
<literal>NHibernate.Cfg.ConfigurationSectionHandler</literal>.
The XML namespace of the section should be set to
- <literal>urn:nhibernate-configuration-2.0</literal>.
+ <literal>urn:nhibernate-configuration-2.2</literal>.
</para>
</listitem>
<listitem>
@@ -843,7 +843,7 @@ ISession session = sessions.OpenSession(conn);
</para>
<programlisting><![CDATA[<?xml version='1.0' encoding='utf-8'?>
-<hibernate-configuration xmlns="urn:nhibernate-configuration-2.0">
+<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
<!-- an ISessionFactory instance -->
<session-factory>
View
2  doc/reference/modules/quickstart.xml
@@ -51,7 +51,7 @@
</configSections>
<!-- Add this element -->
- <hibernate-configuration xmlns="urn:nhibernate-configuration-2.0">
+ <hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
<session-factory>
<property name="dialect">NHibernate.Dialect.MsSql2000Dialect</property>
<property name="connection.provider">NHibernate.Connection.DriverConnectionProvider</property>
View
2  src/NHibernate.Examples/hibernate.cfg.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-configuration xmlns="urn:nhibernate-configuration-2.0" >
+<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2" >
<session-factory name="NHibernate.Test">
<!-- properties -->
<property name="connection.provider">NHibernate.Connection.DriverConnectionProvider</property>
View
8 src/NHibernate.Test/CfgTest/ConfigurationFixture.cs
@@ -116,7 +116,7 @@ public void InvalidXmlInCfgFile()
public void EmptyPropertyTag()
{
string xml = @"<?xml version='1.0' encoding='utf-8' ?>
-<hibernate-configuration xmlns='urn:nhibernate-configuration-2.0'>
+<hibernate-configuration xmlns='urn:nhibernate-configuration-2.2'>
<session-factory name='NHibernate.Test'>
<property name='connection.provider'></property>
</session-factory>
@@ -135,7 +135,7 @@ public void EmptyPropertyTag()
public void CacheConfigurationForUnmappedClass()
{
string cfgString = @"<?xml version='1.0' encoding='utf-8' ?>
- <hibernate-configuration xmlns='urn:nhibernate-configuration-2.0'>
+ <hibernate-configuration xmlns='urn:nhibernate-configuration-2.2'>
<session-factory>
<class-cache class='NHibernate.DomainModel.A, NHibernate.DomainModel' usage='read-write' region='xx' />
</session-factory>
@@ -150,7 +150,7 @@ public void CacheConfigurationForUnmappedClass()
public void CacheConfigurationForUnmappedCollection()
{
string cfgString = @"<?xml version='1.0' encoding='utf-8' ?>
- <hibernate-configuration xmlns='urn:nhibernate-configuration-2.0'>
+ <hibernate-configuration xmlns='urn:nhibernate-configuration-2.2'>
<session-factory>
<mapping resource='NHibernate.DomainModel.ABC.hbm.xml' assembly='NHibernate.DomainModel' />
<collection-cache collection='NHibernate.DomainModel.B.XX' usage='nonstrict-read-write' region='yy' />
@@ -175,7 +175,7 @@ public void NoSessionFactoriesInConfiguration()
public void CacheConfiguration()
{
string cfgString = @"<?xml version='1.0' encoding='utf-8' ?>
- <hibernate-configuration xmlns='urn:nhibernate-configuration-2.0'>
+ <hibernate-configuration xmlns='urn:nhibernate-configuration-2.2'>
<session-factory>
<mapping resource='NHibernate.DomainModel.ABC.hbm.xml' assembly='NHibernate.DomainModel' />
<class-cache class='NHibernate.DomainModel.A, NHibernate.DomainModel' usage='read-write' region='xx' />
View
2  src/NHibernate.Test/NHSpecificTest/NH720/Fixture.cs
@@ -22,7 +22,7 @@ public void CacheTest()
properties["expiration"] = "120";
FooCacheProvider.BuildCacheStatic("yy", properties);
string cfgString = @"<?xml version='1.0' encoding='utf-8' ?>
- <hibernate-configuration xmlns='urn:nhibernate-configuration-2.0'>
+ <hibernate-configuration xmlns='urn:nhibernate-configuration-2.2'>
<session-factory>
<property name='cache.provider_class'>NHibernate.Test.NHSpecificTest.NH720.FooCacheProvider, NHibernate.Test</property>
<mapping resource='NHibernate.Test.NHSpecificTest.NH720.Mappings.hbm.xml' assembly='NHibernate.Test' />
View
2  src/NHibernate.Test/hibernate.cfg.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-configuration xmlns="urn:nhibernate-configuration-2.0" >
+<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2" >
<session-factory name="NHibernate.Test">
<!-- properties -->
<property name="connection.provider">NHibernate.Connection.DriverConnectionProvider</property>
View
4 src/NHibernate/Cfg/Configuration.cs
@@ -48,9 +48,9 @@ public class Configuration
/// <summary>
/// The XML Namespace for the nhibernate-configuration
/// </summary>
- public static readonly string CfgSchemaXMLNS = "urn:nhibernate-configuration-2.0";
+ public static readonly string CfgSchemaXMLNS = "urn:nhibernate-configuration-2.2";
- private const string CfgSchemaResource = "NHibernate.nhibernate-configuration-2.0.xsd";
+ private const string CfgSchemaResource = "NHibernate.nhibernate-configuration-2.2.xsd";
private const string CfgNamespacePrefix = "cfg";
private string currentDocumentName;
View
9 src/NHibernate/NHibernate-2.0.csproj
@@ -458,9 +458,6 @@
<Compile Include="WrongClassException.cs" />
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="nhibernate-configuration-2.0.xsd">
- <SubType>Designer</SubType>
- </EmbeddedResource>
<EmbeddedResource Include="nhibernate-generic.xsd">
<SubType>Designer</SubType>
</EmbeddedResource>
@@ -724,6 +721,12 @@
<SubType>Code</SubType>
</Compile>
<Compile Include="Util\XmlHelper.cs" />
+ <EmbeddedResource Include="nhibernate-configuration-2.2.xsd">
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <None Include="nhibernate-configuration-2.2.xsx">
+ <DependentUpon>nhibernate-configuration-2.2.xsd</DependentUpon>
+ </None>
<None Include="nhibernate-generic.xsx">
<DependentUpon>nhibernate-generic.xsd</DependentUpon>
</None>
View
2  src/NHibernate/nhibernate-configuration-2.0.xsd → src/NHibernate/nhibernate-configuration-2.2.xsd
@@ -1,4 +1,4 @@
-<xs:schema targetNamespace='urn:nhibernate-configuration-2.0' xmlns='urn:nhibernate-configuration-2.0'
+<xs:schema targetNamespace='urn:nhibernate-configuration-2.2' xmlns='urn:nhibernate-configuration-2.2'
xmlns:xs='http://www.w3.org/2001/XMLSchema'>
<xs:annotation>
<xs:documentation>
Please sign in to comment.
Something went wrong with that request. Please try again.