From: Brett Porter Date: Sat, 26 Aug 2006 07:52:00 +0000 (+0000) Subject: more renaming X-Git-Tag: archiva-0.9-alpha-1~651 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=444d73327f23a0a8e7e59f078af4ab7adce9d816;p=archiva.git more renaming git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@437119 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-reports-standard/pom.xml b/archiva-reports-standard/pom.xml index f6d85a9ba..64df5f2d6 100755 --- a/archiva-reports-standard/pom.xml +++ b/archiva-reports-standard/pom.xml @@ -53,10 +53,6 @@ org.apache.maven.wagon wagon-provider-api - - org.apache.maven - maven-artifact-manager - org.apache.maven.archiva archiva-utils diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxiedRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxiedRepository.jsp index b064b5678..8deb1468d 100644 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxiedRepository.jsp +++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxiedRepository.jsp @@ -19,7 +19,7 @@ Configuration - + @@ -35,12 +35,12 @@ - + - + 'unmodified' : 'Leave the repository unmodified'}" name="operation" theme="archiva"/> + diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp index cb2245256..4e4b84cea 100644 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp +++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp @@ -19,7 +19,7 @@ Configuration - + @@ -35,11 +35,11 @@ - + - + 'unmodified' : 'Leave the repository unmodified'}" name="operation" theme="archiva"/> + diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteSyncedRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteSyncedRepository.jsp index 7db55d5c7..d940999af 100644 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteSyncedRepository.jsp +++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteSyncedRepository.jsp @@ -19,7 +19,7 @@ Configuration - + @@ -35,12 +35,12 @@ - + - + 'unmodified' : 'Leave the repository unmodified'}" name="operation" theme="archiva"/> + diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp index 76f7b3402..9df80b159 100644 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp +++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp @@ -20,8 +20,8 @@ <%@ taglib prefix="my" tagdir="/WEB-INF/tags" %> - Maven Repository Manager :: - <decorator:title default="Maven Repository Manager" /> + <title>Maven Archiva :: + <decorator:title default="Maven Archiva"/> - - + + " class="composite"> @@ -62,13 +62,13 @@
- Repository Manager | + Archiva | Maven | Apache
-
+
@@ -117,18 +117,18 @@ -
+
- +
-
+
-
+
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/web.xml b/archiva-webapp/src/main/webapp/WEB-INF/web.xml index 49da01f29..6242bf7be 100644 --- a/archiva-webapp/src/main/webapp/WEB-INF/web.xml +++ b/archiva-webapp/src/main/webapp/WEB-INF/web.xml @@ -15,10 +15,10 @@ --> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> - Maven Repository Manager + Maven Archiva webwork-cleanup diff --git a/design/white-site/pom.xml b/design/white-site/pom.xml index 5139e8210..20365a8c0 100644 --- a/design/white-site/pom.xml +++ b/design/white-site/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.apache.maven.archiva - maven-repository-manager-white-site + archiva-white-site 1.0-SNAPSHOT - Maven Repository Manager White Site + Archiva White Site 2005 true diff --git a/design/white-site/src/site/site.xml b/design/white-site/src/site/site.xml index b41e3b260..ced960459 100644 --- a/design/white-site/src/site/site.xml +++ b/design/white-site/src/site/site.xml @@ -1,5 +1,5 @@ - + http://www.apache.org/images/asf_logo_wide.gif diff --git a/design/white-site/src/site/xdoc/admin/add-proxied-repository.xml b/design/white-site/src/site/xdoc/admin/add-proxied-repository.xml index cb76eb5e7..9ae3b3c4c 100644 --- a/design/white-site/src/site/xdoc/admin/add-proxied-repository.xml +++ b/design/white-site/src/site/xdoc/admin/add-proxied-repository.xml @@ -16,7 +16,7 @@ - Maven Repository Manager + Archiva

Administration

diff --git a/design/white-site/src/site/xdoc/admin/add-repository.xml b/design/white-site/src/site/xdoc/admin/add-repository.xml index 946921c19..85f69e51f 100644 --- a/design/white-site/src/site/xdoc/admin/add-repository.xml +++ b/design/white-site/src/site/xdoc/admin/add-repository.xml @@ -16,7 +16,7 @@ - Maven Repository Manager + Archiva

Administration

diff --git a/design/white-site/src/site/xdoc/admin/add-sync-repository.xml b/design/white-site/src/site/xdoc/admin/add-sync-repository.xml index e2a07bd4c..3e80cb237 100644 --- a/design/white-site/src/site/xdoc/admin/add-sync-repository.xml +++ b/design/white-site/src/site/xdoc/admin/add-sync-repository.xml @@ -16,7 +16,7 @@ - Maven Repository Manager + Archiva

Administration

diff --git a/design/white-site/src/site/xdoc/admin/config.xml b/design/white-site/src/site/xdoc/admin/config.xml index 8e5dede20..ffe8a294a 100644 --- a/design/white-site/src/site/xdoc/admin/config.xml +++ b/design/white-site/src/site/xdoc/admin/config.xml @@ -1,6 +1,6 @@ - Maven Repository Manager + Archiva

Configuration

diff --git a/design/white-site/src/site/xdoc/admin/delete-proxied-repository.xml b/design/white-site/src/site/xdoc/admin/delete-proxied-repository.xml index d1feacb17..6dfe91fee 100644 --- a/design/white-site/src/site/xdoc/admin/delete-proxied-repository.xml +++ b/design/white-site/src/site/xdoc/admin/delete-proxied-repository.xml @@ -1,6 +1,6 @@ - Maven Repository Manager + Archiva

Administration

@@ -9,15 +9,24 @@

Delete Remote Repository

