Moved dynamic config out of web.xml and into system properties.

Development mode is default in the JettyStarter and jetty plugin.

Author: hamnis

pom.xml

@@ -213,10 +213,6 @@
                 </execution>
             </executions>
         </plugin>
-      <plugin>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>

submitit-webapp/pom.xml

@@ -65,4 +65,25 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>maven-jetty-plugin</artifactId>
+        <configuration>
+          <systemProperties>
+            <systemProperty>
+              <name>submitit.properties</name>
+              <value>${basedir}/src/test/resources/submitit.properties</value>
+            </systemProperty>
+            <systemProperty>
+              <name>wicket.configuration</name>
+              <value>development</value>
+            </systemProperty>
+          </systemProperties>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>

submitit-webapp/src/main/scala/no/java/submitit/app/SubmititApp.scala

@@ -35,8 +35,8 @@ import authorization.IUnauthorizedComponentInstantiationListener
 class SubmititApp extends WebApplication with LoggHandling {
 
   override def init() {
-    SubmititApp.propertyFileName = super.getServletContext.getInitParameter("submitit.properties")
-    if (SubmititApp.propertyFileName == null) throw new Exception("""You must specify "submitit.properties" as a init parameter.""")
+    SubmititApp.propertyFileName = System.getProperty("submitit.properties")
+    if (SubmititApp.propertyFileName == null) throw new Exception("""You must specify "submitit.properties" as a system property.""")
     val props = PropertyIOUtils.loadRessource(SubmititApp.propertyFileName)
 
     SubmititApp.properties = DefaultConfigValues.mergeConfig(props)

submitit-webapp/src/main/webapp/WEB-INF/web.xml

@@ -30,13 +30,9 @@
 		<session-timeout>120</session-timeout>
 	</session-config>
 
-  <context-param>
-    <param-name>submitit.properties</param-name>
-    <param-value>submitit-webapp/src/test/resources/submitit.properties</param-value>
-  </context-param>
   <context-param>
     <param-name>wicket.configuration</param-name>
-    <param-value>development</param-value>
+    <param-value>deployment</param-value>
   </context-param>
 
 </web-app>

submitit-webapp/src/test/scala/JettyStarter.scala

@@ -34,17 +34,15 @@ object JettyStarter {
     bb.setContextPath("/");
     bb.setWar(webappDir.toString);
 
-    System.setProperty("submitit.properties", new File(getBaseDir(getClass), "src/main/resources/submitit.properties").toString)
-	
+    System.setProperty("submitit.properties", new File(getBaseDir(getClass), "src/test/resources/submitit.properties").toString)
+    System.setProperty("wicket.configuration", "development")
+
     server.addHandler(bb);
 
     try {
-      System.out.println(">>> STARTING EMBEDDED JETTY SERVER, PRESS ANY KEY TO STOP");
+      System.out.println(">>> STARTING EMBEDDED JETTY SERVER...");
       server.start();
-      while (System.in.available() == 0) {
-        Thread.sleep(5000); 
-      }
-      server.stop();
+      System.out.println(">>> Jetty Started @ port 8081");
       server.join();
     } catch {
       case e: Exception => {