Refactoring of package name for archiva-proxy

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;

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

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

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

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

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

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>

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.base.DefaultRepositoryProxyHandler;
-import org.apache.archiva.proxy.NotFoundException;
+import org.apache.archiva.proxy.base.NotFoundException;
-import org.apache.archiva.proxy.NotModifiedException;
+import org.apache.archiva.proxy.base.NotModifiedException;
-import org.apache.archiva.proxy.ProxyException;
+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;

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

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

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

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

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>