From 708a34f1f23b9c1a20abb244fecd299992480a4b Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 27 Dec 2012 14:55:12 +0000 Subject: [PATCH] rename archiva-webapp-js module to archiva-webapp git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1426213 13f79535-47bb-0310-9956-ffa450edef68 --- .../{archiva-webapp-js => archiva-webapp}/LICENSE | 0 .../{archiva-webapp-js => archiva-webapp}/pom.xml | 0 .../src/main/resources/META-INF/spring-context.xml | 0 .../src/main/resources/ehcache.xml | 0 .../src/main/resources/log4j2.xml | 0 .../org/apache/archiva/redback-security.properties | 0 .../src/main/webapp/WEB-INF/applicationContext.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../src/main/webapp/css/archiva.css | 0 .../src/main/webapp/css/bootstrap.2.2.1.css | 0 .../src/main/webapp/css/images/application.png | Bin .../src/main/webapp/css/images/code.png | Bin .../src/main/webapp/css/images/css.png | Bin .../src/main/webapp/css/images/db.png | Bin .../src/main/webapp/css/images/doc.png | Bin .../src/main/webapp/css/images/file.png | Bin .../src/main/webapp/css/images/film.png | Bin .../src/main/webapp/css/images/flash.png | Bin .../src/main/webapp/css/images/folder-closed.gif | Bin .../src/main/webapp/css/images/folder.gif | Bin .../src/main/webapp/css/images/html.png | Bin .../src/main/webapp/css/images/java.png | Bin .../src/main/webapp/css/images/linux.png | Bin .../src/main/webapp/css/images/music.png | Bin .../src/main/webapp/css/images/pdf.png | Bin .../src/main/webapp/css/images/php.png | Bin .../src/main/webapp/css/images/picture.png | Bin .../src/main/webapp/css/images/ppt.png | Bin .../src/main/webapp/css/images/psd.png | Bin .../src/main/webapp/css/images/ruby.png | Bin .../src/main/webapp/css/images/script.png | Bin .../src/main/webapp/css/images/select2.png | Bin .../src/main/webapp/css/images/select2x2.png | Bin .../src/main/webapp/css/images/spinner.gif | Bin .../src/main/webapp/css/images/txt.png | Bin .../css/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin .../css/images/ui-bg_flat_75_ffffff_40x100.png | Bin .../css/images/ui-bg_glass_55_fbf9ee_1x400.png | Bin .../css/images/ui-bg_glass_65_ffffff_1x400.png | Bin .../css/images/ui-bg_glass_75_dadada_1x400.png | Bin .../css/images/ui-bg_glass_75_e6e6e6_1x400.png | Bin .../css/images/ui-bg_glass_75_ffffff_1x400.png | Bin .../css/images/ui-bg_glass_95_fef1ec_1x400.png | Bin .../images/ui-bg_highlight-soft_75_cccccc_1x100.png | Bin .../css/images/ui-bg_inset-soft_95_fef1ec_1x100.png | Bin .../webapp/css/images/ui-icons_222222_256x240.png | Bin .../webapp/css/images/ui-icons_2e83ff_256x240.png | Bin .../webapp/css/images/ui-icons_454545_256x240.png | Bin .../webapp/css/images/ui-icons_888888_256x240.png | Bin .../webapp/css/images/ui-icons_cd0a0a_256x240.png | Bin .../webapp/css/images/ui-icons_f6cf3b_256x240.png | Bin .../src/main/webapp/css/images/xls.png | Bin .../src/main/webapp/css/images/zip.png | Bin .../main/webapp/css/jquery-ui-1.9.2.custom.min.css | 0 .../src/main/webapp/css/jquery.fileupload-ui.css | 0 .../src/main/webapp/css/jquery.ui.1.8.16.ie.css | 0 .../src/main/webapp/css/jqueryFileTree.css | 0 .../src/main/webapp/css/prettify.css | 0 .../src/main/webapp/css/select2-3.2.css | 0 .../src/main/webapp/favicon.ico | Bin .../webapp/images/applications-internet-2-32-32.png | Bin .../webapp/images/applications-internet-32-32.png | Bin .../src/main/webapp/images/atom.gif | Bin .../src/main/webapp/images/dialog-error-22-22.png | Bin .../src/main/webapp/images/dialog-error.png | Bin .../webapp/images/drive-removable-media-16-16.png | Bin .../src/main/webapp/images/edit-cut.png | Bin .../src/main/webapp/images/folder-saved-search.png | Bin .../src/main/webapp/images/folder.png | Bin .../src/main/webapp/images/go-home.png | Bin .../src/main/webapp/images/green-22-22.png | Bin .../webapp/images/internet-web-browser-32-32.png | Bin .../src/main/webapp/images/internet-web-browser.png | Bin .../src/main/webapp/images/list-add-22-22.png | Bin .../src/main/webapp/images/list-add.png | Bin .../src/main/webapp/images/medium-spinner.gif | Bin .../src/main/webapp/images/package-x-generic.png | Bin .../preferences-system-network-proxy-32-32.png | Bin .../src/main/webapp/images/red-22-22.png | Bin .../src/main/webapp/images/small-spinner.gif | Bin .../webapp/images/system-file-manager-32-32.png | Bin .../main/webapp/images/system-lock-screen-22-22.png | Bin .../src/main/webapp/images/system-lock-screen.png | Bin .../src/main/webapp/images/system-search-16-16.png | Bin .../webapp/images/system-software-update-32-32.png | Bin .../src/main/webapp/images/system-users-32-32.png | Bin .../src/main/webapp/images/trash.png | Bin .../src/main/webapp/images/user-trash-full.png | Bin .../src/main/webapp/images/user-trash.png | Bin .../images/utilities-system-monitor-22-22.png | Bin .../main/webapp/images/utilities-system-monitor.png | Bin .../src/main/webapp/images/view-refresh-22-22.png | Bin .../src/main/webapp/images/view-refresh.png | Bin .../src/main/webapp/images/weather-clear-22-22.png | Bin .../src/main/webapp/images/weather-clear.png | Bin .../main/webapp/img/glyphicons-halflings-white.png | Bin .../src/main/webapp/img/glyphicons-halflings.png | Bin .../src/main/webapp/img/loading.gif | Bin .../src/main/webapp/img/progressbar.gif | Bin .../src/main/webapp/index.html | 0 .../src/main/webapp/js/archiva/archiva.js | 0 .../main/webapp/js/archiva/artifacts-management.js | 0 .../src/main/webapp/js/archiva/docs.js | 0 .../src/main/webapp/js/archiva/general-admin.js | 0 .../src/main/webapp/js/archiva/main-tmpl.js | 0 .../src/main/webapp/js/archiva/main.js | 0 .../src/main/webapp/js/archiva/network-proxies.js | 0 .../webapp/js/archiva/proxy-connectors-rules.js | 0 .../src/main/webapp/js/archiva/proxy-connectors.js | 0 .../src/main/webapp/js/archiva/repositories.js | 0 .../src/main/webapp/js/archiva/repository-groups.js | 0 .../src/main/webapp/js/archiva/search.js | 0 .../src/main/webapp/js/archiva/startup.js | 0 .../src/main/webapp/js/archiva/utils.js | 0 .../src/main/webapp/js/bootstrap.2.2.1.js | 0 .../src/main/webapp/js/domReady.js | 0 .../src/main/webapp/js/jquery-1.8.3.min.js | 0 .../main/webapp/js/jquery-ui-1.9.2.custom.min.js | 0 .../src/main/webapp/js/jquery.cookie.1.0.0.js | 0 .../src/main/webapp/js/jquery.fileupload-5.10.0.js | 0 .../main/webapp/js/jquery.fileupload-ip-1.0.6.js | 0 .../main/webapp/js/jquery.fileupload-ui-6.6.3.js | 0 .../main/webapp/js/jquery.i18n.properties-1.0.9.js | 0 .../main/webapp/js/jquery.iframe-transport-1.4.js | 0 .../src/main/webapp/js/jquery.json-2.3.min.js | 0 .../src/main/webapp/js/jquery.tmpl.js | 0 .../src/main/webapp/js/jquery.ui.widget-1.9.2.js | 0 .../src/main/webapp/js/jquery.validate-1.9.0.js | 0 .../src/main/webapp/js/jqueryFileTree-1.0.1.js | 0 .../src/main/webapp/js/knockout-2.2.0.debug.js | 0 .../src/main/webapp/js/knockout-sortable.js | 0 .../src/main/webapp/js/knockout.simpleGrid.js | 0 .../src/main/webapp/js/order.js | 0 .../src/main/webapp/js/prettify.js | 0 .../src/main/webapp/js/purl-2.2.1.js | 0 .../src/main/webapp/js/redback/redback-tmpl.js | 0 .../src/main/webapp/js/redback/redback.js | 0 .../src/main/webapp/js/redback/roles.js | 0 .../src/main/webapp/js/redback/user.js | 0 .../src/main/webapp/js/redback/users.js | 0 .../src/main/webapp/js/require.2.1.2.js | 0 .../src/main/webapp/js/sammy.0.7.1.js | 0 .../src/main/webapp/js/select2.min-3.2.js | 0 .../src/main/webapp/js/templates/archiva/docs.html | 0 .../webapp/js/templates/archiva/general-admin.html | 0 .../main/webapp/js/templates/archiva/generics.html | 0 .../src/main/webapp/js/templates/archiva/menu.html | 0 .../src/main/webapp/js/templates/archiva/modal.html | 0 .../webapp/js/templates/archiva/repositories.html | 0 .../main/webapp/js/templates/archiva/search.html | 0 .../src/main/webapp/js/templates/redback/login.html | 0 .../main/webapp/js/templates/redback/user-edit.html | 0 .../src/main/webapp/js/text.js | 0 .../src/main/webapp/js/tmpl.min.js | 0 .../src/test/tomcat/auto-admin-creation.properties | 0 .../src/test/tomcat/log4j2-test.xml | 0 .../src/test/tomcat/tomcat-context-archiva.xml | 0 archiva-modules/archiva-web/pom.xml | 2 +- 158 files changed, 1 insertion(+), 1 deletion(-) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/LICENSE (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/pom.xml (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/resources/META-INF/spring-context.xml (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/resources/ehcache.xml (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/resources/log4j2.xml (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/resources/org/apache/archiva/redback-security.properties (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/WEB-INF/applicationContext.xml (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/WEB-INF/web.xml (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/archiva.css (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/bootstrap.2.2.1.css (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/application.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/code.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/css.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/db.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/doc.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/file.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/film.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/flash.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/folder-closed.gif (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/folder.gif (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/html.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/java.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/linux.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/music.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/pdf.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/php.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/picture.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/ppt.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/psd.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/ruby.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/script.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/select2.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/select2x2.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/spinner.gif (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/txt.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/ui-bg_flat_0_aaaaaa_40x100.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/ui-bg_flat_75_ffffff_40x100.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/ui-bg_glass_55_fbf9ee_1x400.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/ui-bg_glass_65_ffffff_1x400.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/ui-bg_glass_75_dadada_1x400.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/ui-bg_glass_75_e6e6e6_1x400.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/ui-bg_glass_75_ffffff_1x400.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/ui-bg_glass_95_fef1ec_1x400.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/ui-icons_222222_256x240.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/ui-icons_2e83ff_256x240.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/ui-icons_454545_256x240.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/ui-icons_888888_256x240.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/ui-icons_cd0a0a_256x240.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/ui-icons_f6cf3b_256x240.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/xls.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/images/zip.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/jquery-ui-1.9.2.custom.min.css (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/jquery.fileupload-ui.css (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/jquery.ui.1.8.16.ie.css (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/jqueryFileTree.css (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/prettify.css (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/css/select2-3.2.css (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/favicon.ico (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/applications-internet-2-32-32.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/applications-internet-32-32.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/atom.gif (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/dialog-error-22-22.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/dialog-error.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/drive-removable-media-16-16.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/edit-cut.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/folder-saved-search.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/folder.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/go-home.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/green-22-22.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/internet-web-browser-32-32.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/internet-web-browser.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/list-add-22-22.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/list-add.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/medium-spinner.gif (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/package-x-generic.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/preferences-system-network-proxy-32-32.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/red-22-22.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/small-spinner.gif (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/system-file-manager-32-32.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/system-lock-screen-22-22.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/system-lock-screen.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/system-search-16-16.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/system-software-update-32-32.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/system-users-32-32.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/trash.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/user-trash-full.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/user-trash.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/utilities-system-monitor-22-22.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/utilities-system-monitor.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/view-refresh-22-22.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/view-refresh.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/weather-clear-22-22.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/images/weather-clear.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/img/glyphicons-halflings-white.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/img/glyphicons-halflings.png (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/img/loading.gif (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/img/progressbar.gif (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/index.html (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/archiva/archiva.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/archiva/artifacts-management.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/archiva/docs.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/archiva/general-admin.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/archiva/main-tmpl.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/archiva/main.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/archiva/network-proxies.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/archiva/proxy-connectors-rules.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/archiva/proxy-connectors.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/archiva/repositories.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/archiva/repository-groups.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/archiva/search.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/archiva/startup.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/archiva/utils.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/bootstrap.2.2.1.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/domReady.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/jquery-1.8.3.min.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/jquery-ui-1.9.2.custom.min.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/jquery.cookie.1.0.0.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/jquery.fileupload-5.10.0.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/jquery.fileupload-ip-1.0.6.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/jquery.fileupload-ui-6.6.3.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/jquery.i18n.properties-1.0.9.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/jquery.iframe-transport-1.4.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/jquery.json-2.3.min.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/jquery.tmpl.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/jquery.ui.widget-1.9.2.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/jquery.validate-1.9.0.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/jqueryFileTree-1.0.1.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/knockout-2.2.0.debug.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/knockout-sortable.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/knockout.simpleGrid.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/order.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/prettify.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/purl-2.2.1.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/redback/redback-tmpl.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/redback/redback.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/redback/roles.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/redback/user.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/redback/users.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/require.2.1.2.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/sammy.0.7.1.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/select2.min-3.2.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/templates/archiva/docs.html (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/templates/archiva/general-admin.html (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/templates/archiva/generics.html (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/templates/archiva/menu.html (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/templates/archiva/modal.html (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/templates/archiva/repositories.html (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/templates/archiva/search.html (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/templates/redback/login.html (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/templates/redback/user-edit.html (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/text.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/main/webapp/js/tmpl.min.js (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/test/tomcat/auto-admin-creation.properties (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/test/tomcat/log4j2-test.xml (100%) rename archiva-modules/archiva-web/{archiva-webapp-js => archiva-webapp}/src/test/tomcat/tomcat-context-archiva.xml (100%) diff --git a/archiva-modules/archiva-web/archiva-webapp-js/LICENSE b/archiva-modules/archiva-web/archiva-webapp/LICENSE similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/LICENSE rename to archiva-modules/archiva-web/archiva-webapp/LICENSE diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/pom.xml rename to archiva-modules/archiva-web/archiva-webapp/pom.xml diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml rename to archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/ehcache.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/ehcache.xml similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/ehcache.xml rename to archiva-modules/archiva-web/archiva-webapp/src/main/resources/ehcache.xml diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/log4j2.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/log4j2.xml rename to archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/org/apache/archiva/redback-security.properties b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/redback-security.properties similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/org/apache/archiva/redback-security.properties rename to archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/redback-security.properties diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/web.xml rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/archiva.css similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/archiva.css diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/bootstrap.2.2.1.css b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/bootstrap.2.2.1.css similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/bootstrap.2.2.1.css rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/bootstrap.2.2.1.css diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/application.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/application.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/application.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/application.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/code.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/code.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/code.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/code.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/css.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/css.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/css.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/css.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/db.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/db.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/db.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/db.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/doc.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/doc.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/doc.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/doc.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/file.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/file.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/file.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/file.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/film.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/film.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/film.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/film.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/flash.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/flash.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/flash.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/flash.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/folder-closed.gif b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/folder-closed.gif similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/folder-closed.gif rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/folder-closed.gif diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/folder.gif b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/folder.gif similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/folder.gif rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/folder.gif diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/html.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/html.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/html.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/html.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/java.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/java.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/java.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/java.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/linux.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/linux.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/linux.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/linux.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/music.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/music.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/music.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/music.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/pdf.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/pdf.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/pdf.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/pdf.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/php.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/php.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/php.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/php.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/picture.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/picture.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/picture.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/picture.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ppt.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ppt.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ppt.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ppt.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/psd.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/psd.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/psd.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/psd.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ruby.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ruby.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ruby.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ruby.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/script.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/script.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/script.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/script.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/select2.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/select2.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/select2.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/select2.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/select2x2.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/select2x2.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/select2x2.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/select2x2.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/spinner.gif b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/spinner.gif similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/spinner.gif rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/spinner.gif diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/txt.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/txt.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/txt.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/txt.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-bg_flat_0_aaaaaa_40x100.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-bg_flat_75_ffffff_40x100.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-bg_flat_75_ffffff_40x100.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-bg_flat_75_ffffff_40x100.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-bg_flat_75_ffffff_40x100.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-bg_glass_55_fbf9ee_1x400.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-bg_glass_65_ffffff_1x400.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-bg_glass_65_ffffff_1x400.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-bg_glass_75_dadada_1x400.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-bg_glass_75_dadada_1x400.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-bg_glass_75_dadada_1x400.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-bg_glass_75_e6e6e6_1x400.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-bg_glass_75_ffffff_1x400.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-bg_glass_75_ffffff_1x400.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-bg_glass_75_ffffff_1x400.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-bg_glass_75_ffffff_1x400.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-bg_glass_95_fef1ec_1x400.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-bg_glass_95_fef1ec_1x400.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-icons_222222_256x240.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-icons_222222_256x240.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-icons_222222_256x240.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-icons_222222_256x240.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-icons_2e83ff_256x240.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-icons_2e83ff_256x240.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-icons_2e83ff_256x240.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-icons_454545_256x240.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-icons_454545_256x240.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-icons_454545_256x240.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-icons_454545_256x240.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-icons_888888_256x240.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-icons_888888_256x240.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-icons_888888_256x240.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-icons_888888_256x240.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-icons_cd0a0a_256x240.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-icons_cd0a0a_256x240.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-icons_cd0a0a_256x240.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-icons_f6cf3b_256x240.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-icons_f6cf3b_256x240.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/ui-icons_f6cf3b_256x240.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/ui-icons_f6cf3b_256x240.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/xls.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/xls.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/xls.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/xls.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/zip.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/zip.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/images/zip.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/images/zip.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/jquery-ui-1.9.2.custom.min.css b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/jquery-ui-1.9.2.custom.min.css similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/jquery-ui-1.9.2.custom.min.css rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/jquery-ui-1.9.2.custom.min.css diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/jquery.fileupload-ui.css b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/jquery.fileupload-ui.css similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/jquery.fileupload-ui.css rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/jquery.fileupload-ui.css diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/jquery.ui.1.8.16.ie.css b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/jquery.ui.1.8.16.ie.css similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/jquery.ui.1.8.16.ie.css rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/jquery.ui.1.8.16.ie.css diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/jqueryFileTree.css b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/jqueryFileTree.css similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/jqueryFileTree.css rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/jqueryFileTree.css diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/prettify.css b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/prettify.css similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/prettify.css rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/prettify.css diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/select2-3.2.css b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/select2-3.2.css similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/select2-3.2.css rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/css/select2-3.2.css diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/favicon.ico b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/favicon.ico similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/favicon.ico rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/favicon.ico diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/applications-internet-2-32-32.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/applications-internet-2-32-32.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/applications-internet-2-32-32.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/applications-internet-2-32-32.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/applications-internet-32-32.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/applications-internet-32-32.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/applications-internet-32-32.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/applications-internet-32-32.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/atom.gif b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/atom.gif similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/atom.gif rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/atom.gif diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/dialog-error-22-22.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/dialog-error-22-22.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/dialog-error-22-22.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/dialog-error-22-22.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/dialog-error.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/dialog-error.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/dialog-error.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/dialog-error.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/drive-removable-media-16-16.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/drive-removable-media-16-16.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/drive-removable-media-16-16.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/drive-removable-media-16-16.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/edit-cut.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/edit-cut.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/edit-cut.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/edit-cut.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/folder-saved-search.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/folder-saved-search.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/folder-saved-search.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/folder-saved-search.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/folder.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/folder.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/folder.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/folder.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/go-home.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/go-home.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/go-home.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/go-home.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/green-22-22.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/green-22-22.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/green-22-22.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/green-22-22.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/internet-web-browser-32-32.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/internet-web-browser-32-32.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/internet-web-browser-32-32.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/internet-web-browser-32-32.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/internet-web-browser.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/internet-web-browser.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/internet-web-browser.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/internet-web-browser.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/list-add-22-22.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/list-add-22-22.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/list-add-22-22.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/list-add-22-22.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/list-add.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/list-add.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/list-add.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/list-add.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/medium-spinner.gif b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/medium-spinner.gif similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/medium-spinner.gif rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/medium-spinner.gif diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/package-x-generic.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/package-x-generic.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/package-x-generic.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/package-x-generic.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/preferences-system-network-proxy-32-32.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/preferences-system-network-proxy-32-32.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/preferences-system-network-proxy-32-32.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/preferences-system-network-proxy-32-32.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/red-22-22.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/red-22-22.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/red-22-22.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/red-22-22.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/small-spinner.gif b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/small-spinner.gif similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/small-spinner.gif rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/small-spinner.gif diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/system-file-manager-32-32.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/system-file-manager-32-32.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/system-file-manager-32-32.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/system-file-manager-32-32.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/system-lock-screen-22-22.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/system-lock-screen-22-22.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/system-lock-screen-22-22.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/system-lock-screen-22-22.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/system-lock-screen.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/system-lock-screen.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/system-lock-screen.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/system-lock-screen.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/system-search-16-16.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/system-search-16-16.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/system-search-16-16.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/system-search-16-16.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/system-software-update-32-32.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/system-software-update-32-32.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/system-software-update-32-32.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/system-software-update-32-32.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/system-users-32-32.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/system-users-32-32.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/system-users-32-32.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/system-users-32-32.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/trash.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/trash.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/trash.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/trash.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/user-trash-full.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/user-trash-full.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/user-trash-full.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/user-trash-full.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/user-trash.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/user-trash.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/user-trash.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/user-trash.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/utilities-system-monitor-22-22.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/utilities-system-monitor-22-22.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/utilities-system-monitor-22-22.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/utilities-system-monitor-22-22.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/utilities-system-monitor.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/utilities-system-monitor.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/utilities-system-monitor.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/utilities-system-monitor.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/view-refresh-22-22.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/view-refresh-22-22.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/view-refresh-22-22.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/view-refresh-22-22.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/view-refresh.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/view-refresh.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/view-refresh.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/view-refresh.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/weather-clear-22-22.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/weather-clear-22-22.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/weather-clear-22-22.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/weather-clear-22-22.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/weather-clear.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/weather-clear.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/images/weather-clear.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/images/weather-clear.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/glyphicons-halflings-white.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/img/glyphicons-halflings-white.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/glyphicons-halflings-white.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/img/glyphicons-halflings-white.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/glyphicons-halflings.png b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/img/glyphicons-halflings.png similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/glyphicons-halflings.png rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/img/glyphicons-halflings.png diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/loading.gif b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/img/loading.gif similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/loading.gif rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/img/loading.gif diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/progressbar.gif b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/img/progressbar.gif similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/img/progressbar.gif rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/img/progressbar.gif diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/index.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/index.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/archiva.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/artifacts-management.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/artifacts-management.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/docs.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/docs.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/docs.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/docs.js 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/src/main/webapp/js/archiva/general-admin.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/general-admin.js 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/src/main/webapp/js/archiva/main-tmpl.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main-tmpl.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js 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/src/main/webapp/js/archiva/network-proxies.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/network-proxies.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/proxy-connectors-rules.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/proxy-connectors-rules.js 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/src/main/webapp/js/archiva/proxy-connectors.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/proxy-connectors.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/repositories.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/repositories.js 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/src/main/webapp/js/archiva/repository-groups.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/repository-groups.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/startup.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/startup.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/utils.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/utils.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/bootstrap.2.2.1.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/bootstrap.2.2.1.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/bootstrap.2.2.1.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/bootstrap.2.2.1.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/domReady.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/domReady.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/domReady.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/domReady.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery-1.8.3.min.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery-1.8.3.min.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery-1.8.3.min.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery-1.8.3.min.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery-ui-1.9.2.custom.min.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery-ui-1.9.2.custom.min.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery-ui-1.9.2.custom.min.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery-ui-1.9.2.custom.min.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.cookie.1.0.0.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.cookie.1.0.0.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.cookie.1.0.0.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.cookie.1.0.0.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.fileupload-5.10.0.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.fileupload-5.10.0.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.fileupload-5.10.0.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.fileupload-5.10.0.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.fileupload-ip-1.0.6.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.fileupload-ip-1.0.6.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.fileupload-ip-1.0.6.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.fileupload-ip-1.0.6.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.fileupload-ui-6.6.3.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.fileupload-ui-6.6.3.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.fileupload-ui-6.6.3.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.fileupload-ui-6.6.3.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.i18n.properties-1.0.9.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.i18n.properties-1.0.9.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.i18n.properties-1.0.9.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.i18n.properties-1.0.9.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.iframe-transport-1.4.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.iframe-transport-1.4.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.iframe-transport-1.4.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.iframe-transport-1.4.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.json-2.3.min.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.json-2.3.min.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.json-2.3.min.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.json-2.3.min.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.tmpl.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.tmpl.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.tmpl.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.tmpl.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.ui.widget-1.9.2.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.ui.widget-1.9.2.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.ui.widget-1.9.2.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.ui.widget-1.9.2.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.validate-1.9.0.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.validate-1.9.0.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.validate-1.9.0.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jquery.validate-1.9.0.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jqueryFileTree-1.0.1.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jqueryFileTree-1.0.1.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jqueryFileTree-1.0.1.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/jqueryFileTree-1.0.1.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout-2.2.0.debug.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/knockout-2.2.0.debug.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout-2.2.0.debug.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/knockout-2.2.0.debug.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout-sortable.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/knockout-sortable.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout-sortable.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/knockout-sortable.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/knockout.simpleGrid.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/knockout.simpleGrid.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/order.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/order.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/order.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/order.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/prettify.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/prettify.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/prettify.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/prettify.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/purl-2.2.1.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/purl-2.2.1.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/purl-2.2.1.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/purl-2.2.1.js 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/src/main/webapp/js/redback/redback-tmpl.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/redback-tmpl.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/redback.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/redback.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/roles.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/roles.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/roles.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/user.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/users.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/redback/users.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/require.2.1.2.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/require.2.1.2.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/require.2.1.2.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/require.2.1.2.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/sammy.0.7.1.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/sammy.0.7.1.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/sammy.0.7.1.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/sammy.0.7.1.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/select2.min-3.2.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/select2.min-3.2.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/select2.min-3.2.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/select2.min-3.2.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/docs.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/docs.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/generics.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/generics.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/generics.html rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/generics.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/menu.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/modal.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/modal.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/search.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/search.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/login.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/login.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/login.html rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/login.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-edit.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-edit.html rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/redback/user-edit.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/text.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/text.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/text.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/text.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/tmpl.min.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/tmpl.min.js similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/tmpl.min.js rename to archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/tmpl.min.js diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/auto-admin-creation.properties b/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/auto-admin-creation.properties similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/auto-admin-creation.properties rename to archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/auto-admin-creation.properties diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j2-test.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j2-test.xml rename to archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/tomcat-context-archiva.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/tomcat-context-archiva.xml similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/tomcat-context-archiva.xml rename to archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/tomcat-context-archiva.xml diff --git a/archiva-modules/archiva-web/pom.xml b/archiva-modules/archiva-web/pom.xml index c5f5a1540..3dff27057 100644 --- a/archiva-modules/archiva-web/pom.xml +++ b/archiva-modules/archiva-web/pom.xml @@ -49,7 +49,7 @@ archiva-test-mocks archiva-rest archiva-web-common - archiva-webapp-js + archiva-webapp