Author: mpodolin Date: 2010-02-25 07:42:28 -0500 (Thu, 25 Feb 2010) New Revision: 1863 Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.bat portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.bat portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh Log: GTNPORTAL-708: exo.conf.dir property changed from default $TOMCAT_HOME/bin to $TOMCAT_HOME/gatein/conf on tomcat Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.bat =================================================================== --- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.bat 2010-02-25 11:02:56 UTC (rev 1862) +++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.bat 2010-02-25 12:42:28 UTC (rev 1863) @@ -27,7 +27,7 @@ rem Sets some variables set LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog" set SECURITY_OPTS="-Djava.security.auth.login.config=..\conf\jaas.conf" -set EXO_OPTS="-Dexo.product.developing=false" +set EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir=..\gatein\conf" set EXO_CONFIG_OPTS="-Dorg.exoplatform.container.configuration.debug" set JAVA_OPTS=-Xshare:auto -Xms128m -Xmx512m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS% %EXO_CONFIG_OPTS% set JPDA_TRANSPORT=dt_socket 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-25 11:02:56 UTC (rev 1862) +++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh 2010-02-25 12:42:28 UTC (rev 1863) @@ -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" +EXO_OPTS="-Dexo.product.developing=true -Dexo.conf.dir=../gatein/conf" 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.bat =================================================================== --- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.bat 2010-02-25 11:02:56 UTC (rev 1862) +++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.bat 2010-02-25 12:42:28 UTC (rev 1863) @@ -27,7 +27,7 @@ rem Sets some variables set LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog" set SECURITY_OPTS="-Djava.security.auth.login.config=..\conf\jaas.conf" -set EXO_OPTS="-Dexo.product.developing=false" +set EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir=..\gatein\conf" set JAVA_OPTS=-Xshare:auto -Xms128m -Xmx512m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS%% rem Launches the server 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-25 11:02:56 UTC (rev 1862) +++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh 2010-02-25 12:42:28 UTC (rev 1863) @@ -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" +EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir=../gatein/conf" JAVA_OPTS="-Xshare:auto -Xms128m -Xmx512m $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS" export JAVA_OPTS