move /projects to /projects/admin

21 files changed, 8 insertions, 8 deletions

diff --git a/it/it-tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-be-able-to-provision-project.html b/it/it-tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-be-able-to-provision-project.html
index e968d015676..9d10b763456 100644
--- a/it/it-tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-be-able-to-provision-project.html
+++ b/it/it-tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-be-able-to-provision-project.html
@@ -40,7 +40,7 @@
   </tr>
   <tr>
     <td>open</td>
-    <td>/projects</td>
+    <td>/projects_admin</td>
     <td></td>
   </tr>
   <tr>
diff --git a/it/it-tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-not-be-able-to-provision-project.html b/it/it-tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-not-be-able-to-provision-project.html
index 428cf851541..a43148e4cd2 100644
--- a/it/it-tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-not-be-able-to-provision-project.html
+++ b/it/it-tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-not-be-able-to-provision-project.html
@@ -40,7 +40,7 @@
   </tr>
   <tr>
     <td>open</td>
-    <td>/projects</td>
+    <td>/projects_admin</td>
     <td></td>
   </tr>
   <tr>
diff --git a/it/it-tests/src/test/resources/projectAdministration/BulkDeletionTest/bulk-delete-filter-projects.html b/it/it-tests/src/test/resources/projectAdministration/BulkDeletionTest/bulk-delete-filter-projects.html
index b1a78ffe504..3752d35ee36 100644
--- a/it/it-tests/src/test/resources/projectAdministration/BulkDeletionTest/bulk-delete-filter-projects.html
+++ b/it/it-tests/src/test/resources/projectAdministration/BulkDeletionTest/bulk-delete-filter-projects.html
@@ -40,7 +40,7 @@
 </tr>
 <tr>
 	<td>open</td>
