Index: webapp/cms/WEB-INF/config/config.deliver.xml
===================================================================
--- webapp/cms/WEB-INF/config/config.deliver.xml (revision 37362)
+++ webapp/cms/WEB-INF/config/config.deliver.xml (working copy)
@@ -35,7 +35,6 @@
<!-- plugin.repositoryapp:PLUGINS_REPOSITORYAPP_CONFIG_GROUP -->
<repository.default.sort>document</repository.default.sort>
<!-- plugin.repository:PLUGINS_REPOSITORY_CONFIG_JCR -->
- <org.ametys.plugins.repository.home>WEB-INF/data/repository</org.ametys.plugins.repository.home>
<org.ametys.plugins.repository.cache>16777216</org.ametys.plugins.repository.cache>
<!--+
@@ -159,7 +158,6 @@
<page.element.cache.disabled>true</page.element.cache.disabled>
<!-- plugin.core:PLUGINS_CORE_UPLOAD_CONFIG_GROUP -->
<runtime.upload.max-size>10485760</runtime.upload.max-size>
- <runtime.upload.dir>WEB-INF/data/uploads</runtime.upload.dir>
<!-- plugin.core:PLUGINS_CORE_LOGGING_GROUP -->
<runtime.log.abnormal.time>true</runtime.log.abnormal.time>
Index: webapp/cms/WEB-INF/log4j.deliver.xml
===================================================================
--- webapp/cms/WEB-INF/log4j.deliver.xml (revision 37362)
+++ webapp/cms/WEB-INF/log4j.deliver.xml (working copy)
@@ -19,7 +19,7 @@
<appender name="servlet" class="org.apache.log4j.rolling.RollingFileAppender">
<rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
- <param name="FileNamePattern" value="${ametys.log4j.contextPath}/WEB-INF/logs/ametys-cms-%d.log"/>
+ <param name="FileNamePattern" value="${ametys.home.dir}/logs/ametys-cms-%d.log"/>
</rollingPolicy>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %-5p [%c] (%t;%X{requestURI}) %m%n"/>
Index: webapp/cms/WEB-INF/log4j.xml
===================================================================
--- webapp/cms/WEB-INF/log4j.xml (revision 37362)
+++ webapp/cms/WEB-INF/log4j.xml (working copy)
@@ -21,7 +21,7 @@
<appender name="servlet" class="org.apache.log4j.rolling.RollingFileAppender">
<rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
- <param name="FileNamePattern" value="${ametys.log4j.contextPath}/WEB-INF/logs/ametys-cms-%d.log"/>
+ <param name="FileNamePattern" value="${ametys.home.dir}/logs/ametys-cms-%d.log"/>
</rollingPolicy>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %-5p [%c] (%t;%X{requestURI}) %m%n"/>
Index: webapp/cms/WEB-INF/web.xml
===================================================================
--- webapp/cms/WEB-INF/web.xml (revision 37362)
+++ webapp/cms/WEB-INF/web.xml (working copy)
@@ -38,7 +38,16 @@
<display-name>Ametys</display-name>
<servlet-name>Ametys</servlet-name>
<servlet-class>org.ametys.runtime.servlet.RuntimeServlet</servlet-class>
-
+
+ <!--
+ Ametys home property allow to use an environment variable that will indicates the Ametys home directory location.
+ By default the Ametys home directory location will be WEB-INF/data .
+ -->
+ <init-param>
+ <param-name>ametys.home.property</param-name>
+ <param-value>AMETYS_CMS_HOME</param-value>
+ </init-param>
+
<load-on-startup>1</load-on-startup>
</servlet>
Index: webapp/site/WEB-INF/config/config.deliver.xml
===================================================================
--- webapp/site/WEB-INF/config/config.deliver.xml (revision 37362)
+++ webapp/site/WEB-INF/config/config.deliver.xml (working copy)
@@ -20,7 +20,6 @@
+-->
<!-- plugin.site:SITE_CONFIG_ROOT_GROUP -->
- <org.ametys.site.root>context://WEB-INF/data/cache</org.ametys.site.root>
<org.ametys.site.cache.max.filename.length>255</org.ametys.site.cache.max.filename.length>
<!--+
@@ -33,7 +32,6 @@
<!-- plugin.core:PLUGINS_CORE_UPLOAD_CONFIG_GROUP_UPLOAD -->
<runtime.upload.max-size>10485760</runtime.upload.max-size>
- <runtime.upload.dir>WEB-INF/data/uploads</runtime.upload.dir>
<!-- plugin.core:PLUGINS_CORE_LOGGING_GROUP -->
<runtime.log.abnormal.time>true</runtime.log.abnormal.time>
Index: webapp/site/WEB-INF/log4j.deliver.xml
===================================================================
--- webapp/site/WEB-INF/log4j.deliver.xml (revision 37362)
+++ webapp/site/WEB-INF/log4j.deliver.xml (working copy)
@@ -19,7 +19,7 @@
<appender name="servlet" class="org.apache.log4j.rolling.RollingFileAppender">
<rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
- <param name="FileNamePattern" value="${ametys.log4j.contextPath}/WEB-INF/logs/ametys-site-%d.log"/>
+ <param name="FileNamePattern" value="${ametys.home.dir}/logs/ametys-site-%d.log"/>
</rollingPolicy>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %-5p [%c] (%t;%X{requestURI}) %m%n"/>
Index: webapp/site/WEB-INF/log4j.xml
===================================================================
--- webapp/site/WEB-INF/log4j.xml (revision 37362)
+++ webapp/site/WEB-INF/log4j.xml (working copy)
@@ -21,7 +21,7 @@
<appender name="servlet" class="org.apache.log4j.rolling.RollingFileAppender">
<rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
- <param name="FileNamePattern" value="${ametys.log4j.contextPath}/WEB-INF/logs/ametys-site-%d.log"/>
+ <param name="FileNamePattern" value="${ametys.home.dir}/logs/ametys-site-%d.log"/>
</rollingPolicy>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %-5p [%c] (%t;%X{requestURI}) %m%n"/>
Index: webapp/site/WEB-INF/web.xml
===================================================================
--- webapp/site/WEB-INF/web.xml (revision 37362)
+++ webapp/site/WEB-INF/web.xml (working copy)
@@ -237,7 +237,16 @@
<param-name>form-encoding</param-name>
<param-value>utf-8</param-value>
</init-param>
-
+
+ <!--
+ Ametys home property allow to use an environment variable that will indicates the Ametys home directory location.
+ By default the Ametys home directory location will be WEB-INF/data .
+ -->
+ <init-param>
+ <param-name>ametys.home.property</param-name>
+ <param-value>AMETYS_SITE_HOME</param-value>
+ </init-param>
+
<!--
This parameter allows you to startup Cocoon2 immediately after startup
of your servlet engine.