Author: mpodolin Date: 2009-12-01 10:40:52 -0500 (Tue, 01 Dec 2009) New Revision: 895 Modified: portal/branches/EPP_5_0_0_ER01_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml portal/branches/EPP_5_0_0_ER01_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml Log: Initial productization steps for EPP 5.0.0 ER1 Modified: portal/branches/EPP_5_0_0_ER01_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml =================================================================== --- portal/branches/EPP_5_0_0_ER01_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2009-12-01 15:21:22 UTC (rev 894) +++ portal/branches/EPP_5_0_0_ER01_Branch/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2009-12-01 15:40:52 UTC (rev 895) @@ -22,24 +22,24 @@ <repository-service default-repository="repository"> <repositories> <repository name="repository" system-workspace="system" default-workspace="portal-system"> - <security-domain>gatein-domain</security-domain> + <security-domain>exo-domain</security-domain> <access-control>optional</access-control> <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> <workspaces> <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${container.name.suffix}" /> <property name="dialect" value="hsqldb" /> <property name="multi-db" value="false" /> <property name="update-storage" value="true" /> <property name="max-buffer-size" value="204800" /> - <property name="swap-directory" value="../temp/swap/sample-ws${container.name.suffix}" /> + <property name="swap-directory" value="${jboss.server.data.dir}/gatein/swap/sample-ws${container.name.suffix}" /> </properties> <value-storages> <value-storage id="sample-ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="../temp/values/sample-ws${container.name.suffix}" /> + <property name="path" value="${jboss.server.data.dir}/gatein/values/sample-ws${container.name.suffix}" /> </properties> <filters> <filter property-type="Binary" /> @@ -62,14 +62,14 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> - <property name="index-dir" value="../temp/jcrlucenedb/sample-ws${container.name.suffix}" /> + <property name="index-dir" value="${jboss.server.data.dir}/gatein/jcrlucenedb/sample-ws${container.name.suffix}" /> </properties> </query-handler> <lock-manager> <time-out>15m</time-out><!-- 15min --> <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> <properties> - <property name="path" value="../temp/lock/sample-ws${container.name.suffix}" /> + <property name="path" value="${jboss.server.data.dir}/gatein/lock/sample-ws${container.name.suffix}" /> </properties> </persister> </lock-manager> Modified: portal/branches/EPP_5_0_0_ER01_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml =================================================================== --- portal/branches/EPP_5_0_0_ER01_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2009-12-01 15:21:22 UTC (rev 894) +++ portal/branches/EPP_5_0_0_ER01_Branch/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2009-12-01 15:40:52 UTC (rev 895) @@ -22,24 +22,24 @@ <repository-service default-repository="repository"> <repositories> <repository name="repository" system-workspace="system" default-workspace="portal-system"> - <security-domain>gatein-domain</security-domain> + <security-domain>exo-domain</security-domain> <access-control>optional</access-control> <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> <workspaces> <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${container.name.suffix}" /> <property name="dialect" value="hsqldb" /> <property name="multi-db" value="false" /> <property name="update-storage" value="true" /> <property name="max-buffer-size" value="204800" /> - <property name="swap-directory" value="../temp/swap/sample-ws${container.name.suffix}" /> + <property name="swap-directory" value="${jboss.server.data.dir}/gatein/swap/sample-ws${container.name.suffix}" /> </properties> <value-storages> <value-storage id="sample-ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="../temp/values/sample-ws${container.name.suffix}" /> + <property name="path" value="${jboss.server.data.dir}/gatein/values/sample-ws${container.name.suffix}" /> </properties> <filters> <filter property-type="Binary" /> @@ -62,14 +62,14 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> - <property name="index-dir" value="../temp/jcrlucenedb/sample-ws${container.name.suffix}" /> + <property name="index-dir" value="${jboss.server.data.dir}/gatein/jcrlucenedb/sample-ws${container.name.suffix}" /> </properties> </query-handler> <lock-manager> <time-out>15m</time-out><!-- 15min --> <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> <properties> - <property name="path" value="../temp/lock/sample-ws${container.name.suffix}" /> + <property name="path" value="${jboss.server.data.dir}/gatein/lock/sample-ws${container.name.suffix}" /> </properties> </persister> </lock-manager> Modified: portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml =================================================================== --- portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml 2009-12-01 15:21:22 UTC (rev 894) +++ portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml 2009-12-01 15:40:52 UTC (rev 895) @@ -38,49 +38,11 @@ <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="jdbc:hsqldb:file:../temp/data/exodb${container.name.suffix}"/> - <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/> + <property name="hibernate.bytecode.use_reflection_optimizer" value="true"/> + <property name="hibernate.connection.datasource" value="gatein${container.name.suffix}" /> <property name="hibernate.connection.autocommit" value="true"/> - <property name="hibernate.connection.username" value="sa"/> - <property name="hibernate.connection.password" value=""/> <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> - <property name="hibernate.c3p0.min_size" value="5"/> - <property name="hibernate.c3p0.max_size" value="20"/> - <property name="hibernate.c3p0.timeout" value="1800"/> - <property name="hibernate.c3p0.max_statements" value="50"/> </properties-param> </init-params> </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>jdbcexo${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:../temp/data/exodb${container.name.suffix}"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - </external-component-plugins> </configuration> Modified: portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml =================================================================== --- portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2009-12-01 15:21:22 UTC (rev 894) +++ portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2009-12-01 15:40:52 UTC (rev 895) @@ -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${container.name.suffix}"/> <property name="dialect" value="hsqldb"/> </properties-param> </init-params> Modified: portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml =================================================================== --- portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2009-12-01 15:21:22 UTC (rev 894) +++ portal/branches/EPP_5_0_0_ER01_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2009-12-01 15:40:52 UTC (rev 895) @@ -22,24 +22,24 @@ <repository-service default-repository="repository"> <repositories> <repository name="repository" system-workspace="system" default-workspace="portal-system"> - <security-domain>gatein-domain</security-domain> + <security-domain>exo-domain</security-domain> <access-control>optional</access-control> <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> <workspaces> <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${container.name.suffix}"/> <property name="dialect" value="hsqldb"/> <property name="multi-db" value="false"/> <property name="update-storage" value="true"/> <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="../temp/swap/system${container.name.suffix}"/> + <property name="swap-directory" value="${jboss.server.data.dir}/gatein/swap/system${container.name.suffix}"/> </properties> <value-storages> <value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="../temp/values/system${container.name.suffix}"/> + <property name="path" value="${jboss.server.data.dir}/gatein/values/system${container.name.suffix}"/> </properties> <filters> <filter property-type="Binary"/> @@ -61,14 +61,14 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> - <property name="index-dir" value="../temp/jcrlucenedb/system${container.name.suffix}"/> + <property name="index-dir" value="${jboss.server.data.dir}/gatein/jcrlucenedb/system${container.name.suffix}"/> </properties> </query-handler> <lock-manager> <time-out>15m</time-out><!-- 15min --> <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> <properties> - <property name="path" value="../temp/lock/system${container.name.suffix}"/> + <property name="path" value="${jboss.server.data.dir}/gatein/lock/system${container.name.suffix}"/> </properties> </persister> </lock-manager> @@ -76,17 +76,17 @@ <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${container.name.suffix}"/> <property name="dialect" value="hsqldb"/> <property name="multi-db" value="false"/> <property name="update-storage" value="true"/> <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="../temp/swap/portal-system${container.name.suffix}"/> + <property name="swap-directory" value="${jboss.server.data.dir}/gatein/swap/portal-system${container.name.suffix}"/> </properties> <value-storages> <value-storage id="portal-system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="../temp/values/portal-system${container.name.suffix}"/> + <property name="path" value="${jboss.server.data.dir}/gatein/values/portal-system${container.name.suffix}"/> </properties> <filters> <filter property-type="Binary"/> @@ -108,14 +108,14 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> - <property name="index-dir" value="../temp/jcrlucenedb/portal-system${container.name.suffix}"/> + <property name="index-dir" value="${jboss.server.data.dir}/gatein/jcrlucenedb/portal-system${container.name.suffix}"/> </properties> </query-handler> <lock-manager> <time-out>15m</time-out><!-- 15min --> <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> <properties> - <property name="path" value="../temp/lock/portal-system${container.name.suffix}"/> + <property name="path" value="${jboss.server.data.dir}/gatein/lock/portal-system${container.name.suffix}"/> </properties> </persister> </lock-manager> @@ -123,17 +123,17 @@ <workspace name="gadgets"> <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${container.name.suffix}"/> <property name="dialect" value="hsqldb"/> <property name="multi-db" value="false"/> <property name="update-storage" value="true"/> <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="../temp/swap/gadgets${container.name.suffix}"/> + <property name="swap-directory" value="${jboss.server.data.dir}/gatein/swap/gadgets${container.name.suffix}"/> </properties> <value-storages> <value-storage id="gadgets" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="../temp/values/gadgets${container.name.suffix}"/> + <property name="path" value="${jboss.server.data.dir}/gatein/values/gadgets${container.name.suffix}"/> </properties> <filters> <filter property-type="Binary"/> @@ -155,14 +155,14 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> - <property name="index-dir" value="../temp/jcrlucenedb/gadgets${container.name.suffix}"/> + <property name="index-dir" value="${jboss.server.data.dir}/gatein/jcrlucenedb/gadgets${container.name.suffix}"/> </properties> </query-handler> <lock-manager> <time-out>15m</time-out> <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> <properties> - <property name="path" value="../temp/lock/gadgets${container.name.suffix}"/> + <property name="path" value="${jboss.server.data.dir}/gatein/lock/gadgets${container.name.suffix}"/> </properties> </persister> </lock-manager>