From: Olivier Lamy Date: Wed, 7 Sep 2011 21:48:21 +0000 (+0000) Subject: [MRM-1490] REST services : proxyconnector service X-Git-Tag: archiva-1.4-M1~360 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d9d5b0d710e7df68fd5250e7c0abcc638c6bf527;p=archiva.git [MRM-1490] REST services : proxyconnector service git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1166426 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java index c83a57766..7b77cfd3c 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java @@ -64,17 +64,7 @@ public class DefaultProxyConnectorAdmin List proxyConnectors = new ArrayList( proxyConnectorConfigurations.size() ); for ( ProxyConnectorConfiguration configuration : proxyConnectorConfigurations ) { - ProxyConnector proxyConnector = new ProxyConnector(); - proxyConnectors.add( proxyConnector ); - proxyConnector.setOrder( configuration.getOrder() ); - proxyConnector.setBlackListPatterns( new ArrayList( configuration.getBlackListPatterns() ) ); - proxyConnector.setWhiteListPatterns( new ArrayList( configuration.getWhiteListPatterns() ) ); - proxyConnector.setDisabled( configuration.isDisabled() ); - proxyConnector.setPolicies( new HashMap( configuration.getPolicies() ) ); - proxyConnector.setProperties( new HashMap( configuration.getProperties() ) ); - proxyConnector.setProxyId( configuration.getProxyId() ); - proxyConnector.setSourceRepoId( configuration.getSourceRepoId() ); - proxyConnector.setTargetRepoId( configuration.getTargetRepoId() ); + proxyConnectors.add( getProxyConnector( configuration ) ); } return proxyConnectors; @@ -193,13 +183,6 @@ public class DefaultProxyConnectorAdmin return proxyConnectorMap; } - public ProxyConnector findProxyConnector( String sourceId, String targetId ) - throws RepositoryAdminException - { - return getProxyConnector( - findProxyConnector( sourceId, targetId, getArchivaConfiguration().getConfiguration() ) ); - } - private ProxyConnectorConfiguration findProxyConnector( String sourceId, String targetId, Configuration configuration ) { diff --git a/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnector.java b/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnector.java index 5c811963b..67a767216 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnector.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnector.java @@ -77,7 +77,7 @@ public class ProxyConnector */ public static final String POLICY_CACHE_FAILURES = "cache-failures"; -/** + /** * * The order of the proxy connectors. (0 means no order specified) * . diff --git a/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorAdmin.java index 0228f9b73..cfb549b2a 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/src/main/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorAdmin.java @@ -58,8 +58,4 @@ public interface ProxyConnectorAdmin Map> getProxyConnectorAsMap() throws RepositoryAdminException; - ProxyConnector findProxyConnector( String sourceId, String targetId ) - throws RepositoryAdminException; - - } diff --git a/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorAdminTest.java b/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorAdminTest.java index af35ff36c..4240f2fd9 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorAdminTest.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorAdminTest.java @@ -132,30 +132,29 @@ public class ProxyConnectorAdminTest public void findProxyConnector() throws Exception { - ProxyConnector proxyConnector = proxyConnectorAdmin.findProxyConnector( "internal", "central" ); + ProxyConnector proxyConnector = proxyConnectorAdmin.getProxyConnector( "internal", "central" ); assertNotNull( proxyConnector ); } - @Test + @Test public void updateProxyConnector() throws Exception { - ProxyConnector proxyConnector = proxyConnectorAdmin.findProxyConnector( "internal", "central" ); + ProxyConnector proxyConnector = proxyConnectorAdmin.getProxyConnector( "internal", "central" ); assertNotNull( proxyConnector ); proxyConnector.setDisabled( false ); proxyConnectorAdmin.updateProxyConnector( proxyConnector, getFakeAuditInformation() ); - proxyConnector = proxyConnectorAdmin.findProxyConnector( "internal", "central" ); + proxyConnector = proxyConnectorAdmin.getProxyConnector( "internal", "central" ); assertFalse( proxyConnector.isDisabled() ); - proxyConnector.setDisabled( true ); proxyConnectorAdmin.updateProxyConnector( proxyConnector, getFakeAuditInformation() ); - proxyConnector = proxyConnectorAdmin.findProxyConnector( "internal", "central" ); + proxyConnector = proxyConnectorAdmin.getProxyConnector( "internal", "central" ); assertTrue( proxyConnector.isDisabled() ); proxyConnector.setOrder( 4 ); proxyConnectorAdmin.updateProxyConnector( proxyConnector, getFakeAuditInformation() ); - proxyConnector = proxyConnectorAdmin.findProxyConnector( "internal", "central" ); + proxyConnector = proxyConnectorAdmin.getProxyConnector( "internal", "central" ); assertEquals( 4, proxyConnector.getOrder() ); } diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java index eecc75938..57a9917cc 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java @@ -33,10 +33,10 @@ public class ManagedRepository private String name; - private String location; - private String layout; + private String location; + private boolean snapshots = false; private boolean releases = false; @@ -54,8 +54,9 @@ public class ManagedRepository // no op } - public ManagedRepository( String id, String name, String location, String layout, boolean snapshots, boolean releases, - boolean blockRedeployments, boolean stageRepoNeeded, String cronExpression ) + public ManagedRepository( String id, String name, String location, String layout, boolean snapshots, + boolean releases, boolean blockRedeployments, boolean stageRepoNeeded, + String cronExpression ) { this.id = id; this.name = name; diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ProxyConnector.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ProxyConnector.java new file mode 100644 index 000000000..79ba84428 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ProxyConnector.java @@ -0,0 +1,180 @@ +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; +import java.util.List; +import java.util.Map; + +/** + * @author Olivier Lamy + * @since 1.4 + */ +@XmlRootElement( name = "proxyConnector" ) +public class ProxyConnector + implements Serializable +{ + /** + * The order of the proxy connectors. (0 means no order specified) + * . + */ + private int order = 0; + + /** + * The Repository Source for this connector. + */ + private String sourceRepoId; + + /** + * The Repository Target for this connector. + */ + private String targetRepoId; + + /** + * The network proxy ID to use for this connector. + */ + private String proxyId; + + /** + * Field blackListPatterns. + */ + private List blackListPatterns; + + /** + * Field whiteListPatterns. + */ + private List whiteListPatterns; + + /** + * Field policies. + */ + private Map policies; + + /** + * Field properties. + */ + private Map properties; + + /** + * If the the repository proxy connector is disabled or not + */ + private boolean disabled = false; + + /** + * Get the order of the proxy connectors. (0 means no order specified) + * + * @return int + */ + public int getOrder() + { + return this.order; + } + + + /** + * Set the order of the proxy connectors. (0 means no order specified) + * + * @param order + */ + public void setOrder( int order ) + { + this.order = order; + } + + public String getSourceRepoId() + { + return sourceRepoId; + } + + public void setSourceRepoId( String sourceRepoId ) + { + this.sourceRepoId = sourceRepoId; + } + + public String getTargetRepoId() + { + return targetRepoId; + } + + public void setTargetRepoId( String targetRepoId ) + { + this.targetRepoId = targetRepoId; + } + + public String getProxyId() + { + return proxyId; + } + + public void setProxyId( String proxyId ) + { + this.proxyId = proxyId; + } + + public List getBlackListPatterns() + { + return blackListPatterns; + } + + public void setBlackListPatterns( List blackListPatterns ) + { + this.blackListPatterns = blackListPatterns; + } + + public List getWhiteListPatterns() + { + return whiteListPatterns; + } + + public void setWhiteListPatterns( List whiteListPatterns ) + { + this.whiteListPatterns = whiteListPatterns; + } + + public Map getPolicies() + { + return policies; + } + + public void setPolicies( Map policies ) + { + this.policies = policies; + } + + public Map getProperties() + { + return properties; + } + + public void setProperties( Map properties ) + { + this.properties = properties; + } + + public boolean isDisabled() + { + return disabled; + } + + public void setDisabled( boolean disabled ) + { + this.disabled = disabled; + } +} diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RemoteRepository.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RemoteRepository.java index 2117788ef..43d99a77a 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RemoteRepository.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RemoteRepository.java @@ -31,10 +31,10 @@ public class RemoteRepository private String name; - private String url; - private String layout; + private String url; + private String userName; private String password; diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java new file mode 100644 index 000000000..f53ebc94c --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java @@ -0,0 +1,99 @@ +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.ProxyConnector; +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; +import java.util.Map; + +/** + * No update method for changing source and target here as id is : sourceRepoId and targetRepoId, use delete then add. + * + * @author Olivier Lamy + * @since 1.4 + */ +@Path( "/proxyConnectorService/" ) +public interface ProxyConnectorService +{ + @Path( "getProxyConnectors" ) + @GET + @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } ) + @RedbackAuthorization( permission = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION ) + List getProxyConnectors() + throws RepositoryAdminException; + + @Path( "getProxyConnector" ) + @GET + @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } ) + @RedbackAuthorization( permission = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION ) + ProxyConnector getProxyConnector( @QueryParam( "sourceRepoId" ) String sourceRepoId, @QueryParam( "targetRepoId" ) String targetRepoId ) + throws RepositoryAdminException; + + @Path( "addProxyConnector" ) + @POST + @Consumes( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } ) + @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } ) + @RedbackAuthorization( permission = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION ) + Boolean addProxyConnector( ProxyConnector proxyConnector ) + throws RepositoryAdminException; + + @Path( "deleteProxyConnector" ) + @POST + @Consumes( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } ) + @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } ) + @RedbackAuthorization( permission = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION ) + Boolean deleteProxyConnector( ProxyConnector proxyConnector ) + throws RepositoryAdminException; + + /** + * only for enabled/disable or changing bean values except target/source + * + * @param proxyConnector + * @return + * @throws org.apache.archiva.admin.repository.RepositoryAdminException + * + */ + @Path( "updateProxyConnector" ) + @POST + @Consumes( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } ) + @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } ) + @RedbackAuthorization( permission = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION ) + Boolean updateProxyConnector( ProxyConnector proxyConnector ) + throws RepositoryAdminException; + + + @Path( "getProxyConnectorAsMap" ) + @GET + @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_PLAIN } ) + @RedbackAuthorization( permission = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION ) + Map> getProxyConnectorAsMap() + throws RepositoryAdminException; + +} diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/SearchService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/SearchService.java index 93285952d..baf1d26f0 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/SearchService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/SearchService.java @@ -23,11 +23,12 @@ package org.apache.archiva.rest.api.services; import org.apache.archiva.rest.api.model.Artifact; import org.apache.archiva.rest.api.model.Dependency; +import javax.ws.rs.Path; import javax.xml.bind.annotation.XmlRootElement; import java.util.Date; import java.util.List; -@XmlRootElement( name = "searchRequest" ) +@Path( "/searchService/" ) public interface SearchService { /* diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index 9b1e9e8f6..ed2191792 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -107,6 +107,21 @@ jsr311-api + + net.sf.beanlib + beanlib + + + cglib + cglib + + + aopalliance + aopalliance + + + + org.apache.cxf diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java new file mode 100644 index 000000000..ef2699f6a --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java @@ -0,0 +1,137 @@ +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 net.sf.beanlib.provider.replicator.BeanReplicator; +import org.apache.archiva.admin.repository.RepositoryAdminException; +import org.apache.archiva.admin.repository.proxyconnector.ProxyConnectorAdmin; +import org.apache.archiva.rest.api.model.ProxyConnector; +import org.apache.archiva.rest.api.services.ProxyConnectorService; +import org.springframework.stereotype.Service; + +import javax.inject.Inject; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author Olivier Lamy + */ +@Service( "proxyConnectorService#rest" ) +public class DefaultProxyConnectorService + extends AbstractRestService + implements ProxyConnectorService +{ + @Inject + private ProxyConnectorAdmin proxyConnectorAdmin; + + public List getProxyConnectors() + throws RepositoryAdminException + { + List proxyConnectors = new ArrayList(); + for ( org.apache.archiva.admin.repository.proxyconnector.ProxyConnector proxyConnector : proxyConnectorAdmin.getProxyConnectors() ) + { + proxyConnectors.add( new BeanReplicator().replicateBean( proxyConnector, ProxyConnector.class ) ); + } + return proxyConnectors; + } + + public ProxyConnector getProxyConnector( String sourceRepoId, String targetRepoId ) + throws RepositoryAdminException + { + org.apache.archiva.admin.repository.proxyconnector.ProxyConnector proxyConnector = + proxyConnectorAdmin.getProxyConnector( sourceRepoId, targetRepoId ); + return proxyConnector == null + ? null + : new BeanReplicator().replicateBean( proxyConnector, ProxyConnector.class ); + } + + public Boolean addProxyConnector( ProxyConnector proxyConnector ) + throws RepositoryAdminException + { + if ( proxyConnector == null ) + { + return Boolean.FALSE; + } + return proxyConnectorAdmin.addProxyConnector( new BeanReplicator().replicateBean( proxyConnector, + org.apache.archiva.admin.repository.proxyconnector.ProxyConnector.class ), + getAuditInformation() ); + } + + public Boolean deleteProxyConnector( ProxyConnector proxyConnector ) + throws RepositoryAdminException + { + if ( proxyConnector == null ) + { + return Boolean.FALSE; + } + return proxyConnectorAdmin.deleteProxyConnector( new BeanReplicator().replicateBean( proxyConnector, + org.apache.archiva.admin.repository.proxyconnector.ProxyConnector.class ), + getAuditInformation() ); + } + + public Boolean updateProxyConnector( ProxyConnector proxyConnector ) + throws RepositoryAdminException + { + if ( proxyConnector == null ) + { + return Boolean.FALSE; + } + return proxyConnectorAdmin.updateProxyConnector( new BeanReplicator().replicateBean( proxyConnector, + org.apache.archiva.admin.repository.proxyconnector.ProxyConnector.class ), + getAuditInformation() ); + } + + public Map> getProxyConnectorAsMap() + throws RepositoryAdminException + { + Map> modelMap = + proxyConnectorAdmin.getProxyConnectorAsMap(); + if ( modelMap == null || modelMap.isEmpty() ) + { + return Collections.emptyMap(); + } + Map> map = new HashMap>( modelMap.size() ); + for ( Map.Entry> entry : modelMap.entrySet() ) + { + List proxyConnectors = new ArrayList( entry.getValue().size() ); + for ( org.apache.archiva.admin.repository.proxyconnector.ProxyConnector proxyConnector : entry.getValue() ) + { + proxyConnectors.add( new BeanReplicator().replicateBean( proxyConnector, ProxyConnector.class ) ); + } + map.put( entry.getKey(), proxyConnectors ); + } + return map; + } + + + public ProxyConnectorAdmin getProxyConnectorAdmin() + { + return proxyConnectorAdmin; + } + + public void setProxyConnectorAdmin( ProxyConnectorAdmin proxyConnectorAdmin ) + { + this.proxyConnectorAdmin = proxyConnectorAdmin; + } +} + + diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml index fc358920e..e5ad02ac9 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml @@ -53,6 +53,7 @@ +