-	<td>/projects</td>
+	<td>/projects_admin</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/server/sonar-web/config/webpack/webpack.config.base.js b/server/sonar-web/config/webpack/webpack.config.base.js
index 245c6ba7ca4..de369bbcb09 100644
--- a/server/sonar-web/config/webpack/webpack.config.base.js
+++ b/server/sonar-web/config/webpack/webpack.config.base.js
@@ -43,7 +43,7 @@ module.exports = {
     'permission-templates': './src/main/js/apps/permission-templates/app.js',
     'project-admin': './src/main/js/apps/project-admin/app.js',
     'project-permissions': './src/main/js/apps/permissions/project/app.js',
-    'projects': './src/main/js/apps/projects/app.js',
+    'projects-admin': './src/main/js/apps/projects-admin/app.js',
     'quality-gates': './src/main/js/apps/quality-gates/app.js',
     'quality-profiles': './src/main/js/apps/quality-profiles/app.js',
     'settings': './src/main/js/apps/settings/app.js',
diff --git a/server/sonar-web/src/main/js/apps/projects/__tests__/projects-test.js b/server/sonar-web/src/main/js/apps/projects-admin/__tests__/projects-test.js
index 85abb704b2b..85abb704b2b 100644
--- a/server/sonar-web/src/main/js/apps/projects/__tests__/projects-test.js
+++ b/server/sonar-web/src/main/js/apps/projects-admin/__tests__/projects-test.js
diff --git a/server/sonar-web/src/main/js/apps/projects/app.js b/server/sonar-web/src/main/js/apps/projects-admin/app.js
index 7c68d2c4b6e..7c68d2c4b6e 100644
--- a/server/sonar-web/src/main/js/apps/projects/app.js
+++ b/server/sonar-web/src/main/js/apps/projects-admin/app.js
diff --git a/server/sonar-web/src/main/js/apps/projects/constants.js b/server/sonar-web/src/main/js/apps/projects-admin/constants.js
index 59a57a281e6..59a57a281e6 100644
--- a/server/sonar-web/src/main/js/apps/projects/constants.js
+++ b/server/sonar-web/src/main/js/apps/projects-admin/constants.js
diff --git a/server/sonar-web/src/main/js/apps/projects/create-view.js b/server/sonar-web/src/main/js/apps/projects-admin/create-view.js
index 3f1662349bc..3f1662349bc 100644
--- a/server/sonar-web/src/main/js/apps/projects/create-view.js
+++ b/server/sonar-web/src/main/js/apps/projects-admin/create-view.js
diff --git a/server/sonar-web/src/main/js/apps/projects/delete-view.js b/server/sonar-web/src/main/js/apps/projects-admin/delete-view.js
index 7d7ee00be62..7d7ee00be62 100644
--- a/server/sonar-web/src/main/js/apps/projects/delete-view.js
+++ b/server/sonar-web/src/main/js/apps/projects-admin/delete-view.js
diff --git a/server/sonar-web/src/main/js/apps/projects/form-view.js b/server/sonar-web/src/main/js/apps/projects-admin/form-view.js
index 7b96a150358..7b96a150358 100644
--- a/server/sonar-web/src/main/js/apps/projects/form-view.js
+++ b/server/sonar-web/src/main/js/apps/projects-admin/form-view.js
diff --git a/server/sonar-web/src/main/js/apps/projects/header.js b/server/sonar-web/src/main/js/apps/projects-admin/header.js
index 1d4200e3aa5..1d4200e3aa5 100644
--- a/server/sonar-web/src/main/js/apps/projects/header.js
+++ b/server/sonar-web/src/main/js/apps/projects-admin/header.js
diff --git a/server/sonar-web/src/main/js/apps/projects/main.js b/server/sonar-web/src/main/js/apps/projects-admin/main.js
index c3a240b19db..c3a240b19db 100644
--- a/server/sonar-web/src/main/js/apps/projects/main.js
+++ b/server/sonar-web/src/main/js/apps/projects-admin/main.js
diff --git a/server/sonar-web/src/main/js/apps/projects/projects.js b/server/sonar-web/src/main/js/apps/projects-admin/projects.js
index 140471de317..140471de317 100644
--- a/server/sonar-web/src/main/js/apps/projects/projects.js
+++ b/server/sonar-web/src/main/js/apps/projects-admin/projects.js
diff --git a/server/sonar-web/src/main/js/apps/projects/search.js b/server/sonar-web/src/main/js/apps/projects-admin/search.js
index 24817c916f9..24817c916f9 100644
--- a/server/sonar-web/src/main/js/apps/projects/search.js
+++ b/server/sonar-web/src/main/js/apps/projects-admin/search.js
diff --git a/server/sonar-web/src/main/js/apps/projects/templates/BulkApplyTemplateTemplate.hbs b/server/sonar-web/src/main/js/apps/projects-admin/templates/BulkApplyTemplateTemplate.hbs
index b4933eb193c..b4933eb193c 100644
--- a/server/sonar-web/src/main/js/apps/projects/templates/BulkApplyTemplateTemplate.hbs
+++ b/server/sonar-web/src/main/js/apps/projects-admin/templates/BulkApplyTemplateTemplate.hbs
diff --git a/server/sonar-web/src/main/js/apps/projects/templates/projects-create-form.hbs b/server/sonar-web/src/main/js/apps/projects-admin/templates/projects-create-form.hbs
index f94b5461f8f..f94b5461f8f 100644
--- a/server/sonar-web/src/main/js/apps/projects/templates/projects-create-form.hbs
+++ b/server/sonar-web/src/main/js/apps/projects-admin/templates/projects-create-form.hbs
diff --git a/server/sonar-web/src/main/js/apps/projects/templates/projects-delete.hbs b/server/sonar-web/src/main/js/apps/projects-admin/templates/projects-delete.hbs
index 2ab69b28f72..2ab69b28f72 100644
--- a/server/sonar-web/src/main/js/apps/projects/templates/projects-delete.hbs
+++ b/server/sonar-web/src/main/js/apps/projects-admin/templates/projects-delete.hbs
diff --git a/server/sonar-web/src/main/js/apps/projects/views/BulkApplyTemplateView.js b/server/sonar-web/src/main/js/apps/projects-admin/views/BulkApplyTemplateView.js
index d2fc1aba72e..d2fc1aba72e 100644
--- a/server/sonar-web/src/main/js/apps/projects/views/BulkApplyTemplateView.js
+++ b/server/sonar-web/src/main/js/apps/projects-admin/views/BulkApplyTemplateView.js
diff --git a/server/sonar-web/src/main/js/main/nav/settings/settings-nav.js b/server/sonar-web/src/main/js/main/nav/settings/settings-nav.js
index afad572d0e8..35313c30300 100644
--- a/server/sonar-web/src/main/js/main/nav/settings/settings-nav.js
+++ b/server/sonar-web/src/main/js/main/nav/settings/settings-nav.js
@@ -41,7 +41,7 @@ export default React.createClass({
   },
 
   isProjectsActive() {
-    const urls = ['/projects', '/background_tasks'];
+    const urls = ['/projects_admin', '/background_tasks'];
     return this.isSomethingActive(urls);
   },
 
@@ -109,7 +109,7 @@ export default React.createClass({
                 <i className="icon-dropdown"></i>
               </a>
               <ul className="dropdown-menu">
-                {this.renderLink('/projects', 'Management')}
+                {this.renderLink('/projects_admin', 'Management')}
                 {this.renderLink('/background_tasks',
                     translate('background_tasks.page'))}
               </ul>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/projects_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/projects_admin_controller.rb
index 6661201822c..09ad7385d78 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/projects_controller.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/projects_admin_controller.rb
@@ -17,7 +17,7 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-class ProjectsController < ApplicationController
+class ProjectsAdminController < ApplicationController
 
   before_filter :admin_required
 
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/projects/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/projects_admin/index.html.erb
index e9c8ffd9ad8..3c6e21dbbd1 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/projects/index.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/projects_admin/index.html.erb
@@ -1,3 +1,3 @@
 <% content_for :extra_script do %>
-  <script src="<%= ApplicationController.root_context -%>/js/bundles/projects.js?v=<%= sonar_version -%>"></script>
+  <script src="<%= ApplicationController.root_context -%>/js/bundles/projects-admin.js?v=<%= sonar_version -%>"></script>
 <% end %>