svn commit: r1550043 - in /archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2: Maven2RepositoryStorage.java RepositoryModelResolver.java

[olamy]

Author: olamy
Date: Wed Dec 11 03:40:08 2013
New Revision: 1550043

URL: http://svn.apache.org/r1550043
Log:
use constant

Modified:
    
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
    
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java

Modified: 
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java?rev=1550043&r1=1550042&r2=1550043&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
 (original)
+++ 
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
 Wed Dec 11 03:40:08 2013
@@ -786,7 +786,7 @@ public class Maven2RepositoryStorage
             return filePath;
         }
 
-        if ( StringUtils.endsWith( artifactReference.getVersion(), "SNAPSHOT" 
) )
+        if ( StringUtils.endsWith( artifactReference.getVersion(), 
VersionUtil.SNAPSHOT ) )
         {
             // read maven metadata to get last timestamp
             File metadataDir = new File( 
managedRepositoryContent.getRepoRoot(), filePath ).getParentFile();
@@ -809,7 +809,7 @@ public class Maven2RepositoryStorage
             filePath =
                 StringUtils.replace( filePath, 
artifactReference.getArtifactId() + "-" + artifactReference.getVersion(),
                                      artifactReference.getArtifactId() + "-" + 
StringUtils.remove(
-                                         artifactReference.getVersion(), 
"-SNAPSHOT" ) + "-" + timestamp + "-"
+                                         artifactReference.getVersion(), "-" + 
VersionUtil.SNAPSHOT ) + "-" + timestamp + "-"
                                          + buildNumber );
 
             throw new RelocationException(

Modified: 
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java?rev=1550043&r1=1550042&r2=1550043&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
 (original)
+++ 
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
 Wed Dec 11 03:40:08 2013
@@ -176,8 +176,8 @@ public class RepositoryModelResolver
                     int buildNumber = snapshotVersion.getBuildNumber();
                     String snapshotPath =
                         StringUtils.replaceChars( groupId, '.', '/' ) + '/' + 
artifactId + '/' + version + '/'
-                            + artifactId + '-' + StringUtils.remove( version, 
"-SNAPSHOT" ) + '-' + lastVersion + '-'
-                            + buildNumber + ".pom";
+                            + artifactId + '-' + StringUtils.remove( version, 
"-" + VersionUtil.SNAPSHOT )
+                            + '-' + lastVersion + '-' + buildNumber + ".pom";
 
                     log.debug( "use snapshot path {} for maven coordinate 
{}:{}:{}", snapshotPath, groupId, artifactId,
                                version );