@@ -28,9 +28,9 @@ import org.apache.archiva.indexer.IndexCreationFailedException; | |||
import org.apache.archiva.indexer.IndexUpdateFailedException; | |||
import org.apache.archiva.indexer.UnsupportedBaseContextException; | |||
import org.apache.archiva.proxy.ProxyRegistry; | |||
import org.apache.archiva.maven.proxy.WagonFactory; | |||
import org.apache.archiva.maven.proxy.WagonFactoryException; | |||
import org.apache.archiva.maven.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.maven.common.proxy.WagonFactory; | |||
import org.apache.archiva.maven.common.proxy.WagonFactoryException; | |||
import org.apache.archiva.maven.common.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.proxy.model.NetworkProxy; | |||
import org.apache.archiva.repository.EditableRepository; | |||
import org.apache.archiva.repository.ManagedRepository; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.maven.proxy; | |||
package org.apache.archiva.maven.common.proxy; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
* or more contributor license agreements. See the NOTICE file |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.maven.proxy; | |||
package org.apache.archiva.maven.common.proxy; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.maven.proxy; | |||
package org.apache.archiva.maven.common.proxy; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.maven.proxy; | |||
package org.apache.archiva.maven.common.proxy; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.maven.proxy; | |||
package org.apache.archiva.maven.common.proxy; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
* or more contributor license agreements. See the NOTICE file |
@@ -28,6 +28,6 @@ | |||
default-lazy-init="true"> | |||
<context:annotation-config/> | |||
<context:component-scan base-package="org.apache.archiva.maven.proxy"/> | |||
<context:component-scan base-package="org.apache.archiva.maven.common.proxy"/> | |||
</beans> |
@@ -27,9 +27,9 @@ import org.apache.archiva.indexer.IndexCreationFailedException; | |||
import org.apache.archiva.indexer.IndexUpdateFailedException; | |||
import org.apache.archiva.indexer.UnsupportedBaseContextException; | |||
import org.apache.archiva.proxy.ProxyRegistry; | |||
import org.apache.archiva.maven.proxy.WagonFactory; | |||
import org.apache.archiva.maven.proxy.WagonFactoryException; | |||
import org.apache.archiva.maven.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.maven.common.proxy.WagonFactory; | |||
import org.apache.archiva.maven.common.proxy.WagonFactoryException; | |||
import org.apache.archiva.maven.common.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.proxy.model.NetworkProxy; | |||
import org.apache.archiva.repository.EditableRepository; | |||
import org.apache.archiva.repository.ManagedRepository; |
@@ -28,7 +28,7 @@ | |||
default-lazy-init="false"> | |||
<context:annotation-config/> | |||
<context:component-scan base-package="org.apache.archiva.indexer.maven,org.apache.archiva.repository,org.apache.archiva.repository.content.maven2" /> | |||
<context:component-scan base-package="org.apache.archiva.maven.indexer,org.apache.archiva.repository" /> | |||
<bean name="wagon#file" scope="prototype" class="org.apache.maven.wagon.providers.file.FileWagon"/> |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.maven2.model; | |||
package org.apache.archiva.maven.model; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.maven2.model; | |||
* "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 | |||
* | |||
* 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 |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.maven2.model; | |||
package org.apache.archiva.maven.model; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
* or more contributor license agreements. See the NOTICE file | |||
@@ -8,8 +8,7 @@ package org.apache.archiva.maven2.model; | |||
* "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 | |||
* | |||
* 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 |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.maven2.model; | |||
package org.apache.archiva.maven.model; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
* or more contributor license agreements. See the NOTICE file | |||
@@ -8,8 +8,7 @@ package org.apache.archiva.maven2.model; | |||
* "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 | |||
* | |||
* 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 |
@@ -234,6 +234,23 @@ | |||
</plugin> | |||
</plugins> | |||
</pluginManagement> | |||
<plugins> | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-surefire-plugin</artifactId> | |||
<configuration> | |||
<systemPropertyVariables> | |||
<appserver.base>${project.build.directory}/appserver-base</appserver.base> | |||
<plexus.home>${project.build.directory}/appserver-base</plexus.home> | |||
<derby.system.home>${project.build.directory}/appserver-base</derby.system.home> | |||
<redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url> | |||
<redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name> | |||
<archiva.repositorySessionFactory.id>mock</archiva.repositorySessionFactory.id> | |||
<openjpa.Log>${openjpa.Log}</openjpa.Log> | |||
</systemPropertyVariables> | |||
</configuration> | |||
</plugin> | |||
</plugins> | |||
</build> | |||
<!-- |
@@ -18,6 +18,9 @@ package org.apache.archiva.maven.proxy; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.maven.common.proxy.WagonFactory; | |||
import org.apache.archiva.maven.common.proxy.WagonFactoryException; | |||
import org.apache.archiva.maven.common.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.proxy.DefaultRepositoryProxyHandler; | |||
import org.apache.archiva.proxy.NotFoundException; | |||
import org.apache.archiva.proxy.NotModifiedException; | |||
@@ -171,7 +174,7 @@ public class MavenRepositoryProxyHandler extends DefaultRepositoryProxyHandler { | |||
urlFailureCache.cacheFailure(url); | |||
throw e; | |||
} | |||
catch (WagonFactoryException e) { | |||
catch ( WagonFactoryException e) { | |||
throw new ProxyException(e.getMessage(), e); | |||
} finally { | |||
if (wagon != null) { |
@@ -28,7 +28,7 @@ | |||
default-lazy-init="true"> | |||
<context:annotation-config/> | |||
<context:component-scan base-package="org.apache.archiva.proxy.maven"/> | |||
<context:component-scan base-package="org.apache.archiva.maven.proxy"/> | |||
<bean name="wagon#http" scope="prototype" class="org.apache.maven.wagon.providers.http.HttpWagon"/> | |||
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.proxy.common; | |||
package org.apache.archiva.maven.common.proxy; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.proxy.common; | |||
* "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 | |||
* | |||
* 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 | |||
@@ -20,8 +19,8 @@ package org.apache.archiva.proxy.common; | |||
*/ | |||
import junit.framework.TestCase; | |||
import org.apache.archiva.maven.proxy.WagonFactory; | |||
import org.apache.archiva.maven.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.maven.common.proxy.WagonFactory; | |||
import org.apache.archiva.maven.common.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; | |||
import org.apache.maven.wagon.Wagon; | |||
import org.junit.Test; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.proxy; | |||
package org.apache.archiva.maven.proxy; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.proxy; | |||
* "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 | |||
* | |||
* 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 | |||
@@ -32,6 +31,7 @@ import org.apache.archiva.policies.PropagateErrorsDownloadPolicy; | |||
import org.apache.archiva.policies.PropagateErrorsOnUpdateDownloadPolicy; | |||
import org.apache.archiva.policies.ReleasesPolicy; | |||
import org.apache.archiva.policies.SnapshotsPolicy; | |||
import org.apache.archiva.proxy.ProxyRegistry; | |||
import org.apache.archiva.proxy.model.RepositoryProxyHandler; | |||
import org.apache.archiva.repository.ManagedRepository; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.proxy; | |||
package org.apache.archiva.maven.proxy; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.proxy; | |||
* "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 | |||
* | |||
* 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 |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.proxy; | |||
package org.apache.archiva.maven.proxy; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.proxy; | |||
* "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 | |||
* | |||
* 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 |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.proxy; | |||
package org.apache.archiva.maven.proxy; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.proxy; | |||
* "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 | |||
* | |||
* 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 |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.proxy; | |||
package org.apache.archiva.maven.proxy; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.proxy; | |||
* "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 | |||
* | |||
* 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 | |||
@@ -29,6 +28,7 @@ import org.apache.archiva.policies.PropagateErrorsDownloadPolicy; | |||
import org.apache.archiva.policies.PropagateErrorsOnUpdateDownloadPolicy; | |||
import org.apache.archiva.policies.ReleasesPolicy; | |||
import org.apache.archiva.policies.SnapshotsPolicy; | |||
import org.apache.archiva.proxy.ProxyRegistry; | |||
import org.apache.archiva.proxy.model.RepositoryProxyHandler; | |||
import org.apache.archiva.repository.ManagedRepository; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.proxy; | |||
package org.apache.archiva.maven.proxy; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.proxy; | |||
* "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 | |||
* | |||
* 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 |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.proxy; | |||
package org.apache.archiva.maven.proxy; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.proxy; | |||
* "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 | |||
* | |||
* 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 |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.proxy; | |||
package org.apache.archiva.maven.proxy; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.proxy; | |||
* "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 | |||
* | |||
* 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 |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.proxy; | |||
package org.apache.archiva.maven.proxy; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.proxy; | |||
* "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 | |||
* | |||
* 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 |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.proxy; | |||
package org.apache.archiva.maven.proxy; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.proxy; | |||
* "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 | |||
* | |||
* 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 |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.metadata.repository; | |||
package org.apache.archiva.maven.proxy.mock.metadata.repository; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
* or more contributor license agreements. See the NOTICE file | |||
@@ -8,8 +8,7 @@ package org.apache.archiva.metadata.repository; | |||
* "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 | |||
* | |||
* 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 |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.mock; | |||
package org.apache.archiva.maven.proxy.mock.repository; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.mock; | |||
* "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 | |||
* | |||
* 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 |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.mock; | |||
package org.apache.archiva.maven.proxy.mock.repository; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.mock; | |||
* "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 | |||
* | |||
* 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 |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.mock; | |||
package org.apache.archiva.maven.proxy.mock.repository; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.mock; | |||
* "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 | |||
* | |||
* 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 |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.mock; | |||
package org.apache.archiva.maven.proxy.mock.repository; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.mock; | |||
* "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 | |||
* | |||
* 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 |
@@ -1,4 +1,4 @@ | |||
package org.apache.archiva.repository.mock; | |||
package org.apache.archiva.maven.proxy.mock.repository; | |||
/* | |||
* Licensed to the Apache Software Foundation (ASF) under one | |||
@@ -9,8 +9,7 @@ package org.apache.archiva.repository.mock; | |||
* "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 | |||
* | |||
* 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 |
@@ -27,7 +27,7 @@ | |||
http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd" | |||
default-lazy-init="true"> | |||
<context:component-scan base-package="org.apache.archiva.proxy.maven"/> | |||
<context:component-scan base-package="org.apache.archiva.maven.proxy"/> | |||
<bean name="wagon#file" scope="prototype" class="org.apache.maven.wagon.providers.file.FileWagon"/> | |||
@@ -28,7 +28,7 @@ | |||
default-lazy-init="true"> | |||
<context:annotation-config/> | |||
<context:component-scan base-package="org.apache.archiva.metadata.repository,org.apache.archiva.proxy,org.apache.archiva.repository.mock"/> | |||
<context:component-scan base-package="org.apache.archiva.metadata,org.apache.archiva.proxy,org.apache.archiva.maven.proxy.mock"/> | |||
<alias name="mockRepositoryProvider" alias="mavenRepositoryProvider" /> | |||
<alias name="archivaConfiguration#mock" alias="archivaConfiguration#default"/> | |||
@@ -47,7 +47,7 @@ | |||
</property> | |||
</bean> | |||
<bean name="repositoryContentProvider#mocked" class="org.apache.archiva.repository.mock.RepositoryContentProviderMock" /> | |||
<bean name="repositoryContentProvider#mocked" class="org.apache.archiva.maven.proxy.mock.repository.RepositoryContentProviderMock" /> | |||
<bean name="repositoryProxyHandler#test" class="org.apache.archiva.maven.proxy.MavenRepositoryProxyHandler"> | |||
@@ -81,7 +81,7 @@ | |||
<property name="timeToLiveSeconds" value="1800"/> | |||
</bean> | |||
<bean name="wagon#http" class="org.apache.archiva.proxy.WagonDelegate" scope="singleton"/> | |||
<bean name="wagon#http" class="org.apache.archiva.maven.proxy.WagonDelegate" scope="singleton"/> | |||
<bean name="wagon#file" scope="prototype" class="org.apache.maven.wagon.providers.file.FileWagon"/> | |||
<alias name="userConfiguration#redback" alias="userConfiguration#default"/> |
@@ -17,7 +17,7 @@ package org.apache.archiva.repository.maven.dependency.tree; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.maven2.model.TreeEntry; | |||
import org.apache.archiva.maven.model.TreeEntry; | |||
import org.eclipse.aether.graph.DependencyVisitor; | |||
import java.util.List; |
@@ -24,7 +24,7 @@ import org.apache.archiva.admin.model.beans.ProxyConnector; | |||
import org.apache.archiva.admin.model.networkproxy.NetworkProxyAdmin; | |||
import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorAdmin; | |||
import org.apache.archiva.common.utils.VersionUtil; | |||
import org.apache.archiva.maven2.model.TreeEntry; | |||
import org.apache.archiva.maven.model.TreeEntry; | |||
import org.apache.archiva.maven.metadata.MavenMetadataReader; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; | |||
import org.apache.archiva.model.ArchivaRepositoryMetadata; |
@@ -17,8 +17,8 @@ package org.apache.archiva.repository.maven.dependency.tree; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven2.model.TreeEntry; | |||
import org.apache.archiva.maven.model.Artifact; | |||
import org.apache.archiva.maven.model.TreeEntry; | |||
import org.eclipse.aether.graph.DependencyNode; | |||
import org.eclipse.aether.graph.DependencyVisitor; | |||
import org.modelmapper.ModelMapper; |
@@ -39,7 +39,7 @@ import org.apache.archiva.model.ArchivaRepositoryMetadata; | |||
import org.apache.archiva.model.SnapshotVersion; | |||
import org.apache.archiva.policies.ProxyDownloadException; | |||
import org.apache.archiva.proxy.ProxyRegistry; | |||
import org.apache.archiva.maven.proxy.WagonFactory; | |||
import org.apache.archiva.maven.common.proxy.WagonFactory; | |||
import org.apache.archiva.proxy.model.NetworkProxy; | |||
import org.apache.archiva.proxy.model.ProxyConnector; | |||
import org.apache.archiva.proxy.model.RepositoryProxyHandler; |
@@ -23,9 +23,9 @@ import org.apache.archiva.maven.metadata.MavenMetadataReader; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; | |||
import org.apache.archiva.model.ArchivaRepositoryMetadata; | |||
import org.apache.archiva.model.SnapshotVersion; | |||
import org.apache.archiva.maven.proxy.WagonFactory; | |||
import org.apache.archiva.maven.proxy.WagonFactoryException; | |||
import org.apache.archiva.maven.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.maven.common.proxy.WagonFactory; | |||
import org.apache.archiva.maven.common.proxy.WagonFactoryException; | |||
import org.apache.archiva.maven.common.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.proxy.model.NetworkProxy; | |||
import org.apache.archiva.repository.ManagedRepository; | |||
import org.apache.archiva.repository.RemoteRepository; |
@@ -22,8 +22,8 @@ import junit.framework.TestCase; | |||
import org.apache.archiva.configuration.ArchivaConfiguration; | |||
import org.apache.archiva.configuration.Configuration; | |||
import org.apache.archiva.configuration.ManagedRepositoryConfiguration; | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven2.model.TreeEntry; | |||
import org.apache.archiva.maven.model.Artifact; | |||
import org.apache.archiva.maven.model.TreeEntry; | |||
import org.apache.archiva.repository.RepositoryRegistry; | |||
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; | |||
import org.junit.Before; |
@@ -33,8 +33,8 @@ import org.apache.archiva.metadata.model.License; | |||
import org.apache.archiva.metadata.model.MailingList; | |||
import org.apache.archiva.metadata.model.ProjectVersionMetadata; | |||
import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; | |||
import org.apache.archiva.maven.proxy.WagonFactory; | |||
import org.apache.archiva.maven.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.maven.common.proxy.WagonFactory; | |||
import org.apache.archiva.maven.common.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.repository.RepositoryRegistry; | |||
import org.apache.archiva.repository.base.RepositoryHandlerDependencies; | |||
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; |
@@ -33,8 +33,8 @@ import org.apache.archiva.metadata.model.MailingList; | |||
import org.apache.archiva.metadata.model.ProjectVersionMetadata; | |||
import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryStorageRuntimeException; | |||
import org.apache.archiva.maven.proxy.WagonFactory; | |||
import org.apache.archiva.maven.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.maven.common.proxy.WagonFactory; | |||
import org.apache.archiva.maven.common.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.repository.ReleaseScheme; | |||
import org.apache.archiva.repository.RepositoryRegistry; | |||
import org.apache.archiva.repository.base.RepositoryHandlerDependencies; |
@@ -23,7 +23,7 @@ import org.apache.archiva.filter.Filter; | |||
import org.apache.archiva.metadata.model.ProjectVersionMetadata; | |||
import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryStorageRuntimeException; | |||
import org.apache.archiva.maven.proxy.WagonFactory; | |||
import org.apache.archiva.maven.common.proxy.WagonFactory; | |||
import org.apache.archiva.repository.RepositoryRegistry; | |||
import org.apache.archiva.repository.base.RepositoryHandlerDependencies; | |||
import org.junit.Before; |
@@ -37,8 +37,8 @@ import org.apache.archiva.metadata.model.ProjectVersionMetadata; | |||
import org.apache.archiva.metadata.repository.storage.ReadMetadataRequest; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataInvalidException; | |||
import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataNotFoundException; | |||
import org.apache.archiva.maven.proxy.WagonFactory; | |||
import org.apache.archiva.maven.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.maven.common.proxy.WagonFactory; | |||
import org.apache.archiva.maven.common.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.repository.RepositoryRegistry; | |||
import org.apache.archiva.repository.base.RepositoryHandlerDependencies; | |||
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; |
@@ -28,9 +28,9 @@ import org.apache.archiva.indexer.IndexCreationFailedException; | |||
import org.apache.archiva.indexer.IndexUpdateFailedException; | |||
import org.apache.archiva.indexer.UnsupportedBaseContextException; | |||
import org.apache.archiva.proxy.ProxyRegistry; | |||
import org.apache.archiva.maven.proxy.WagonFactory; | |||
import org.apache.archiva.maven.proxy.WagonFactoryException; | |||
import org.apache.archiva.maven.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.maven.common.proxy.WagonFactory; | |||
import org.apache.archiva.maven.common.proxy.WagonFactoryException; | |||
import org.apache.archiva.maven.common.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.proxy.model.NetworkProxy; | |||
import org.apache.archiva.repository.EditableRepository; | |||
import org.apache.archiva.repository.ManagedRepository; |
@@ -26,7 +26,7 @@ import org.apache.archiva.configuration.ArchivaConfiguration; | |||
import org.apache.archiva.configuration.ConfigurationEvent; | |||
import org.apache.archiva.configuration.ConfigurationListener; | |||
import org.apache.archiva.indexer.UnsupportedBaseContextException; | |||
import org.apache.archiva.maven.proxy.WagonFactory; | |||
import org.apache.archiva.maven.common.proxy.WagonFactory; | |||
import org.apache.archiva.repository.RepositoryRegistry; | |||
import org.apache.archiva.repository.features.RemoteIndexFeature; | |||
import org.apache.commons.lang3.StringUtils; |
@@ -18,8 +18,8 @@ package org.apache.archiva.scheduler.indexing.maven; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.maven.proxy.WagonFactory; | |||
import org.apache.archiva.maven.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.maven.common.proxy.WagonFactory; | |||
import org.apache.archiva.maven.common.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.proxy.model.NetworkProxy; | |||
import org.apache.archiva.repository.base.PasswordCredentials; | |||
import org.apache.archiva.repository.RemoteRepository; |
@@ -18,7 +18,7 @@ package org.apache.archiva.scheduler.indexing.maven; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.maven.proxy.WagonFactory; | |||
import org.apache.archiva.maven.common.proxy.WagonFactory; | |||
import org.apache.archiva.proxy.model.NetworkProxy; | |||
import org.apache.archiva.repository.RemoteRepository; | |||
import org.apache.maven.index.packer.IndexPacker; |
@@ -28,9 +28,9 @@ import org.apache.archiva.indexer.ArchivaIndexingContext; | |||
import org.apache.archiva.indexer.IndexCreationFailedException; | |||
import org.apache.archiva.indexer.IndexUpdateFailedException; | |||
import org.apache.archiva.indexer.UnsupportedBaseContextException; | |||
import org.apache.archiva.maven.proxy.WagonFactory; | |||
import org.apache.archiva.maven.proxy.WagonFactoryException; | |||
import org.apache.archiva.maven.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.maven.common.proxy.WagonFactory; | |||
import org.apache.archiva.maven.common.proxy.WagonFactoryException; | |||
import org.apache.archiva.maven.common.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.proxy.model.NetworkProxy; | |||
import org.apache.archiva.repository.EditableRepository; | |||
import org.apache.archiva.repository.ManagedRepository; |
@@ -18,7 +18,7 @@ package org.apache.archiva.rest.api.model; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven.model.Artifact; | |||
import javax.xml.bind.annotation.XmlRootElement; | |||
import java.io.Serializable; |
@@ -20,8 +20,8 @@ package org.apache.archiva.rest.api.services; | |||
import io.swagger.v3.oas.annotations.tags.Tag; | |||
import org.apache.archiva.admin.model.beans.ManagedRepository; | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven2.model.TreeEntry; | |||
import org.apache.archiva.maven.model.Artifact; | |||
import org.apache.archiva.maven.model.TreeEntry; | |||
import org.apache.archiva.metadata.model.ProjectVersionMetadata; | |||
import org.apache.archiva.redback.authorization.RedbackAuthorization; | |||
import org.apache.archiva.rest.api.model.ActionStatus; |
@@ -19,7 +19,7 @@ package org.apache.archiva.rest.api.services; | |||
*/ | |||
import io.swagger.v3.oas.annotations.tags.Tag; | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven.model.Artifact; | |||
import org.apache.archiva.redback.authorization.RedbackAuthorization; | |||
import org.apache.archiva.security.common.ArchivaRoleConstants; | |||
@@ -20,7 +20,7 @@ package org.apache.archiva.rest.api.services; | |||
*/ | |||
import io.swagger.v3.oas.annotations.tags.Tag; | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven.model.Artifact; | |||
import org.apache.archiva.redback.authorization.RedbackAuthorization; | |||
import org.apache.archiva.repository.scanner.RepositoryScanStatistics; | |||
import org.apache.archiva.rest.api.model.ActionStatus; |
@@ -21,7 +21,7 @@ package org.apache.archiva.rest.api.services; | |||
import io.swagger.v3.oas.annotations.tags.Tag; | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven.model.Artifact; | |||
import org.apache.archiva.redback.authorization.RedbackAuthorization; | |||
import org.apache.archiva.rest.api.model.ChecksumSearch; | |||
import org.apache.archiva.rest.api.model.GroupIdList; |
@@ -26,7 +26,7 @@ import org.apache.archiva.admin.model.beans.ProxyConnector; | |||
import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorAdmin; | |||
import org.apache.archiva.common.utils.VersionUtil; | |||
import org.apache.archiva.indexer.search.SearchResultHit; | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven.model.Artifact; | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.metadata.model.facets.AuditEvent; | |||
import org.apache.archiva.metadata.repository.RepositorySessionFactory; |
@@ -24,8 +24,8 @@ import org.apache.archiva.common.utils.VersionUtil; | |||
import org.apache.archiva.repository.ManagedRepositoryContent; | |||
import org.apache.archiva.repository.content.base.ArchivaItemSelector; | |||
import org.apache.archiva.repository.maven.dependency.tree.DependencyTreeBuilder; | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven2.model.TreeEntry; | |||
import org.apache.archiva.maven.model.Artifact; | |||
import org.apache.archiva.maven.model.TreeEntry; | |||
import org.apache.archiva.metadata.generic.GenericMetadataFacet; | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.metadata.model.MetadataFacet; |
@@ -19,7 +19,7 @@ package org.apache.archiva.rest.services; | |||
*/ | |||
import org.apache.archiva.common.utils.VersionUtil; | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven.model.Artifact; | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.metadata.model.facets.AuditEvent; | |||
import org.apache.archiva.metadata.repository.MetadataRepository; |
@@ -23,8 +23,8 @@ import org.apache.archiva.admin.model.RepositoryAdminException; | |||
import org.apache.archiva.admin.model.beans.RemoteRepository; | |||
import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin; | |||
import org.apache.archiva.proxy.ProxyRegistry; | |||
import org.apache.archiva.maven.proxy.WagonFactory; | |||
import org.apache.archiva.maven.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.maven.common.proxy.WagonFactory; | |||
import org.apache.archiva.maven.common.proxy.WagonFactoryRequest; | |||
import org.apache.archiva.proxy.model.NetworkProxy; | |||
import org.apache.archiva.rest.api.model.ActionStatus; | |||
import org.apache.archiva.rest.api.services.ArchivaRestServiceException; |
@@ -27,7 +27,7 @@ import org.apache.archiva.common.utils.VersionComparator; | |||
import org.apache.archiva.common.utils.VersionUtil; | |||
import org.apache.archiva.components.cache.Cache; | |||
import org.apache.archiva.components.taskqueue.TaskQueueException; | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven.model.Artifact; | |||
import org.apache.archiva.metadata.audit.RepositoryListener; | |||
import org.apache.archiva.maven.metadata.model.MavenArtifactFacet; | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; |
@@ -26,7 +26,7 @@ import org.apache.archiva.indexer.search.SearchFields; | |||
import org.apache.archiva.indexer.search.SearchResultHit; | |||
import org.apache.archiva.indexer.search.SearchResultLimits; | |||
import org.apache.archiva.indexer.search.SearchResults; | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven.model.Artifact; | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.metadata.repository.MetadataRepository; | |||
import org.apache.archiva.metadata.repository.MetadataRepositoryException; |
@@ -18,7 +18,7 @@ package org.apache.archiva.rest.services.utils; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven.model.Artifact; | |||
import org.apache.archiva.metadata.model.ArtifactMetadata; | |||
import org.apache.archiva.maven.metadata.model.MavenArtifactFacet; | |||
import org.apache.archiva.repository.content.BaseRepositoryContentLayout; |
@@ -19,7 +19,7 @@ package org.apache.archiva.rest.services; | |||
*/ | |||
import org.apache.archiva.admin.model.beans.ManagedRepository; | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven.model.Artifact; | |||
import org.apache.archiva.metadata.model.ProjectVersionMetadata; | |||
import org.apache.archiva.redback.rest.api.model.Role; | |||
import org.apache.archiva.redback.rest.api.services.RedbackServiceException; |
@@ -18,16 +18,14 @@ package org.apache.archiva.rest.services; | |||
* under the License. | |||
*/ | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven.model.Artifact; | |||
import org.apache.archiva.rest.api.services.MergeRepositoriesService; | |||
import org.apache.commons.io.FileUtils; | |||
import org.junit.After; | |||
import org.junit.Before; | |||
import org.junit.Test; | |||
import java.nio.file.Files; | |||
import java.nio.file.Path; | |||
import java.nio.file.Paths; | |||
import java.util.List; | |||
import static org.assertj.core.api.Assertions.assertThat; |
@@ -20,7 +20,7 @@ package org.apache.archiva.rest.services; | |||
*/ | |||
import org.apache.archiva.admin.model.beans.ManagedRepository; | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven.model.Artifact; | |||
import org.apache.archiva.redback.rest.api.services.UserService; | |||
import org.apache.archiva.rest.api.model.BrowseResult; | |||
import org.apache.archiva.rest.api.model.BrowseResultEntry; |
@@ -19,7 +19,7 @@ package org.apache.archiva.rest.services; | |||
*/ | |||
import org.apache.archiva.admin.model.beans.UiConfiguration; | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven.model.Artifact; | |||
import org.apache.archiva.rest.api.model.ChecksumSearch; | |||
import org.apache.archiva.rest.api.model.SearchRequest; | |||
import org.apache.archiva.rest.api.services.SearchService; |
@@ -22,10 +22,9 @@ import org.apache.archiva.admin.model.beans.ManagedRepository; | |||
import org.apache.archiva.admin.model.beans.ProxyConnector; | |||
import org.apache.archiva.admin.model.beans.RemoteRepository; | |||
import org.apache.archiva.admin.model.beans.RepositoryGroup; | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven.model.Artifact; | |||
import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; | |||
import org.apache.archiva.redback.rest.services.BaseSetup; | |||
import org.apache.archiva.redback.rest.services.FakeCreateAdminService; | |||
import org.apache.archiva.rest.api.model.SearchRequest; | |||
import org.apache.archiva.rest.api.services.ManagedRepositoriesService; | |||
import org.apache.archiva.rest.api.services.ProxyConnectorService; |
@@ -22,10 +22,9 @@ import org.apache.archiva.admin.model.beans.ManagedRepository; | |||
import org.apache.archiva.admin.model.beans.ProxyConnector; | |||
import org.apache.archiva.admin.model.beans.RemoteRepository; | |||
import org.apache.archiva.admin.model.beans.RepositoryGroup; | |||
import org.apache.archiva.maven2.model.Artifact; | |||
import org.apache.archiva.maven.model.Artifact; | |||
import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; | |||
import org.apache.archiva.redback.rest.services.BaseSetup; | |||
import org.apache.archiva.redback.rest.services.FakeCreateAdminService; | |||
import org.apache.archiva.rest.api.model.SearchRequest; | |||
import org.apache.archiva.rest.api.services.ManagedRepositoriesService; | |||
import org.apache.archiva.rest.api.services.ProxyConnectorService; |