Author: olamy
Date: Thu Sep 8 20:17:04 2011
New Revision: 1166884
URL: http://svn.apache.org/viewvc?rev=1166884&view=rev
Log:
[MRM-1490] REST services : configure legacy paths tru rest services
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/LegacyArtifactPath.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaAdministrationService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java
- copied, changed from r1166883,
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaAdministrationServiceTest.java
- copied, changed from r1166883,
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/ArchivaAdministration.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/ArchivaAdministration.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/admin/ArchivaAdministrationTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/ArchivaAdministration.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/ArchivaAdministration.java?rev=1166884&r1=1166883&r2=1166884&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/ArchivaAdministration.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/ArchivaAdministration.java
Thu Sep 8 20:17:04 2011
@@ -18,6 +18,7 @@ package org.apache.archiva.admin.reposit
* under the License.
*/
+import org.apache.archiva.admin.AuditInformation;
import org.apache.archiva.admin.repository.RepositoryAdminException;
import java.util.List;
@@ -32,9 +33,9 @@ public interface ArchivaAdministration
List<LegacyArtifactPath> getLegacyArtifactPaths()
throws RepositoryAdminException;
- void addLegacyArtifactPath( LegacyArtifactPath legacyArtifactPath )
+ void addLegacyArtifactPath( LegacyArtifactPath legacyArtifactPath,
AuditInformation auditInformation )
throws RepositoryAdminException;
- void deleteLegacyArtifactPath( String path )
+ void deleteLegacyArtifactPath( String path, AuditInformation
auditInformation )
throws RepositoryAdminException;
}
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java?rev=1166884&r1=1166883&r2=1166884&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
Thu Sep 8 20:17:04 2011
@@ -19,6 +19,7 @@ package org.apache.archiva.admin.reposit
*/
import net.sf.beanlib.provider.replicator.BeanReplicator;
+import org.apache.archiva.admin.AuditInformation;
import org.apache.archiva.admin.repository.AbstractRepositoryAdmin;
import org.apache.archiva.admin.repository.RepositoryAdminException;
import org.apache.maven.archiva.configuration.Configuration;
@@ -30,7 +31,7 @@ import java.util.List;
/**
* @author Olivier Lamy
*/
-@Service("archivaAdministration#default")
+@Service( "archivaAdministration#default" )
public class DefaultArchivaAdministration
extends AbstractRepositoryAdmin
implements ArchivaAdministration
@@ -47,7 +48,7 @@ public class DefaultArchivaAdministratio
return legacyArtifactPaths;
}
- public void addLegacyArtifactPath( LegacyArtifactPath legacyArtifactPath )
+ public void addLegacyArtifactPath( LegacyArtifactPath legacyArtifactPath,
AuditInformation auditInformation )
throws RepositoryAdminException
{
Configuration configuration =
getArchivaConfiguration().getConfiguration();
@@ -58,7 +59,7 @@ public class DefaultArchivaAdministratio
saveConfiguration( configuration );
}
- public void deleteLegacyArtifactPath( String path )
+ public void deleteLegacyArtifactPath( String path, AuditInformation
auditInformation )
throws RepositoryAdminException
{
Configuration configuration =
getArchivaConfiguration().getConfiguration();
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/admin/ArchivaAdministrationTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/admin/ArchivaAdministrationTest.java?rev=1166884&r1=1166883&r2=1166884&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/admin/ArchivaAdministrationTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/admin/ArchivaAdministrationTest.java
Thu Sep 8 20:17:04 2011
@@ -49,12 +49,12 @@ public class ArchivaAdministrationTest
int initialSize =
archivaAdministration.getLegacyArtifactPaths().size();
LegacyArtifactPath legacyArtifactPath = new LegacyArtifactPath( "foo",
"bar" );
- archivaAdministration.addLegacyArtifactPath( legacyArtifactPath );
+ archivaAdministration.addLegacyArtifactPath( legacyArtifactPath,
getFakeAuditInformation() );
assertTrue( archivaAdministration.getLegacyArtifactPaths().contains(
new LegacyArtifactPath( "foo", "bar" ) ) );
assertEquals( initialSize + 1,
archivaAdministration.getLegacyArtifactPaths().size() );
- archivaAdministration.deleteLegacyArtifactPath(
legacyArtifactPath.getPath() );
+ archivaAdministration.deleteLegacyArtifactPath(
legacyArtifactPath.getPath(), getFakeAuditInformation() );
assertFalse(
archivaAdministration.getLegacyArtifactPaths().contains( new
LegacyArtifactPath( "foo", "bar" ) ) );
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/LegacyArtifactPath.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/LegacyArtifactPath.java?rev=1166884&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/LegacyArtifactPath.java
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/LegacyArtifactPath.java
Thu Sep 8 20:17:04 2011
@@ -0,0 +1,104 @@
+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
+ * @since 1.4
+ */
+@XmlRootElement( name = "legacyArtifactPath" )
+public class LegacyArtifactPath
+ implements Serializable
+{
+ /**
+ * The legacy path.
+ */
+ private String path;
+
+ /**
+ * The artifact reference, as " [groupId] :
+ * [artifactId] : [version] : [classifier] : [type] ".
+ */
+ private String artifact;
+
+ public LegacyArtifactPath()
+ {
+ // no op
+ }
+
+ public LegacyArtifactPath( String path, String artifact )
+ {
+ this.path = path;
+ this.artifact = artifact;
+ }
+
+ public String getPath()
+ {
+ return path;
+ }
+
+ public void setPath( String path )
+ {
+ this.path = path;
+ }
+
+ public String getArtifact()
+ {
+ return artifact;
+ }
+
+ public void setArtifact( String artifact )
+ {
+ this.artifact = artifact;
+ }
+
+ public boolean match( String path )
+ {
+ return path.equals( this.path );
+ }
+
+ public String getGroupId()
+ {
+ return artifact.split( ":" )[0];
+ }
+
+ public String getArtifactId()
+ {
+ return artifact.split( ":" )[1];
+ }
+
+ public String getVersion()
+ {
+ return artifact.split( ":" )[2];
+ }
+
+ public String getClassifier()
+ {
+ String classifier = artifact.split( ":" )[3];
+ return classifier.length() > 0 ? classifier : null;
+ }
+
+ public String getType()
+ {
+ return artifact.split( ":" )[4];
+ }
+}
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaAdministrationService.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/ArchivaAdministrationService.java?rev=1166884&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaAdministrationService.java
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaAdministrationService.java
Thu Sep 8 20:17:04 2011
@@ -0,0 +1,63 @@
+package org.apache.archiva.rest.api.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.repository.RepositoryAdminException;
+import org.apache.archiva.rest.api.model.LegacyArtifactPath;
+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.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+/**
+ * @author Olivier Lamy
+ * @since 1.4
+ */
+@Path( "/archivaAdministrationService/" )
+public interface ArchivaAdministrationService
+{
+ @Path( "getLegacyArtifactPaths" )
+ @GET
+ @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML,
MediaType.TEXT_PLAIN } )
+ @RedbackAuthorization( permission =
ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION )
+ List<LegacyArtifactPath> getLegacyArtifactPaths()
+ throws RepositoryAdminException;
+
+ @Path( "addLegacyArtifactPath" )
+ @POST
+ @Consumes( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
+ @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML,
MediaType.TEXT_PLAIN } )
+ @RedbackAuthorization( permission =
ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION )
+ void addLegacyArtifactPath( LegacyArtifactPath legacyArtifactPath )
+ throws RepositoryAdminException;
+
+ @Path( "deleteLegacyArtifactPath" )
+ @GET
+ @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML,
MediaType.TEXT_PLAIN } )
+ @RedbackAuthorization( permission =
ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION )
+ Boolean deleteLegacyArtifactPath( @QueryParam( "path" ) String path )
+ throws RepositoryAdminException;
+}
Copied:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java
(from r1166883,
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.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/DefaultArchivaAdministrationService.java?p2=archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java&p1=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java&r1=1166883&r2=1166884&rev=1166884&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaAdministrationService.java
Thu Sep 8 20:17:04 2011
@@ -1,4 +1,4 @@
-package org.apache.archiva.admin.repository.admin;
+package org.apache.archiva.rest.services;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,27 +19,33 @@ package org.apache.archiva.admin.reposit
*/
import net.sf.beanlib.provider.replicator.BeanReplicator;
-import org.apache.archiva.admin.repository.AbstractRepositoryAdmin;
import org.apache.archiva.admin.repository.RepositoryAdminException;
-import org.apache.maven.archiva.configuration.Configuration;
+import org.apache.archiva.admin.repository.admin.ArchivaAdministration;
+import org.apache.archiva.rest.api.model.LegacyArtifactPath;
+import org.apache.archiva.rest.api.services.ArchivaAdministrationService;
import org.springframework.stereotype.Service;
+import javax.inject.Inject;
import java.util.ArrayList;
import java.util.List;
/**
* @author Olivier Lamy
+ * @since 1.4
*/
-@Service("archivaAdministration#default")
-public class DefaultArchivaAdministration
- extends AbstractRepositoryAdmin
- implements ArchivaAdministration
+@Service( "archivaAdministrationService#default" )
+public class DefaultArchivaAdministrationService
+ extends AbstractRestService
+ implements ArchivaAdministrationService
{
+ @Inject
+ private ArchivaAdministration archivaAdministration;
+
public List<LegacyArtifactPath> getLegacyArtifactPaths()
throws RepositoryAdminException
{
List<LegacyArtifactPath> legacyArtifactPaths = new
ArrayList<LegacyArtifactPath>();
- for ( org.apache.maven.archiva.configuration.LegacyArtifactPath
legacyArtifactPath :
getArchivaConfiguration().getConfiguration().getLegacyArtifactPaths() )
+ for ( org.apache.archiva.admin.repository.admin.LegacyArtifactPath
legacyArtifactPath : archivaAdministration.getLegacyArtifactPaths() )
{
legacyArtifactPaths.add(
new BeanReplicator().replicateBean( legacyArtifactPath,
LegacyArtifactPath.class ) );
@@ -50,24 +56,15 @@ public class DefaultArchivaAdministratio
public void addLegacyArtifactPath( LegacyArtifactPath legacyArtifactPath )
throws RepositoryAdminException
{
- Configuration configuration =
getArchivaConfiguration().getConfiguration();
-
- configuration.addLegacyArtifactPath( new
BeanReplicator().replicateBean( legacyArtifactPath,
-
org.apache.maven.archiva.configuration.LegacyArtifactPath.class ) );
-
- saveConfiguration( configuration );
+ archivaAdministration.addLegacyArtifactPath( new
BeanReplicator().replicateBean( legacyArtifactPath,
+
org.apache.archiva.admin.repository.admin.LegacyArtifactPath.class ),
+ getAuditInformation() );
}
- public void deleteLegacyArtifactPath( String path )
+ public Boolean deleteLegacyArtifactPath( String path )
throws RepositoryAdminException
{
- Configuration configuration =
getArchivaConfiguration().getConfiguration();
- org.apache.maven.archiva.configuration.LegacyArtifactPath
legacyArtifactPath =
- new org.apache.maven.archiva.configuration.LegacyArtifactPath();
-
- legacyArtifactPath.setPath( path );
- configuration.removeLegacyArtifactPath( legacyArtifactPath );
-
- saveConfiguration( configuration );
+ archivaAdministration.deleteLegacyArtifactPath( path,
getAuditInformation() );
+ return Boolean.TRUE;
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml?rev=1166884&r1=1166883&r2=1166884&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
Thu Sep 8 20:17:04 2011
@@ -55,6 +55,7 @@
<ref bean="repositoryGroupService#rest"/>
<ref bean="proxyConnectorService#rest"/>
<ref bean="networkProxyService#rest"/>
+ <ref bean="archivaAdministrationService#default"/>
</jaxrs:serviceBeans>
<jaxrs:outInterceptors>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.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/AbstractArchivaRestTest.java?rev=1166884&r1=1166883&r2=1166884&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
Thu Sep 8 20:17:04 2011
@@ -20,6 +20,7 @@ package org.apache.archiva.rest.services
import org.apache.archiva.rest.api.model.ManagedRepository;
+import org.apache.archiva.rest.api.services.ArchivaAdministrationService;
import org.apache.archiva.rest.api.services.ManagedRepositoriesService;
import org.apache.archiva.rest.api.services.NetworkProxyService;
import org.apache.archiva.rest.api.services.PingService;
@@ -105,6 +106,17 @@ public abstract class AbstractArchivaRes
return service;
}
+ protected ArchivaAdministrationService getArchivaAdministrationService()
+ {
+ ArchivaAdministrationService service =
+ JAXRSClientFactory.create( "http://localhost:"; + port +
"/services/archivaServices/",
+ ArchivaAdministrationService.class );
+
+ WebClient.client( service ).header( "Authorization",
authorizationHeader );
+ WebClient.getConfig( service
).getHttpConduit().getClient().setReceiveTimeout( 300000 );
+ return service;
+ }
+
protected ManagedRepository getTestManagedRepository()
{
String location = new File( FileUtil.getBasedir(), "target/test-repo"
).getAbsolutePath();
Copied:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaAdministrationServiceTest.java
(from r1166883,
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/ArchivaAdministration.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/ArchivaAdministrationServiceTest.java?p2=archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaAdministrationServiceTest.java&p1=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/ArchivaAdministration.java&r1=1166883&r2=1166884&rev=1166884&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/admin/ArchivaAdministration.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArchivaAdministrationServiceTest.java
Thu Sep 8 20:17:04 2011
@@ -1,4 +1,4 @@
-package org.apache.archiva.admin.repository.admin;
+package org.apache.archiva.rest.services;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,23 +18,19 @@ package org.apache.archiva.admin.reposit
* under the License.
*/
-import org.apache.archiva.admin.repository.RepositoryAdminException;
-
-import java.util.List;
+import org.junit.Test;
/**
* @author Olivier Lamy
- * @since 1.4
*/
-public interface ArchivaAdministration
+public class ArchivaAdministrationServiceTest
+ extends AbstractArchivaRestTest
{
-
- List<LegacyArtifactPath> getLegacyArtifactPaths()
- throws RepositoryAdminException;
-
- void addLegacyArtifactPath( LegacyArtifactPath legacyArtifactPath )
- throws RepositoryAdminException;
-
- void deleteLegacyArtifactPath( String path )
- throws RepositoryAdminException;
+ @Test
+ public void getAllLegacyPaths()
+ throws Exception
+ {
+ assertNotNull(
getArchivaAdministrationService().getLegacyArtifactPaths() );
+ assertFalse(
getArchivaAdministrationService().getLegacyArtifactPaths().isEmpty() );
+ }
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java?rev=1166884&r1=1166883&r2=1166884&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java
Thu Sep 8 20:17:04 2011
@@ -100,7 +100,7 @@ public class AddLegacyArtifactPathAction
try
{
- getArchivaAdministration().addLegacyArtifactPath(
legacyArtifactPath );
+ getArchivaAdministration().addLegacyArtifactPath(
legacyArtifactPath, getAuditInformation() );
}
catch ( RepositoryAdminException e )
{
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java?rev=1166884&r1=1166883&r2=1166884&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java
Thu Sep 8 20:17:04 2011
@@ -48,7 +48,7 @@ public class DeleteLegacyArtifactPathAct
log.info( "remove [" + path + "] from legacy artifact path resolution"
);
try
{
- getArchivaAdministration().deleteLegacyArtifactPath( path );
+ getArchivaAdministration().deleteLegacyArtifactPath( path,
getAuditInformation() );
}
catch ( RepositoryAdminException e )
{
