Author: thomas.heute(a)jboss.com Date: 2009-07-23 03:25:55 -0400 (Thu, 23 Jul 2009) New Revision: 13594 Modified: branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/security/AuthorizationProviderImpl.java modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-beans-security-test.xml modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-beans-security.xml Log: JBEPP-98: SQLException on user login if hibernate schema name is specified Rollback and use Martin's solution. (Weird service ordering issue) Modified: branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2009-07-22 23:10:45 UTC (rev 13593) +++ branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2009-07-23 07:25:55 UTC (rev 13594) @@ -474,7 +474,6 @@ <attribute name="CmsRootUserName">admin</attribute> <attribute name="CmsSessionFactory">java:/portal/cms/CMSSessionFactory</attribute> <depends optional-attribute-name="IdentityServiceController" proxy-type="attribute">portal:service=Module,type=IdentityServiceController</depends> - <depends optional-attribute-name="SessionFactoryBinder" proxy-type="attribute">portal:service=Hibernate,type=CMS</depends> </mbean> <!-- ACL Security Interceptor --> Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/security/AuthorizationProviderImpl.java =================================================================== --- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/security/AuthorizationProviderImpl.java 2009-07-22 23:10:45 UTC (rev 13593) +++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/security/AuthorizationProviderImpl.java 2009-07-23 07:25:55 UTC (rev 13594) @@ -25,6 +25,7 @@ import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.Transaction; +import org.jboss.mx.util.MBeanProxy; import org.jboss.portal.cms.util.HibernateUtil; import org.jboss.portal.cms.impl.jcr.JCRCMS; import org.jboss.portal.identity.AnonymousRole; @@ -46,6 +47,7 @@ import org.jboss.portal.security.spi.provider.SecurityConfigurationException; import org.jboss.portal.security.impl.jacc.JACCPortalPrincipal; +import javax.management.ObjectName; import javax.security.auth.Subject; import javax.security.jacc.PolicyContext; import javax.security.jacc.PolicyContextException; @@ -65,8 +67,6 @@ { private IdentityServiceController identityServiceController = null; - private HibernateProvider sessionFactoryBinder = null; - private MembershipModule membershipModule = null; private UserModule userModule = null; @@ -77,6 +77,8 @@ private String cmsSessionFactory = null; + private String schemaName = null; + /** * */ @@ -88,6 +90,12 @@ IdentityContext.TYPE_MEMBERSHIP_MODULE); this.userModule = (UserModule)identityServiceController .getIdentityContext().getObject(IdentityContext.TYPE_USER_MODULE); + + HibernateProvider hibernateProvider = (HibernateProvider)MBeanProxy.get(HibernateProvider.class, new ObjectName("portal:service=Hibernate,type=Instance"), getServer()); + if(hibernateProvider!=null) + { + schemaName = hibernateProvider.getConfig().getProperty("hibernate.default_schema"); + } } // ------AuthorizationDomain @@ -331,16 +339,6 @@ this.identityServiceController = identityServiceController; } - public HibernateProvider getSessionFactoryBinder() - { - return sessionFactoryBinder; - } - - public void setSessionFactoryBinder(HibernateProvider sessionFactoryBinder) - { - this.sessionFactoryBinder = sessionFactoryBinder; - } - // -------------------------------------------------------------------------------------------------------------- /** * Stores a permission and its associations into peristent storage @@ -452,8 +450,6 @@ if (this.userModule instanceof HibernateUserModuleImpl) { - - String schemaName = sessionFactoryBinder.getConfig().getProperty("hibernate.default_schema"); String schemaPrefix = (schemaName!=null ? schemaName+"." : ""); // in case of a database version, use the cache optimized way to Modified: modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-beans-security-test.xml =================================================================== --- modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-beans-security-test.xml 2009-07-22 23:10:45 UTC (rev 13593) +++ modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-beans-security-test.xml 2009-07-23 07:25:55 UTC (rev 13594) @@ -120,16 +120,9 @@ <property name="identitySessionFactory">java:/SessionFactory</property> </bean> - <bean name="SessionFactoryBinder" class="org.jboss.portal.jems.hibernate.SessionFactoryBinder"> - <property name="doChecking">true</property> - <property name="configLocation">hibernate.cfg.xml</property> - <property name="JNDIName">java:/portal/cms/CMSSessionFactory</property> - </bean> - <!-- setup for cms security testing --> <bean name="AuthorizationProvider" class="org.jboss.portal.cms.security.AuthorizationProviderImpl"> <property name="identityServiceController"><inject bean="IdentityServiceController"/></property> - <property name="sessionFactoryBinder"><inject bean="SessionFactoryBinder"/></property> <property name="cmsRootUserName">admin</property> <property name="cmsSessionFactory">java:/SessionFactory</property> </bean> Modified: modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-beans-security.xml =================================================================== --- modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-beans-security.xml 2009-07-22 23:10:45 UTC (rev 13593) +++ modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-beans-security.xml 2009-07-23 07:25:55 UTC (rev 13594) @@ -120,20 +120,13 @@ <property name="identitySessionFactory">java:/SessionFactory</property> </bean> - <bean name="SessionFactoryBinder" class="org.jboss.portal.jems.hibernate.SessionFactoryBinder"> - <property name="doChecking">true</property> - <property name="configLocation">hibernate.cfg.xml</property> - <property name="JNDIName">java:/portal/cms/CMSSessionFactory</property> - </bean> - <!-- setup for cms security testing --> <bean name="AuthorizationProvider" class="org.jboss.portal.cms.security.AuthorizationProviderImpl"> <property name="identityServiceController"><inject bean="IdentityServiceController"/></property> - <property name="sessionFactoryBinder"><inject bean="SessionFactoryBinder"/></property> <property name="cmsRootUserName">admin</property> <property name="cmsSessionFactory">java:/SessionFactory</property> </bean> - + <bean name="AuthorizationManager" class="org.jboss.portal.cms.security.AuthorizationManagerImpl"> <property name="provider"><inject bean="AuthorizationProvider"/></property> <property name="JNDIName">java:portal/cms/AuthorizationManager</property>