From e146c9a82d4178fe1ec125bc30f923aa737a196b Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 27 Mar 2012 13:46:38 +0000 Subject: [PATCH] unify naming convention for requirejs module names git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1305839 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva-webapp-js/src/main/webapp/index.html | 10 +++++----- .../src/main/webapp/js/archiva/general-admin.js | 4 ++-- .../src/main/webapp/js/archiva/main-tmpl.js | 2 +- .../src/main/webapp/js/archiva/main.js | 4 ++-- .../src/main/webapp/js/archiva/network-proxies.js | 2 +- .../src/main/webapp/js/archiva/proxy-connectors.js | 2 +- .../src/main/webapp/js/archiva/repositories.js | 2 +- .../src/main/webapp/js/archiva/repository-groups.js | 2 +- .../src/main/webapp/js/archiva/search.js | 2 +- .../src/main/webapp/js/archiva/utils.js | 2 +- .../src/main/webapp/js/redback/redback-tmpl.js | 2 +- .../src/main/webapp/js/redback/redback.js | 2 +- .../src/main/webapp/js/redback/roles.js | 2 +- .../src/main/webapp/js/redback/user.js | 2 +- .../src/main/webapp/js/redback/users.js | 2 +- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html index f35bc74b0..34a8b8ab3 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html @@ -77,14 +77,14 @@ paths: { "i18n":"jquery.i18n.properties-1.0.9", "jquery": "jquery-1.7.2", - "jquery_tmpl": "jquery.tmpl", + "jquery.tmpl": "jquery.tmpl", "utils": "archiva/utils", - "jquery_ui": "jquery-ui-1.8.16.custom.min", - "jquery_cookie": "jquery.cookie.1.0.0", + "jquery.ui.widget": "jquery-ui-1.8.16.custom.min", + "jquery.cookie": "jquery.cookie.1.0.0", "bootstrap": "bootstrap.2.0.2", "choosen": "chosen.jquery-0.9.7", - "jquery_validate": "jquery.validate-1.9.0", - "jquery_json": "jquery.json-2.3.min", + "jquery.validate": "jquery.validate-1.9.0", + "jquery.json": "jquery.json-2.3.min", "knockout": "knockout-2.0.0.debug", "knockout.simpleGrid": "knockout.simpleGrid", "knockout.sortable": "knockout-sortable", diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js index aa5115e80..ef8826785 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js @@ -16,8 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -define("general-admin",["jquery","i18n","order!utils","order!jquery_tmpl","order!knockout","order!knockout.simpleGrid", - "jquery_validate","bootstrap"] +define("general-admin",["jquery","i18n","order!utils","order!jquery.tmpl","order!knockout","order!knockout.simpleGrid", + "jquery.validate","bootstrap"] , function() { //------------------------- diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js index 121eacaac..b99ef64d5 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js @@ -26,7 +26,7 @@ define("main-templates",["text!templates/archiva/menu.html", "text!templates/archiva/repository-groups.html", "text!templates/archiva/search.html", "text!templates/archiva/general-admin.html", - "jquery_tmpl","utils"], + "jquery.tmpl","utils"], function(menu,message,modal,grids_generics,repositories,network_proxies,proxies_connectors, repository_groups,search,general_admin) { diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js index b4e6ad894..b372459ee 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js @@ -16,8 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -define("main",["order!jquery","jquery_ui","jquery_cookie","bootstrap","order!archiva/search", - "jquery_validate","jquery_json","order!knockout","order!redback-templates","order!main-templates","order!roles", +define("main",["order!jquery","jquery.ui.widget","jquery.cookie","bootstrap","order!archiva/search", + "jquery.validate","jquery.json","order!knockout","order!redback-templates","order!main-templates","order!roles", "order!redback","general-admin","repositories","network-proxies","proxy-connectors","repository-groups", "order!knockout.simpleGrid"], function() { diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js index f723349dc..aed5923d5 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -define("network-proxies",["jquery","i18n","jquery_tmpl","bootstrap","jquery_validate","order!knockout" +define("network-proxies",["jquery","i18n","jquery.tmpl","bootstrap","jquery.validate","order!knockout" ,"order!knockout.simpleGrid"], function() { diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js index 9cfeccf6d..c0f19ca95 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -define("proxy-connectors",["jquery","i18n","jquery_tmpl","bootstrap","jquery_validate","order!knockout" +define("proxy-connectors",["jquery","i18n","jquery.tmpl","bootstrap","jquery.validate","order!knockout" ,"order!knockout.simpleGrid","knockout.sortable"], function() { ProxyConnector=function(sourceRepoId,targetRepoId,proxyId,blackListPatterns,whiteListPatterns,policiesEntries,propertiesEntries, diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js index c7a918c4a..c1704091d 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -define("repositories",["jquery","i18n","jquery_tmpl","bootstrap","jquery_validate","order!knockout","order!knockout.simpleGrid"], +define("repositories",["jquery","i18n","jquery.tmpl","bootstrap","jquery.validate","order!knockout","order!knockout.simpleGrid"], function() { // FIXME this must be dynamic if we do a plugin mechanism with dynamic repositories types diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js index e924d90e2..77010a202 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -define("repository-groups",["jquery","i18n","jquery_tmpl","bootstrap","jquery_validate","jquery_ui","order!knockout" +define("repository-groups",["jquery","i18n","jquery.tmpl","bootstrap","jquery.validate","jquery.ui.widget","order!knockout" ,"order!knockout.simpleGrid","knockout.sortable"], function() { diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js index d96572168..d76cb2d80 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -define("search",["jquery","i18n","jquery_tmpl","choosen","order!knockout","knockout.simpleGrid"], function() { +define("search",["jquery","i18n","jquery.tmpl","choosen","order!knockout","knockout.simpleGrid"], function() { diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js index c1599fa53..5ab9e81ab 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js @@ -17,7 +17,7 @@ * under the License. */ -define("utils",["jquery","i18n","jquery_tmpl"], function() { +define("utils",["jquery","i18n","jquery.tmpl"], function() { loadi18n=function(){ var browserLang = usedLang(); diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js index e08ab110e..027bf5bb7 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js @@ -23,7 +23,7 @@ define("redback-templates",["text!templates/redback/user-edit.html", "text!templates/redback/password-change-form.html", "text!templates/redback/user-edit-form.html", "text!templates/redback/roles-tmpl.html", - "jquery_tmpl","utils"], + "jquery.tmpl","utils"], function(useredit, usergrids, login,register,passwordchange,usereditform,roles) { var htmlFragment=$("#html-fragments"); diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js index c3b72f168..4d0a6b525 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -define("redback",["jquery","order!utils","jquery_validate","jquery_json","order!knockout", +define("redback",["jquery","order!utils","jquery.validate","jquery.json","order!knockout", "order!knockout.simpleGrid","roles","user","users"], function() { // define a container object with various datas diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js index 2efdedc33..551bea4bf 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -define("roles",["jquery","order!utils","i18n","jquery_validate","order!knockout","order!knockout.simpleGrid"], function() { +define("roles",["jquery","order!utils","i18n","jquery.validate","order!knockout","order!knockout.simpleGrid"], function() { Role = function(name,description,assignable,childRoleNames,parentRoleNames,users,parentsRolesUsers,permissions,otherUsers){ diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js index 56e6e8474..d243b27b7 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -define("user",["jquery","order!utils","i18n","jquery_validate","order!knockout","order!knockout.simpleGrid"], function() { +define("user",["jquery","order!utils","i18n","jquery.validate","order!knockout","order!knockout.simpleGrid"], function() { /** * object model for user with some function to create/update/delete users diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js index 6e54b2c61..8f206367c 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -define("users",["jquery","order!utils","i18n","jquery_validate","order!knockout","order!knockout.simpleGrid"], function() { +define("users",["jquery","order!utils","i18n","jquery.validate","order!knockout","order!knockout.simpleGrid"], function() { /** * view model used for users grid -- 2.39.5