[gatein-commits] gatein SVN: r6440 - in portal/trunk/component: pc/src/main/java/org/exoplatform/portal/pc and 1 other directory.

Author: julien_viet Date: 2011-05-03 18:15:41 -0400 (Tue, 03 May 2011) New Revision: 6440 Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java Log: GTNPORTAL-1889 : improve configuration Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2011-05-03 13:14:07 UTC (rev 6439) +++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2011-05-03 22:15:41 UTC (rev 6440) @@ -17,7 +17,8 @@ # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # -# Data +# +gatein.conf.dir=${jboss.server.home.dir}/conf/gatein gatein.data.dir=${jboss.server.data.dir}/gatein # DB @@ -58,8 +59,8 @@ gatein.email.smtp.socketFactory.port=465 gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory -#Global portlet.xml -gatein.portlet.metadata.global=../conf/gatein/portlet.xml +# Global portlet.xml +gatein.portlet.config=${gatein.conf.dir}/portlet.xml # Web gatein.web.compressor.js.level=simple \ No newline at end of file Modified: portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties 2011-05-03 13:14:07 UTC (rev 6439) +++ portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties 2011-05-03 22:15:41 UTC (rev 6440) @@ -17,8 +17,9 @@ # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # -# Data +# gatein.data.dir=${jetty.home}/gatein/data +gatein.conf.dir=${jetty.home}/gatein/conf # DB gatein.db.data.dir=${gatein.data.dir}/db @@ -61,5 +62,8 @@ gatein.email.smtp.socketFactory.port=465 gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory +# Global portlet.xml +gatein.portlet.config=${gatein.conf.dir}/portlet.xml + # Web -gatein.web.compressor.js.level=simple \ No newline at end of file +gatein.web.compressor.js.level=simple Modified: portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2011-05-03 13:14:07 UTC (rev 6439) +++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2011-05-03 22:15:41 UTC (rev 6440) @@ -17,7 +17,8 @@ # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # -# Data +# +gatein.conf.dir=../gatein/conf gatein.data.dir=../gatein/data # DB @@ -61,8 +62,8 @@ gatein.email.smtp.socketFactory.port=465 gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory -#Global portlet.xml -gatein.portlet.metadata.global=../gatein/conf/portlet.xml +# Global portlet.xml +gatein.portlet.config=${gatein.conf.dir}/portlet.xml # Web gatein.web.compressor.js.level=simple \ No newline at end of file Modified: portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java =================================================================== --- portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java 2011-05-03 13:14:07 UTC (rev 6439) +++ portal/trunk/component/pc/src/main/java/org/exoplatform/portal/pc/ExoPortletApplicationDeployer.java 2011-05-03 22:15:41 UTC (rev 6440) @@ -53,7 +53,7 @@ { md.setResourceBundleFactoryName(ExoResourceBundleFactory.class.getName()); - String globalPortletLocation = PropertyManager.getProperty("gatein.portlet.metadata.global"); + String globalPortletLocation = PropertyManager.getProperty("gatein.portlet.conf"); if (globalPortletLocation != null) { try