9:45 a.m.
Author: julien_viet
Date: 2010-02-08 10:45:52 -0500 (Mon, 08 Feb 2010)
New Revision: 1557
Removed:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database/
Modified:
portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
Log:
GTNPORTAL-605 : Datasource separation
Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
===================================================================
---
portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-02-08
15:33:06 UTC (rev 1556)
+++
portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-02-08
15:45:52 UTC (rev 1557)
@@ -17,11 +17,6 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-# Datasource name
-gatein.datasource.name=java:jdbcexo
-gatein.datasource.dialect.hibernate=org.hibernate.dialect.HSQLDialect
-gatein.datasource.dialect.jcr=hsqldb
-
# Data
gatein.data.dir=${jboss.server.data.dir}/gatein
@@ -30,14 +25,16 @@
# JCR
gatein.jcr.config.type=local
-gatein.jcr.datasource.name=${gatein.datasource.name}
+gatein.jcr.datasource.name=jdbcjcr
+gatein.jcr.datasource.dialect=hsqldb
gatein.jcr.data.dir=${gatein.data.dir}/jcr
gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values
gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/jcrlucenedb
gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter
#IDM
-gatein.idm.datasource.name=${gatein.datasource.name}
+gatein.idm.datasource.name=jdbcidm
+gatein.idm.datasource.dialect=org.hibernate.dialect.HSQLDialect
# temporary here, need to remove it
jbosscache-cl-cache.jdbc.node.type=OBJECT
Modified:
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
===================================================================
---
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-02-08
15:33:06 UTC (rev 1556)
+++
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-02-08
15:45:52 UTC (rev 1557)
@@ -17,11 +17,6 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-# Datasource name
-gatein.datasource.name=jdbcexo
-gatein.datasource.dialect.hibernate=org.hibernate.dialect.HSQLDialect
-gatein.datasource.dialect.jcr=hsqldb
-
# Data
gatein.data.dir=../temp
@@ -30,14 +25,16 @@
# JCR
gatein.jcr.config.type=local
-gatein.jcr.datasource.name=${gatein.datasource.name}
+gatein.jcr.datasource.name=jdbcjcr
+gatein.jcr.datasource.dialect=hsqldb
gatein.jcr.data.dir=${gatein.data.dir}/jcr
gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values
gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/jcrlucenedb
gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter
#IDM
-gatein.idm.datasource.name=${gatein.datasource.name}
+gatein.idm.datasource.name=jdbcidm
+gatein.idm.datasource.dialect=org.hibernate.dialect.HSQLDialect
# temporary here, need to remove it
jbosscache-cl-cache.jdbc.node.type=OBJECT
Modified:
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml
===================================================================
---
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2010-02-08
15:33:06 UTC (rev 1556)
+++
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2010-02-08
15:45:52 UTC (rev 1557)
@@ -29,7 +29,7 @@
<workspace name="sample-ws">
<container
class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
- <property name="source-name"
value="${gatein.datasource.name}${container.name.suffix}" />
+ <property name="source-name"
value="${gatein.jcr.datasource.name}${container.name.suffix}" />
<property name="dialect" value="hsqldb" />
<property name="multi-db" value="false" />
<property name="update-storage" value="true" />
Modified:
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml
===================================================================
---
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2010-02-08
15:33:06 UTC (rev 1556)
+++
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2010-02-08
15:45:52 UTC (rev 1557)
@@ -29,7 +29,7 @@
<workspace name="sample-ws">
<container
class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
- <property name="source-name"
value="${gatein.datasource.name}${container.name.suffix}" />
+ <property name="source-name"
value="${gatein.jcr.datasource.namee}${container.name.suffix}" />
<property name="dialect" value="hsqldb" />
<property name="multi-db" value="false" />
<property name="update-storage" value="true" />
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2010-02-08
15:33:06 UTC (rev 1556)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2010-02-08
15:45:52 UTC (rev 1557)
@@ -29,7 +29,6 @@
<import
profiles="jboss">war:/conf/wsrp/wsrp-configuration.xml</import>
<import>war:/conf/common/logs-configuration.xml</import>
<import>war:/conf/common/autologin-configuration.xml</import>
- <import>war:/conf/database/database-configuration.xml</import>
<import>war:/conf/jcr/jcr-configuration.xml</import>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
===================================================================
---
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-02-08
15:33:06 UTC (rev 1556)
+++
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-02-08
15:45:52 UTC (rev 1557)
@@ -37,8 +37,8 @@
<name>working-conf</name>
<description>working-conf</description>
<property name="persister-class-name"
value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/>
- <property name="source-name"
value="${gatein.datasource.name}${container.name.suffix}"/>
- <property name="dialect"
value="${gatein.datasource.dialect.jcr}"/>
+ <property name="source-name"
value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
+ <property name="dialect"
value="${gatein.jcr.datasource.dialect}"/>
</properties-param>
</init-params>
</component>
@@ -124,4 +124,35 @@
</component-plugin>
</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="org.hsqldb.jdbcDriver"/>
+ <property name="url"
value="jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcjcr${container.name.suffix}"/>
+ <property name="username" value="sa"/>
+ <property name="password" value=""/>
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+
</configuration>
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
===================================================================
---
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-02-08
15:33:06 UTC (rev 1556)
+++
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-02-08
15:45:52 UTC (rev 1557)
@@ -31,8 +31,8 @@
<workspace name="system">
<container
class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
- <property name="source-name"
value="${gatein.datasource.name}${container.name.suffix}"/>
- <property name="dialect"
value="${gatein.datasource.dialect.jcr}"/>
+ <property name="source-name"
value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
+ <property name="dialect"
value="${gatein.jcr.datasource.dialect}"/>
<property name="multi-db" value="false"/>
<property name="update-storage" value="true"/>
<property name="max-buffer-size"
value="204800"/>
@@ -92,7 +92,7 @@
<property name="jbosscache-cl-cache.jdbc.node.type"
value="LONGBLOB" />
-->
<property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource"
value="${gatein.datasource.name}${container.name.suffix}" />
+ <property name="jbosscache-cl-cache.jdbc.datasource"
value="${gatein.jcr.datasource.name}${container.name.suffix}" />
</properties>
</lock-manager>
</workspace>
@@ -101,8 +101,8 @@
<workspace name="portal-system">
<container
class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
- <property name="source-name"
value="${gatein.datasource.name}${container.name.suffix}"/>
- <property name="dialect"
value="${gatein.datasource.dialect.jcr}"/>
+ <property name="source-name"
value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
+ <property name="dialect"
value="${gatein.jcr.datasource.dialect}"/>
<property name="multi-db" value="false"/>
<property name="update-storage" value="true"/>
<property name="max-buffer-size"
value="204800"/>
@@ -162,7 +162,7 @@
<property name="jbosscache-cl-cache.jdbc.node.type"
value="LONGBLOB" />
-->
<property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource"
value="${gatein.datasource.name}${container.name.suffix}" />
+ <property name="jbosscache-cl-cache.jdbc.datasource"
value="${gatein.jcr.datasource.name}${container.name.suffix}" />
</properties>
</lock-manager>
</workspace>
@@ -171,8 +171,8 @@
<workspace name="portal-work">
<container
class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
- <property name="source-name"
value="${gatein.datasource.name}${container.name.suffix}"/>
- <property name="dialect"
value="${gatein.datasource.dialect.jcr}"/>
+ <property name="source-name"
value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
+ <property name="dialect"
value="${gatein.jcr.datasource.dialect}"/>
<property name="multi-db" value="false"/>
<property name="update-storage" value="true"/>
<property name="max-buffer-size"
value="204800"/>
@@ -232,7 +232,7 @@
<property name="jbosscache-cl-cache.jdbc.node.type"
value="LONGBLOB" />
-->
<property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource"
value="${gatein.datasource.name}${container.name.suffix}" />
+ <property name="jbosscache-cl-cache.jdbc.datasource"
value="${gatein.jcr.datasource.name}${container.name.suffix}" />
</properties>
</lock-manager>
</workspace>
@@ -241,8 +241,8 @@
<workspace name="wsrp-system">
<container
class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
- <property name="source-name"
value="${gatein.datasource.name}${container.name.suffix}"/>
- <property name="dialect"
value="${gatein.datasource.dialect.jcr}"/>
+ <property name="source-name"
value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
+ <property name="dialect"
value="${gatein.jcr.datasource.dialect}"/>
<property name="multi-db" value="false"/>
<property name="update-storage" value="true"/>
<property name="max-buffer-size"
value="204800"/>
@@ -303,7 +303,7 @@
<property name="jbosscache-cl-cache.jdbc.node.type"
value="LONGBLOB" />
-->
<property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource"
value="${gatein.datasource.name}${container.name.suffix}" />
+ <property name="jbosscache-cl-cache.jdbc.datasource"
value="${gatein.jcr.datasource.name}${container.name.suffix}" />
</properties>
</lock-manager>
</workspace>
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
===================================================================
---
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-02-08
15:33:06 UTC (rev 1556)
+++
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-02-08
15:45:52 UTC (rev 1557)
@@ -25,6 +25,27 @@
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+ <component>
+ <key>org.exoplatform.services.database.HibernateService</key>
+ <jmx-name>database:type=HibernateService</jmx-name>
+ <type>org.exoplatform.services.database.impl.HibernateServiceImpl</type>
+ <init-params>
+ <properties-param>
+ <name>hibernate.properties</name>
+ <description>Default Hibernate Service</description>
+ <property name="hibernate.show_sql" value="false"/>
+ <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.cglib.use_reflection_optimizer"
value="true"/>
+ <property name="hibernate.connection.datasource"
value="${gatein.idm.datasource.name}${container.name.suffix}"/>
+ <property name="hibernate.connection.autocommit"
value="true"/>
+ <property name="hibernate.dialect"
value="${gatein.idm.datasource.dialect}"/>
+ </properties-param>
+ </init-params>
+ </component>
<component>
<key>org.exoplatform.services.organization.idm.PicketLinkIDMService</key>
@@ -124,6 +145,37 @@
</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="org.hsqldb.jdbcDriver"/>
+ <property name="url"
value="jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm${container.name.suffix}"/>
+ <property name="username" value="sa"/>
+ <property name="password" value=""/>
+ </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>
@@ -148,5 +200,4 @@
</component-plugin>
</external-component-plugins>
-
</configuration>