Fix deprecated URLs sonarsource.org and sonar.codehaus.org

diff --git a/sonar-server/src/main/webapp/500.html b/sonar-server/src/main/webapp/500.html
index ba937f8d67ae9d07f92b6d3c8f91883bd0395ade..c60b0501e272df627cb7c925032b6a9781aab468 100644 (file)
--- a/sonar-server/src/main/webapp/500.html
+++ b/sonar-server/src/main/webapp/500.html
@@ -34,7 +34,7 @@
 <div class="dialog">
   <h1>We're sorry, but something went wrong.</h1>
 
-  <p>Please try back in a few minutes and contact <a href="http://sonar.codehaus.org/support">support</a> if the problem
+  <p>Please try back in a few minutes and contact <a href="http://www.sonarqube.org/get-support/">support</a> if the problem
     persists.</p>
 
   <p>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
index 74bb5a1fdc9f8662ea1a772a0057e796f4eb2bc2..013e9a882fc9e43d699f9e55c4fae8cdcbcc90bf 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
@@ -154,7 +154,7 @@
 
           <%= yield :sidebar %>
           <li id="logo">
-            <center><a href="http://www.sonarsource.org/" target="SonarSource"><%= image_tag('sonarqube-24x100.png', :alt => message('layout.sonar.slogan'), :width => 100, :height => 24) -%></a></center>
+            <center><a href="http://www.sonarqube.org/" target="SonarSource"><%= image_tag('sonarqube-24x100.png', :alt => message('layout.sonar.slogan'), :width => 100, :height => 24) -%></a></center>
           </li>
         </ul>
       </div>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb
index 5396c330d5235e240fcc29b9f5cbd1c3e142fd95..85630232a969f54f31bc89950dd781effde7b0a2 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb
@@ -11,7 +11,7 @@
 </style>
 
 <div id="maintenance">
-<div id="maintenancelogo"><a href="http://www.sonarsource.org"><%= image_tag('sonarqube-24x100.png', :class => 'png') -%></a></div>
+<div id="maintenancelogo"><a href="http://www.sonarqube.org"><%= image_tag('sonarqube-24x100.png', :class => 'png') -%></a></div>
 <h1>SonarQube is under maintenance. <a href="<%= ApplicationController.root_context -%>/">Please check back later.</a></h1>
 <p>Whilst waiting, you might want to check <a href="http://sonar-plugins.codehaus.org">new plugins</a> to extend the current functionality. </p><p>If you are an administrator and have no idea why this message is showing, you should read the <a href="http://docs.codehaus.org/display/SONAR/Upgrade+guide">upgrade guide</a>.</p>
 </div>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/markdown/help.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/markdown/help.html.erb
index 86024ca7769aed711de0a2ee32f12b024def3ddb..5f56037851cc768f37c9fbff700e13f159b24d8a 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/markdown/help.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/markdown/help.html.erb
@@ -13,8 +13,8 @@
       <td><b>this text is bold</b></td>
     </tr>
     <tr class="odd">
-      <td>http://sonarsource.org</td>
-      <td><a href="http://sonarsource.org">http://sonarsource.org</a></td>
+      <td>http://sonarqube.org</td>
+      <td><a href="http://sonarqube.org">http://sonarqube.org</a></td>
     </tr>
     <tr class="even">
       <td valign="top">* bulleted point</td>
@@ -49,4 +49,4 @@
     </tr>
     </tbody>
   </table>
-</div>
\ No newline at end of file
+</div>