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
This commit is contained in:
Olivier Lamy 2012-03-27 13:47:07 +00:00
parent e146c9a82d
commit 2a224bb7dc
13 changed files with 27 additions and 25 deletions

View File

@ -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()

View File

@ -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() {

View File

@ -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",

View File

@ -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() {

View File

@ -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() {

View File

@ -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,

View File

@ -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

View File

@ -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() {

View File

@ -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",

View File

@ -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};

View File

@ -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){

View File

@ -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

View File

@ -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