You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/10/20 08:08:53 UTC
[1/4] git commit: MRM-813 tweak APC interface and ADRF AuditEvents
Repository: archiva
Updated Branches:
refs/heads/master aa14083b0 -> 5b59e0b10
MRM-813 tweak APC interface and ADRF AuditEvents
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/7c926711
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/7c926711
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/7c926711
Branch: refs/heads/master
Commit: 7c9267111a4eb6b8a47b8b4891af98c487dd0c9b
Parents: d3687d8
Author: Jonathan Sharp <fo...@gmail.com>
Authored: Fri Oct 17 15:23:47 2014 -0700
Committer: Jonathan Sharp <fo...@gmail.com>
Committed: Fri Oct 17 15:23:47 2014 -0700
----------------------------------------------------------------------
.../archiva/proxy/model/ProxyFetchResult.java | 48 ++++++++++++++++++++
.../proxy/model/RepositoryProxyConnectors.java | 2 +-
.../proxy/DefaultRepositoryProxyConnectors.java | 8 ++--
.../archiva/proxy/MetadataTransferTest.java | 21 +++++----
.../archiva/webdav/ArchivaDavResource.java | 4 +-
.../webdav/ArchivaDavResourceFactory.java | 11 ++---
.../webdav/ArchivaDavResourceFactoryTest.java | 5 +-
7 files changed, 75 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/7c926711/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyFetchResult.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyFetchResult.java b/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyFetchResult.java
new file mode 100644
index 0000000..28c2af0
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyFetchResult.java
@@ -0,0 +1,48 @@
+package org.apache.archiva.proxy.model;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+
+/**
+ * A result from a proxy fetch operation.
+ */
+public class ProxyFetchResult
+{
+
+ //The file returned
+ File file;
+
+ //Was the local file modified by the fetch?
+ boolean modified;
+
+ public ProxyFetchResult( File file, boolean modified) {
+ this.file = file;
+ this.modified = modified;
+ }
+
+ public File getFile() {
+ return file;
+ }
+
+ public boolean isModified() {
+ return modified;
+ }
+}
http://git-wip-us.apache.org/repos/asf/archiva/blob/7c926711/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/RepositoryProxyConnectors.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/RepositoryProxyConnectors.java b/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/RepositoryProxyConnectors.java
index 37b3732..e63f623 100644
--- a/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/RepositoryProxyConnectors.java
+++ b/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/RepositoryProxyConnectors.java
@@ -59,7 +59,7 @@ public interface RepositoryProxyConnectors
* @param logicalPath the metadata to fetch.
* @return the file that was obtained, or null if no content was obtained
*/
- File fetchMetatadaFromProxies( ManagedRepositoryContent repository, String logicalPath );
+ ProxyFetchResult fetchMetadataFromProxies( ManagedRepositoryContent repository, String logicalPath );
/**
* Performs the fetch operation against the target repositories
http://git-wip-us.apache.org/repos/asf/archiva/blob/7c926711/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
index 151dd61..0daa2d2 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
@@ -48,6 +48,7 @@ import org.apache.archiva.policies.urlcache.UrlFailureCache;
import org.apache.archiva.proxy.common.WagonFactory;
import org.apache.archiva.proxy.common.WagonFactoryException;
import org.apache.archiva.proxy.common.WagonFactoryRequest;
+import org.apache.archiva.proxy.model.ProxyFetchResult;
import org.apache.archiva.proxy.model.ProxyConnector;
import org.apache.archiva.proxy.model.RepositoryProxyConnectors;
import org.apache.archiva.redback.components.registry.Registry;
@@ -447,7 +448,7 @@ public class DefaultRepositoryProxyConnectors
}
@Override
- public File fetchMetatadaFromProxies( ManagedRepositoryContent repository, String logicalPath )
+ public ProxyFetchResult fetchMetadataFromProxies( ManagedRepositoryContent repository, String logicalPath )
{
File localFile = new File( repository.getRepoRoot(), logicalPath );
@@ -517,14 +518,15 @@ public class DefaultRepositoryProxyConnectors
{
log.warn( "Unable to update metadata {}:{}", localFile.getAbsolutePath(), e.getMessage(), e );
}
+
}
if ( fileExists( localFile ) )
{
- return localFile;
+ return new ProxyFetchResult( localFile, metadataNeedsUpdating );
}
- return null;
+ return new ProxyFetchResult( null, false );
}
/**
http://git-wip-us.apache.org/repos/asf/archiva/blob/7c926711/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
index ed7f04b..8ed5767 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
@@ -31,6 +31,7 @@ import org.apache.archiva.policies.CachedFailuresPolicy;
import org.apache.archiva.policies.ChecksumPolicy;
import org.apache.archiva.policies.ReleasesPolicy;
import org.apache.archiva.policies.SnapshotsPolicy;
+import org.apache.archiva.proxy.model.ProxyFetchResult;
import org.apache.archiva.repository.metadata.MetadataTools;
import org.apache.archiva.repository.metadata.RepositoryMetadataException;
import org.apache.archiva.repository.metadata.RepositoryMetadataWriter;
@@ -124,9 +125,9 @@ public class MetadataTransferTest
ProjectReference metadata = createProjectReference( requestedResource );
- File downloadedFile = proxyHandler.fetchMetatadaFromProxies( managedDefaultRepository,
+ File downloadedFile = proxyHandler.fetchMetadataFromProxies( managedDefaultRepository,
managedDefaultRepository.toMetadataPath(
- metadata ) );
+ metadata ) ).getFile();
assertNull( "Should not have downloaded a file.", downloadedFile );
assertNoTempFiles( expectedFile );
@@ -987,9 +988,9 @@ public class MetadataTransferTest
ProjectReference metadata = createProjectReference( requestedResource );
- File downloadedFile = proxyHandler.fetchMetatadaFromProxies( managedDefaultRepository,
+ File downloadedFile = proxyHandler.fetchMetadataFromProxies( managedDefaultRepository,
managedDefaultRepository.toMetadataPath(
- metadata ) );
+ metadata ) ).getFile();
assertNotNull( "Should have downloaded a file.", downloadedFile );
assertNoTempFiles( expectedFile );
@@ -1013,9 +1014,9 @@ public class MetadataTransferTest
File expectedFile = new File( managedDefaultDir, requestedResource );
ProjectReference metadata = createProjectReference( requestedResource );
- File downloadedFile = proxyHandler.fetchMetatadaFromProxies( managedDefaultRepository,
+ File downloadedFile = proxyHandler.fetchMetadataFromProxies( managedDefaultRepository,
managedDefaultRepository.toMetadataPath(
- metadata ) );
+ metadata ) ).getFile();
assertNull( downloadedFile );
assertNoTempFiles( expectedFile );
@@ -1034,9 +1035,9 @@ public class MetadataTransferTest
VersionedReference metadata = createVersionedReference( requestedResource );
- File downloadedFile = proxyHandler.fetchMetatadaFromProxies( managedDefaultRepository,
+ File downloadedFile = proxyHandler.fetchMetadataFromProxies( managedDefaultRepository,
managedDefaultRepository.toMetadataPath(
- metadata ) );
+ metadata ) ).getFile();
assertNotNull( "Should have downloaded a file.", downloadedFile );
assertNoTempFiles( expectedFile );
@@ -1060,9 +1061,9 @@ public class MetadataTransferTest
File expectedFile = new File( managedDefaultDir, requestedResource );
VersionedReference metadata = createVersionedReference( requestedResource );
- File downloadedFile = proxyHandler.fetchMetatadaFromProxies( managedDefaultRepository,
+ File downloadedFile = proxyHandler.fetchMetadataFromProxies( managedDefaultRepository,
managedDefaultRepository.toMetadataPath(
- metadata ) );
+ metadata ) ).getFile();
assertNull( downloadedFile );
assertNoTempFiles( expectedFile );
http://git-wip-us.apache.org/repos/asf/archiva/blob/7c926711/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
index f9a4d9e..074d13b 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
@@ -442,13 +442,13 @@ public class ArchivaDavResource
}
}
- private void triggerAuditEvent( DavResource member, String event )
+ private void triggerAuditEvent( DavResource member, String action )
throws DavException
{
String path = logicalResource + "/" + member.getDisplayName();
ArchivaDavResource resource = checkDavResourceIsArchivaDavResource( member );
- AuditEvent auditEvent = new AuditEvent( locator.getRepositoryId(), resource.principal, path, event );
+ AuditEvent auditEvent = new AuditEvent( locator.getRepositoryId(), resource.principal, path, action );
auditEvent.setRemoteIP( resource.remoteAddr );
for ( AuditListener listener : auditListeners )
http://git-wip-us.apache.org/repos/asf/archiva/blob/7c926711/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
index 1e225a6..31e2b88 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
@@ -47,6 +47,7 @@ import org.apache.archiva.model.ArchivaRepositoryMetadata;
import org.apache.archiva.model.ArtifactReference;
import org.apache.archiva.policies.ProxyDownloadException;
import org.apache.archiva.proxy.model.RepositoryProxyConnectors;
+import org.apache.archiva.proxy.model.ProxyFetchResult;
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authorization.AuthorizationException;
@@ -626,9 +627,7 @@ public class ArchivaDavResourceFactory
{
boolean previouslyExisted = resourceFile.exists();
- // Attempt to fetch the resource from any defined proxy.
- boolean fromProxy =
- fetchContentFromProxies( managedRepositoryContent, request, logicalResource );
+ boolean fromProxy = fetchContentFromProxies( managedRepositoryContent, request, logicalResource );
// At this point the incoming request can either be in default or
// legacy layout format.
@@ -656,14 +655,14 @@ public class ArchivaDavResourceFactory
if ( fromProxy )
{
- String event = ( previouslyExisted ? AuditEvent.MODIFY_FILE : AuditEvent.CREATE_FILE )
+ String action = ( previouslyExisted ? AuditEvent.MODIFY_FILE : AuditEvent.CREATE_FILE )
+ PROXIED_SUFFIX;
log.debug( "Proxied artifact '{}' in repository '{}' (current user '{}')",
resourceFile.getName(), managedRepositoryContent.getId(), activePrincipal );
triggerAuditEvent( request.getRemoteAddr(), archivaLocator.getRepositoryId(),
- logicalResource.getPath(), event, activePrincipal );
+ logicalResource.getPath(), action, activePrincipal );
}
if ( !resourceFile.exists() )
@@ -793,7 +792,7 @@ public class ArchivaDavResourceFactory
// Is it a Metadata resource?
if ( repositoryRequest.isDefault( path ) && repositoryRequest.isMetadata( path ) )
{
- return connectors.fetchMetatadaFromProxies( managedRepository, path ) != null;
+ return connectors.fetchMetadataFromProxies( managedRepository, path ).isModified();
}
// Is it an Archetype Catalog?
http://git-wip-us.apache.org/repos/asf/archiva/blob/7c926711/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java
index b8e460e..edb8ab3 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavResourceFactoryTest.java
@@ -33,6 +33,7 @@ import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.Configuration;
import org.apache.archiva.configuration.RepositoryGroupConfiguration;
import org.apache.archiva.proxy.DefaultRepositoryProxyConnectors;
+import org.apache.archiva.proxy.model.ProxyFetchResult;
import org.apache.archiva.repository.ManagedRepositoryContent;
import org.apache.archiva.repository.RepositoryContentFactory;
import org.apache.archiva.repository.content.legacy.LegacyPathParser;
@@ -645,7 +646,7 @@ public class ArchivaDavResourceFactoryTest
extends DefaultRepositoryProxyConnectors
{
@Override
- public File fetchMetatadaFromProxies( ManagedRepositoryContent repository, String logicalPath )
+ public ProxyFetchResult fetchMetadataFromProxies( ManagedRepositoryContent repository, String logicalPath )
{
File target = new File( repository.getRepoRoot(), logicalPath );
try
@@ -657,7 +658,7 @@ public class ArchivaDavResourceFactoryTest
}
- return target;
+ return new ProxyFetchResult( target, true );
}
}
}
[4/4] git commit: Merge branch 'MRM-813'
Posted by ol...@apache.org.
Merge branch 'MRM-813'
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/5b59e0b1
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/5b59e0b1
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/5b59e0b1
Branch: refs/heads/master
Commit: 5b59e0b10889d70800e52b8b6af93631c70b4d39
Parents: aa14083 69ebec8
Author: Olivier Lamy <ol...@apache.org>
Authored: Mon Oct 20 17:08:22 2014 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Mon Oct 20 17:08:22 2014 +1100
----------------------------------------------------------------------
.../archiva/proxy/model/ProxyFetchResult.java | 53 ++++++++++++++++++++
.../proxy/model/RepositoryProxyConnectors.java | 2 +-
.../proxy/DefaultRepositoryProxyConnectors.java | 8 +--
.../archiva/proxy/MetadataTransferTest.java | 21 ++++----
.../src/main/webapp/js/archiva/search.js | 2 +-
.../webapp/js/templates/archiva/search.html | 2 +-
.../archiva/webdav/ArchivaDavResource.java | 4 +-
.../webdav/ArchivaDavResourceFactory.java | 11 ++--
.../webdav/ArchivaDavResourceFactoryTest.java | 5 +-
9 files changed, 82 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
[3/4] git commit: add missing @since, formatting, make fields private
Posted by ol...@apache.org.
add missing @since, formatting, make fields private
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/69ebec88
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/69ebec88
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/69ebec88
Branch: refs/heads/master
Commit: 69ebec88413acf908cd4291170be134843bcb462
Parents: 84c1a1e
Author: Olivier Lamy <ol...@apache.org>
Authored: Mon Oct 20 17:08:01 2014 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Mon Oct 20 17:08:01 2014 +1100
----------------------------------------------------------------------
.../archiva/proxy/model/ProxyFetchResult.java | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/69ebec88/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyFetchResult.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyFetchResult.java b/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyFetchResult.java
index 28c2af0..94df725 100644
--- a/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyFetchResult.java
+++ b/archiva-modules/archiva-base/archiva-proxy-api/src/main/java/org/apache/archiva/proxy/model/ProxyFetchResult.java
@@ -23,26 +23,31 @@ import java.io.File;
/**
* A result from a proxy fetch operation.
+ *
+ * @since 2.1.2
*/
public class ProxyFetchResult
{
//The file returned
- File file;
+ private File file;
//Was the local file modified by the fetch?
- boolean modified;
+ private boolean modified;
- public ProxyFetchResult( File file, boolean modified) {
+ public ProxyFetchResult( File file, boolean modified )
+ {
this.file = file;
this.modified = modified;
- }
+ }
- public File getFile() {
+ public File getFile()
+ {
return file;
}
- public boolean isModified() {
+ public boolean isModified()
+ {
return modified;
}
}
[2/4] git commit: Metatada typo fixes
Posted by ol...@apache.org.
Metatada typo fixes
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/84c1a1ef
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/84c1a1ef
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/84c1a1ef
Branch: refs/heads/master
Commit: 84c1a1ef0ce4b9d05465e45a71c68a214f53d6e5
Parents: 7c92671
Author: Jonathan Sharp <fo...@gmail.com>
Authored: Sat Oct 18 08:49:18 2014 -0700
Committer: Jonathan Sharp <fo...@gmail.com>
Committed: Sat Oct 18 08:49:18 2014 -0700
----------------------------------------------------------------------
.../archiva-webapp/src/main/webapp/js/archiva/search.js | 2 +-
.../src/main/webapp/js/templates/archiva/search.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/84c1a1ef/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js
index ffabac7..eefdfef 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/search.js
@@ -868,7 +868,7 @@ define("archiva.search",["jquery","jquery.ui","i18n","jquery.tmpl","select2","kn
}
- this.gridMetatadasViewModel = new ko.simpleGrid.viewModel({
+ this.gridMetadataViewModel = new ko.simpleGrid.viewModel({
data: self.entries,
pageSize: 10
});
http://git-wip-us.apache.org/repos/asf/archiva/blob/84c1a1ef/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/search.html
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/search.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/search.html
index c0a4529..164fe76 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/search.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/search.html
@@ -788,7 +788,7 @@
<div id="artifact-details-metadatas-content" class="tab-pane">
<table class="table table-striped table-bordered" id="artifact-details-metadatas-content-table"
- data-bind="simpleGrid: gridMetatadasViewModel,simpleGridTemplate:'artifact_metadata_properties_tmpl',pageLinksId:'artifactMetadata_Pagination'">
+ data-bind="simpleGrid: gridMetadataViewModel,simpleGridTemplate:'artifact_metadata_properties_tmpl',pageLinksId:'artifactMetadata_Pagination'">
</table>
<div id="artifactMetadata_Pagination"></div>