unify naming convention for requirejs module names

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1305839 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 f35bc74b02d973f94f8660f165054c04d9b1dfe6..34a8b8ab317d6514623cc1f14ae4b81dce68f213 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
@@ -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 aa5115e80576323c31596601b85022f7e3d12a45..ef88267851c50a243ded481e23b1a832ded8f444 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,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 121eacaac088d146384eae19de57ce39d52b8f7b..b99ef64d5a24d2a0fa2f8236cd257276ff5a8f66 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
@@ -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 b4e6ad894a4418191aaf02d7d56ebdf1b1c50f65..b372459eefd921b55370010ca57790c564ec6960 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,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 f723349dc4e29998ff6037e77f7c3d47eafdc626..aed5923d5dd280609890fd3d4d48ed8a2f329562 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("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 9cfeccf6d41e1585fdb4d8776030c6f8c16885f2..c0f19ca95fa3370c6087134556d5a182b6b1aebe 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("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 c7a918c4a40d69fbe38b3a45f9e4cfd07731c430..c1704091d266fc418490b7ad9b8bb176976d1a66 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("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 e924d90e266e7dedc756e63f072cb6c81073c53b..77010a202e0d8b4bdd4421b216113c37b9f14d46 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","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 d965721680b75931a4d7490419f1a3e00633db3e..d76cb2d807e08e4df388e19818cd4acbe0255780 100644 (file)
--- 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 c1599fa5354db8d4a999080a0f2f372bb142aa44..5ab9e81abce2f0594193fe4324560f2bf208bf7c 100644 (file)
--- 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 e08ab110eb9d1447c0ed5e1c15b3d6eae24037cd..027bf5bb76cef5bb0014ce9295edf7c59f58a743 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
@@ -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 c3b72f168c60ba74122047da6a49686813d2272e..4d0a6b525bdcf6e228639a72a0fef3ba66217c19 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
@@ -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 2efdedc33b39d9241090d360a854af5b6937ab80..551bea4bf91f15668b2bb31b698b43b381997d48 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("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 56e6e8474669c14fc9084300a4dbe170998ed394..d243b27b771b047977985205f42523ac78bb7c1d 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("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 6e54b2c611a7fca70cb997782a05275ec041a0c5..8f206367cefd14f070421e5f1b20a7942f5976f2 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("users",["jquery","order!utils","i18n","jquery.validate","order!knockout","order!knockout.simpleGrid"], function() {
 
   /**
    * view model used for users grid