Upgrade copyright headers

6 files changed, 81 insertions, 81 deletions

diff --git a/sonar-application/src/main/assembly/war/build-war.bat b/sonar-application/src/main/assembly/war/build-war.bat
index 96e1f3f6a62..73cea1947ed 100644
--- a/sonar-application/src/main/assembly/war/build-war.bat
+++ b/sonar-application/src/main/assembly/war/build-war.bat
@@ -1,6 +1,6 @@
-@echo off

+@echo off
 
-rem Copyright (C) 2009 SonarSource SA
+rem Copyright (C) 2008-2011 SonarSource
 rem mailto:contact AT sonarsource DOT com
 rem 
 rem Sonar is free software; you can redistribute it and/or
diff --git a/sonar-application/src/main/assembly/war/build-war.sh b/sonar-application/src/main/assembly/war/build-war.sh
index 9e5ec345416..0155f378f2b 100644
--- a/sonar-application/src/main/assembly/war/build-war.sh
+++ b/sonar-application/src/main/assembly/war/build-war.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2009 SonarSource SA
+# Copyright (C) 2008-2011 SonarSource
 # mailto:contact AT sonarsource DOT com
 # 
 # Sonar is free software; you can redistribute it and/or
diff --git a/sonar-application/src/main/assembly/war/build.xml b/sonar-application/src/main/assembly/war/build.xml
index 3efa2935547..b8409fbaa64 100644
--- a/sonar-application/src/main/assembly/war/build.xml
+++ b/sonar-application/src/main/assembly/war/build.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright (C) 2009 SonarSource SA
+Copyright (C) 2008-2011 SonarSource
 mailto:contact AT sonarsource DOT com
 
 Sonar is free software; you can redistribute it and/or
diff --git a/sonar-application/src/main/java/org/sonar/application/JettyEmbedder.java b/sonar-application/src/main/java/org/sonar/application/JettyEmbedder.java
index 423eb04f9d6..369e07b68d3 100644
--- a/sonar-application/src/main/java/org/sonar/application/JettyEmbedder.java
+++ b/sonar-application/src/main/java/org/sonar/application/JettyEmbedder.java
@@ -1,6 +1,6 @@
 /*
  * Sonar, open source software quality management tool.
- * Copyright (C) 2009 SonarSource SA
+ * Copyright (C) 2008-2011 SonarSource
  * mailto:contact AT sonarsource DOT com
  *
  * Sonar is free software; you can redistribute it and/or
diff --git a/sonar-application/src/main/java/org/sonar/application/StartServer.java b/sonar-application/src/main/java/org/sonar/application/StartServer.java
index fd92dd066c1..c92b5069e6e 100644
--- a/sonar-application/src/main/java/org/sonar/application/StartServer.java
+++ b/sonar-application/src/main/java/org/sonar/application/StartServer.java
@@ -1,75 +1,75 @@
-/*

- * Sonar, open source software quality management tool.

- * Copyright (C) 2009 SonarSource SA

- * mailto:contact AT sonarsource DOT com

- *

- * Sonar is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 3 of the License, or (at your option) any later version.

- *

- * Sonar is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- * You should have received a copy of the GNU Lesser General Public

- * License along with Sonar; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02

- */

-package org.sonar.application;

-

-import java.io.File;

-import java.io.IOException;

-import java.net.URISyntaxException;

-import java.util.Properties;

-

