[portal-commits] JBoss Portal SVN: r11472 - in branches/JBoss_Portal_Branch_2_6: core/src/resources/portal-core-sar/conf/hibernate/portal and 1 other directories.

Author: thomas.heute(a)jboss.com Date: 2008-07-17 06:10:18 -0400 (Thu, 17 Jul 2008) New Revision: 11472 Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/instance/domain.hbm.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml branches/JBoss_Portal_Branch_2_6/jems/src/main/org/jboss/portal/jems/hibernate/DialectFactory.java Log: Fixes for Sybase ASE Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/instance/domain.hbm.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/instance/domain.hbm.xml 2008-07-17 08:12:53 UTC (rev 11471) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/instance/domain.hbm.xml 2008-07-17 10:10:18 UTC (rev 11472) @@ -60,7 +60,7 @@ column="SER_STATE" not-null="false" unique="false" - length="50000000"/> + length="16384"/> <map name="relatedSecurityBindings" sort="unsorted" @@ -69,7 +69,7 @@ fetch="join"> <cache usage=&quot;@portal.hibernate.cache.usage(a)&quot;/&gt; <key column="INSTANCE_PK"/> - <index column="ROLE" type="string"/> + <index column="`ROLE`" type="string"/> <one-to-many class="org.jboss.portal.core.impl.model.instance.persistent.PersistentRoleSecurityBinding"/> </map> <map @@ -117,7 +117,7 @@ column="SER_STATE" not-null="false" unique="false" - length="50000000"/> + length="16384"/> <properties name="user_and_portlet_ref" unique="true"> @@ -148,7 +148,7 @@ </id> <property name="role" - column="ROLE" + column="`ROLE`" not-null="true" unique="false"/> <set Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml 2008-07-17 08:12:53 UTC (rev 11471) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml 2008-07-17 10:10:18 UTC (rev 11472) @@ -41,7 +41,7 @@ <natural-id> <property name="path" - column="PATH" + column="`PATH`" type="org.jboss.portal.core.impl.model.portal.PortalObjectIdUserType" not-null="false" unique="false"/> @@ -83,7 +83,7 @@ <cache usage=&quot;@portal.hibernate.cache.usage(a)&quot;/&gt; <key column="NODE_KEY"/> <index - column="ROLE" + column="`ROLE`" type="string"/> <one-to-many class="org.jboss.portal.core.impl.model.portal.ObjectNodeSecurityConstraint"/> </map> @@ -191,7 +191,7 @@ </id> <property name="role" - column="ROLE" + column="`ROLE`" not-null="true" unique="false"/> <set Modified: branches/JBoss_Portal_Branch_2_6/jems/src/main/org/jboss/portal/jems/hibernate/DialectFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/jems/src/main/org/jboss/portal/jems/hibernate/DialectFactory.java 2008-07-17 08:12:53 UTC (rev 11471) +++ branches/JBoss_Portal_Branch_2_6/jems/src/main/org/jboss/portal/jems/hibernate/DialectFactory.java 2008-07-17 10:10:18 UTC (rev 11472) @@ -98,22 +98,20 @@ MAPPERS.put("DB2/NT", new VersionInsensitiveMapper("org.hibernate.dialect.DB2Dialect")); MAPPERS.put("MySQL", new VersionInsensitiveMapper("org.hibernate.dialect.MySQLDialect")); MAPPERS.put("PostgreSQL", new VersionInsensitiveMapper("org.hibernate.dialect.PostgreSQLDialect")); - MAPPERS.put("Microsoft SQL Server Database", new VersionInsensitiveMapper("org.hibernate.dialect.SQLServerDialect")); + MAPPERS.put("Microsoft SQL Server Database", new VersionInsensitiveMapper( + "org.hibernate.dialect.SQLServerDialect")); MAPPERS.put("Microsoft SQL Server", new VersionInsensitiveMapper("org.hibernate.dialect.SQLServerDialect")); MAPPERS.put("Sybase SQL Server", new VersionInsensitiveMapper("org.hibernate.dialect.SybaseDialect")); + MAPPERS.put("Adaptive Server Enterprise", new VersionInsensitiveMapper("org.hibernate.dialect.SybaseDialect")); MAPPERS.put("Informix Dynamic Server", new VersionInsensitiveMapper("org.hibernate.dialect.InformixDialect")); - MAPPERS.put( - "Oracle", - new DatabaseDialectMapper() + MAPPERS.put("Oracle", new DatabaseDialectMapper() + { + public String getDialectClass(int majorVersion) { - public String getDialectClass(int majorVersion) - { - return majorVersion > 8 - ? "org.hibernate.dialect.Oracle9Dialect" - : "org.hibernate.dialect.OracleDialect"; - } + return majorVersion > 8 ? "org.hibernate.dialect.Oracle9Dialect" : "org.hibernate.dialect.OracleDialect"; } - ); + }); + } }