Merged /archiva/trunk:r882384-883981

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@883995 13f79535-47bb-0310-9956-ffa450edef68

diff --cc archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
Simple merge

diff --cc archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
index 1fb4390122ddd2da243291cea7ea7bf19b0b4e53,18facd580ac1b20b0d474b7477ede2c92b05df52..f1b63ae2a0557370ef94c6e2dd7bdcec8cbf145e
--- 1/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
--- 2/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
@@@ -372,8 -296,4 +372,8 @@@ public class ShowArtifactActio
          this.snapshotVersions = snapshotVersions;
      }
  
-     public MetadataResolver getMetadataRepository()
++    public MetadataResolver getMetadataResolver()
 +    {
 +        return metadataResolver;
 +    }
  }

diff --cc archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
Simple merge

diff --cc archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java
index 58341922e53305473d3be35b73c9da2bb3f5ff0d,259121a083dea488f8eb405d71147df8a49deb9b..5d4ab0853cc193d96a19c816e04b1341deeb5f5e
--- 1/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java
--- 2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/ShowArtifactActionTest.java
@@@ -437,6 -547,6 +437,6 @@@ public class ShowArtifactActionTes
      {
          super.setUp();
          action = (ShowArtifactAction) lookup( Action.class, ACTION_HINT );
-         metadataResolver = (TestMetadataResolver) action.getMetadataRepository();
 -        archivaDao = (ArchivaDAOStub) lookup( ArchivaDAO.class, "jdo" );
++        metadataResolver = (TestMetadataResolver) action.getMetadataResolver();
      }
  }

diff --cc archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java
Simple merge

diff --cc archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
Simple merge