Author: julien_viet Date: 2010-01-23 16:51:00 -0500 (Sat, 23 Jan 2010) New Revision: 1433 Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties portal/trunk/component/common/src/main/java/conf/configuration.properties portal/trunk/component/common/src/main/java/conf/configuration.xml 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/database/database-configuration.tmpl.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.tmpl.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/local/repository-configuration.tmpl.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/local/repository-configuration.xml Log: - factor configuration of JNDI name of data source in properties file - use java: namespace for datasource name in JBoss AS Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-01-23 18:44:38 UTC (rev 1432) +++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-01-23 21:51:00 UTC (rev 1433) @@ -17,6 +17,9 @@ # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # +# Datasource name +gatein.datasource.name=java:jdbcexo + # Data gatein.data.dir=${jboss.server.data.dir}/gatein Modified: portal/trunk/component/common/src/main/java/conf/configuration.properties =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration.properties 2010-01-23 18:44:38 UTC (rev 1432) +++ portal/trunk/component/common/src/main/java/conf/configuration.properties 2010-01-23 21:51:00 UTC (rev 1433) @@ -17,6 +17,9 @@ # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # +# Datasource name +gatein.datasource.name=jdbcexo + # Data gatein.data.dir=../temp Modified: portal/trunk/component/common/src/main/java/conf/configuration.xml =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration.xml 2010-01-23 18:44:38 UTC (rev 1432) +++ portal/trunk/component/common/src/main/java/conf/configuration.xml 2010-01-23 21:51:00 UTC (rev 1433) @@ -29,7 +29,7 @@ <key>org.exoplatform.container.PropertyConfigurator</key> <type>org.exoplatform.container.PropertyConfigurator</type> <init-params> - <value-param> + <value-param profiles="tomcat"> <name>properties.url</name> <value>jar:/conf/configuration.properties</value> </value-param> 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-01-23 18:44:38 UTC (rev 1432) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2010-01-23 21:51:00 UTC (rev 1433) @@ -29,7 +29,7 @@ <workspace name="sample-ws"> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> <properties> - <property name="source-name" value="jdbcexo${container.name.suffix}" /> + <property name="source-name" value="${gatein.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-01-23 18:44:38 UTC (rev 1432) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2010-01-23 21:51:00 UTC (rev 1433) @@ -29,7 +29,7 @@ <workspace name="sample-ws"> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> <properties> - <property name="source-name" value="jdbcexo${container.name.suffix}" /> + <property name="source-name" value="${gatein.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/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.tmpl.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.tmpl.xml 2010-01-23 18:44:38 UTC (rev 1432) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.tmpl.xml 2010-01-23 21:51:00 UTC (rev 1433) @@ -33,12 +33,14 @@ <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.url" value="${connectionUrl}"/> - <property name="hibernate.connection.driver_class" value="${driverClass}"/> + <property name="hibernate.connection.datasource" value="${gatein.datasource.name}${container.name.suffix}"/> <property name="hibernate.connection.autocommit" value="true"/> - <property name="hibernate.connection.username" value="${username}"/> - <property name="hibernate.connection.password" value="${password}"/> <property name="hibernate.dialect" value="${dialect}"/> <property name="hibernate.c3p0.min_size" value="5"/> <property name="hibernate.c3p0.max_size" value="20"/> @@ -48,25 +50,6 @@ </init-params> </component> - <!-- - <component> - <key>org.exoplatform.services.database.DatabaseService</key> - <type>org.exoplatform.services.database.impl.XAPoolTxSupportDatabaseService</type> - <init-params> - <properties-param> - <name>default</name> - <description>Connection configuration</description> - <property name='connection.driver' value='${driverClass}'/> - <property name='connection.url' value='${connectionUrl}'/> - <property name='connection.login' value='${username}'/> - <property name='connection.password' value='${password}'/> - <property name='connection.min-size' value='3'/> - <property name='connection.max-size' value='5'/> - </properties-param> - </init-params> - </component> - --> - <external-component-plugins> <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> <component-plugin> @@ -76,7 +59,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcexo${container.name.suffix}</value> + <value>${gatein.datasource.name}${container.name.suffix}</value> </value-param> <value-param> <name>class-name</name> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml 2010-01-23 18:44:38 UTC (rev 1432) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml 2010-01-23 21:51:00 UTC (rev 1433) @@ -39,7 +39,7 @@ <!--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="jdbcexo${container.name.suffix}"/> + <property name="hibernate.connection.datasource" value="${gatein.datasource.name}${container.name.suffix}"/> <property name="hibernate.connection.autocommit" value="true"/> <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> <property name="hibernate.c3p0.min_size" value="5"/> @@ -59,7 +59,7 @@ <init-params> <value-param> <name>bind-name</name> - <value>jdbcexo${container.name.suffix}</value> + <value>${gatein.datasource.name}${container.name.suffix}</value> </value-param> <value-param> <name>class-name</name> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.tmpl.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.tmpl.xml 2010-01-23 18:44:38 UTC (rev 1432) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.tmpl.xml 2010-01-23 21:51:00 UTC (rev 1433) @@ -37,7 +37,7 @@ <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="jdbcexo${container.name.suffix}"/> + <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/> <property name="dialect" value="${dialect}"/> </properties-param> </init-params> 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-01-23 18:44:38 UTC (rev 1432) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-01-23 21:51:00 UTC (rev 1433) @@ -37,7 +37,7 @@ <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="jdbcexo${container.name.suffix}"/> + <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/> <property name="dialect" value="hsqldb"/> </properties-param> </init-params> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/local/repository-configuration.tmpl.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/local/repository-configuration.tmpl.xml 2010-01-23 18:44:38 UTC (rev 1432) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/local/repository-configuration.tmpl.xml 2010-01-23 21:51:00 UTC (rev 1433) @@ -31,7 +31,7 @@ <workspace name="system"> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> <properties> - <property name="source-name" value="jdbcexo${container.name.suffix}"/> + <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/> <property name="dialect" value="${dialect}"/> <property name="multi-db" value="false"/> <property name="update-storage" value="true"/> @@ -77,7 +77,7 @@ <workspace name="portal-system"> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> <properties> - <property name="source-name" value="jdbcexo${container.name.suffix}"/> + <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/> <property name="dialect" value="${dialect}"/> <property name="multi-db" value="false"/> <property name="update-storage" value="true"/> @@ -123,7 +123,7 @@ <workspace name="portal-work"> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> <properties> - <property name="source-name" value="jdbcexo${container.name.suffix}"/> + <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/> <property name="dialect" value="${dialect}"/> <property name="multi-db" value="false"/> <property name="update-storage" value="true"/> @@ -169,7 +169,7 @@ <workspace name="wsrp-system"> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> <properties> - <property name="source-name" value="jdbcexo${container.name.suffix}"/> + <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/> <property name="dialect" value="${dialect}"/> <property name="multi-db" value="false"/> <property name="update-storage" value="true"/> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/local/repository-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/local/repository-configuration.xml 2010-01-23 18:44:38 UTC (rev 1432) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/local/repository-configuration.xml 2010-01-23 21:51:00 UTC (rev 1433) @@ -31,7 +31,7 @@ <workspace name="system"> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> <properties> - <property name="source-name" value="jdbcexo${container.name.suffix}"/> + <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/> <property name="dialect" value="hsqldb"/> <property name="multi-db" value="false"/> <property name="update-storage" value="true"/> @@ -77,7 +77,7 @@ <workspace name="portal-system"> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> <properties> - <property name="source-name" value="jdbcexo${container.name.suffix}"/> + <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/> <property name="dialect" value="hsqldb"/> <property name="multi-db" value="false"/> <property name="update-storage" value="true"/> @@ -123,7 +123,7 @@ <workspace name="portal-work"> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> <properties> - <property name="source-name" value="jdbcexo${container.name.suffix}"/> + <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/> <property name="dialect" value="hsqldb"/> <property name="multi-db" value="false"/> <property name="update-storage" value="true"/> @@ -169,7 +169,7 @@ <workspace name="wsrp-system"> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> <properties> - <property name="source-name" value="jdbcexo${container.name.suffix}"/> + <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/> <property name="dialect" value="hsqldb"/> <property name="multi-db" value="false"/> <property name="update-storage" value="true"/>