Fix CRLF and remove executable flag for non-executable file

diff --git a/sonar-application/src/main/assembly/conf/wrapper.conf b/sonar-application/src/main/assembly/conf/wrapper.conf
index ed55b5edfa734bd73c13f386c3583a813cb8a8e5..e1044594cad15576b2441d4b89273fdea1f121e9 100644 (file)
--- a/sonar-application/src/main/assembly/conf/wrapper.conf
+++ b/sonar-application/src/main/assembly/conf/wrapper.conf
@@ -1,128 +1,128 @@
-# Java Additional Parameters\r
-wrapper.java.additional.1=-Djava.awt.headless=true\r
-wrapper.java.additional.2=-XX:MaxPermSize=128m\r
-\r
-# RECOMMENDED : uncomment if Java Virtual Machine is a JDK but not a JRE. To know which JVM you use, execute\r
-# 'java -version'. JDK displays 'Server VM'.\r
-# wrapper.java.additional.3=-server\r
-\r
-# Initial Java Heap Size (in MB)\r
-wrapper.java.initmemory=256\r
-\r
-# Maximum Java Heap Size (in MB)\r
-wrapper.java.maxmemory=512\r
-\r
-#********************************************************************\r
-# Wrapper Java Properties\r
-#********************************************************************\r
-# JVM\r
-# Can be an absolute path, for example:\r
-#wrapper.java.command=/path/to/my/jdk/bin/java\r
-wrapper.java.command=java\r
-\r
-# Java Main class.  This class must implement the WrapperListener interface\r
-#  or guarantee that the WrapperManager class is initialized.  Helper\r
-#  classes are provided to do this for you.  See the Integration section\r
-#  of the documentation for details.\r
-wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp\r
-\r
-# Java Classpath (include wrapper.jar)  Add class path elements as\r
-#  needed starting from 1\r
-wrapper.java.classpath.1=../../lib/*.jar\r
-wrapper.java.classpath.2=../../\r
-wrapper.java.classpath.3=../../extensions/jdbc-driver/derby/*.jar\r
-wrapper.java.classpath.4=../../extensions/jdbc-driver/mysql/*.jar\r
-wrapper.java.classpath.5=../../extensions/jdbc-driver/oracle/*.jar\r
-wrapper.java.classpath.6=../../extensions/jdbc-driver/postgresql/*.jar\r
-wrapper.java.classpath.7=../../extensions/jdbc-driver/mssql/*.jar\r
-\r
-# Java Library Path (location of Wrapper.DLL or libwrapper.so)\r
-wrapper.java.library.path.1=./lib\r
-\r
-# Application parameters.  Add parameters as needed starting from 1\r
-wrapper.app.parameter.1=org.sonar.application.StartServer\r
-\r
-#********************************************************************\r
-# Profiling and debbuging - for development only\r
-# If wrapper.java.additional.3=-server is not commented, parameter ids should start from 4 instead of 3.\r
-#********************************************************************\r
-# Java remote debugging\r
-#wrapper.java.additional.3=-agentlib:jdwp=transport=dt_socket,server=y,address=8000\r
-\r
-# JProfiler 5\r
-#wrapper.java.additional.3=-Xint\r
-#wrapper.java.additional.4=-agentlib:jprofilerti=port=8849\r
-#wrapper.java.additional.5=-Xbootclasspath/a:/Applications/jprofiler5/bin/agent.jar\r
-\r
-# JMX remote monitoring on Sun JVM (warning, security is disabled)\r
-#wrapper.java.additional.3=-Dcom.sun.management.jmxremote\r
-#wrapper.java.additional.4=-Dcom.sun.management.jmxremote.port=9005\r
-#wrapper.java.additional.5=-Dcom.sun.management.jmxremote.authenticate=false\r
-#wrapper.java.additional.6=-Dcom.sun.management.jmxremote.ssl=false\r
-\r
-#********************************************************************\r
-# Wrapper Logging Properties\r
-#********************************************************************\r
-# Format of output for the console.  (See docs for formats)\r
-wrapper.console.format=PM\r
-\r
-# Log Level for console output.  (See docs for log levels)\r
-wrapper.console.loglevel=INFO\r
-\r
-# Log file to use for wrapper output logging.\r
-wrapper.logfile=../../logs/sonar.log\r
-\r
-# Format of output for the log file.  (See docs for formats)\r
-wrapper.logfile.format=LPTM\r
-\r
-# Log Level for log file output.  (See docs for log levels)\r
-wrapper.logfile.loglevel=INFO\r
-\r
-# Maximum size that the log file will be allowed to grow to before\r
-#  the log is rolled. Size is specified in bytes.  The default value\r
-#  of 0, disables log rolling.  May abbreviate with the 'k' (kb) or\r
-#  'm' (mb) suffix.  For example: 10m = 10 megabytes.\r
-#wrapper.logfile.maxsize=0\r
-\r
-# Maximum number of rolled log files which will be allowed before old\r
-#  files are deleted.  The default value of 0 implies no limit.\r
-#wrapper.logfile.maxfiles=0\r
-\r
-# Log Level for sys/event log output.  (See docs for log levels)\r
-wrapper.syslog.loglevel=NONE\r
-\r
-#********************************************************************\r
-# Wrapper Windows Properties\r
-#********************************************************************\r
-# Title to use when running as a console\r
-wrapper.console.title=Sonar\r
-\r
-#********************************************************************\r
-# Wrapper Windows NT/2000/XP Service Properties\r
-#********************************************************************\r
-# WARNING - Do not modify any of these properties when an application\r
-#  using this configuration file has been installed as a service.\r
-#  Please uninstall the service before modifying this section.  The\r
-#  service can then be reinstalled.\r
-\r
-# Name of the service\r
-wrapper.ntservice.name=Sonar\r
-\r
-# Display name of the service\r
-wrapper.ntservice.displayname=Sonar\r
-\r
-# Description of the service\r
-wrapper.ntservice.description=Sonar\r
-\r
-# Service dependencies.  Add dependencies as needed starting from 1\r
-wrapper.ntservice.dependency.1=\r
-\r
-# Mode in which the service is installed.  AUTO_START or DEMAND_START\r
-wrapper.ntservice.starttype=AUTO_START\r
-\r
-# Allow the service to interact with the desktop.\r
-wrapper.ntservice.interactive=false\r
-\r
-#********************************************************************\r
-# restart the process if CPU is heavily loaded during 240 seconds.\r
-wrapper.ping.timeout=240
\ No newline at end of file
+# Java Additional Parameters
+wrapper.java.additional.1=-Djava.awt.headless=true
+wrapper.java.additional.2=-XX:MaxPermSize=128m
+
+# 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.3=-server
+
+# Initial Java Heap Size (in MB)
+wrapper.java.initmemory=256
+
+# Maximum Java Heap Size (in MB)
+wrapper.java.maxmemory=512
+
+#********************************************************************
+# Wrapper Java Properties
+#********************************************************************
+# JVM
+# Can be an absolute path, for example:
+#wrapper.java.command=/path/to/my/jdk/bin/java
+wrapper.java.command=java
+
+# Java Main class.  This class must implement the WrapperListener interface
+#  or guarantee that the WrapperManager class is initialized.  Helper
+#  classes are provided to do this for you.  See the Integration section
+#  of the documentation for details.
+wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
+
+# Java Classpath (include wrapper.jar)  Add class path elements as
+#  needed starting from 1
+wrapper.java.classpath.1=../../lib/*.jar
+wrapper.java.classpath.2=../../
+wrapper.java.classpath.3=../../extensions/jdbc-driver/derby/*.jar
+wrapper.java.classpath.4=../../extensions/jdbc-driver/mysql/*.jar
+wrapper.java.classpath.5=../../extensions/jdbc-driver/oracle/*.jar
+wrapper.java.classpath.6=../../extensions/jdbc-driver/postgresql/*.jar
+wrapper.java.classpath.7=../../extensions/jdbc-driver/mssql/*.jar
+
+# Java Library Path (location of Wrapper.DLL or libwrapper.so)
+wrapper.java.library.path.1=./lib
+
+# Application parameters.  Add parameters as needed starting from 1
+wrapper.app.parameter.1=org.sonar.application.StartServer
+
+#********************************************************************
+# Profiling and debbuging - for development only
+# If wrapper.java.additional.3=-server is not commented, parameter ids should start from 4 instead of 3.
+#********************************************************************
+# Java remote debugging
+#wrapper.java.additional.3=-agentlib:jdwp=transport=dt_socket,server=y,address=8000
+
+# JProfiler 5
+#wrapper.java.additional.3=-Xint
+#wrapper.java.additional.4=-agentlib:jprofilerti=port=8849
+#wrapper.java.additional.5=-Xbootclasspath/a:/Applications/jprofiler5/bin/agent.jar
+
+# JMX remote monitoring on Sun JVM (warning, security is disabled)
+#wrapper.java.additional.3=-Dcom.sun.management.jmxremote
+#wrapper.java.additional.4=-Dcom.sun.management.jmxremote.port=9005
+#wrapper.java.additional.5=-Dcom.sun.management.jmxremote.authenticate=false
+#wrapper.java.additional.6=-Dcom.sun.management.jmxremote.ssl=false
+
+#********************************************************************
+# Wrapper Logging Properties
+#********************************************************************
+# Format of output for the console.  (See docs for formats)
+wrapper.console.format=PM
+
+# Log Level for console output.  (See docs for log levels)
+wrapper.console.loglevel=INFO
+
+# Log file to use for wrapper output logging.
+wrapper.logfile=../../logs/sonar.log
+
+# Format of output for the log file.  (See docs for formats)
+wrapper.logfile.format=LPTM
+
+# Log Level for log file output.  (See docs for log levels)
+wrapper.logfile.loglevel=INFO
+
+# Maximum size that the log file will be allowed to grow to before
+#  the log is rolled. Size is specified in bytes.  The default value
+#  of 0, disables log rolling.  May abbreviate with the 'k' (kb) or
+#  'm' (mb) suffix.  For example: 10m = 10 megabytes.
+#wrapper.logfile.maxsize=0
+
+# Maximum number of rolled log files which will be allowed before old
+#  files are deleted.  The default value of 0 implies no limit.
+#wrapper.logfile.maxfiles=0
+
+# Log Level for sys/event log output.  (See docs for log levels)
+wrapper.syslog.loglevel=NONE
+
+#********************************************************************
+# Wrapper Windows Properties
+#********************************************************************
+# Title to use when running as a console
+wrapper.console.title=Sonar
+
+#********************************************************************
+# Wrapper Windows NT/2000/XP Service Properties
+#********************************************************************
+# WARNING - Do not modify any of these properties when an application
+#  using this configuration file has been installed as a service.
+#  Please uninstall the service before modifying this section.  The
+#  service can then be reinstalled.
+
+# Name of the service
+wrapper.ntservice.name=Sonar
+
+# Display name of the service
+wrapper.ntservice.displayname=Sonar
+
+# Description of the service
+wrapper.ntservice.description=Sonar
+
+# Service dependencies.  Add dependencies as needed starting from 1
+wrapper.ntservice.dependency.1=
+
+# Mode in which the service is installed.  AUTO_START or DEMAND_START
+wrapper.ntservice.starttype=AUTO_START
+
+# Allow the service to interact with the desktop.
+wrapper.ntservice.interactive=false
+
+#********************************************************************
+# restart the process if CPU is heavily loaded during 240 seconds.
+wrapper.ping.timeout=240

diff --git a/sonar-application/src/test/resources/org/sonar/application/jetty-test.xml b/sonar-application/src/test/resources/org/sonar/application/jetty-test.xml
old mode 100755 (executable)
new mode 100644 (file)
index bf0c35a..66b8887
--- a/sonar-application/src/test/resources/org/sonar/application/jetty-test.xml
+++ b/sonar-application/src/test/resources/org/sonar/application/jetty-test.xml
@@ -44,13 +44,13 @@
             <Set name="Acceptors">2</Set>
             <Set name="statsOn">false</Set>
             <Set name="confidentialPort">8443</Set>
-               <Set name="lowResourcesConnections">5000</Set>
-               <Set name="lowResourcesMaxIdleTime">5000</Set>
+            <Set name="lowResourcesConnections">5000</Set>
+            <Set name="lowResourcesMaxIdleTime">5000</Set>
           </New>
       </Arg>
     </Call>
-       
-       <!-- =========================================================== -->
+
+    <!-- =========================================================== -->
     <!-- extra options                                               -->
     <!-- =========================================================== -->
     <Set name="stopAtShutdown">true</Set>