diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2011-10-10 15:53:04 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2011-10-10 15:53:22 +0200 |
| commit | 1e5d6794b55293419c9843242a47d059cd3c2c94 (patch) | |
| tree | 40ff882cd34d2e087c37c91b74fa1e7f85eb22d9 /sonar-server/src/dev | |
| parent | 16059d8cddd42e56d9d058ffdf849601781f3164 (diff) | |
| download | sonarqube-1e5d6794b55293419c9843242a47d059cd3c2c94.tar.gz sonarqube-1e5d6794b55293419c9843242a47d059cd3c2c94.zip | |
Fix dev mode
Diffstat (limited to 'sonar-server/src/dev')
| -rw-r--r-- | sonar-server/src/dev/derby/conf/logback.xml (renamed from sonar-server/src/dev/mysql/logback.xml) | 5 | ||||
| -rw-r--r-- | sonar-server/src/dev/mysql/conf/logback.xml (renamed from sonar-server/src/dev/derby/logback.xml) | 4 | ||||
| -rw-r--r-- | sonar-server/src/dev/oracle/sonar.properties | 13 | ||||
| -rw-r--r-- | sonar-server/src/dev/postgresql/conf/logback.xml (renamed from sonar-server/src/dev/postgresql/logback.xml) | 4 | ||||
| -rw-r--r-- | sonar-server/src/dev/web.xml | 10 |
5 files changed, 6 insertions, 30 deletions
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> |