Author: thomas.heute(a)jboss.com Date: 2010-02-16 06:23:53 -0500 (Tue, 16 Feb 2010) New Revision: 1737 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/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh 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 Log: Externalizing configuration didn't work well because of the extension mechanism 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-16 11:22:37 UTC (rev 1736) +++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-02-16 11:23:53 UTC (rev 1737) @@ -28,11 +28,6 @@ gatein.jcr.datasource.name=java:jdbcjcr gatein.jcr.datasource.dialect=auto -gatein.jcr.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcjcr -gatein.jcr.datasource.username=sa -gatein.jcr.datasource.password= -gatein.jcr.datasource.driver=org.hsqldb.jdbcDriver - 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}/lucene @@ -40,9 +35,4 @@ # IDM gatein.idm.datasource.name=java:jdbcidm -gatein.idm.datasource.dialect=org.hibernate.dialect.HSQLDialect -gatein.idm.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm -gatein.idm.datasource.username=sa -gatein.idm.datasource.password= -gatein.idm.datasource.driver=org.hsqldb.jdbcDriver 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-16 11:22:37 UTC (rev 1736) +++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-02-16 11:23:53 UTC (rev 1737) @@ -18,7 +18,7 @@ # # Data -gatein.data.dir=../temp +gatein.data.dir=../gatein/data # DB gatein.db.data.dir=${gatein.data.dir}/db @@ -28,11 +28,6 @@ gatein.jcr.datasource.name=jdbcjcr gatein.jcr.datasource.dialect=auto -gatein.jcr.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcjcr -gatein.jcr.datasource.username=sa -gatein.jcr.datasource.password= -gatein.jcr.datasource.driver=org.hsqldb.jdbcDriver - 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}/lucene @@ -40,9 +35,3 @@ # IDM gatein.idm.datasource.name=jdbcidm -gatein.idm.datasource.dialect=org.hibernate.dialect.HSQLDialect - -gatein.idm.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm -gatein.idm.datasource.username=sa -gatein.idm.datasource.password= -gatein.idm.datasource.driver=org.hsqldb.jdbcDriver Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh =================================================================== --- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh 2010-02-16 11:22:37 UTC (rev 1736) +++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh 2010-02-16 11:23:53 UTC (rev 1737) @@ -24,7 +24,7 @@ # Sets some variables LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog" SECURITY_OPTS="-Djava.security.auth.login.config=../conf/jaas.conf" -EXO_OPTS="-Dexo.product.developing=true -Dexo.properties.url=../conf/gatein/configuration.properties" +EXO_OPTS="-Dexo.product.developing=true" EXO_CONFIG_OPTS="-Xshare:auto -Xms128m -Xmx512m -Dorg.exoplatform.container.configuration.debug" JPDA_TRANSPORT=dt_socket Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh =================================================================== --- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh 2010-02-16 11:22:37 UTC (rev 1736) +++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh 2010-02-16 11:23:53 UTC (rev 1737) @@ -27,7 +27,7 @@ # Sets some variables LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog" SECURITY_OPTS="-Djava.security.auth.login.config=../conf/jaas.conf" -EXO_OPTS="-Dexo.product.developing=false -Dexo.properties.url=../conf/gatein/configuration.properties" +EXO_OPTS="-Dexo.product.developing=false" JAVA_OPTS="-Xshare:auto -Xms128m -Xmx512m $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS" export JAVA_OPTS 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-16 11:22:37 UTC (rev 1736) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-02-16 11:23:53 UTC (rev 1737) @@ -148,10 +148,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="${gatein.jcr.datasource.driver}"/> - <property name="url" value="${gatein.jcr.datasource.url}${container.name.suffix}"/> - <property name="username" value="${gatein.jcr.datasource.username}"/> - <property name="password" value="${gatein.jcr.datasource.password}"/> + <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> 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-16 11:22:37 UTC (rev 1736) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-02-16 11:23:53 UTC (rev 1737) @@ -42,7 +42,10 @@ <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}"/> + <!-- + Should be automatically detected. Force otherwise + <property name="hibernate.dialect" value="org.hibernate.dialect.XXXDialect"/> + --> </properties-param> </init-params> </component> @@ -197,10 +200,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="${gatein.idm.datasource.driver}"/> - <property name="url" value="${gatein.idm.datasource.url}${container.name.suffix}"/> - <property name="username" value="${gatein.idm.datasource.username}"/> - <property name="password" value="${gatein.idm.datasource.password}"/> + <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>