- WARNING: This operation can not be undone. + + WARNING: + This operation can not be undone. +
- Remove the repository and delete its contents from managed repositories
- Remove the repository from the available list, but leave the contents in the managed - repositories
- Leave the repository unmodified
- + + Remove the repository and delete its contents from managed repositories +
+ + Remove the repository from the available list, but leave the contents in the managed + repositories +
+ + Leave the repository unmodified +
+
diff --git a/design/white-site/src/site/xdoc/admin/delete-repository.xml b/design/white-site/src/site/xdoc/admin/delete-repository.xml index 5c00abe82..0bef5c1f5 100644 --- a/design/white-site/src/site/xdoc/admin/delete-repository.xml +++ b/design/white-site/src/site/xdoc/admin/delete-repository.xml @@ -1,6 +1,6 @@ - Maven Repository Manager + Archiva

Administration

@@ -9,14 +9,23 @@

Delete Managed Repository

- WARNING: This operation can not be undone. + + WARNING: + This operation can not be undone. +
- Remove the repository and delete its contents from disk
- Remove the repository from the management list, but leave the contents unmodified
- Leave the repository unmodified
- + + Remove the repository and delete its contents from disk +
+ + Remove the repository from the management list, but leave the contents unmodified +
+ + Leave the repository unmodified +
+
diff --git a/design/white-site/src/site/xdoc/admin/delete-sync-repository.xml b/design/white-site/src/site/xdoc/admin/delete-sync-repository.xml index cc5549822..4cfce5656 100644 --- a/design/white-site/src/site/xdoc/admin/delete-sync-repository.xml +++ b/design/white-site/src/site/xdoc/admin/delete-sync-repository.xml @@ -1,6 +1,6 @@ - Maven Repository Manager + Archiva

Administration

@@ -9,15 +9,24 @@

Delete Remote Repository

- WARNING: This operation can not be undone. + + WARNING: + This operation can not be undone. +
- Remove the repository and delete its contents from managed repositories
- Remove the repository from the available list, but leave the contents in the managed - repositories
- Leave the repository unmodified
- + + Remove the repository and delete its contents from managed repositories +
+ + Remove the repository from the available list, but leave the contents in the managed + repositories +
+ + Leave the repository unmodified +
+
diff --git a/design/white-site/src/site/xdoc/admin/edit-cvs-sync-repository.xml b/design/white-site/src/site/xdoc/admin/edit-cvs-sync-repository.xml index ac998abe4..fb3516f75 100644 --- a/design/white-site/src/site/xdoc/admin/edit-cvs-sync-repository.xml +++ b/design/white-site/src/site/xdoc/admin/edit-cvs-sync-repository.xml @@ -16,7 +16,7 @@ - Maven Repository Manager + Archiva

Administration

diff --git a/design/white-site/src/site/xdoc/admin/edit-file-sync-repository.xml b/design/white-site/src/site/xdoc/admin/edit-file-sync-repository.xml index a4d5ae448..47e83966b 100644 --- a/design/white-site/src/site/xdoc/admin/edit-file-sync-repository.xml +++ b/design/white-site/src/site/xdoc/admin/edit-file-sync-repository.xml @@ -16,7 +16,7 @@ - Maven Repository Manager + Archiva

Administration

diff --git a/design/white-site/src/site/xdoc/admin/edit-rsync-sync-repository.xml b/design/white-site/src/site/xdoc/admin/edit-rsync-sync-repository.xml index d16ea270f..d76994d3a 100644 --- a/design/white-site/src/site/xdoc/admin/edit-rsync-sync-repository.xml +++ b/design/white-site/src/site/xdoc/admin/edit-rsync-sync-repository.xml @@ -16,7 +16,7 @@ - Maven Repository Manager + Archiva

Administration

diff --git a/design/white-site/src/site/xdoc/admin/edit-svn-sync-repository.xml b/design/white-site/src/site/xdoc/admin/edit-svn-sync-repository.xml index 7f9a3d3c4..f02dfa1d8 100644 --- a/design/white-site/src/site/xdoc/admin/edit-svn-sync-repository.xml +++ b/design/white-site/src/site/xdoc/admin/edit-svn-sync-repository.xml @@ -16,7 +16,7 @@ - Maven Repository Manager + Archiva

Administration

diff --git a/design/white-site/src/site/xdoc/admin/index.xml b/design/white-site/src/site/xdoc/admin/index.xml index ab32e35d1..a634ee484 100644 --- a/design/white-site/src/site/xdoc/admin/index.xml +++ b/design/white-site/src/site/xdoc/admin/index.xml @@ -1,6 +1,6 @@ - Maven Repository Manager + Archiva

Administration

diff --git a/design/white-site/src/site/xdoc/admin/proxies.xml b/design/white-site/src/site/xdoc/admin/proxies.xml index ea6a6e94d..9ee0d8195 100644 --- a/design/white-site/src/site/xdoc/admin/proxies.xml +++ b/design/white-site/src/site/xdoc/admin/proxies.xml @@ -16,7 +16,7 @@ - Maven Repository Manager + Archiva

Administration

diff --git a/design/white-site/src/site/xdoc/admin/sync.xml b/design/white-site/src/site/xdoc/admin/sync.xml index 4c7bab30e..e5cfd9f40 100644 --- a/design/white-site/src/site/xdoc/admin/sync.xml +++ b/design/white-site/src/site/xdoc/admin/sync.xml @@ -16,7 +16,7 @@ - Maven Repository Manager + Archiva

Administration

diff --git a/design/white-site/src/site/xdoc/artifact.xml b/design/white-site/src/site/xdoc/artifact.xml index dd3f21ec2..2aece3a87 100644 --- a/design/white-site/src/site/xdoc/artifact.xml +++ b/design/white-site/src/site/xdoc/artifact.xml @@ -1,6 +1,6 @@ - Maven Repository Manager + Archiva