Author: olamy
Date: Thu Sep 22 22:20:45 2011
New Revision: 1174423
URL: http://svn.apache.org/viewvc?rev=1174423&view=rev
Log:
[MRM-1490] REST services : add a service to copy an artifact from one repo to
an other one
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ArtifactTransferRequest.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/CopyArtifactTest.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoriesService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/WebdavMethodUtil.java
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ArtifactTransferRequest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ArtifactTransferRequest.java?rev=1174423&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ArtifactTransferRequest.java
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ArtifactTransferRequest.java
Thu Sep 22 22:20:45 2011
@@ -0,0 +1,55 @@
+package org.apache.archiva.rest.api.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 javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+
+/**
+ * @author Olivier Lamy
+ */
+@XmlRootElement( name = "artifactTransferRequest" )
+public class ArtifactTransferRequest
+ extends Artifact
+ implements Serializable
+{
+ private String sourceRepositoryId;
+
+ private String targetRepositoryId;
+
+ public String getSourceRepositoryId()
+ {
+ return sourceRepositoryId;
+ }
+
+ public void setSourceRepositoryId( String sourceRepositoryId )
+ {
+ this.sourceRepositoryId = sourceRepositoryId;
+ }
+
+ public String getTargetRepositoryId()
+ {
+ return targetRepositoryId;
+ }
+
+ public void setTargetRepositoryId( String targetRepositoryId )
+ {
+ this.targetRepositoryId = targetRepositoryId;
+ }
+}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoriesService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoriesService.java?rev=1174423&r1=1174422&r2=1174423&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoriesService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoriesService.java
Thu Sep 22 22:20:45 2011
@@ -19,10 +19,13 @@ package org.apache.archiva.rest.api.serv
* under the License.
*/
+import org.apache.archiva.rest.api.model.ArtifactTransferRequest;
import org.apache.archiva.security.common.ArchivaRoleConstants;
import org.codehaus.plexus.redback.authorization.RedbackAuthorization;
+import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
+import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
@@ -68,4 +71,16 @@ public interface RepositoriesService
@QueryParam( "fullScan" ) boolean fullScan )
throws ArchivaRestServiceException;
+ @Path( "copyArtifact" )
+ @POST
+ @Consumes( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
+ @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML,
MediaType.TEXT_PLAIN } )
+ @RedbackAuthorization( noPermission = true )
+ /**
+ * permission are checked in impl
+ * will copy an artifact from the source repository to the target
repository
+ */
+ Boolean copyArtifact( ArtifactTransferRequest artifactTransferRequest )
+ throws ArchivaRestServiceException;
+
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml?rev=1174423&r1=1174422&r2=1174423&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
Thu Sep 22 22:20:45 2011
@@ -63,6 +63,10 @@
<artifactId>archiva-indexer</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-repository-layer</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.redback</groupId>
<artifactId>redback-authorization-api</artifactId>
<exclusions>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java?rev=1174423&r1=1174422&r2=1174423&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
Thu Sep 22 22:20:45 2011
@@ -19,19 +19,47 @@ package org.apache.archiva.rest.services
* under the License.
*/
+import org.apache.archiva.admin.model.RepositoryAdminException;
+import org.apache.archiva.admin.model.admin.ArchivaAdministration;
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
+import org.apache.archiva.checksum.ChecksumAlgorithm;
+import org.apache.archiva.checksum.ChecksummedFile;
import org.apache.archiva.common.plexusbridge.MavenIndexerUtils;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
+import org.apache.archiva.common.utils.VersionComparator;
+import org.apache.archiva.common.utils.VersionUtil;
+import org.apache.archiva.model.ArchivaRepositoryMetadata;
+import org.apache.archiva.model.ArtifactReference;
+import org.apache.archiva.repository.ManagedRepositoryContent;
+import org.apache.archiva.repository.RepositoryContentFactory;
+import org.apache.archiva.repository.RepositoryException;
+import org.apache.archiva.repository.metadata.MetadataTools;
+import org.apache.archiva.repository.metadata.RepositoryMetadataException;
+import org.apache.archiva.repository.metadata.RepositoryMetadataReader;
+import org.apache.archiva.repository.metadata.RepositoryMetadataWriter;
+import org.apache.archiva.rest.api.model.ArtifactTransferRequest;
import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
import org.apache.archiva.rest.api.services.RepositoriesService;
+import org.apache.archiva.scheduler.ArchivaTaskScheduler;
import org.apache.archiva.scheduler.indexing.ArchivaIndexingTaskExecutor;
import org.apache.archiva.scheduler.indexing.ArtifactIndexingTask;
import org.apache.archiva.scheduler.repository.RepositoryArchivaTaskScheduler;
import org.apache.archiva.scheduler.repository.RepositoryTask;
+import org.apache.archiva.security.common.ArchivaRoleConstants;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.context.IndexCreator;
import org.apache.maven.index.context.IndexingContext;
+import org.codehaus.plexus.redback.authentication.AuthenticationResult;
+import org.codehaus.plexus.redback.authorization.AuthorizationException;
+import org.codehaus.plexus.redback.system.DefaultSecuritySession;
+import org.codehaus.plexus.redback.system.SecuritySession;
+import org.codehaus.plexus.redback.system.SecuritySystem;
+import org.codehaus.plexus.redback.users.User;
+import org.codehaus.plexus.redback.users.UserNotFoundException;
import org.codehaus.plexus.taskqueue.TaskQueueException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,7 +68,15 @@ import org.springframework.stereotype.Se
import javax.inject.Inject;
import javax.inject.Named;
import javax.ws.rs.PathParam;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
/**
* @author Olivier Lamy
@@ -70,12 +106,27 @@ public class DefaultRepositoriesService
@Inject
private MavenIndexerUtils mavenIndexerUtils;
- // FIXME olamy move this to repository admin component !
+ @Inject
+ private SecuritySystem securitySystem;
+
+ @Inject
+ private RepositoryContentFactory repositoryFactory;
+
+ @Inject
+ private ArchivaAdministration archivaAdministration;
+
+ @Inject
+ @Named( value = "archivaTaskScheduler#repository" )
+ private ArchivaTaskScheduler scheduler;
+
+ private ChecksumAlgorithm[] algorithms = new ChecksumAlgorithm[]{
ChecksumAlgorithm.SHA1, ChecksumAlgorithm.MD5 };
+
public Boolean scanRepository( String repositoryId, boolean fullScan )
{
if ( repositoryTaskScheduler.isProcessingRepositoryTask( repositoryId
) )
{
log.info( "scanning of repository with id {} already scheduled" );
+ return Boolean.FALSE;
}
RepositoryTask task = new RepositoryTask();
task.setRepositoryId( repositoryId );
@@ -139,6 +190,363 @@ public class DefaultRepositoriesService
throw new ArchivaRestServiceException( e.getMessage() );
}
}
+
+ public Boolean copyArtifact( ArtifactTransferRequest
artifactTransferRequest )
+ throws ArchivaRestServiceException
+ {
+ // check parameters
+ String userName = getAuditInformation().getUser().getUsername();
+ if ( StringUtils.isBlank( userName ) )
+ {
+ throw new ArchivaRestServiceException( "copyArtifact call:
userName not found" );
+ }
+
+ if ( StringUtils.isBlank(
artifactTransferRequest.getSourceRepositoryId() ) )
+ {
+ throw new ArchivaRestServiceException( "copyArtifact call:
sourceRepositoryId cannot be null" );
+ }
+
+ if ( StringUtils.isBlank(
artifactTransferRequest.getTargetRepositoryId() ) )
+ {
+ throw new ArchivaRestServiceException( "copyArtifact call:
targetRepositoryId cannot be null" );
+ }
+
+ ManagedRepository source = null;
+ try
+ {
+ source = managedRepositoryAdmin.getManagedRepository(
artifactTransferRequest.getSourceRepositoryId() );
+ }
+ catch ( RepositoryAdminException e )
+ {
+ throw new ArchivaRestServiceException( e.getMessage() );
+ }
+
+ if ( source == null )
+ {
+ throw new ArchivaRestServiceException(
+ "cannot find repository with id " +
artifactTransferRequest.getSourceRepositoryId() );
+ }
+
+ ManagedRepository target = null;
+ try
+ {
+ target = managedRepositoryAdmin.getManagedRepository(
artifactTransferRequest.getTargetRepositoryId() );
+ }
+ catch ( RepositoryAdminException e )
+ {
+ throw new ArchivaRestServiceException( e.getMessage() );
+ }
+
+ if ( target == null )
+ {
+ throw new ArchivaRestServiceException(
+ "cannot find repository with id " +
artifactTransferRequest.getTargetRepositoryId() );
+ }
+
+ if ( StringUtils.isBlank( artifactTransferRequest.getGroupId() ) )
+ {
+ throw new ArchivaRestServiceException( "groupId is mandatory" );
+ }
+
+ if ( StringUtils.isBlank( artifactTransferRequest.getArtifactId() ) )
+ {
+ throw new ArchivaRestServiceException( "artifactId is mandatory" );
+ }
+
+ if ( StringUtils.isBlank( artifactTransferRequest.getVersion() ) )
+ {
+ throw new ArchivaRestServiceException( "version is mandatory" );
+ }
+
+ if ( VersionUtil.isSnapshot( artifactTransferRequest.getVersion() ) )
+ {
+ throw new ArchivaRestServiceException( "copy of SNAPSHOT not
supported" );
+ }
+
+ // end check parameters
+
+ User user = null;
+ try
+ {
+ user = securitySystem.getUserManager().findUser( userName );
+ }
+ catch ( UserNotFoundException e )
+ {
+ throw new ArchivaRestServiceException( "user " + userName + " not
found" );
+ }
+
+ // check karma on source : read
+ AuthenticationResult authn = new AuthenticationResult( true, userName,
null );
+ SecuritySession securitySession = new DefaultSecuritySession( authn,
user );
+ try
+ {
+ boolean authz =
+ securitySystem.isAuthorized( securitySession,
ArchivaRoleConstants.OPERATION_REPOSITORY_ACCESS,
+
artifactTransferRequest.getSourceRepositoryId() );
+ if ( !authz )
+ {
+ throw new ArchivaRestServiceException(
+ "not authorized to access repo:" +
artifactTransferRequest.getSourceRepositoryId() );
+ }
+ }
+ catch ( AuthorizationException e )
+ {
+ log.error( "error reading permission: " + e.getMessage(), e );
+ throw new ArchivaRestServiceException( e.getMessage() );
+ }
+
+ // check karma on target: write
+ try
+ {
+ boolean authz =
+ securitySystem.isAuthorized( securitySession,
ArchivaRoleConstants.OPERATION_REPOSITORY_UPLOAD,
+
artifactTransferRequest.getTargetRepositoryId() );
+ if ( !authz )
+ {
+ throw new ArchivaRestServiceException(
+ "not authorized to write to repo:" +
artifactTransferRequest.getTargetRepositoryId() );
+ }
+ }
+ catch ( AuthorizationException e )
+ {
+ log.error( "error reading permission: " + e.getMessage(), e );
+ throw new ArchivaRestServiceException( e.getMessage() );
+ }
+
+ // sounds good we can continue !
+
+ ArtifactReference artifactReference = new ArtifactReference();
+ artifactReference.setArtifactId(
artifactTransferRequest.getArtifactId() );
+ artifactReference.setGroupId( artifactTransferRequest.getGroupId() );
+ artifactReference.setVersion( artifactTransferRequest.getVersion() );
+ artifactReference.setClassifier(
artifactTransferRequest.getClassifier() );
+ String packaging = StringUtils.trim(
artifactTransferRequest.getPackaging() );
+ artifactReference.setType( StringUtils.isEmpty( packaging ) ? "jar" :
packaging );
+
+ try
+ {
+
+ ManagedRepositoryContent sourceRepository =
+ repositoryFactory.getManagedRepositoryContent(
artifactTransferRequest.getSourceRepositoryId() );
+
+ String artifactSourcePath = sourceRepository.toPath(
artifactReference );
+
+ File artifactFile = new File( source.getLocation(),
artifactSourcePath );
+
+ ManagedRepositoryContent targetRepository =
+ repositoryFactory.getManagedRepositoryContent(
artifactTransferRequest.getTargetRepositoryId() );
+
+ String artifactPath = targetRepository.toPath( artifactReference );
+
+ int lastIndex = artifactPath.lastIndexOf( '/' );
+
+ String path = artifactPath.substring( 0, lastIndex );
+ File targetPath = new File( target.getLocation(), path );
+
+ Date lastUpdatedTimestamp = Calendar.getInstance().getTime();
+ int newBuildNumber = 1;
+ String timestamp = null;
+
+ File versionMetadataFile = new File( targetPath,
MetadataTools.MAVEN_METADATA );
+ ArchivaRepositoryMetadata versionMetadata = getMetadata(
versionMetadataFile );
+
+ if ( !targetPath.exists() )
+ {
+ targetPath.mkdirs();
+ }
+
+ String filename = artifactPath.substring( lastIndex + 1 );
+
+ // FIXME some dupe with uploadaction
+
+ boolean fixChecksums =
+ !( archivaAdministration.getKnownContentConsumers().contains(
"create-missing-checksums" ) );
+
+ File targetFile = new File( targetPath, filename );
+ if ( targetFile.exists() && target.isBlockRedeployments() )
+ {
+ throw new ArchivaRestServiceException(
+ "artifact already exists in target repo: " +
artifactTransferRequest.getTargetRepositoryId()
+ + " and redeployment blocked" );
+ }
+ else
+ {
+ copyFile( artifactFile, targetPath, filename, fixChecksums );
+ queueRepositoryTask( target.getId(), targetFile );
+ }
+
+ // copy source pom to target repo
+ String pomFilename = filename;
+ if ( StringUtils.isNotBlank(
artifactTransferRequest.getClassifier() ) )
+ {
+ pomFilename = StringUtils.remove( pomFilename, "-" +
artifactTransferRequest.getClassifier() );
+ }
+ pomFilename = FilenameUtils.removeExtension( pomFilename ) +
".pom";
+
+ File pomFile = new File(
+ new File( source.getLocation(), artifactSourcePath.substring(
0, artifactPath.lastIndexOf( '/' ) ) ),
+ pomFilename );
+
+ if ( pomFile != null && pomFile.length() > 0 )
+ {
+ copyFile( pomFile, targetPath, pomFilename, fixChecksums );
+ queueRepositoryTask( target.getId(), new File( targetPath,
pomFilename ) );
+
+
+ }
+
+ // explicitly update only if metadata-updater consumer is not
enabled!
+ if ( !archivaAdministration.getKnownContentConsumers().contains(
"metadata-updater" ) )
+ {
+ updateProjectMetadata( targetPath.getAbsolutePath(),
lastUpdatedTimestamp, timestamp, newBuildNumber,
+ fixChecksums, artifactTransferRequest );
+
+
+ }
+
+ String msg =
+ "Artifact \'" + artifactTransferRequest.getGroupId() + ":" +
artifactTransferRequest.getArtifactId()
+ + ":" + artifactTransferRequest.getVersion() + "\' was
successfully deployed to repository \'"
+ + artifactTransferRequest.getTargetRepositoryId() + "\'";
+
+ }
+ catch ( RepositoryException e )
+ {
+ log.error( "RepositoryException: " + e.getMessage(), e );
+ throw new ArchivaRestServiceException( e.getMessage() );
+ }
+ catch ( RepositoryAdminException e )
+ {
+ log.error( "RepositoryAdminException: " + e.getMessage(), e );
+ throw new ArchivaRestServiceException( e.getMessage() );
+ }
+ catch ( IOException e )
+ {
+ log.error( "IOException: " + e.getMessage(), e );
+ throw new ArchivaRestServiceException( e.getMessage() );
+ }
+ return true;
+ }
+
+ //FIXME some duplicate with UploadAction
+
+ private void queueRepositoryTask( String repositoryId, File localFile )
+ {
+ RepositoryTask task = new RepositoryTask();
+ task.setRepositoryId( repositoryId );
+ task.setResourceFile( localFile );
+ task.setUpdateRelatedArtifacts( true );
+ //task.setScanAll( true );
+
+ try
+ {
+ scheduler.queueTask( task );
+ }
+ catch ( TaskQueueException e )
+ {
+ log.error( "Unable to queue repository task to execute consumers
on resource file ['" + localFile.getName()
+ + "']." );
+ }
+ }
+
+ private ArchivaRepositoryMetadata getMetadata( File metadataFile )
+ throws RepositoryMetadataException
+ {
+ ArchivaRepositoryMetadata metadata = new ArchivaRepositoryMetadata();
+ if ( metadataFile.exists() )
+ {
+ metadata = RepositoryMetadataReader.read( metadataFile );
+ }
+ return metadata;
+ }
+
+ private void copyFile( File sourceFile, File targetPath, String
targetFilename, boolean fixChecksums )
+ throws IOException
+ {
+ FileOutputStream out = new FileOutputStream( new File( targetPath,
targetFilename ) );
+ FileInputStream input = new FileInputStream( sourceFile );
+
+ try
+ {
+ IOUtils.copy( input, out );
+ }
+ finally
+ {
+ out.close();
+ input.close();
+ }
+
+ if ( fixChecksums )
+ {
+ fixChecksums( new File( targetPath, targetFilename ) );
+ }
+ }
+
+ private void fixChecksums( File file )
+ {
+ ChecksummedFile checksum = new ChecksummedFile( file );
+ checksum.fixChecksums( algorithms );
+ }
+
+ private void updateProjectMetadata( String targetPath, Date
lastUpdatedTimestamp, String timestamp, int buildNumber,
+ boolean fixChecksums,
ArtifactTransferRequest artifactTransferRequest )
+ throws RepositoryMetadataException
+ {
+ List<String> availableVersions = new ArrayList<String>();
+ String latestVersion = artifactTransferRequest.getVersion();
+
+ File projectDir = new File( targetPath ).getParentFile();
+ File projectMetadataFile = new File( projectDir,
MetadataTools.MAVEN_METADATA );
+
+ ArchivaRepositoryMetadata projectMetadata = getMetadata(
projectMetadataFile );
+
+ if ( projectMetadataFile.exists() )
+ {
+ availableVersions = projectMetadata.getAvailableVersions();
+
+ Collections.sort( availableVersions,
VersionComparator.getInstance() );
+
+ if ( !availableVersions.contains(
artifactTransferRequest.getVersion() ) )
+ {
+ availableVersions.add( artifactTransferRequest.getVersion() );
+ }
+
+ latestVersion = availableVersions.get( availableVersions.size() -
1 );
+ }
+ else
+ {
+ availableVersions.add( artifactTransferRequest.getVersion() );
+
+ projectMetadata.setGroupId( artifactTransferRequest.getGroupId() );
+ projectMetadata.setArtifactId(
artifactTransferRequest.getArtifactId() );
+ }
+
+ if ( projectMetadata.getGroupId() == null )
+ {
+ projectMetadata.setGroupId( artifactTransferRequest.getGroupId() );
+ }
+
+ if ( projectMetadata.getArtifactId() == null )
+ {
+ projectMetadata.setArtifactId(
artifactTransferRequest.getArtifactId() );
+ }
+
+ projectMetadata.setLatestVersion( latestVersion );
+ projectMetadata.setLastUpdatedTimestamp( lastUpdatedTimestamp );
+ projectMetadata.setAvailableVersions( availableVersions );
+
+ if ( !VersionUtil.isSnapshot( artifactTransferRequest.getVersion() ) )
+ {
+ projectMetadata.setReleasedVersion( latestVersion );
+ }
+
+ RepositoryMetadataWriter.write( projectMetadata, projectMetadataFile );
+
+ if ( fixChecksums )
+ {
+ fixChecksums( projectMetadataFile );
+ }
+ }
}
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/CopyArtifactTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/CopyArtifactTest.java?rev=1174423&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/CopyArtifactTest.java
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/CopyArtifactTest.java
Thu Sep 22 22:20:45 2011
@@ -0,0 +1,125 @@
+package org.apache.archiva.rest.services;
+/*
+ * 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 org.apache.archiva.admin.model.beans.ManagedRepository;
+import org.apache.archiva.model.ArtifactReference;
+import org.apache.archiva.repository.RepositoryContentFactory;
+import org.apache.archiva.rest.api.model.ArtifactTransferRequest;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
+import org.junit.Test;
+
+import javax.inject.Inject;
+import java.io.File;
+
+/**
+ * @author Olivier Lamy
+ */
+public class CopyArtifactTest
+ extends AbstractArchivaRestTest
+{
+ static final String TARGET_REPO_ID = "test-copy-target";
+
+ static final String SOURCE_REPO_ID = "test-origin-repo";
+
+ @Inject
+ private RepositoryContentFactory repositoryFactory;
+
+ private void initSourceTargetRepo()
+ throws Exception
+ {
+ File targetRepo = new File( "target/test-repo-copy" );
+ if ( targetRepo.exists() )
+ {
+ FileUtils.deleteDirectory( targetRepo );
+ }
+ assertFalse( targetRepo.exists() );
+ targetRepo.mkdirs();
+
+ ManagedRepository managedRepository = getTestManagedRepository();
+ managedRepository.setId( TARGET_REPO_ID );
+ managedRepository.setLocation( targetRepo.getCanonicalPath() );
+ managedRepository.setCronExpression( "* * * * * ?" );
+ getManagedRepositoriesService( authorizationHeader
).addManagedRepository( managedRepository );
+ assertNotNull( getManagedRepositoriesService( authorizationHeader
).getManagedRepository( TARGET_REPO_ID ) );
+
+
+ File originRepo = new File( "target/test-origin-repo" );
+ if ( originRepo.exists() )
+ {
+ FileUtils.deleteDirectory( originRepo );
+ }
+ assertFalse( originRepo.exists() );
+ FileUtils.copyDirectory( new File( "src/test/repo-with-osgi" ),
originRepo );
+
+ managedRepository = getTestManagedRepository();
+ managedRepository.setId( SOURCE_REPO_ID );
+ managedRepository.setLocation( originRepo.getCanonicalPath() );
+
+ getManagedRepositoriesService( authorizationHeader
).addManagedRepository( managedRepository );
+ assertNotNull( getManagedRepositoriesService( authorizationHeader
).getManagedRepository( SOURCE_REPO_ID ) );
+
+ getArchivaAdministrationService().addKnownContentConsumer(
"create-missing-checksums" );
+ getArchivaAdministrationService().addKnownContentConsumer(
"metadata-updater" );
+
+ }
+
+ @Test
+ public void copyToAnEmptyRepo()
+ throws Exception
+ {
+ initSourceTargetRepo();
+
+ ArtifactTransferRequest artifactTransferRequest = new
ArtifactTransferRequest();
+ artifactTransferRequest.setGroupId( "org.apache.karaf.features" );
+ artifactTransferRequest.setArtifactId(
"org.apache.karaf.features.core" );
+ artifactTransferRequest.setVersion( "2.2.2" );
+ artifactTransferRequest.setSourceRepositoryId( SOURCE_REPO_ID );
+ artifactTransferRequest.setTargetRepositoryId( TARGET_REPO_ID );
+ assertTrue( getRepositoriesService( authorizationHeader
).copyArtifact( artifactTransferRequest ) );
+
+ ArtifactReference artifactReference = new ArtifactReference();
+ artifactReference.setArtifactId(
artifactTransferRequest.getArtifactId() );
+ artifactReference.setGroupId( artifactTransferRequest.getGroupId() );
+ artifactReference.setVersion( artifactTransferRequest.getVersion() );
+ artifactReference.setClassifier(
artifactTransferRequest.getClassifier() );
+ String packaging = StringUtils.trim(
artifactTransferRequest.getPackaging() );
+ artifactReference.setType( StringUtils.isEmpty( packaging ) ? "jar" :
packaging );
+
+ String targetRepoPath =
+ getManagedRepositoriesService( authorizationHeader
).getManagedRepository( TARGET_REPO_ID ).getLocation();
+
+ File artifact = new File( targetRepoPath,
+
"/org/apache/karaf/features/org.apache.karaf.features.core/2.2.2/org.apache.karaf.features.core-2.2.2.jar"
);
+ assertTrue( artifact.exists() );
+ File pom = new File( targetRepoPath,
+
"/org/apache/karaf/features/org.apache.karaf.features.core/2.2.2/org.apache.karaf.features.core-2.2.2.pom"
);
+
+ assertTrue( "not exists " + pom.getPath(), pom.exists() );
+
+ }
+
+ //@Test
+ public void copyToAnExistingRepo()
+ throws Exception
+ {
+ initSourceTargetRepo();
+ }
+}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/WebdavMethodUtil.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/WebdavMethodUtil.java?rev=1174423&r1=1174422&r2=1174423&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/WebdavMethodUtil.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/WebdavMethodUtil.java
Thu Sep 22 22:20:45 2011
@@ -19,7 +19,8 @@ package org.apache.archiva.webdav.util;
* under the License.
*/
-import org.apache.archiva.security.ArchivaRoleConstants;
+
+import org.apache.archiva.security.common.ArchivaRoleConstants;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
