[gatein-commits] gatein SVN: r2187 - in portal/trunk: component/common/src/main/java/conf and 5 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Mar 11 15:13:52 EST 2010
Author: thomas.heute at jboss.com
Date: 2010-03-11 15:13:51 -0500 (Thu, 11 Mar 2010)
New Revision: 2187
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/component/common/src/main/java/conf/configuration.xml
portal/trunk/examples/extension/config/src/main/java/conf/configuration.xml
portal/trunk/examples/portal/config/src/main/java/conf/configuration.xml
portal/trunk/pom.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/organization/idm-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
Log:
GTNPORTAL-872: Externalize portal container configuration
Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-03-11 20:04:24 UTC (rev 2186)
+++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-03-11 20:13:51 UTC (rev 2187)
@@ -27,6 +27,11 @@
gatein.jcr.config.type=local
gatein.jcr.datasource.name=java:jdbcjcr
gatein.jcr.datasource.dialect=auto
+gatein.jcr.datasource.url=
+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
@@ -35,4 +40,7 @@
# 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=
Modified: portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-03-11 20:04:24 UTC (rev 2186)
+++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-03-11 20:13:51 UTC (rev 2187)
@@ -27,6 +27,10 @@
gatein.jcr.config.type=local
gatein.jcr.datasource.name=jdbcjcr
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
@@ -35,6 +39,10 @@
# IDM
gatein.idm.datasource.name=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
# Arjuna configuration
-com.arjuna.ats.arjuna.objectstore.objectStoreDir=${gatein.data.dir}/jta
\ No newline at end of file
+com.arjuna.ats.arjuna.objectstore.objectStoreDir=${gatein.data.dir}/jta
Modified: portal/trunk/component/common/src/main/java/conf/configuration.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration.xml 2010-03-11 20:04:24 UTC (rev 2186)
+++ portal/trunk/component/common/src/main/java/conf/configuration.xml 2010-03-11 20:13:51 UTC (rev 2187)
@@ -29,14 +29,10 @@
<key>org.exoplatform.container.PropertyConfigurator</key>
<type>org.exoplatform.container.PropertyConfigurator</type>
<init-params>
- <value-param profiles="tomcat">
+ <value-param>
<name>properties.url</name>
- <value>file:///${catalina.base}/gatein/conf/configuration.properties</value>
+ <value>configuration.properties</value>
</value-param>
- <value-param profiles="jboss">
- <name>properties.url</name>
- <value>${jboss.server.config.url}/gatein/configuration.properties</value>
- </value-param>
</init-params>
</component>
Modified: portal/trunk/examples/extension/config/src/main/java/conf/configuration.xml
===================================================================
--- portal/trunk/examples/extension/config/src/main/java/conf/configuration.xml 2010-03-11 20:04:24 UTC (rev 2186)
+++ portal/trunk/examples/extension/config/src/main/java/conf/configuration.xml 2010-03-11 20:13:51 UTC (rev 2187)
@@ -42,6 +42,9 @@
<field name="restContextName"><string>rest</string></field>
<!-- The name of the realm -->
<field name="realmName"><string>gatein-domain</string></field>
+ <field name="externalSettingsPath">
+ <string>configuration.properties</string>
+ </field>
<!-- All the dependencies of the portal container ordered by loading priority -->
<field name="dependencies">
<collection type="java.util.ArrayList">
Modified: portal/trunk/examples/portal/config/src/main/java/conf/configuration.xml
===================================================================
--- portal/trunk/examples/portal/config/src/main/java/conf/configuration.xml 2010-03-11 20:04:24 UTC (rev 2186)
+++ portal/trunk/examples/portal/config/src/main/java/conf/configuration.xml 2010-03-11 20:13:51 UTC (rev 2187)
@@ -42,6 +42,9 @@
<field name="restContextName"><string>rest-sample-portal</string></field>
<!-- The name of the realm -->
<field name="realmName"><string>gatein-domain-sample-portal</string></field>
+ <field name="externalSettingsPath">
+ <string>configuration.properties</string>
+ </field>
<!-- All the dependencies of the portal container ordered by loading priority -->
<field name="dependencies">
<collection type="java.util.ArrayList">
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-03-11 20:04:24 UTC (rev 2186)
+++ portal/trunk/pom.xml 2010-03-11 20:13:51 UTC (rev 2187)
@@ -124,11 +124,6 @@
<version>${org.exoplatform.kernel.version}</version>
</dependency>
<dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId>
- <version>${org.exoplatform.kernel.version}</version>
- </dependency>
- <dependency>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>exo.kernel.component.command</artifactId>
<version>${org.exoplatform.kernel.version}</version>
@@ -164,6 +159,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId>
+ <version>${org.exoplatform.kernel.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.exoplatform.core</groupId>
<artifactId>exo.core.component.organization.api</artifactId>
<version>${org.exoplatform.core.version}</version>
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-03-11 20:04:24 UTC (rev 2186)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-03-11 20:13:51 UTC (rev 2187)
@@ -150,10 +150,10 @@
<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=""/>
+ <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>
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-03-11 20:04:24 UTC (rev 2186)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-03-11 20:13:51 UTC (rev 2187)
@@ -221,10 +221,11 @@
<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=""/>
+ <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>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-03-11 20:04:24 UTC (rev 2186)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-03-11 20:13:51 UTC (rev 2187)
@@ -193,7 +193,7 @@
</component-plugin>
</component-plugins>
</component>
-
+
<external-component-plugins>
<target-component>org.exoplatform.services.organization.OrganizationService</target-component>
<component-plugin>
More information about the gatein-commits
mailing list