diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2013-09-12 00:52:06 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2013-09-12 00:52:06 +0200 |
| commit | 580464eac64d2169c29cf32a72482c57ab8263d5 (patch) | |
| tree | 1ded13d69c9196dfe30e237013b29a37b676c547 /sonar-application | |
| parent | 7c375efff9e6561a6a0aa3c6ee65eff22290e4ec (diff) | |
| download | sonarqube-580464eac64d2169c29cf32a72482c57ab8263d5.tar.gz sonarqube-580464eac64d2169c29cf32a72482c57ab8263d5.zip | |
Prepare upgrades of JRuby/Rails by upgrading to servlet 3.0
Diffstat (limited to 'sonar-application')
| -rw-r--r-- | sonar-application/pom.xml | 2 | ||||
| -rw-r--r-- | sonar-application/src/main/assembly/conf/wrapper.conf | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml index eac47e09a19..52d2b28ad3f 100644 --- a/sonar-application/pom.xml +++ b/sonar-application/pom.xml @@ -44,7 +44,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>javax.servlet</groupId> + <groupId>org.mortbay.jetty</groupId> <artifactId>servlet-api</artifactId> <scope>test</scope> </dependency> diff --git a/sonar-application/src/main/assembly/conf/wrapper.conf b/sonar-application/src/main/assembly/conf/wrapper.conf index f6ae9409ada..0ef0bf41059 100644 --- a/sonar-application/src/main/assembly/conf/wrapper.conf +++ b/sonar-application/src/main/assembly/conf/wrapper.conf @@ -2,10 +2,11 @@ wrapper.java.additional.1=-Djava.awt.headless=true wrapper.java.additional.2=-XX:MaxPermSize=128m wrapper.java.additional.3=-XX:+HeapDumpOnOutOfMemoryError +wrapper.java.additional.4=-Dfile.encoding=UTF-8 # RECOMMENDED : uncomment if Java Virtual Machine is a JDK but not a JRE. To know which JVM you use, execute # 'java -version'. JDK displays 'Server VM'. -#wrapper.java.additional.4=-server +#wrapper.java.additional.5=-server # Initial Java Heap Size (in MB) wrapper.java.initmemory=256 @@ -44,16 +45,16 @@ wrapper.app.parameter.1=org.sonar.application.StartServer #******************************************************************** # Profiling and debbuging - for development only -# If wrapper.java.additional.4=-server is not commented, parameter ids should start from 5 instead of 4. +# If wrapper.java.additional.5=-server is not commented, parameter ids should start from 6 instead of 5. #******************************************************************** # Java remote debugging -#wrapper.java.additional.4=-agentlib:jdwp=transport=dt_socket,server=y,address=8000 +#wrapper.java.additional.5=-agentlib:jdwp=transport=dt_socket,server=y,address=8000 # JMX remote monitoring on Sun JVM (warning, security is disabled) -#wrapper.java.additional.4=-Dcom.sun.management.jmxremote -#wrapper.java.additional.5=-Dcom.sun.management.jmxremote.port=9005 -#wrapper.java.additional.6=-Dcom.sun.management.jmxremote.authenticate=false -#wrapper.java.additional.7=-Dcom.sun.management.jmxremote.ssl=false +#wrapper.java.additional.5=-Dcom.sun.management.jmxremote +#wrapper.java.additional.6=-Dcom.sun.management.jmxremote.port=9005 +#wrapper.java.additional.7=-Dcom.sun.management.jmxremote.authenticate=false +#wrapper.java.additional.8=-Dcom.sun.management.jmxremote.ssl=false #******************************************************************** # Wrapper Logging Properties |