Author: olamy
Date: Tue Mar 27 13:46:38 2012
New Revision: 1305839
URL: http://svn.apache.org/viewvc?rev=1305839&view=rev
Log:
unify naming convention for requirejs module names
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html?rev=1305839&r1=1305838&r2=1305839&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
Tue Mar 27 13:46:38 2012
@@ -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",
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js?rev=1305839&r1=1305838&r2=1305839&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
Tue Mar 27 13:46:38 2012
@@ -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() {
//-------------------------
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js?rev=1305839&r1=1305838&r2=1305839&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
Tue Mar 27 13:46:38 2012
@@ -26,7 +26,7 @@ define("main-templates",["text!templates
"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) {
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1305839&r1=1305838&r2=1305839&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
Tue Mar 27 13:46:38 2012
@@ -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() {
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js?rev=1305839&r1=1305838&r2=1305839&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
Tue Mar 27 13:46:38 2012
@@ -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() {
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js?rev=1305839&r1=1305838&r2=1305839&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
Tue Mar 27 13:46:38 2012
@@ -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,
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js?rev=1305839&r1=1305838&r2=1305839&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
Tue Mar 27 13:46:38 2012
@@ -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
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js?rev=1305839&r1=1305838&r2=1305839&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
Tue Mar 27 13:46:38 2012
@@ -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() {
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1305839&r1=1305838&r2=1305839&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
Tue Mar 27 13:46:38 2012
@@ -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() {
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js?rev=1305839&r1=1305838&r2=1305839&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
Tue Mar 27 13:46:38 2012
@@ -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();
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js?rev=1305839&r1=1305838&r2=1305839&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js
Tue Mar 27 13:46:38 2012
@@ -23,7 +23,7 @@ define("redback-templates",["text!templa
"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");
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js?rev=1305839&r1=1305838&r2=1305839&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
Tue Mar 27 13:46:38 2012
@@ -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
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js?rev=1305839&r1=1305838&r2=1305839&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js
Tue Mar 27 13:46:38 2012
@@ -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){
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js?rev=1305839&r1=1305838&r2=1305839&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
Tue Mar 27 13:46:38 2012
@@ -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
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js?rev=1305839&r1=1305838&r2=1305839&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
Tue Mar 27 13:46:38 2012
@@ -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
