From: Olivier Lamy Date: Tue, 27 Mar 2012 13:47:07 +0000 (+0000) Subject: use a better naming convention for require modules adding redback or archiva X-Git-Tag: archiva-1.4-M3~924 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2a224bb7dc627b9e645346bce1aa69d52d69fe85;p=archiva.git use a better naming convention for require modules adding redback or archiva git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1305840 13f79535-47bb-0310-9956-ffa450edef68 --- 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 34a8b8ab3..cef6f1cfd 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 @@ -89,17 +89,17 @@ "knockout.simpleGrid": "knockout.simpleGrid", "knockout.sortable": "knockout-sortable", "redback": "redback/redback", - "general-admin":"archiva/general-admin", - "redback-templates": "redback/redback-tmpl", - "main-templates": "archiva/main-tmpl", - "repositories": "archiva/repositories", - "network-proxies": "archiva/network-proxies", - "proxy-connectors": "archiva/proxy-connectors", - "repository-groups": "archiva/repository-groups", - "roles": "redback/roles", - "user": "redback/user", - "users": "redback/users", - "archiva/main": "archiva/main" + "redback.roles": "redback/roles", + "redback.user": "redback/user", + "redback.users": "redback/users", + "redback.templates": "redback/redback-tmpl", + "archiva.general-admin":"archiva/general-admin", + "archiva.templates": "archiva/main-tmpl", + "archiva.repositories": "archiva/repositories", + "archiva.network-proxies": "archiva/network-proxies", + "archiva.proxy-connectors": "archiva/proxy-connectors", + "archiva.repository-groups": "archiva/repository-groups", + "archiva.main": "archiva/main" } // file upload dependencies //.script("jquery.iframe-transport-1.4.js").wait() 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 ef8826785..a66073d5c 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,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -define("general-admin",["jquery","i18n","order!utils","order!jquery.tmpl","order!knockout","order!knockout.simpleGrid", +define("archiva.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 b99ef64d5..03089f5bc 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 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -define("main-templates",["text!templates/archiva/menu.html", +define("archiva.templates",["text!templates/archiva/menu.html", "text!templates/archiva/message.html", "text!templates/archiva/modal.html", "text!templates/archiva/grids-generics.html", 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 b372459ee..cac5f96f1 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,9 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -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", +define("archiva.main",["order!jquery","jquery.ui.widget","jquery.cookie","bootstrap","order!archiva/search", + "jquery.validate","jquery.json","order!knockout","order!redback.templates","order!archiva.templates", + "order!redback.roles", + "order!redback","archiva.general-admin","archiva.repositories","archiva.network-proxies","archiva.proxy-connectors", + "archiva.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 aed5923d5..d3ae12590 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("archiva.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 c0f19ca95..9d214ca08 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("archiva.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 c1704091d..9ad0ca221 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("archiva.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 77010a202..cf887b4b9 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.widget","order!knockout" +define("archiva.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/redback/redback-tmpl.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js index 027bf5bb7..8a9f723e7 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 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -define("redback-templates",["text!templates/redback/user-edit.html", +define("redback.templates",["text!templates/redback/user-edit.html", "text!templates/redback/user-grids.html", "text!templates/redback/login.html", "text!templates/redback/register-form.html", 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 4d0a6b525..116c376f3 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 @@ -17,7 +17,7 @@ * under the License. */ define("redback",["jquery","order!utils","jquery.validate","jquery.json","order!knockout", - "order!knockout.simpleGrid","roles","user","users"], function() { + "order!knockout.simpleGrid","redback.roles","redback.user","redback.users"], function() { // define a container object with various datas window.redbackModel = {userOperationNames:null,key:null,i18n:$.i18n.map}; 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 551bea4bf..6ea9234d3 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("redback.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 d243b27b7..896076627 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("redback.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 8f206367c..3fdc20780 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("redback.users",["jquery","order!utils","i18n","jquery.validate","order!knockout","order!knockout.simpleGrid"], function() { /** * view model used for users grid