You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jd...@apache.org on 2008/08/14 04:17:17 UTC
svn commit: r685748 - in /archiva/trunk/archiva-modules/archiva-base:
archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/
archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/
Author: jdumay
Date: Wed Aug 13 19:17:16 2008
New Revision: 685748
URL: http://svn.apache.org/viewvc?rev=685748&view=rev
Log:
MRM-907 - Remove VersionedReference/ProjectReference/ArtifactReference from RepositoryProxyConnectors
* A few more null checks for good measure.
* Metadata should always be updated even if the file does not exist. (wsmoak will love this, no more having to touch files).
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/ (props changed)
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java
Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 13 19:17:16 2008
@@ -0,0 +1 @@
+.DefaultRepositoryProxyConnectors.java.swp
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java?rev=685748&r1=685747&r2=685748&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java Wed Aug 13 19:17:16 2008
@@ -320,7 +320,7 @@
metadataNeedsUpdating = true;
}
- if ( metadataNeedsUpdating )
+ if ( metadataNeedsUpdating || !localFile.exists())
{
try
{
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java?rev=685748&r1=685747&r2=685748&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java Wed Aug 13 19:17:16 2008
@@ -439,7 +439,18 @@
metadata = RepositoryMetadataMerge.merge(metadata, proxiedMetadata);
}
- Set<String> availableVersions = new HashSet<String>(metadata.getAvailableVersions());
+ if (metadata == null)
+ {
+ log.debug("No metadata to update for " + logicalResource);
+ return;
+ }
+
+ Set<String> availableVersions = new HashSet<String>();
+ List<String> metadataAvailableVersions = metadata.getAvailableVersions();
+ if (metadataAvailableVersions != null)
+ {
+ availableVersions.addAll(metadataAvailableVersions);
+ }
availableVersions = findPossibleVersions(availableVersions, metadataFile.getParentFile());
if (availableVersions.size() > 0)
@@ -500,12 +511,16 @@
}
}
- for (String proxyId : proxies.get(managedRepository.getId()))
+ Set<String> proxyIds = proxies.get(managedRepository.getId());
+ if (proxyIds != null)
{
- ArchivaRepositoryMetadata proxyMetadata = readProxyMetadata( managedRepository, logicalResource, proxyId );
- if (proxyMetadata != null)
+ for (String proxyId : proxyIds)
{
- metadatas.add(proxyMetadata);
+ ArchivaRepositoryMetadata proxyMetadata = readProxyMetadata( managedRepository, logicalResource, proxyId );
+ if (proxyMetadata != null)
+ {
+ metadatas.add(proxyMetadata);
+ }
}
}