You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2021/12/24 14:22:14 UTC
[archiva] branch master updated (a24de67 -> a8fa3d5)
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git.
from a24de67 Refactoring packages for maven scheduler module
new 1fafee5 Cleanup of package names
new a8fa3d5 Refactoring of package name for archiva-proxy
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../test/resources/spring-context-cleanup-released-snapshots.xml | 4 ++--
.../org/apache/archiva/proxy/{ => base}/ArchivaProxyRegistry.java | 6 +++---
.../archiva/proxy/{ => base}/DefaultRepositoryProxyHandler.java | 5 ++---
.../org/apache/archiva/proxy/{ => base}/NotFoundException.java | 5 ++---
.../org/apache/archiva/proxy/{ => base}/NotModifiedException.java | 5 ++---
.../archiva/proxy/{ => base}/ProxyConnectorOrderComparator.java | 5 ++---
.../java/org/apache/archiva/proxy/{ => base}/ProxyException.java | 5 ++---
.../archiva-proxy/src/main/resources/META-INF/spring-context.xml | 2 +-
.../apache/archiva/maven/proxy/MavenRepositoryProxyHandler.java | 8 ++++----
.../{ => scheduler/repository}/mock/ArchivaIndexManagerMock.java | 5 ++---
.../{ => scheduler/repository}/mock/MavenIndexContextMock.java | 5 ++---
.../repository}/mock/MockArchivaAdministration.java | 5 ++---
.../repository}/mock/MockRemoteRepositoryAdmin.java | 5 ++---
.../src/test/resources/spring-context.xml | 4 ++--
.../archiva-web/archiva-rss/src/test/resources/log4j2-test.xml | 2 +-
.../archiva-web/archiva-webdav/src/test/resources/log4j2-test.xml | 2 +-
16 files changed, 32 insertions(+), 41 deletions(-)
rename archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/{ => base}/ArchivaProxyRegistry.java (98%)
rename archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/{ => base}/DefaultRepositoryProxyHandler.java (99%)
rename archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/{ => base}/NotFoundException.java (92%)
rename archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/{ => base}/NotModifiedException.java (94%)
rename archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/{ => base}/ProxyConnectorOrderComparator.java (95%)
rename archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/{ => base}/ProxyException.java (92%)
rename archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/{ => scheduler/repository}/mock/ArchivaIndexManagerMock.java (99%)
rename archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/{ => scheduler/repository}/mock/MavenIndexContextMock.java (97%)
rename archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/{ => scheduler/repository}/mock/MockArchivaAdministration.java (98%)
rename archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/{ => scheduler/repository}/mock/MockRemoteRepositoryAdmin.java (96%)
[archiva] 02/02: Refactoring of package name for archiva-proxy
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit a8fa3d574b674c02d837d61c3a483849a454269e
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Fri Dec 24 15:22:09 2021 +0100
Refactoring of package name for archiva-proxy
---
.../org/apache/archiva/proxy/{ => base}/ArchivaProxyRegistry.java | 6 +++---
.../archiva/proxy/{ => base}/DefaultRepositoryProxyHandler.java | 5 ++---
.../org/apache/archiva/proxy/{ => base}/NotFoundException.java | 5 ++---
.../org/apache/archiva/proxy/{ => base}/NotModifiedException.java | 5 ++---
.../archiva/proxy/{ => base}/ProxyConnectorOrderComparator.java | 5 ++---
.../java/org/apache/archiva/proxy/{ => base}/ProxyException.java | 5 ++---
.../archiva-proxy/src/main/resources/META-INF/spring-context.xml | 2 +-
.../apache/archiva/maven/proxy/MavenRepositoryProxyHandler.java | 8 ++++----
.../{ => scheduler/repository}/mock/ArchivaIndexManagerMock.java | 5 ++---
.../{ => scheduler/repository}/mock/MavenIndexContextMock.java | 5 ++---
.../repository}/mock/MockArchivaAdministration.java | 5 ++---
.../repository}/mock/MockRemoteRepositoryAdmin.java | 5 ++---
.../src/test/resources/spring-context.xml | 4 ++--
13 files changed, 28 insertions(+), 37 deletions(-)
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ArchivaProxyRegistry.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/ArchivaProxyRegistry.java
similarity index 98%
rename from archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ArchivaProxyRegistry.java
rename to archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/ArchivaProxyRegistry.java
index 20bb51d..a86cb37 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ArchivaProxyRegistry.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/ArchivaProxyRegistry.java
@@ -1,4 +1,4 @@
-package org.apache.archiva.proxy;
+package org.apache.archiva.proxy.base;
/*
* 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
@@ -25,6 +24,7 @@ import org.apache.archiva.configuration.ProxyConnectorConfiguration;
import org.apache.archiva.policies.Policy;
import org.apache.archiva.policies.PolicyOption;
import org.apache.archiva.policies.PolicyUtil;
+import org.apache.archiva.proxy.ProxyRegistry;
import org.apache.archiva.proxy.model.NetworkProxy;
import org.apache.archiva.proxy.model.ProxyConnector;
import org.apache.archiva.proxy.model.RepositoryProxyHandler;
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyHandler.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/DefaultRepositoryProxyHandler.java
similarity index 99%
rename from archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyHandler.java
rename to archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/DefaultRepositoryProxyHandler.java
index 7e95b61..44c6c92 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyHandler.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/DefaultRepositoryProxyHandler.java
@@ -1,4 +1,4 @@
-package org.apache.archiva.proxy;
+package org.apache.archiva.proxy.base;
/*
* 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
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/NotFoundException.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/NotFoundException.java
similarity index 92%
rename from archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/NotFoundException.java
rename to archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/NotFoundException.java
index 6fd6f1a..6aff317 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/NotFoundException.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/NotFoundException.java
@@ -1,4 +1,4 @@
-package org.apache.archiva.proxy;
+package org.apache.archiva.proxy.base;
/*
* 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
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/NotModifiedException.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/NotModifiedException.java
similarity index 94%
rename from archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/NotModifiedException.java
rename to archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/NotModifiedException.java
index 79fba1e..40efdae 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/NotModifiedException.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/NotModifiedException.java
@@ -1,4 +1,4 @@
-package org.apache.archiva.proxy;
+package org.apache.archiva.proxy.base;
/*
* 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
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnectorOrderComparator.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/ProxyConnectorOrderComparator.java
similarity index 95%
rename from archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnectorOrderComparator.java
rename to archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/ProxyConnectorOrderComparator.java
index 8acb4ee..3c37883 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyConnectorOrderComparator.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/ProxyConnectorOrderComparator.java
@@ -1,4 +1,4 @@
-package org.apache.archiva.proxy;
+package org.apache.archiva.proxy.base;
/*
* 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
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyException.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/ProxyException.java
similarity index 92%
rename from archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyException.java
rename to archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/ProxyException.java
index ae24f6f..2a85f6e 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/ProxyException.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/base/ProxyException.java
@@ -1,4 +1,4 @@
-package org.apache.archiva.proxy;
+package org.apache.archiva.proxy.base;
/*
* 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
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-proxy/src/main/resources/META-INF/spring-context.xml
index e433b67..0569ff1 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/resources/META-INF/spring-context.xml
@@ -28,7 +28,7 @@
default-lazy-init="true">
<context:annotation-config/>
- <context:component-scan base-package="org.apache.archiva.proxy"/>
+ <context:component-scan base-package="org.apache.archiva.proxy.base"/>
</beans>
\ No newline at end of file
diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/src/main/java/org/apache/archiva/maven/proxy/MavenRepositoryProxyHandler.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/main/java/org/apache/archiva/maven/proxy/MavenRepositoryProxyHandler.java
index 714ea5b..4aebcd3 100644
--- a/archiva-modules/archiva-maven/archiva-maven-proxy/src/main/java/org/apache/archiva/maven/proxy/MavenRepositoryProxyHandler.java
+++ b/archiva-modules/archiva-maven/archiva-maven-proxy/src/main/java/org/apache/archiva/maven/proxy/MavenRepositoryProxyHandler.java
@@ -21,10 +21,10 @@ package org.apache.archiva.maven.proxy;
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;
-import org.apache.archiva.proxy.ProxyException;
+import org.apache.archiva.proxy.base.DefaultRepositoryProxyHandler;
+import org.apache.archiva.proxy.base.NotFoundException;
+import org.apache.archiva.proxy.base.NotModifiedException;
+import org.apache.archiva.proxy.base.ProxyException;
import org.apache.archiva.proxy.model.NetworkProxy;
import org.apache.archiva.proxy.model.ProxyConnector;
import org.apache.archiva.proxy.model.RepositoryProxyHandler;
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/ArchivaIndexManagerMock.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/mock/ArchivaIndexManagerMock.java
similarity index 99%
rename from archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/ArchivaIndexManagerMock.java
rename to archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/mock/ArchivaIndexManagerMock.java
index e3836b6..296262d 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/ArchivaIndexManagerMock.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/mock/ArchivaIndexManagerMock.java
@@ -1,4 +1,4 @@
-package org.apache.archiva.mock;
+package org.apache.archiva.scheduler.repository.mock;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -9,8 +9,7 @@ package org.apache.archiva.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
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MavenIndexContextMock.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/mock/MavenIndexContextMock.java
similarity index 97%
rename from archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MavenIndexContextMock.java
rename to archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/mock/MavenIndexContextMock.java
index 3d64f09..4a840f1 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MavenIndexContextMock.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/mock/MavenIndexContextMock.java
@@ -1,4 +1,4 @@
-package org.apache.archiva.mock;
+package org.apache.archiva.scheduler.repository.mock;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -9,8 +9,7 @@ package org.apache.archiva.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
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/mock/MockArchivaAdministration.java
similarity index 98%
rename from archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java
rename to archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/mock/MockArchivaAdministration.java
index 1c659a2..a689483 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockArchivaAdministration.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/mock/MockArchivaAdministration.java
@@ -1,4 +1,4 @@
-package org.apache.archiva.mock;
+package org.apache.archiva.scheduler.repository.mock;
/*
* 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.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
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockRemoteRepositoryAdmin.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/mock/MockRemoteRepositoryAdmin.java
similarity index 96%
rename from archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockRemoteRepositoryAdmin.java
rename to archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/mock/MockRemoteRepositoryAdmin.java
index 26bc859..4db51d3 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/mock/MockRemoteRepositoryAdmin.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/mock/MockRemoteRepositoryAdmin.java
@@ -1,4 +1,4 @@
-package org.apache.archiva.mock;
+package org.apache.archiva.scheduler.repository.mock;
/*
* 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.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
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml
index 3d83234..cdb04cd 100755
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml
@@ -30,11 +30,11 @@
<context:annotation-config/>
- <bean name="archivaAdministration#mock" class="org.apache.archiva.mock.MockArchivaAdministration">
+ <bean name="archivaAdministration#mock" class="org.apache.archiva.scheduler.repository.mock.MockArchivaAdministration">
<property name="archivaConfiguration" ref="archivaConfiguration#test-repository-scanning"/>
</bean>
- <bean name="remoteRepositoryAdmin#mock" class="org.apache.archiva.mock.MockRemoteRepositoryAdmin">
+ <bean name="remoteRepositoryAdmin#mock" class="org.apache.archiva.scheduler.repository.mock.MockRemoteRepositoryAdmin">
<property name="archivaConfiguration" ref="archivaConfiguration#test-repository-scanning"/>
</bean>
[archiva] 01/02: Cleanup of package names
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit 1fafee574cab299042ed6e5949b0afcb2cad5e0c
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Fri Dec 24 14:46:51 2021 +0100
Cleanup of package names
---
.../src/test/resources/spring-context-cleanup-released-snapshots.xml | 4 ++--
.../archiva-web/archiva-rss/src/test/resources/log4j2-test.xml | 2 +-
.../archiva-web/archiva-webdav/src/test/resources/log4j2-test.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml
index ee3d8e0..95c2033 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml
@@ -32,7 +32,7 @@
</bean>
<alias name="archivaConfiguration#cleanup-released-snapshots" alias="archivaConfiguration"/>
<alias name="archivaConfiguration#cleanup-released-snapshots" alias="archivaConfiguration#default"/>
- <context:component-scan base-package="org.apache.archiva.configuration,org.apache.archiva.repository.content.base,org.apache.archiva.indexer.maven"/>
+ <context:component-scan base-package="org.apache.archiva.configuration,org.apache.archiva.repository.content.base,org.apache.archiva.maven.indexer"/>
<alias name="repositoryContentFactory#cleanup-released-snapshots" alias="repositoryContentFactory#default" />
@@ -100,4 +100,4 @@
*** -->
-</beans>
\ No newline at end of file
+</beans>
diff --git a/archiva-modules/archiva-web/archiva-rss/src/test/resources/log4j2-test.xml b/archiva-modules/archiva-web/archiva-rss/src/test/resources/log4j2-test.xml
index e539b74..36ce8d8 100644
--- a/archiva-modules/archiva-web/archiva-rss/src/test/resources/log4j2-test.xml
+++ b/archiva-modules/archiva-web/archiva-rss/src/test/resources/log4j2-test.xml
@@ -52,7 +52,7 @@
<logger name="org.apache.http.headers" level="debug"/>
-->
- <logger name="org.apache.archiva.indexer.maven.search.MavenRepositorySearch" level="info"/>
+ <logger name="org.apache.archiva.maven.indexer.search.MavenRepositorySearch" level="info"/>
<logger name="org.apache.archiva.common.plexusbridge.MavenIndexerUtils" level="info"/>
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/log4j2-test.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/log4j2-test.xml
index 0d5a52a..254f268 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/log4j2-test.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/log4j2-test.xml
@@ -43,7 +43,7 @@
<logger name="org.apache.archiva.rest.services" level="info"/>
<logger name="org.springframework" level="info"/>
<logger name="org.apache.commons.configuration" level="info"/>
- <logger name="org.apache.archiva.indexer.maven" level="debug" />
+ <logger name="org.apache.archiva.maven.indexer" level="debug" />
<root level="info">
<appender-ref ref="console"/>