Author: thomas.heute(a)jboss.com Date: 2010-09-02 12:35:39 -0400 (Thu, 02 Sep 2010) New Revision: 4037 Modified: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/configuration-jboss.properties epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml Log: JBEPP-453: EPP 5.1 productization Modified: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/configuration-jboss.properties =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/configuration-jboss.properties 2010-09-02 15:40:06 UTC (rev 4036) +++ epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/configuration-jboss.properties 2010-09-02 16:35:39 UTC (rev 4037) @@ -25,12 +25,8 @@ # JCR gatein.jcr.config.type=local -gatein.jcr.datasource.name=java:jdbcjcr +gatein.jcr.datasource.name=java:gatein-jcr gatein.jcr.datasource.dialect=auto -gatein.jcr.datasource.driver=org.hsqldb.jdbcDriver -gatein.jcr.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcjcr_${name} -gatein.jcr.datasource.username=sa -gatein.jcr.datasource.password= gatein.jcr.data.dir=${gatein.data.dir}/jcr gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values @@ -42,11 +38,7 @@ gatein.jcr.jgroups.config=classpath:/conf/jcr/jbosscache/cluster/udp-mux.xml # IDM -gatein.idm.datasource.name=java:jdbcidm -gatein.idm.datasource.driver=org.hsqldb.jdbcDriver -gatein.idm.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm_${name} -gatein.idm.datasource.username=sa -gatein.idm.datasource.password= +gatein.idm.datasource.name=java:gatein-idm # EMail gatein.email.smtp.username= Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-09-02 15:40:06 UTC (rev 4036) +++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-09-02 16:35:39 UTC (rev 4037) @@ -129,37 +129,6 @@ </external-component-plugins> <external-component-plugins> - <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>${gatein.jcr.datasource.name}${container.name.suffix}</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="${portal.container.gatein.jcr.datasource.driver}"/> - <property name="url" value="${portal.container.gatein.jcr.datasource.url}"/> - <property name="username" value="${portal.container.gatein.jcr.datasource.username}"/> - <property name="password" value="${portal.container.gatein.jcr.datasource.password}"/> - </properties-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <external-component-plugins> <target-component>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</target-component> <component-plugin> <name>addPaths</name> Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-09-02 15:40:06 UTC (rev 4036) +++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-09-02 16:35:39 UTC (rev 4037) @@ -42,8 +42,9 @@ <property name="hibernate.current_session_context_class" value="thread"/> <property name="hibernate.cache.use_second_level_cache" value="true"/> <property name="hibernate.cache.use_query_cache" value="true"/> - <!--CHANGEME HashtableCacheProvider shold not be used in production env--> - <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> + <property name="hibernate.cache.region.jbc2.query.localonly" value="true" /> + <property name="hibernate.cache.region.factory_class" value="org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory" /> + <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup" /> <property name="hibernate.connection.datasource" value="${gatein.idm.datasource.name}${container.name.suffix}"/> <property name="hibernate.connection.autocommit" value="true"/> <!-- @@ -232,38 +233,6 @@ </component> <external-component-plugins> - <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>${gatein.idm.datasource.name}${container.name.suffix}</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="${portal.container.gatein.idm.datasource.driver}"/> - <property name="url" value="${portal.container.gatein.idm.datasource.url}"/> - <property name="username" value="${portal.container.gatein.idm.datasource.username}"/> - <property name="password" value="${portal.container.gatein.idm.datasource.password}"/> - - </properties-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <external-component-plugins> <target-component>org.exoplatform.services.database.HibernateService</target-component> <component-plugin> <name>add.hibernate.mapping</name>