unify naming convention for requirejs module names

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1305839 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-03-27 13:46:38 +00:00
parent d9fa9a6a32
commit e146c9a82d
15 changed files with 21 additions and 21 deletions

View File

@ -77,14 +77,14 @@
paths: { paths: {
"i18n":"jquery.i18n.properties-1.0.9", "i18n":"jquery.i18n.properties-1.0.9",
"jquery": "jquery-1.7.2", "jquery": "jquery-1.7.2",
"jquery_tmpl": "jquery.tmpl", "jquery.tmpl": "jquery.tmpl",
"utils": "archiva/utils", "utils": "archiva/utils",
"jquery_ui": "jquery-ui-1.8.16.custom.min", "jquery.ui.widget": "jquery-ui-1.8.16.custom.min",
"jquery_cookie": "jquery.cookie.1.0.0", "jquery.cookie": "jquery.cookie.1.0.0",
"bootstrap": "bootstrap.2.0.2", "bootstrap": "bootstrap.2.0.2",
"choosen": "chosen.jquery-0.9.7", "choosen": "chosen.jquery-0.9.7",
"jquery_validate": "jquery.validate-1.9.0", "jquery.validate": "jquery.validate-1.9.0",
"jquery_json": "jquery.json-2.3.min", "jquery.json": "jquery.json-2.3.min",
"knockout": "knockout-2.0.0.debug", "knockout": "knockout-2.0.0.debug",
"knockout.simpleGrid": "knockout.simpleGrid", "knockout.simpleGrid": "knockout.simpleGrid",
"knockout.sortable": "knockout-sortable", "knockout.sortable": "knockout-sortable",

View File

@ -16,8 +16,8 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
define("general-admin",["jquery","i18n","order!utils","order!jquery_tmpl","order!knockout","order!knockout.simpleGrid", define("general-admin",["jquery","i18n","order!utils","order!jquery.tmpl","order!knockout","order!knockout.simpleGrid",
"jquery_validate","bootstrap"] "jquery.validate","bootstrap"]
, function() { , function() {
//------------------------- //-------------------------

View File

@ -26,7 +26,7 @@ define("main-templates",["text!templates/archiva/menu.html",
"text!templates/archiva/repository-groups.html", "text!templates/archiva/repository-groups.html",
"text!templates/archiva/search.html", "text!templates/archiva/search.html",
"text!templates/archiva/general-admin.html", "text!templates/archiva/general-admin.html",
"jquery_tmpl","utils"], "jquery.tmpl","utils"],
function(menu,message,modal,grids_generics,repositories,network_proxies,proxies_connectors, function(menu,message,modal,grids_generics,repositories,network_proxies,proxies_connectors,
repository_groups,search,general_admin) { repository_groups,search,general_admin) {

View File

@ -16,8 +16,8 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
define("main",["order!jquery","jquery_ui","jquery_cookie","bootstrap","order!archiva/search", 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", "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!redback","general-admin","repositories","network-proxies","proxy-connectors","repository-groups",
"order!knockout.simpleGrid"], "order!knockout.simpleGrid"],
function() { function() {

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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() { ,"order!knockout.simpleGrid"], function() {

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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() { ,"order!knockout.simpleGrid","knockout.sortable"], function() {
ProxyConnector=function(sourceRepoId,targetRepoId,proxyId,blackListPatterns,whiteListPatterns,policiesEntries,propertiesEntries, ProxyConnector=function(sourceRepoId,targetRepoId,proxyId,blackListPatterns,whiteListPatterns,policiesEntries,propertiesEntries,

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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() { function() {
// FIXME this must be dynamic if we do a plugin mechanism with dynamic repositories types // FIXME this must be dynamic if we do a plugin mechanism with dynamic repositories types

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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"], ,"order!knockout.simpleGrid","knockout.sortable"],
function() { function() {

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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() {

View File

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
define("utils",["jquery","i18n","jquery_tmpl"], function() { define("utils",["jquery","i18n","jquery.tmpl"], function() {
loadi18n=function(){ loadi18n=function(){
var browserLang = usedLang(); var browserLang = usedLang();

View File

@ -23,7 +23,7 @@ define("redback-templates",["text!templates/redback/user-edit.html",
"text!templates/redback/password-change-form.html", "text!templates/redback/password-change-form.html",
"text!templates/redback/user-edit-form.html", "text!templates/redback/user-edit-form.html",
"text!templates/redback/roles-tmpl.html", "text!templates/redback/roles-tmpl.html",
"jquery_tmpl","utils"], "jquery.tmpl","utils"],
function(useredit, usergrids, login,register,passwordchange,usereditform,roles) { function(useredit, usergrids, login,register,passwordchange,usereditform,roles) {
var htmlFragment=$("#html-fragments"); var htmlFragment=$("#html-fragments");

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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() { "order!knockout.simpleGrid","roles","user","users"], function() {
// define a container object with various datas // define a container object with various datas

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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){ Role = function(name,description,assignable,childRoleNames,parentRoleNames,users,parentsRolesUsers,permissions,otherUsers){

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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 * object model for user with some function to create/update/delete users

View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * 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 * view model used for users grid