Author: thomas.heute(a)jboss.com Date: 2010-02-16 06:21:27 -0500 (Tue, 16 Feb 2010) New Revision: 1734 Modified: portal/trunk/component/common/src/main/java/conf/configuration.xml portal/trunk/packaging/pkg/pom.xml Log: - Use configuration file from $TOMCAT_HOME/gatein/conf/configuration.properties - Explode 02portal.war in JBoss Modified: portal/trunk/component/common/src/main/java/conf/configuration.xml =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration.xml 2010-02-16 11:02:56 UTC (rev 1733) +++ portal/trunk/component/common/src/main/java/conf/configuration.xml 2010-02-16 11:21:27 UTC (rev 1734) @@ -31,7 +31,7 @@ <init-params> <value-param profiles="tomcat"> <name>properties.url</name> - <value>jar:/conf/configuration-tomcat.properties</value> + <value>file://${catalina.base}/gatein/conf/configuration.properties</value> </value-param> <value-param profiles="jboss"> <name>properties.url</name> Modified: portal/trunk/packaging/pkg/pom.xml =================================================================== --- portal/trunk/packaging/pkg/pom.xml 2010-02-16 11:02:56 UTC (rev 1733) +++ portal/trunk/packaging/pkg/pom.xml 2010-02-16 11:21:27 UTC (rev 1734) @@ -37,7 +37,7 @@ <groupId>org.gatein.tools</groupId> <artifactId>packager</artifactId> <type>zip</type> - <version>1.0.0-Beta06</version> + <version>1.0.0-Beta08</version> </dependency> <dependency>