Author: ilgrosso
Date: Mon Dec 24 10:42:01 2012
New Revision: 1425625
URL: http://svn.apache.org/viewvc?rev=1425625&view=rev
Log:
Enabling Wicket development mode only for profiles dev and jrebel
Added:
syncope/trunk/console/src/test/resources/web.xml
- copied unchanged from r1425623,
syncope/trunk/console/src/main/webapp/WEB-INF/web.xml
Modified:
syncope/trunk/console/pom.xml
syncope/trunk/console/src/main/webapp/WEB-INF/web.xml
Modified: syncope/trunk/console/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/pom.xml?rev=1425625&r1=1425624&r2=1425625&view=diff
==============================================================================
--- syncope/trunk/console/pom.xml (original)
+++ syncope/trunk/console/pom.xml Mon Dec 24 10:42:01 2012
@@ -500,6 +500,16 @@ under the License.
</properties>
<build>
<defaultGoal>clean verify cargo:run</defaultGoal>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webXml>${project.build.directory}/test-classes/web.xml</webXml>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</profile>
@@ -514,6 +524,14 @@ under the License.
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webXml>${project.build.directory}/test-classes/web.xml</webXml>
+ </configuration>
+ </plugin>
+
+ <plugin>
<groupId>org.zeroturnaround</groupId>
<artifactId>jrebel-maven-plugin</artifactId>
<inherited>true</inherited>
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=1425625&r1=1425624&r2=1425625&view=diff
==============================================================================
--- syncope/trunk/console/src/main/webapp/WEB-INF/web.xml (original)
+++ syncope/trunk/console/src/main/webapp/WEB-INF/web.xml Mon Dec 24 10:42:01
2012
@@ -25,12 +25,7 @@ under the License.
version="2.5">
<display-name>Syncope console</display-name>
-
- <context-param>
- <param-name>configuration</param-name>
- <param-value>development</param-value>
- </context-param>
-
+
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>classpath:applicationContext.xml</param-value>
@@ -59,7 +54,7 @@ under the License.
<dispatcher>INCLUDE</dispatcher>
</filter-mapping>
- <!-- SESSION TIMEOUT (MINUTES)-->
+ <!-- SESSION TIMEOUT (MINUTES)-->
<session-config>
<session-timeout>30</session-timeout>
</session-config>
