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 34a8b8ab317d6514623cc1f14ae4b81dce68f213..cef6f1cfd9b965377e44b9e7cb30cd20e64f461a 100644 (file)
--- 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 ef88267851c50a243ded481e23b1a832ded8f444..a66073d5c6c230c4a280dfb293b9be0f5db2b914 100644 (file)
--- 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 b99ef64d5a24d2a0fa2f8236cd257276ff5a8f66..03089f5bc379f12f8c715f5ffa7dd9213a8562b4 100644 (file)
--- 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 b372459eefd921b55370010ca57790c564ec6960..cac5f96f18f790e605a632d752f6d080c65d5da0 100644 (file)
--- 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 aed5923d5dd280609890fd3d4d48ed8a2f329562..d3ae125902c897f3fa9a07071752111c42121829 100644 (file)
--- 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 c0f19ca95fa3370c6087134556d5a182b6b1aebe..9d214ca08c0f6a2d0d2fd15ba4ddc16cad8bab6d 100644 (file)
--- 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 c1704091d266fc418490b7ad9b8bb176976d1a66..9ad0ca2215c141c4d89521648b1f5f59162e22c9 100644 (file)
--- 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 77010a202e0d8b4bdd4421b216113c37b9f14d46..cf887b4b93bf82e1ef4fd2411bf6bac10e3dd5bd 100644 (file)
--- 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 027bf5bb76cef5bb0014ce9295edf7c59f58a743..8a9f723e7eed22e43a851ceb59412a842ac6eaf3 100644 (file)
--- 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 4d0a6b525bdcf6e228639a72a0fef3ba66217c19..116c376f3fc59f68bfc8cf3ecd56ef884dd02123 100644 (file)
--- 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 551bea4bf91f15668b2bb31b698b43b381997d48..6ea9234d32eb5a037ed29f6683197b5b188ae2d3 100644 (file)
--- 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 d243b27b771b047977985205f42523ac78bb7c1d..8960766277f8ad9c96b7c0afdb7a7a8a84ab172e 100644 (file)
--- 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 8f206367cefd14f070421e5f1b20a7942f5976f2..3fdc2078046e5bf9dcc69ef9f36de0f6f31e3c6f 100644 (file)
--- 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