From fb313fb39f4c4ab6978c4aa6a14d8534199bd5ff Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 22 Mar 2007 21:03:04 +0000 Subject: [PATCH] Moving some directories around. git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches/archiva-jpox-database-refactor@521463 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva-applet}/pom.xml | 0 .../archiva-applet}/src/keystore/keystore | Bin .../apache/maven/archiva/applet/ChecksumApplet.java | 0 .../archiva-security}/pom.xml | 0 .../archiva/security/ArchivaGuestRoleProfile.java | 0 .../archiva/security/ArchivaRoleConstants.java | 0 .../archiva/security/ArchivaRoleProfileManager.java | 0 .../ArchivaSystemAdministratorRoleProfile.java | 0 .../ArchivaUserAdministratorRoleProfile.java | 0 .../GlobalRepositoryManagerRoleProfile.java | 0 .../GlobalRepositoryObserverRoleProfile.java | 0 .../RepositoryManagerDynamicRoleProfile.java | 0 .../RepositoryObserverDynamicRoleProfile.java | 0 .../security/RoleProfileEnvironmentCheck.java | 0 .../main/resources/META-INF/plexus/components.xml | 0 .../archiva-webapp}/pom.xml | 0 .../src/appserver-base/conf/archiva.xml | 0 .../src/appserver-base/conf/shared.xml | 0 .../archiva-webapp}/src/jetty-env.xml | 0 .../web/action/AbstractConfiguredAction.java | 0 .../maven/archiva/web/action/BrowseAction.java | 0 .../maven/archiva/web/action/ReportsAction.java | 0 .../maven/archiva/web/action/SearchAction.java | 0 .../archiva/web/action/ShowArtifactAction.java | 0 .../admin/AbstractConfigureRepositoryAction.java | 0 .../admin/AbstractDeleteRepositoryAction.java | 0 .../archiva/web/action/admin/ConfigureAction.java | 0 .../web/action/admin/ConfigureAppearanceAction.java | 0 .../admin/ConfigureProxiedRepositoryAction.java | 0 .../web/action/admin/ConfigureRepositoryAction.java | 0 .../admin/ConfigureSyncedRepositoryAction.java | 0 .../action/admin/DeleteProxiedRepositoryAction.java | 0 .../web/action/admin/DeleteRepositoryAction.java | 0 .../action/admin/DeleteSyncedRepositoryAction.java | 0 .../archiva/web/action/admin/EditPomAction.java | 0 .../web/action/admin/RunRepositoryTaskAction.java | 0 .../web/action/component/CompanyInfoAction.java | 0 .../web/check/RoleExistanceEnvironmentCheck.java | 0 .../web/interceptor/ConfigurationInterceptor.java | 0 .../archiva/web/mapper/RepositoryActionMapper.java | 0 .../maven/archiva/web/repository/AuditLog.java | 0 .../archiva/web/repository/ProxiedDavServer.java | 0 .../archiva/web/repository/RepositoryServlet.java | 0 .../maven/archiva/web/tags/DownloadArtifact.java | 0 .../maven/archiva/web/tags/DownloadArtifactTag.java | 0 .../maven/archiva/web/tags/ExpressionTool.java | 0 .../apache/maven/archiva/web/tags/GroupIdLink.java | 0 .../maven/archiva/web/tags/GroupIdLinkTag.java | 0 .../maven/archiva/web/tags/PlexusTagUtil.java | 0 .../maven/archiva/web/util/VersionMerger.java | 0 .../archiva/web/validator/IntervalValidator.java | 0 .../web/validator/SyncedRepositoryValidator.java | 0 .../main/resources/META-INF/plexus/application.xml | 0 .../src/main/resources/META-INF/taglib.tld | 0 .../archiva-webapp}/src/main/resources/log4j.xml | 0 .../org/apache/maven/archiva/security.properties | 0 .../SearchAction-checksumSearch-validation.xml | 0 .../action/SearchAction-quickSearch-validation.xml | 0 .../web/action/admin/ConfigureAction-validation.xml | 0 .../action/admin/ConfigureAppearance-validation.xml | 0 .../web/action/admin/ConfigureAppearance.properties | 0 .../ConfigureProxiedRepositoryAction-validation.xml | 0 .../admin/ConfigureRepositoryAction-validation.xml | 0 ...ction-addSelectedSyncedRepository-validation.xml | 0 .../ConfigureSyncedRepositoryAction-validation.xml | 0 .../src/main/resources/validators.xml | 0 .../src/main/resources/webwork.properties | 0 .../archiva-webapp}/src/main/resources/xwork.xml | 0 .../src/main/webapp/WEB-INF/decorators.xml | 0 .../WEB-INF/jsp/admin/addProxiedRepository.jsp | 0 .../main/webapp/WEB-INF/jsp/admin/addRepository.jsp | 0 .../WEB-INF/jsp/admin/addSyncedRepository.jsp | 0 .../main/webapp/WEB-INF/jsp/admin/appearance.jsp | 0 .../src/main/webapp/WEB-INF/jsp/admin/configure.jsp | 0 .../WEB-INF/jsp/admin/deleteProxiedRepository.jsp | 0 .../webapp/WEB-INF/jsp/admin/deleteRepository.jsp | 0 .../WEB-INF/jsp/admin/deleteSyncedRepository.jsp | 0 .../webapp/WEB-INF/jsp/admin/editAppearance.jsp | 0 .../src/main/webapp/WEB-INF/jsp/admin/editPom.jsp | 0 .../WEB-INF/jsp/admin/editProxiedRepository.jsp | 0 .../webapp/WEB-INF/jsp/admin/editRepository.jsp | 0 .../WEB-INF/jsp/admin/editSyncedRepository.jsp | 0 .../main/webapp/WEB-INF/jsp/admin/errorMessages.jsp | 0 .../jsp/admin/include/managedRepositoryForm.jspf | 0 .../jsp/admin/include/proxiedRepositoryForm.jspf | 0 .../jsp/admin/include/syncedRepositoryForm.jspf | 0 .../src/main/webapp/WEB-INF/jsp/admin/index.jsp | 0 .../WEB-INF/jsp/admin/managedRepositories.jsp | 0 .../WEB-INF/jsp/admin/proxiedRepositories.jsp | 0 .../WEB-INF/jsp/admin/selectSyncedRepository.jsp | 0 .../webapp/WEB-INF/jsp/admin/syncedRepositories.jsp | 0 .../src/main/webapp/WEB-INF/jsp/alert.jsp | 0 .../src/main/webapp/WEB-INF/jsp/browse.jsp | 0 .../src/main/webapp/WEB-INF/jsp/browseArtifact.jsp | 0 .../src/main/webapp/WEB-INF/jsp/browseGroup.jsp | 0 .../webapp/WEB-INF/jsp/components/companyLogo.jsp | 0 .../main/webapp/WEB-INF/jsp/decorators/default.jsp | 0 .../src/main/webapp/WEB-INF/jsp/findArtifact.jsp | 0 .../src/main/webapp/WEB-INF/jsp/generalError.jsp | 0 .../WEB-INF/jsp/include/artifactDependencies.jspf | 0 .../webapp/WEB-INF/jsp/include/artifactInfo.jspf | 0 .../webapp/WEB-INF/jsp/include/artifactReports.jspf | 0 .../webapp/WEB-INF/jsp/include/dependencyTree.jspf | 0 .../webapp/WEB-INF/jsp/include/mailingLists.jspf | 0 .../webapp/WEB-INF/jsp/include/quickSearchForm.jspf | 0 .../src/main/webapp/WEB-INF/jsp/quickSearch.jsp | 0 .../src/main/webapp/WEB-INF/jsp/reports/reports.jsp | 0 .../src/main/webapp/WEB-INF/jsp/results.jsp | 0 .../src/main/webapp/WEB-INF/jsp/showArtifact.jsp | 0 .../src/main/webapp/WEB-INF/tags/currentWWUrl.tag | 0 .../webapp/WEB-INF/tags/displayUpdatePolicy.tag | 0 .../main/webapp/WEB-INF/tags/showArtifactLink.tag | 0 .../main/webapp/WEB-INF/tags/showArtifactTitle.tag | 0 .../archiva-webapp}/src/main/webapp/WEB-INF/web.xml | 0 .../src/main/webapp/css/maven-base.css | 0 .../src/main/webapp/css/maven-theme.css | 0 .../archiva-webapp}/src/main/webapp/css/print.css | 0 .../archiva-webapp}/src/main/webapp/css/site.css | 0 .../archiva-webapp}/src/main/webapp/favicon.ico | Bin .../src/main/webapp/images/archetype.gif | Bin .../src/main/webapp/images/archiva.png | Bin .../src/main/webapp/images/arrow.gif | Bin .../src/main/webapp/images/collapsed.gif | Bin .../archiva-webapp}/src/main/webapp/images/dl.gif | Bin .../src/main/webapp/images/download.bl.gif | Bin .../src/main/webapp/images/download.br.gif | Bin .../src/main/webapp/images/download.ml.gif | Bin .../src/main/webapp/images/download.mr.gif | Bin .../src/main/webapp/images/download.tl.gif | Bin .../src/main/webapp/images/download.tr.gif | Bin .../src/main/webapp/images/expanded.gif | Bin .../src/main/webapp/images/external.png | Bin .../src/main/webapp/images/footerborder.gif | Bin .../src/main/webapp/images/icon_error_sml.gif | Bin .../src/main/webapp/images/icon_info_sml.gif | Bin .../src/main/webapp/images/icon_success_sml.gif | Bin .../src/main/webapp/images/icon_warning_sml.gif | Bin .../archiva-webapp}/src/main/webapp/images/jar.gif | Bin .../src/main/webapp/images/mavenplugin.gif | Bin .../src/main/webapp/images/newwindow.png | Bin .../src/main/webapp/images/other.gif | Bin .../archiva-webapp}/src/main/webapp/images/pom.gif | Bin .../archiva-webapp}/src/main/webapp/images/skin.gif | Bin .../src/main/webapp/images/super.gif | Bin .../src/main/webapp/images/super_hl.gif | Bin .../src/main/webapp/images/super_hl_sub.gif | Bin .../src/main/webapp/images/supersub.gif | Bin .../archiva-webapp}/src/main/webapp/index.jsp | 0 .../src/main/webapp/js/scriptaculous/builder.js | 0 .../src/main/webapp/js/scriptaculous/controls.js | 0 .../src/main/webapp/js/scriptaculous/dragdrop.js | 0 .../src/main/webapp/js/scriptaculous/effects.js | 0 .../src/main/webapp/js/scriptaculous/prototype.js | 0 .../main/webapp/js/scriptaculous/scriptaculous.js | 0 .../src/main/webapp/js/scriptaculous/slider.js | 0 .../src/main/webapp/js/scriptaculous/unittest.js | 0 .../main/webapp/template/archiva/checkboxlist.ftl | 0 .../src/main/webapp/template/archiva/radiomap.ftl | 0 .../main/webapp/template/archiva/theme.properties | 0 .../web/servlet/repository/RepositoryAccessTest.xml | 0 160 files changed, 0 insertions(+), 0 deletions(-) rename {archiva-applet => archiva-web/archiva-applet}/pom.xml (100%) rename {archiva-applet => archiva-web/archiva-applet}/src/keystore/keystore (100%) rename {archiva-applet => archiva-web/archiva-applet}/src/main/java/org/apache/maven/archiva/applet/ChecksumApplet.java (100%) rename {archiva-security => archiva-web/archiva-security}/pom.xml (100%) rename {archiva-security => archiva-web/archiva-security}/src/main/java/org/apache/maven/archiva/security/ArchivaGuestRoleProfile.java (100%) rename {archiva-security => archiva-web/archiva-security}/src/main/java/org/apache/maven/archiva/security/ArchivaRoleConstants.java (100%) rename {archiva-security => archiva-web/archiva-security}/src/main/java/org/apache/maven/archiva/security/ArchivaRoleProfileManager.java (100%) rename {archiva-security => archiva-web/archiva-security}/src/main/java/org/apache/maven/archiva/security/ArchivaSystemAdministratorRoleProfile.java (100%) rename {archiva-security => archiva-web/archiva-security}/src/main/java/org/apache/maven/archiva/security/ArchivaUserAdministratorRoleProfile.java (100%) rename {archiva-security => archiva-web/archiva-security}/src/main/java/org/apache/maven/archiva/security/GlobalRepositoryManagerRoleProfile.java (100%) rename {archiva-security => archiva-web/archiva-security}/src/main/java/org/apache/maven/archiva/security/GlobalRepositoryObserverRoleProfile.java (100%) rename {archiva-security => archiva-web/archiva-security}/src/main/java/org/apache/maven/archiva/security/RepositoryManagerDynamicRoleProfile.java (100%) rename {archiva-security => archiva-web/archiva-security}/src/main/java/org/apache/maven/archiva/security/RepositoryObserverDynamicRoleProfile.java (100%) rename {archiva-security => archiva-web/archiva-security}/src/main/java/org/apache/maven/archiva/security/RoleProfileEnvironmentCheck.java (100%) rename {archiva-security => archiva-web/archiva-security}/src/main/resources/META-INF/plexus/components.xml (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/pom.xml (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/appserver-base/conf/archiva.xml (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/appserver-base/conf/shared.xml (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/jetty-env.xml (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/action/AbstractConfiguredAction.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/action/ReportsAction.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractConfigureRepositoryAction.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractDeleteRepositoryAction.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAction.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAppearanceAction.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/action/admin/DeleteProxiedRepositoryAction.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/action/admin/DeleteRepositoryAction.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/action/admin/DeleteSyncedRepositoryAction.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/action/admin/EditPomAction.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/action/component/CompanyInfoAction.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/check/RoleExistanceEnvironmentCheck.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/mapper/RepositoryActionMapper.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/repository/AuditLog.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/tags/ExpressionTool.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLinkTag.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/tags/PlexusTagUtil.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/util/VersionMerger.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/resources/META-INF/plexus/application.xml (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/resources/META-INF/taglib.tld (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/resources/log4j.xml (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/resources/org/apache/maven/archiva/security.properties (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-checksumSearch-validation.xml (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-quickSearch-validation.xml (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAction-validation.xml (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance-validation.xml (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance.properties (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction-validation.xml (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/resources/validators.xml (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/resources/webwork.properties (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/resources/xwork.xml (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/decorators.xml (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/addProxiedRepository.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/addSyncedRepository.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/configure.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/deleteProxiedRepository.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/deleteSyncedRepository.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/editProxiedRepository.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/editSyncedRepository.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/errorMessages.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/include/managedRepositoryForm.jspf (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/include/proxiedRepositoryForm.jspf (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/include/syncedRepositoryForm.jspf (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/index.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/managedRepositories.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/selectSyncedRepository.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/alert.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/browse.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/browseGroup.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/decorators/default.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/findArtifact.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/generalError.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/include/artifactReports.jspf (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/include/mailingLists.jspf (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/quickSearch.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/reports/reports.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/results.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/jsp/showArtifact.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/tags/currentWWUrl.tag (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/tags/displayUpdatePolicy.tag (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/tags/showArtifactLink.tag (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/tags/showArtifactTitle.tag (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/WEB-INF/web.xml (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/css/maven-base.css (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/css/maven-theme.css (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/css/print.css (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/css/site.css (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/favicon.ico (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/archetype.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/archiva.png (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/arrow.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/collapsed.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/dl.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/download.bl.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/download.br.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/download.ml.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/download.mr.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/download.tl.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/download.tr.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/expanded.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/external.png (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/footerborder.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/icon_error_sml.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/icon_info_sml.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/icon_success_sml.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/icon_warning_sml.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/jar.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/mavenplugin.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/newwindow.png (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/other.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/pom.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/skin.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/super.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/super_hl.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/super_hl_sub.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/images/supersub.gif (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/index.jsp (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/js/scriptaculous/builder.js (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/js/scriptaculous/controls.js (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/js/scriptaculous/dragdrop.js (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/js/scriptaculous/effects.js (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/js/scriptaculous/prototype.js (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/js/scriptaculous/scriptaculous.js (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/js/scriptaculous/slider.js (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/js/scriptaculous/unittest.js (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/template/archiva/checkboxlist.ftl (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/template/archiva/radiomap.ftl (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/main/webapp/template/archiva/theme.properties (100%) rename {archiva-webapp => archiva-web/archiva-webapp}/src/test/resources/org/apache/maven/archiva/web/servlet/repository/RepositoryAccessTest.xml (100%) diff --git a/archiva-applet/pom.xml b/archiva-web/archiva-applet/pom.xml similarity index 100% rename from archiva-applet/pom.xml rename to archiva-web/archiva-applet/pom.xml diff --git a/archiva-applet/src/keystore/keystore b/archiva-web/archiva-applet/src/keystore/keystore similarity index 100% rename from archiva-applet/src/keystore/keystore rename to archiva-web/archiva-applet/src/keystore/keystore diff --git a/archiva-applet/src/main/java/org/apache/maven/archiva/applet/ChecksumApplet.java b/archiva-web/archiva-applet/src/main/java/org/apache/maven/archiva/applet/ChecksumApplet.java similarity index 100% rename from archiva-applet/src/main/java/org/apache/maven/archiva/applet/ChecksumApplet.java rename to archiva-web/archiva-applet/src/main/java/org/apache/maven/archiva/applet/ChecksumApplet.java diff --git a/archiva-security/pom.xml b/archiva-web/archiva-security/pom.xml similarity index 100% rename from archiva-security/pom.xml rename to archiva-web/archiva-security/pom.xml diff --git a/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaGuestRoleProfile.java b/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaGuestRoleProfile.java similarity index 100% rename from archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaGuestRoleProfile.java rename to archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaGuestRoleProfile.java diff --git a/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaRoleConstants.java b/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaRoleConstants.java similarity index 100% rename from archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaRoleConstants.java rename to archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaRoleConstants.java diff --git a/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaRoleProfileManager.java b/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaRoleProfileManager.java similarity index 100% rename from archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaRoleProfileManager.java rename to archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaRoleProfileManager.java diff --git a/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaSystemAdministratorRoleProfile.java b/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaSystemAdministratorRoleProfile.java similarity index 100% rename from archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaSystemAdministratorRoleProfile.java rename to archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaSystemAdministratorRoleProfile.java diff --git a/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaUserAdministratorRoleProfile.java b/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaUserAdministratorRoleProfile.java similarity index 100% rename from archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaUserAdministratorRoleProfile.java rename to archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaUserAdministratorRoleProfile.java diff --git a/archiva-security/src/main/java/org/apache/maven/archiva/security/GlobalRepositoryManagerRoleProfile.java b/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/GlobalRepositoryManagerRoleProfile.java similarity index 100% rename from archiva-security/src/main/java/org/apache/maven/archiva/security/GlobalRepositoryManagerRoleProfile.java rename to archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/GlobalRepositoryManagerRoleProfile.java diff --git a/archiva-security/src/main/java/org/apache/maven/archiva/security/GlobalRepositoryObserverRoleProfile.java b/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/GlobalRepositoryObserverRoleProfile.java similarity index 100% rename from archiva-security/src/main/java/org/apache/maven/archiva/security/GlobalRepositoryObserverRoleProfile.java rename to archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/GlobalRepositoryObserverRoleProfile.java diff --git a/archiva-security/src/main/java/org/apache/maven/archiva/security/RepositoryManagerDynamicRoleProfile.java b/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/RepositoryManagerDynamicRoleProfile.java similarity index 100% rename from archiva-security/src/main/java/org/apache/maven/archiva/security/RepositoryManagerDynamicRoleProfile.java rename to archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/RepositoryManagerDynamicRoleProfile.java diff --git a/archiva-security/src/main/java/org/apache/maven/archiva/security/RepositoryObserverDynamicRoleProfile.java b/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/RepositoryObserverDynamicRoleProfile.java similarity index 100% rename from archiva-security/src/main/java/org/apache/maven/archiva/security/RepositoryObserverDynamicRoleProfile.java rename to archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/RepositoryObserverDynamicRoleProfile.java diff --git a/archiva-security/src/main/java/org/apache/maven/archiva/security/RoleProfileEnvironmentCheck.java b/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/RoleProfileEnvironmentCheck.java similarity index 100% rename from archiva-security/src/main/java/org/apache/maven/archiva/security/RoleProfileEnvironmentCheck.java rename to archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/RoleProfileEnvironmentCheck.java diff --git a/archiva-security/src/main/resources/META-INF/plexus/components.xml b/archiva-web/archiva-security/src/main/resources/META-INF/plexus/components.xml similarity index 100% rename from archiva-security/src/main/resources/META-INF/plexus/components.xml rename to archiva-web/archiva-security/src/main/resources/META-INF/plexus/components.xml diff --git a/archiva-webapp/pom.xml b/archiva-web/archiva-webapp/pom.xml similarity index 100% rename from archiva-webapp/pom.xml rename to archiva-web/archiva-webapp/pom.xml diff --git a/archiva-webapp/src/appserver-base/conf/archiva.xml b/archiva-web/archiva-webapp/src/appserver-base/conf/archiva.xml similarity index 100% rename from archiva-webapp/src/appserver-base/conf/archiva.xml rename to archiva-web/archiva-webapp/src/appserver-base/conf/archiva.xml diff --git a/archiva-webapp/src/appserver-base/conf/shared.xml b/archiva-web/archiva-webapp/src/appserver-base/conf/shared.xml similarity index 100% rename from archiva-webapp/src/appserver-base/conf/shared.xml rename to archiva-web/archiva-webapp/src/appserver-base/conf/shared.xml diff --git a/archiva-webapp/src/jetty-env.xml b/archiva-web/archiva-webapp/src/jetty-env.xml similarity index 100% rename from archiva-webapp/src/jetty-env.xml rename to archiva-web/archiva-webapp/src/jetty-env.xml diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractConfiguredAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractConfiguredAction.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractConfiguredAction.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractConfiguredAction.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ReportsAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ReportsAction.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ReportsAction.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ReportsAction.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractConfigureRepositoryAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractConfigureRepositoryAction.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractConfigureRepositoryAction.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractConfigureRepositoryAction.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractDeleteRepositoryAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractDeleteRepositoryAction.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractDeleteRepositoryAction.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractDeleteRepositoryAction.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAction.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAction.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAction.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAppearanceAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAppearanceAction.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAppearanceAction.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureAppearanceAction.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/DeleteProxiedRepositoryAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/DeleteProxiedRepositoryAction.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/DeleteProxiedRepositoryAction.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/DeleteProxiedRepositoryAction.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/DeleteRepositoryAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/DeleteRepositoryAction.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/DeleteRepositoryAction.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/DeleteRepositoryAction.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/DeleteSyncedRepositoryAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/DeleteSyncedRepositoryAction.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/DeleteSyncedRepositoryAction.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/DeleteSyncedRepositoryAction.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/EditPomAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/EditPomAction.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/EditPomAction.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/EditPomAction.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/component/CompanyInfoAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/component/CompanyInfoAction.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/component/CompanyInfoAction.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/component/CompanyInfoAction.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/check/RoleExistanceEnvironmentCheck.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/check/RoleExistanceEnvironmentCheck.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/check/RoleExistanceEnvironmentCheck.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/check/RoleExistanceEnvironmentCheck.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/mapper/RepositoryActionMapper.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/mapper/RepositoryActionMapper.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/mapper/RepositoryActionMapper.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/mapper/RepositoryActionMapper.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/AuditLog.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/AuditLog.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/AuditLog.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/AuditLog.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/ExpressionTool.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/ExpressionTool.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/ExpressionTool.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/ExpressionTool.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLinkTag.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLinkTag.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLinkTag.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLinkTag.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/PlexusTagUtil.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/PlexusTagUtil.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/PlexusTagUtil.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/PlexusTagUtil.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/VersionMerger.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/VersionMerger.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/VersionMerger.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/VersionMerger.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java similarity index 100% rename from archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java rename to archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java diff --git a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml similarity index 100% rename from archiva-webapp/src/main/resources/META-INF/plexus/application.xml rename to archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml diff --git a/archiva-webapp/src/main/resources/META-INF/taglib.tld b/archiva-web/archiva-webapp/src/main/resources/META-INF/taglib.tld similarity index 100% rename from archiva-webapp/src/main/resources/META-INF/taglib.tld rename to archiva-web/archiva-webapp/src/main/resources/META-INF/taglib.tld diff --git a/archiva-webapp/src/main/resources/log4j.xml b/archiva-web/archiva-webapp/src/main/resources/log4j.xml similarity index 100% rename from archiva-webapp/src/main/resources/log4j.xml rename to archiva-web/archiva-webapp/src/main/resources/log4j.xml diff --git a/archiva-webapp/src/main/resources/org/apache/maven/archiva/security.properties b/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/security.properties similarity index 100% rename from archiva-webapp/src/main/resources/org/apache/maven/archiva/security.properties rename to archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/security.properties diff --git a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-checksumSearch-validation.xml b/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-checksumSearch-validation.xml similarity index 100% rename from archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-checksumSearch-validation.xml rename to archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-checksumSearch-validation.xml diff --git a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-quickSearch-validation.xml b/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-quickSearch-validation.xml similarity index 100% rename from archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-quickSearch-validation.xml rename to archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-quickSearch-validation.xml diff --git a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAction-validation.xml b/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAction-validation.xml similarity index 100% rename from archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAction-validation.xml rename to archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAction-validation.xml diff --git a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance-validation.xml b/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance-validation.xml similarity index 100% rename from archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance-validation.xml rename to archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance-validation.xml diff --git a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance.properties b/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance.properties similarity index 100% rename from archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance.properties rename to archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAppearance.properties diff --git a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml b/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml similarity index 100% rename from archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml rename to archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml diff --git a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction-validation.xml b/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction-validation.xml similarity index 100% rename from archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction-validation.xml rename to archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction-validation.xml diff --git a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml b/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml similarity index 100% rename from archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml rename to archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml diff --git a/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml b/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml similarity index 100% rename from archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml rename to archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml diff --git a/archiva-webapp/src/main/resources/validators.xml b/archiva-web/archiva-webapp/src/main/resources/validators.xml similarity index 100% rename from archiva-webapp/src/main/resources/validators.xml rename to archiva-web/archiva-webapp/src/main/resources/validators.xml diff --git a/archiva-webapp/src/main/resources/webwork.properties b/archiva-web/archiva-webapp/src/main/resources/webwork.properties similarity index 100% rename from archiva-webapp/src/main/resources/webwork.properties rename to archiva-web/archiva-webapp/src/main/resources/webwork.properties diff --git a/archiva-webapp/src/main/resources/xwork.xml b/archiva-web/archiva-webapp/src/main/resources/xwork.xml similarity index 100% rename from archiva-webapp/src/main/resources/xwork.xml rename to archiva-web/archiva-webapp/src/main/resources/xwork.xml diff --git a/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/decorators.xml rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addProxiedRepository.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addProxiedRepository.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addProxiedRepository.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addProxiedRepository.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addRepository.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addSyncedRepository.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addSyncedRepository.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addSyncedRepository.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addSyncedRepository.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/configure.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/configure.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/configure.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/configure.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxiedRepository.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxiedRepository.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxiedRepository.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxiedRepository.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteSyncedRepository.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteSyncedRepository.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteSyncedRepository.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteSyncedRepository.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxiedRepository.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxiedRepository.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxiedRepository.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editProxiedRepository.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRepository.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editSyncedRepository.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editSyncedRepository.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editSyncedRepository.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editSyncedRepository.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/errorMessages.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/errorMessages.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/errorMessages.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/errorMessages.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/managedRepositoryForm.jspf b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/managedRepositoryForm.jspf similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/managedRepositoryForm.jspf rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/managedRepositoryForm.jspf diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxiedRepositoryForm.jspf b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxiedRepositoryForm.jspf similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxiedRepositoryForm.jspf rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxiedRepositoryForm.jspf diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/syncedRepositoryForm.jspf b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/syncedRepositoryForm.jspf similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/syncedRepositoryForm.jspf rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/syncedRepositoryForm.jspf diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/managedRepositories.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/managedRepositories.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/managedRepositories.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/managedRepositories.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/selectSyncedRepository.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/selectSyncedRepository.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/selectSyncedRepository.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/selectSyncedRepository.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/syncedRepositories.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/alert.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/alert.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/alert.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/alert.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browse.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseArtifact.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/browseGroup.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/findArtifact.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/generalError.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/generalError.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/generalError.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/generalError.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactReports.jspf b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactReports.jspf similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactReports.jspf rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactReports.jspf diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/dependencyTree.jspf diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/mailingLists.jspf b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/mailingLists.jspf similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/include/mailingLists.jspf rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/mailingLists.jspf diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/quickSearch.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/reports.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/reports.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/reports.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/reports/reports.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp diff --git a/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag diff --git a/archiva-webapp/src/main/webapp/WEB-INF/tags/displayUpdatePolicy.tag b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/displayUpdatePolicy.tag similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/tags/displayUpdatePolicy.tag rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/displayUpdatePolicy.tag diff --git a/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactLink.tag b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactLink.tag similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactLink.tag rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactLink.tag diff --git a/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactTitle.tag b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactTitle.tag similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactTitle.tag rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactTitle.tag diff --git a/archiva-webapp/src/main/webapp/WEB-INF/web.xml b/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from archiva-webapp/src/main/webapp/WEB-INF/web.xml rename to archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml diff --git a/archiva-webapp/src/main/webapp/css/maven-base.css b/archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css similarity index 100% rename from archiva-webapp/src/main/webapp/css/maven-base.css rename to archiva-web/archiva-webapp/src/main/webapp/css/maven-base.css diff --git a/archiva-webapp/src/main/webapp/css/maven-theme.css b/archiva-web/archiva-webapp/src/main/webapp/css/maven-theme.css similarity index 100% rename from archiva-webapp/src/main/webapp/css/maven-theme.css rename to archiva-web/archiva-webapp/src/main/webapp/css/maven-theme.css diff --git a/archiva-webapp/src/main/webapp/css/print.css b/archiva-web/archiva-webapp/src/main/webapp/css/print.css similarity index 100% rename from archiva-webapp/src/main/webapp/css/print.css rename to archiva-web/archiva-webapp/src/main/webapp/css/print.css diff --git a/archiva-webapp/src/main/webapp/css/site.css b/archiva-web/archiva-webapp/src/main/webapp/css/site.css similarity index 100% rename from archiva-webapp/src/main/webapp/css/site.css rename to archiva-web/archiva-webapp/src/main/webapp/css/site.css diff --git a/archiva-webapp/src/main/webapp/favicon.ico b/archiva-web/archiva-webapp/src/main/webapp/favicon.ico similarity index 100% rename from archiva-webapp/src/main/webapp/favicon.ico rename to archiva-web/archiva-webapp/src/main/webapp/favicon.ico diff --git a/archiva-webapp/src/main/webapp/images/archetype.gif b/archiva-web/archiva-webapp/src/main/webapp/images/archetype.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/archetype.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/archetype.gif diff --git a/archiva-webapp/src/main/webapp/images/archiva.png b/archiva-web/archiva-webapp/src/main/webapp/images/archiva.png similarity index 100% rename from archiva-webapp/src/main/webapp/images/archiva.png rename to archiva-web/archiva-webapp/src/main/webapp/images/archiva.png diff --git a/archiva-webapp/src/main/webapp/images/arrow.gif b/archiva-web/archiva-webapp/src/main/webapp/images/arrow.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/arrow.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/arrow.gif diff --git a/archiva-webapp/src/main/webapp/images/collapsed.gif b/archiva-web/archiva-webapp/src/main/webapp/images/collapsed.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/collapsed.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/collapsed.gif diff --git a/archiva-webapp/src/main/webapp/images/dl.gif b/archiva-web/archiva-webapp/src/main/webapp/images/dl.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/dl.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/dl.gif diff --git a/archiva-webapp/src/main/webapp/images/download.bl.gif b/archiva-web/archiva-webapp/src/main/webapp/images/download.bl.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/download.bl.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/download.bl.gif diff --git a/archiva-webapp/src/main/webapp/images/download.br.gif b/archiva-web/archiva-webapp/src/main/webapp/images/download.br.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/download.br.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/download.br.gif diff --git a/archiva-webapp/src/main/webapp/images/download.ml.gif b/archiva-web/archiva-webapp/src/main/webapp/images/download.ml.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/download.ml.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/download.ml.gif diff --git a/archiva-webapp/src/main/webapp/images/download.mr.gif b/archiva-web/archiva-webapp/src/main/webapp/images/download.mr.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/download.mr.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/download.mr.gif diff --git a/archiva-webapp/src/main/webapp/images/download.tl.gif b/archiva-web/archiva-webapp/src/main/webapp/images/download.tl.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/download.tl.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/download.tl.gif diff --git a/archiva-webapp/src/main/webapp/images/download.tr.gif b/archiva-web/archiva-webapp/src/main/webapp/images/download.tr.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/download.tr.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/download.tr.gif diff --git a/archiva-webapp/src/main/webapp/images/expanded.gif b/archiva-web/archiva-webapp/src/main/webapp/images/expanded.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/expanded.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/expanded.gif diff --git a/archiva-webapp/src/main/webapp/images/external.png b/archiva-web/archiva-webapp/src/main/webapp/images/external.png similarity index 100% rename from archiva-webapp/src/main/webapp/images/external.png rename to archiva-web/archiva-webapp/src/main/webapp/images/external.png diff --git a/archiva-webapp/src/main/webapp/images/footerborder.gif b/archiva-web/archiva-webapp/src/main/webapp/images/footerborder.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/footerborder.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/footerborder.gif diff --git a/archiva-webapp/src/main/webapp/images/icon_error_sml.gif b/archiva-web/archiva-webapp/src/main/webapp/images/icon_error_sml.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/icon_error_sml.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/icon_error_sml.gif diff --git a/archiva-webapp/src/main/webapp/images/icon_info_sml.gif b/archiva-web/archiva-webapp/src/main/webapp/images/icon_info_sml.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/icon_info_sml.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/icon_info_sml.gif diff --git a/archiva-webapp/src/main/webapp/images/icon_success_sml.gif b/archiva-web/archiva-webapp/src/main/webapp/images/icon_success_sml.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/icon_success_sml.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/icon_success_sml.gif diff --git a/archiva-webapp/src/main/webapp/images/icon_warning_sml.gif b/archiva-web/archiva-webapp/src/main/webapp/images/icon_warning_sml.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/icon_warning_sml.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/icon_warning_sml.gif diff --git a/archiva-webapp/src/main/webapp/images/jar.gif b/archiva-web/archiva-webapp/src/main/webapp/images/jar.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/jar.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/jar.gif diff --git a/archiva-webapp/src/main/webapp/images/mavenplugin.gif b/archiva-web/archiva-webapp/src/main/webapp/images/mavenplugin.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/mavenplugin.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/mavenplugin.gif diff --git a/archiva-webapp/src/main/webapp/images/newwindow.png b/archiva-web/archiva-webapp/src/main/webapp/images/newwindow.png similarity index 100% rename from archiva-webapp/src/main/webapp/images/newwindow.png rename to archiva-web/archiva-webapp/src/main/webapp/images/newwindow.png diff --git a/archiva-webapp/src/main/webapp/images/other.gif b/archiva-web/archiva-webapp/src/main/webapp/images/other.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/other.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/other.gif diff --git a/archiva-webapp/src/main/webapp/images/pom.gif b/archiva-web/archiva-webapp/src/main/webapp/images/pom.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/pom.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/pom.gif diff --git a/archiva-webapp/src/main/webapp/images/skin.gif b/archiva-web/archiva-webapp/src/main/webapp/images/skin.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/skin.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/skin.gif diff --git a/archiva-webapp/src/main/webapp/images/super.gif b/archiva-web/archiva-webapp/src/main/webapp/images/super.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/super.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/super.gif diff --git a/archiva-webapp/src/main/webapp/images/super_hl.gif b/archiva-web/archiva-webapp/src/main/webapp/images/super_hl.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/super_hl.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/super_hl.gif diff --git a/archiva-webapp/src/main/webapp/images/super_hl_sub.gif b/archiva-web/archiva-webapp/src/main/webapp/images/super_hl_sub.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/super_hl_sub.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/super_hl_sub.gif diff --git a/archiva-webapp/src/main/webapp/images/supersub.gif b/archiva-web/archiva-webapp/src/main/webapp/images/supersub.gif similarity index 100% rename from archiva-webapp/src/main/webapp/images/supersub.gif rename to archiva-web/archiva-webapp/src/main/webapp/images/supersub.gif diff --git a/archiva-webapp/src/main/webapp/index.jsp b/archiva-web/archiva-webapp/src/main/webapp/index.jsp similarity index 100% rename from archiva-webapp/src/main/webapp/index.jsp rename to archiva-web/archiva-webapp/src/main/webapp/index.jsp diff --git a/archiva-webapp/src/main/webapp/js/scriptaculous/builder.js b/archiva-web/archiva-webapp/src/main/webapp/js/scriptaculous/builder.js similarity index 100% rename from archiva-webapp/src/main/webapp/js/scriptaculous/builder.js rename to archiva-web/archiva-webapp/src/main/webapp/js/scriptaculous/builder.js diff --git a/archiva-webapp/src/main/webapp/js/scriptaculous/controls.js b/archiva-web/archiva-webapp/src/main/webapp/js/scriptaculous/controls.js similarity index 100% rename from archiva-webapp/src/main/webapp/js/scriptaculous/controls.js rename to archiva-web/archiva-webapp/src/main/webapp/js/scriptaculous/controls.js diff --git a/archiva-webapp/src/main/webapp/js/scriptaculous/dragdrop.js b/archiva-web/archiva-webapp/src/main/webapp/js/scriptaculous/dragdrop.js similarity index 100% rename from archiva-webapp/src/main/webapp/js/scriptaculous/dragdrop.js rename to archiva-web/archiva-webapp/src/main/webapp/js/scriptaculous/dragdrop.js diff --git a/archiva-webapp/src/main/webapp/js/scriptaculous/effects.js b/archiva-web/archiva-webapp/src/main/webapp/js/scriptaculous/effects.js similarity index 100% rename from archiva-webapp/src/main/webapp/js/scriptaculous/effects.js rename to archiva-web/archiva-webapp/src/main/webapp/js/scriptaculous/effects.js diff --git a/archiva-webapp/src/main/webapp/js/scriptaculous/prototype.js b/archiva-web/archiva-webapp/src/main/webapp/js/scriptaculous/prototype.js similarity index 100% rename from archiva-webapp/src/main/webapp/js/scriptaculous/prototype.js rename to archiva-web/archiva-webapp/src/main/webapp/js/scriptaculous/prototype.js diff --git a/archiva-webapp/src/main/webapp/js/scriptaculous/scriptaculous.js b/archiva-web/archiva-webapp/src/main/webapp/js/scriptaculous/scriptaculous.js similarity index 100% rename from archiva-webapp/src/main/webapp/js/scriptaculous/scriptaculous.js rename to archiva-web/archiva-webapp/src/main/webapp/js/scriptaculous/scriptaculous.js diff --git a/archiva-webapp/src/main/webapp/js/scriptaculous/slider.js b/archiva-web/archiva-webapp/src/main/webapp/js/scriptaculous/slider.js similarity index 100% rename from archiva-webapp/src/main/webapp/js/scriptaculous/slider.js rename to archiva-web/archiva-webapp/src/main/webapp/js/scriptaculous/slider.js diff --git a/archiva-webapp/src/main/webapp/js/scriptaculous/unittest.js b/archiva-web/archiva-webapp/src/main/webapp/js/scriptaculous/unittest.js similarity index 100% rename from archiva-webapp/src/main/webapp/js/scriptaculous/unittest.js rename to archiva-web/archiva-webapp/src/main/webapp/js/scriptaculous/unittest.js diff --git a/archiva-webapp/src/main/webapp/template/archiva/checkboxlist.ftl b/archiva-web/archiva-webapp/src/main/webapp/template/archiva/checkboxlist.ftl similarity index 100% rename from archiva-webapp/src/main/webapp/template/archiva/checkboxlist.ftl rename to archiva-web/archiva-webapp/src/main/webapp/template/archiva/checkboxlist.ftl diff --git a/archiva-webapp/src/main/webapp/template/archiva/radiomap.ftl b/archiva-web/archiva-webapp/src/main/webapp/template/archiva/radiomap.ftl similarity index 100% rename from archiva-webapp/src/main/webapp/template/archiva/radiomap.ftl rename to archiva-web/archiva-webapp/src/main/webapp/template/archiva/radiomap.ftl diff --git a/archiva-webapp/src/main/webapp/template/archiva/theme.properties b/archiva-web/archiva-webapp/src/main/webapp/template/archiva/theme.properties similarity index 100% rename from archiva-webapp/src/main/webapp/template/archiva/theme.properties rename to archiva-web/archiva-webapp/src/main/webapp/template/archiva/theme.properties diff --git a/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/servlet/repository/RepositoryAccessTest.xml b/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/servlet/repository/RepositoryAccessTest.xml similarity index 100% rename from archiva-webapp/src/test/resources/org/apache/maven/archiva/web/servlet/repository/RepositoryAccessTest.xml rename to archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/servlet/repository/RepositoryAccessTest.xml -- 2.39.5