Author: ilgrosso
Date: Tue May 28 08:39:54 2013
New Revision: 1486817
URL: http://svn.apache.org/r1486817
Log:
Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/src/main/webapp/WEB-INF/web.xml
syncope/trunk/console/src/test/resources/web.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1486801-1486816
Modified: syncope/trunk/console/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/webapp/WEB-INF/web.xml?rev=1486817&r1=1486816&r2=1486817&view=diff
==============================================================================
--- syncope/trunk/console/src/main/webapp/WEB-INF/web.xml (original)
+++ syncope/trunk/console/src/main/webapp/WEB-INF/web.xml Tue May 28 08:39:54
2013
@@ -24,7 +24,12 @@ under the License.
version="2.5">
<display-name>Apache Syncope console</display-name>
-
+
+ <context-param>
+ <param-name>configuration</param-name>
+ <param-value>deployment</param-value>
+ </context-param>
+
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>classpath:applicationContext.xml</param-value>
@@ -53,7 +58,7 @@ under the License.
<dispatcher>INCLUDE</dispatcher>
</filter-mapping>
- <!-- SESSION TIMEOUT (MINUTES)-->
+ <!-- SESSION TIMEOUT (MINUTES)-->
<session-config>
<session-timeout>30</session-timeout>
</session-config>
Modified: syncope/trunk/console/src/test/resources/web.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/test/resources/web.xml?rev=1486817&r1=1486816&r2=1486817&view=diff
==============================================================================
--- syncope/trunk/console/src/test/resources/web.xml (original)
+++ syncope/trunk/console/src/test/resources/web.xml Tue May 28 08:39:54 2013
@@ -16,7 +16,6 @@ software distributed under the License i
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
@@ -24,7 +23,7 @@ under the License.
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";
version="2.5">
- <display-name>Syncope console</display-name>
+ <display-name>Apache Syncope console</display-name>
<context-param>
<param-name>configuration</param-name>
@@ -59,7 +58,7 @@ under the License.
<dispatcher>INCLUDE</dispatcher>
</filter-mapping>
- <!-- SESSION TIMEOUT (MINUTES)-->
+ <!-- SESSION TIMEOUT (MINUTES)-->
<session-config>
<session-timeout>30</session-timeout>
</session-config>