-public final class StartServer {

-  private static final String DEFAULT_WEB_HOST = "0.0.0.0";

-  private static final int DEFAULT_WEB_PORT = 9000;

-  private static final String DEFAULT_WEB_CONTEXT = "/";

-  private static final int DEFAULT_AJP13_PORT = -1;

-

-  private StartServer() {

-  }

-

-  public static void main(String[] args) throws Exception {

-    configureLogback();

-    configureHome();

-

-    Properties configuration = getConfiguration();

-    String host = configuration.getProperty("sonar.web.host", DEFAULT_WEB_HOST);

-    int port = Integer.parseInt(configuration.getProperty("sonar.web.port", "" + DEFAULT_WEB_PORT));

-    String context = configuration.getProperty("sonar.web.context", DEFAULT_WEB_CONTEXT);

-    int ajp13Port = Integer.parseInt(configuration.getProperty("sonar.ajp13.port", "" + DEFAULT_AJP13_PORT));

-    JettyEmbedder jetty = new JettyEmbedder(host, port, context, ajp13Port, StartServer.class.getResource("/jetty.xml"));

-    configureRequestLogs(jetty, configuration);

-

-    jetty.start();

-    Thread.currentThread().join();

-  }

-

-  private static void configureRequestLogs(JettyEmbedder jetty, Properties configuration) {

-    String filenamePattern = configuration.getProperty("sonar.web.jettyRequestLogs");

-    if (filenamePattern!=null) {

-      jetty.configureRequestLogs(filenamePattern);

-    }

-  }

-

-  private static Properties getConfiguration() throws IOException {

-    Properties properties = new Properties();

-    properties.load(StartServer.class.getResourceAsStream("/conf/sonar.properties"));

-    return properties;

-  }

-

-  private static void configureHome() throws URISyntaxException {

-    File confFile = new File(StartServer.class.getResource("/conf/sonar.properties").toURI());

-    System.setProperty("sonar.home", confFile.getParentFile().getParentFile().getAbsolutePath());

-  }

-

-  private static void configureLogback() throws URISyntaxException {

-    File confFile = new File(StartServer.class.getResource("/conf/logback.xml").toURI());

-    System.setProperty("logback.configurationFile", confFile.getAbsolutePath()); 

-    System.setProperty("logback.ContextSelector", "JNDI");

-  }

-}

+/*
+ * Sonar, open source software quality management tool.
+ * Copyright (C) 2008-2011 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * Sonar is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * Sonar is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Sonar; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
+ */
+package org.sonar.application;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.Properties;
+
+public final class StartServer {
+  private static final String DEFAULT_WEB_HOST = "0.0.0.0";
+  private static final int DEFAULT_WEB_PORT = 9000;
+  private static final String DEFAULT_WEB_CONTEXT = "/";
+  private static final int DEFAULT_AJP13_PORT = -1;
+
+  private StartServer() {
+  }
+
+  public static void main(String[] args) throws Exception {
+    configureLogback();
+    configureHome();
+
+    Properties configuration = getConfiguration();
+    String host = configuration.getProperty("sonar.web.host", DEFAULT_WEB_HOST);
+    int port = Integer.parseInt(configuration.getProperty("sonar.web.port", "" + DEFAULT_WEB_PORT));
+    String context = configuration.getProperty("sonar.web.context", DEFAULT_WEB_CONTEXT);
+    int ajp13Port = Integer.parseInt(configuration.getProperty("sonar.ajp13.port", "" + DEFAULT_AJP13_PORT));
+    JettyEmbedder jetty = new JettyEmbedder(host, port, context, ajp13Port, StartServer.class.getResource("/jetty.xml"));
+    configureRequestLogs(jetty, configuration);
+
+    jetty.start();
+    Thread.currentThread().join();
+  }
+
+  private static void configureRequestLogs(JettyEmbedder jetty, Properties configuration) {
+    String filenamePattern = configuration.getProperty("sonar.web.jettyRequestLogs");
+    if (filenamePattern!=null) {
+      jetty.configureRequestLogs(filenamePattern);
+    }
+  }
+
+  private static Properties getConfiguration() throws IOException {
+    Properties properties = new Properties();
+    properties.load(StartServer.class.getResourceAsStream("/conf/sonar.properties"));
+    return properties;
+  }
+
+  private static void configureHome() throws URISyntaxException {
+    File confFile = new File(StartServer.class.getResource("/conf/sonar.properties").toURI());
+    System.setProperty("sonar.home", confFile.getParentFile().getParentFile().getAbsolutePath());
+  }
+
+  private static void configureLogback() throws URISyntaxException {
+    File confFile = new File(StartServer.class.getResource("/conf/logback.xml").toURI());
+    System.setProperty("logback.configurationFile", confFile.getAbsolutePath()); 
+    System.setProperty("logback.ContextSelector", "JNDI");
+  }
+}
diff --git a/sonar-application/src/test/java/org/sonar/application/JettyEmbedderTest.java b/sonar-application/src/test/java/org/sonar/application/JettyEmbedderTest.java
index 9f0fcdb93f7..614e9752bdb 100644
--- a/sonar-application/src/test/java/org/sonar/application/JettyEmbedderTest.java
+++ b/sonar-application/src/test/java/org/sonar/application/JettyEmbedderTest.java
@@ -1,6 +1,6 @@
 /*
  * Sonar, open source software quality management tool.
- * Copyright (C) 2009 SonarSource SA
+ * Copyright (C) 2008-2011 SonarSource
  * mailto:contact AT sonarsource DOT com
  *
  * Sonar is free software; you can redistribute it and/or