Fix dev mode

6 files changed, 36 insertions, 30 deletions

diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml
index 11343cbd402..0142081d64e 100644
--- a/sonar-server/pom.xml
+++ b/sonar-server/pom.xml
@@ -341,6 +341,27 @@
             </executions>
           </plugin>
           <plugin>
+            <artifactId>maven-resources-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy-conf</id>
+                <phase>validate</phase>
+                <goals>
+                  <goal>copy-resources</goal>
+                </goals>
+                <configuration>
+                  <outputDirectory>${project.build.directory}/sonar-dev-home</outputDirectory>
+                  <resources>
+                    <resource>
+                      <directory>src/dev/${jdbcDialect}</directory>
+                      <filtering>false</filtering>
+                    </resource>
+                  </resources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty-maven-plugin</artifactId>
             <version>7.1.0.v20100505</version>
@@ -451,6 +472,9 @@
 
     <profile>
       <id>postgresql</id>
+      <properties>
+        <jdbcDialect>postgresql</jdbcDialect>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -507,6 +531,9 @@
 
     <profile>
       <id>mysql</id>
+      <properties>
+        <jdbcDialect>mysql</jdbcDialect>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -563,6 +590,9 @@
 
     <profile>
       <id>derby</id>
+      <properties>
+        <jdbcDialect>derby</jdbcDialect>
+      </properties>
       <build>
         <plugins>
           <plugin>
diff --git a/sonar-server/src/dev/mysql/logback.xml b/sonar-server/src/dev/derby/conf/logback.xml
index d9a9a1d015e..0fd2724eb31 100644
--- a/sonar-server/src/dev/mysql/logback.xml
+++ b/sonar-server/src/dev/derby/conf/logback.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-
 <configuration>
 
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <layout class="ch.qos.logback.classic.PatternLayout">
+    <encoder>
       <pattern>
         %d{HH:mm:ss.SSS} %-5level %logger{15} %X - %msg%n
       </pattern>
-    </layout>
+    </encoder>
   </appender>
 
   <logger name="org.hibernate.SQL">
diff --git a/sonar-server/src/dev/derby/logback.xml b/sonar-server/src/dev/mysql/conf/logback.xml
index d9a9a1d015e..cca1077d3b7 100644
--- a/sonar-server/src/dev/derby/logback.xml
+++ b/sonar-server/src/dev/mysql/conf/logback.xml
@@ -3,11 +3,11 @@
 <configuration>
 
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <layout class="ch.qos.logback.classic.PatternLayout">
+    <encoder>
       <pattern>
         %d{HH:mm:ss.SSS} %-5level %logger{15} %X - %msg%n
       </pattern>
-    </layout>
+    </encoder>
   </appender>
 
   <logger name="org.hibernate.SQL">
diff --git a/sonar-server/src/dev/oracle/sonar.properties b/sonar-server/src/dev/oracle/sonar.properties
deleted file mode 100644
index ab8b959d8c0..00000000000
--- a/sonar-server/src/dev/oracle/sonar.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# Oracle
-sonar.jdbc.url:                            jdbc:oracle:thin:@192.168.1.99/XE
-sonar.jdbc.driverClassName:                oracle.jdbc.OracleDriver
-sonar.jdbc.username:                       sonar
-sonar.jdbc.password:                       sonar
-sonar.jdbc.maxActive:                      30
-sonar.jdbc.maxIdle:                        10
-sonar.jdbc.minIdle:                        2
-sonar.jdbc.maxWait:                        5000
-sonar.jdbc.minEvictableIdleTimeMillis:     600000
-sonar.jdbc.timeBetweenEvictionRunsMillis:  30000
-
-sonar.runtime.mode:                        development
\ No newline at end of file
diff --git a/sonar-server/src/dev/postgresql/logback.xml b/sonar-server/src/dev/postgresql/conf/logback.xml
index d4306092164..18772f25a70 100644
--- a/sonar-server/src/dev/postgresql/logback.xml
+++ b/sonar-server/src/dev/postgresql/conf/logback.xml
@@ -3,11 +3,11 @@
 <configuration>
 
   <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <layout class="ch.qos.logback.classic.PatternLayout">
+    <encoder>
       <pattern>
         %d{HH:mm:ss.SSS} %-5level %logger{15} %X - %msg%n
       </pattern>
-    </layout>
+    </encoder>
   </appender>
   
   <logger name="org.hibernate.SQL">
diff --git a/sonar-server/src/dev/web.xml b/sonar-server/src/dev/web.xml
index eb572468163..cca6dc5d8a9 100644
--- a/sonar-server/src/dev/web.xml
+++ b/sonar-server/src/dev/web.xml
@@ -27,13 +27,6 @@
     <param-value>3</param-value>
   </context-param>
 
-  <env-entry>
-    <description>JNDI logback context</description>
-    <env-entry-name>logback/context-name</env-entry-name>
-    <env-entry-type>java.lang.String</env-entry-type>
-    <env-entry-value>Sonar</env-entry-value>
-  </env-entry>
-
   <filter>
     <filter-name>DatabaseSessionFilter</filter-name>
     <filter-class>org.sonar.server.ui.DatabaseSessionFilter</filter-class>
@@ -91,8 +84,5 @@
   <listener>
     <listener-class>org.jruby.rack.rails.RailsServletContextListener</listener-class>
   </listener>
-  <listener>
-    <listener-class>ch.qos.logback.classic.selector.servlet.ContextDetachingSCL</listener-class>
-  </listener>
 
 </web-app>