From 2b1e907f1070d1ceef1f9e211363af3aacd2b95c Mon Sep 17 00:00:00 2001 From: "Edwin L. Punzalan" Date: Thu, 26 Oct 2006 09:15:23 +0000 Subject: [PATCH] - verified copyright headers - optimized imports - ran code formatting git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@467926 13f79535-47bb-0310-9956-ffa450edef68 --- archiva-applet/pom.xml | 3 +- archiva-configuration/pom.xml | 21 +- .../src/test/conf/corrupt.xml | 3 +- .../src/test/conf/repository-manager.xml | 5 +- .../configuration/ConfigurationStoreTest.java | 14 +- .../MavenProxyPropertyLoaderTest.java | 206 ++++++++-------- .../configuration/ConfigurationStoreTest.xml | 3 +- archiva-converter/pom.xml | 1 + .../converter/RepositoryConverterTest.xml | 1 + .../maven-metadata.xml | 1 + .../1.0.0-SNAPSHOT/maven-metadata.xml | 1 + .../maven-metadata.xml | 1 + .../newversion-artifact/maven-metadata.xml | 17 ++ archiva-core/pom.xml | 21 +- .../archiva/DefaultRepositoryManager.java | 16 ++ .../maven/archiva/RepositoryManager.java | 16 ++ .../archiva/proxy/DefaultProxyManager.java | 6 +- .../executors/IndexerTaskExecutor.java | 2 +- .../resources/META-INF/plexus/components.xml | 18 +- .../maven/archiva/RepositoryManagerTest.java | 16 ++ archiva-discoverer/pom.xml | 1 + .../discoverer/AbstractDiscoverer.java | 1 - .../maven/archiva/discoverer/Discoverer.java | 4 +- archiva-discoverer/src/site/apt/design.apt | 17 ++ .../test/repository/javax/maven-metadata.xml | 1 + .../jdbc/2.0/maven-metadata-repository.xml | 1 + .../sql/jdbc/maven-metadata-repository.xml | 1 + .../javax/sql/maven-metadata-repository.xml | 1 + .../org/apache/maven/maven-metadata.xml | 17 ++ .../test-not-updated/maven-metadata.xml | 17 ++ .../update/test-updated/maven-metadata.xml | 17 ++ .../discovery/1.0/maven-metadata.xml | 17 ++ .../testgroup/discovery/maven-metadata.xml | 17 ++ archiva-indexer/pom.xml | 3 +- .../record/MinimalArtifactIndexRecord.java | 6 +- .../record/StandardArtifactIndexRecord.java | 8 +- archiva-indexer/src/site/apt/design.apt | 17 ++ .../maven-artifact/2.0.1/maven-metadata.xml | 17 ++ .../maven/maven-artifact/maven-metadata.xml | 17 ++ .../org/apache/maven/maven-metadata.xml | 17 ++ .../test/repository/test/maven-metadata.xml | 17 ++ archiva-plexus-application/pom.xml | 20 +- .../src/conf/application.xml | 17 ++ .../src/conf/plexus.xml | 17 ++ archiva-plexus-runtime/pom.xml | 17 ++ archiva-plexus-runtime/src/conf/plexus.xml | 17 +- .../src/main/assembly/bin.xml | 17 ++ archiva-proxy/pom.xml | 1 + archiva-proxy/src/site/apt/how-to.apt | 17 ++ archiva-reports-standard/pom.xml | 1 + .../maven/archiva/reporting/ReportGroup.java | 14 +- .../groupId/artifactId/maven-metadata.xml | 1 + .../repository/groupId/unexpectedfile.xml | 4 +- .../src/test/repository/maven-metadata.xml | 1 + ...plicateArtifactFileReportProcessorTest.xml | 17 ++ .../OldArtifactReportProcessorTest.xml | 1 + ...OldSnapshotArtifactReportProcessorTest.xml | 1 + archiva-repository-layer/pom.xml | 6 +- .../groupId/artifactId/maven-metadata.xml | 1 + archiva-security/pom.xml | 20 +- .../security/ArchivaGuestRoleProfile.java | 2 +- .../RepositoryObserverDynamicRoleProfile.java | 2 +- .../resources/META-INF/plexus/components.xml | 17 ++ archiva-utils/pom.xml | 1 + archiva-webapp/pom.xml | 32 ++- archiva-webapp/src/jetty-env.xml | 17 +- .../maven/archiva/web/action/ProxyAction.java | 6 +- .../archiva/web/action/SearchAction.java | 2 +- .../web/action/ShowArtifactAction.java | 3 +- .../AbstractConfigureRepositoryAction.java | 6 +- .../admin/AbstractDeleteRepositoryAction.java | 4 +- .../admin/ConfigureRepositoryAction.java | 4 - .../action/admin/RunRepositoryTaskAction.java | 6 +- .../check/RoleExistanceEnvironmentCheck.java | 23 +- .../servlet/repository/RepositoryAccess.java | 12 +- .../servlet/repository/RepositoryMapping.java | 9 +- .../maven/archiva/web/util/VersionMerger.java | 6 +- .../web/validator/IntervalValidator.java | 124 +++++----- .../validator/SyncedRepositoryValidator.java | 222 +++++++++--------- .../resources/META-INF/plexus/application.xml | 1 + ...SearchAction-checksumSearch-validation.xml | 1 + .../SearchAction-quickSearch-validation.xml | 1 + .../admin/ConfigureAction-validation.xml | 1 + ...gureProxiedRepositoryAction-validation.xml | 3 +- .../ConfigureRepositoryAction-validation.xml | 1 + ...addSelectedSyncedRepository-validation.xml | 3 +- ...igureSyncedRepositoryAction-validation.xml | 3 +- .../src/main/resources/validators.xml | 53 +++-- archiva-webapp/src/main/resources/xwork.xml | 1 + .../src/main/webapp/WEB-INF/decorators.xml | 1 + .../src/main/webapp/WEB-INF/web.xml | 1 + .../repository/RepositoryAccessTest.xml | 1 + design/white-site/pom.xml | 17 ++ design/white-site/src/site/site.xml | 15 ++ .../xdoc/admin/add-proxied-repository.xml | 1 + .../src/site/xdoc/admin/add-repository.xml | 1 + .../site/xdoc/admin/add-sync-repository.xml | 1 + .../white-site/src/site/xdoc/admin/config.xml | 17 ++ .../xdoc/admin/delete-proxied-repository.xml | 17 ++ .../src/site/xdoc/admin/delete-repository.xml | 17 ++ .../xdoc/admin/delete-sync-repository.xml | 17 ++ .../xdoc/admin/edit-cvs-sync-repository.xml | 1 + .../xdoc/admin/edit-file-sync-repository.xml | 1 + .../xdoc/admin/edit-rsync-sync-repository.xml | 1 + .../xdoc/admin/edit-svn-sync-repository.xml | 1 + .../white-site/src/site/xdoc/admin/index.xml | 17 ++ .../white-site/src/site/xdoc/admin/login.xml | 1 + .../src/site/xdoc/admin/proxies.xml | 1 + .../white-site/src/site/xdoc/admin/sync.xml | 1 + .../src/site/xdoc/admin/user-details.xml | 1 + .../src/site/xdoc/admin/user-results.xml | 1 + .../white-site/src/site/xdoc/admin/users.xml | 1 + design/white-site/src/site/xdoc/artifact.xml | 17 ++ design/white-site/src/site/xdoc/browse.xml | 17 ++ design/white-site/src/site/xdoc/browse2.xml | 17 ++ design/white-site/src/site/xdoc/browse3.xml | 17 ++ .../white-site/src/site/xdoc/dependedon.xml | 4 +- .../white-site/src/site/xdoc/dependencies.xml | 4 +- .../src/site/xdoc/find-artifact.xml | 17 ++ design/white-site/src/site/xdoc/index.xml | 17 ++ .../white-site/src/site/xdoc/mail-lists.xml | 4 +- design/white-site/src/site/xdoc/reports.xml | 17 ++ design/white-site/src/site/xdoc/results.xml | 17 ++ design/white-site/src/site/xdoc/sync.xml | 17 ++ maven-meeper/pom.xml | 1 - ...tory-synchronization-refactor-20050406.apt | 17 ++ pom.xml | 1 + src/site/apt/guides/developing/index.apt | 83 ++++--- src/site/apt/guides/getting-started/index.apt | 17 ++ src/site/apt/index.apt | 17 ++ src/site/apt/repository-sync.apt | 17 ++ 131 files changed, 1348 insertions(+), 445 deletions(-) diff --git a/archiva-applet/pom.xml b/archiva-applet/pom.xml index adef730f9..02c37b541 100644 --- a/archiva-applet/pom.xml +++ b/archiva-applet/pom.xml @@ -1,3 +1,4 @@ + + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.apache.maven.archiva diff --git a/archiva-configuration/pom.xml b/archiva-configuration/pom.xml index 6caa30b55..7725fa2ec 100644 --- a/archiva-configuration/pom.xml +++ b/archiva-configuration/pom.xml @@ -1,5 +1,22 @@ - - + + + + archiva org.apache.maven.archiva diff --git a/archiva-configuration/src/test/conf/corrupt.xml b/archiva-configuration/src/test/conf/corrupt.xml index 2476f91ff..ed0c05c89 100644 --- a/archiva-configuration/src/test/conf/corrupt.xml +++ b/archiva-configuration/src/test/conf/corrupt.xml @@ -1,3 +1,4 @@ + + test newversion-artifact diff --git a/archiva-core/pom.xml b/archiva-core/pom.xml index 78e4b9384..ef36c6fd0 100644 --- a/archiva-core/pom.xml +++ b/archiva-core/pom.xml @@ -1,5 +1,22 @@ - - + + + + archiva org.apache.maven.archiva diff --git a/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java b/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java index eeb4b6895..b9622cf08 100644 --- a/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java +++ b/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java @@ -1,5 +1,21 @@ package org.apache.maven.archiva; +/* + * Copyright 2005-2006 The Apache Software Foundation. + * + * Licensed 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.maven.archiva.converter.RepositoryConversionException; import org.apache.maven.archiva.converter.RepositoryConverter; import org.apache.maven.archiva.discoverer.ArtifactDiscoverer; diff --git a/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java b/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java index 7e7076350..56b47f336 100644 --- a/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java +++ b/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java @@ -1,5 +1,21 @@ package org.apache.maven.archiva; +/* + * Copyright 2005-2006 The Apache Software Foundation. + * + * Licensed 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.maven.archiva.converter.RepositoryConversionException; import org.apache.maven.archiva.discoverer.DiscovererException; diff --git a/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java b/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java index 53632ecac..cf3c04c6a 100644 --- a/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java +++ b/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java @@ -17,15 +17,15 @@ package org.apache.maven.archiva.proxy; */ import org.apache.maven.archiva.configuration.Configuration; +import org.apache.maven.archiva.configuration.ConfigurationChangeException; +import org.apache.maven.archiva.configuration.ConfigurationChangeListener; import org.apache.maven.archiva.configuration.ConfigurationStore; import org.apache.maven.archiva.configuration.ConfigurationStoreException; import org.apache.maven.archiva.configuration.ConfiguredRepositoryFactory; +import org.apache.maven.archiva.configuration.InvalidConfigurationException; import org.apache.maven.archiva.configuration.ProxiedRepositoryConfiguration; import org.apache.maven.archiva.configuration.Proxy; import org.apache.maven.archiva.configuration.RepositoryConfiguration; -import org.apache.maven.archiva.configuration.ConfigurationChangeListener; -import org.apache.maven.archiva.configuration.InvalidConfigurationException; -import org.apache.maven.archiva.configuration.ConfigurationChangeException; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.wagon.ResourceDoesNotExistException; import org.apache.maven.wagon.proxy.ProxyInfo; diff --git a/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutor.java b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutor.java index e91949af3..1dd291b00 100644 --- a/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutor.java +++ b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutor.java @@ -18,9 +18,9 @@ package org.apache.maven.archiva.scheduler.executors; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.ConfigurationStore; +import org.apache.maven.archiva.configuration.ConfigurationStoreException; import org.apache.maven.archiva.configuration.ConfiguredRepositoryFactory; import org.apache.maven.archiva.configuration.RepositoryConfiguration; -import org.apache.maven.archiva.configuration.ConfigurationStoreException; import org.apache.maven.archiva.discoverer.ArtifactDiscoverer; import org.apache.maven.archiva.discoverer.DiscovererException; import org.apache.maven.archiva.discoverer.MetadataDiscoverer; diff --git a/archiva-core/src/main/resources/META-INF/plexus/components.xml b/archiva-core/src/main/resources/META-INF/plexus/components.xml index 38934f21e..6bc98f985 100644 --- a/archiva-core/src/main/resources/META-INF/plexus/components.xml +++ b/archiva-core/src/main/resources/META-INF/plexus/components.xml @@ -1,4 +1,20 @@ - + + + diff --git a/archiva-core/src/test/java/org/apache/maven/archiva/RepositoryManagerTest.java b/archiva-core/src/test/java/org/apache/maven/archiva/RepositoryManagerTest.java index e5621ea91..27acf5067 100644 --- a/archiva-core/src/test/java/org/apache/maven/archiva/RepositoryManagerTest.java +++ b/archiva-core/src/test/java/org/apache/maven/archiva/RepositoryManagerTest.java @@ -1,5 +1,21 @@ package org.apache.maven.archiva; +/* + * Copyright 2005-2006 The Apache Software Foundation. + * + * Licensed 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.codehaus.plexus.PlexusTestCase; import java.io.File; diff --git a/archiva-discoverer/pom.xml b/archiva-discoverer/pom.xml index fed41016b..6dcd73f97 100755 --- a/archiva-discoverer/pom.xml +++ b/archiva-discoverer/pom.xml @@ -1,3 +1,4 @@ + + org.apache.maven \ No newline at end of file diff --git a/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml index 71fc9790f..069e7d40e 100644 --- a/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml +++ b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml @@ -1,3 +1,20 @@ + + + org.apache.maven.update test-not-updated diff --git a/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml index fc17a16d7..3fd0a360f 100644 --- a/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml +++ b/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml @@ -1,3 +1,20 @@ + + + org.apache.maven.update test-updated diff --git a/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml b/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml index 9bb9b5a58..c7dfc7f8d 100644 --- a/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml +++ b/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml @@ -1,3 +1,20 @@ + + + org.apache.testgroup discovery diff --git a/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml b/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml index 50215f42b..a88c6f2df 100644 --- a/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml +++ b/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml @@ -1,3 +1,20 @@ + + + org.apache.testgroup discovery diff --git a/archiva-indexer/pom.xml b/archiva-indexer/pom.xml index 8f5aa5e51..1d1e9cb46 100644 --- a/archiva-indexer/pom.xml +++ b/archiva-indexer/pom.xml @@ -1,3 +1,4 @@ + + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> org.apache.maven.archiva archiva diff --git a/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecord.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecord.java index 8a1e49d39..a5decd7bc 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecord.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecord.java @@ -1,8 +1,5 @@ package org.apache.maven.archiva.indexer.record; -import java.util.Date; -import java.util.List; - /* * Copyright 2005-2006 The Apache Software Foundation. * @@ -19,6 +16,9 @@ import java.util.List; * limitations under the License. */ +import java.util.Date; +import java.util.List; + /** * The a record with the fields in the minimal index. * diff --git a/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecord.java b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecord.java index 4998c3119..1966bdb99 100644 --- a/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecord.java +++ b/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecord.java @@ -1,9 +1,5 @@ package org.apache.maven.archiva.indexer.record; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - /* * Copyright 2005-2006 The Apache Software Foundation. * @@ -20,6 +16,10 @@ import java.util.List; * limitations under the License. */ +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + /** * The a record with the fields in the standard index. * diff --git a/archiva-indexer/src/site/apt/design.apt b/archiva-indexer/src/site/apt/design.apt index c442f57d8..aea3f9634 100644 --- a/archiva-indexer/src/site/apt/design.apt +++ b/archiva-indexer/src/site/apt/design.apt @@ -6,6 +6,23 @@ 25 July 2006 ----- +~~ Copyright 2006 The Apache Software Foundation. +~~ +~~ Licensed 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. + +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/guides/mini/guide-apt-format.html + Indexer Design < + + org.apache.maven maven-artifact diff --git a/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml b/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml index f4c4eb8b3..6943f34a2 100644 --- a/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml +++ b/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml @@ -1,3 +1,20 @@ + + + org.apache.maven maven-artifact diff --git a/archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml b/archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml index 3a837529b..ac464ab31 100644 --- a/archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml +++ b/archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml @@ -1,3 +1,20 @@ + + + org.apache.maven diff --git a/archiva-indexer/src/test/repository/test/maven-metadata.xml b/archiva-indexer/src/test/repository/test/maven-metadata.xml index 7d6ae9f04..e993531ad 100644 --- a/archiva-indexer/src/test/repository/test/maven-metadata.xml +++ b/archiva-indexer/src/test/repository/test/maven-metadata.xml @@ -1,3 +1,20 @@ + + + test diff --git a/archiva-plexus-application/pom.xml b/archiva-plexus-application/pom.xml index 6eb24f1cc..c42102e5a 100644 --- a/archiva-plexus-application/pom.xml +++ b/archiva-plexus-application/pom.xml @@ -1,4 +1,22 @@ - + + + + archiva org.apache.maven.archiva diff --git a/archiva-plexus-application/src/conf/application.xml b/archiva-plexus-application/src/conf/application.xml index 6ed734cc6..b21c3c3c5 100644 --- a/archiva-plexus-application/src/conf/application.xml +++ b/archiva-plexus-application/src/conf/application.xml @@ -1,3 +1,20 @@ + + + diff --git a/archiva-plexus-application/src/conf/plexus.xml b/archiva-plexus-application/src/conf/plexus.xml index f997fa797..55c17787f 100644 --- a/archiva-plexus-application/src/conf/plexus.xml +++ b/archiva-plexus-application/src/conf/plexus.xml @@ -1 +1,18 @@ + + + diff --git a/archiva-plexus-runtime/pom.xml b/archiva-plexus-runtime/pom.xml index 2c204db34..78faecf65 100644 --- a/archiva-plexus-runtime/pom.xml +++ b/archiva-plexus-runtime/pom.xml @@ -1,3 +1,20 @@ + + + diff --git a/archiva-plexus-runtime/src/conf/plexus.xml b/archiva-plexus-runtime/src/conf/plexus.xml index 2ba9fecbb..8bd749ea2 100644 --- a/archiva-plexus-runtime/src/conf/plexus.xml +++ b/archiva-plexus-runtime/src/conf/plexus.xml @@ -1,4 +1,19 @@ - + + diff --git a/archiva-plexus-runtime/src/main/assembly/bin.xml b/archiva-plexus-runtime/src/main/assembly/bin.xml index 590ea9164..97d5b5ce8 100644 --- a/archiva-plexus-runtime/src/main/assembly/bin.xml +++ b/archiva-plexus-runtime/src/main/assembly/bin.xml @@ -1,3 +1,20 @@ + + + bin diff --git a/archiva-proxy/pom.xml b/archiva-proxy/pom.xml index eb027f60e..6f3bd7c91 100644 --- a/archiva-proxy/pom.xml +++ b/archiva-proxy/pom.xml @@ -1,3 +1,4 @@ + +This file is here to make sure that it will not be processed during unit test. \ No newline at end of file diff --git a/archiva-reports-standard/src/test/repository/maven-metadata.xml b/archiva-reports-standard/src/test/repository/maven-metadata.xml index 9efaee38c..2b1b5b1a1 100644 --- a/archiva-reports-standard/src/test/repository/maven-metadata.xml +++ b/archiva-reports-standard/src/test/repository/maven-metadata.xml @@ -1,3 +1,4 @@ + + diff --git a/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldArtifactReportProcessorTest.xml b/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldArtifactReportProcessorTest.xml index caee1840a..34b01e482 100644 --- a/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldArtifactReportProcessorTest.xml +++ b/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldArtifactReportProcessorTest.xml @@ -1,3 +1,4 @@ + - + archiva org.apache.maven.archiva diff --git a/archiva-repository-layer/src/test/repository/groupId/artifactId/maven-metadata.xml b/archiva-repository-layer/src/test/repository/groupId/artifactId/maven-metadata.xml index bb105fbcb..b468d3eb7 100644 --- a/archiva-repository-layer/src/test/repository/groupId/artifactId/maven-metadata.xml +++ b/archiva-repository-layer/src/test/repository/groupId/artifactId/maven-metadata.xml @@ -1,3 +1,4 @@ + + + archiva org.apache.maven.archiva diff --git a/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaGuestRoleProfile.java b/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaGuestRoleProfile.java index c8ba7d127..caf4766b2 100644 --- a/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaGuestRoleProfile.java +++ b/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaGuestRoleProfile.java @@ -18,8 +18,8 @@ package org.apache.maven.archiva.security; import org.codehaus.plexus.rbac.profile.AbstractRoleProfile; -import java.util.List; import java.util.ArrayList; +import java.util.List; /** * @todo why does this need to be created in the client app? diff --git a/archiva-security/src/main/java/org/apache/maven/archiva/security/RepositoryObserverDynamicRoleProfile.java b/archiva-security/src/main/java/org/apache/maven/archiva/security/RepositoryObserverDynamicRoleProfile.java index 91c730d20..fd76c1e2f 100644 --- a/archiva-security/src/main/java/org/apache/maven/archiva/security/RepositoryObserverDynamicRoleProfile.java +++ b/archiva-security/src/main/java/org/apache/maven/archiva/security/RepositoryObserverDynamicRoleProfile.java @@ -18,8 +18,8 @@ package org.apache.maven.archiva.security; import org.codehaus.plexus.rbac.profile.AbstractDynamicRoleProfile; -import java.util.List; import java.util.ArrayList; +import java.util.List; /** * @plexus.component role="org.codehaus.plexus.rbac.profile.DynamicRoleProfile" diff --git a/archiva-security/src/main/resources/META-INF/plexus/components.xml b/archiva-security/src/main/resources/META-INF/plexus/components.xml index 8accc36fe..3f5190db0 100644 --- a/archiva-security/src/main/resources/META-INF/plexus/components.xml +++ b/archiva-security/src/main/resources/META-INF/plexus/components.xml @@ -1,3 +1,20 @@ + + + diff --git a/archiva-utils/pom.xml b/archiva-utils/pom.xml index baa86124e..5225338f0 100644 --- a/archiva-utils/pom.xml +++ b/archiva-utils/pom.xml @@ -1,3 +1,4 @@ + META-INF - WEB-INF/classes - WEB-INF/lib - WEB-INF/database - WEB-INF/logs - pss - WEB-INF/jsp/pss - WEB-INF/template/pss + WEB-INF/classes + + WEB-INF/lib + + WEB-INF/database + + WEB-INF/logs + + pss + + WEB-INF/jsp/pss + + WEB-INF/template/pss + diff --git a/archiva-webapp/src/jetty-env.xml b/archiva-webapp/src/jetty-env.xml index 09d573d9f..4b577ef78 100644 --- a/archiva-webapp/src/jetty-env.xml +++ b/archiva-webapp/src/jetty-env.xml @@ -1,6 +1,21 @@ - + + diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ProxyAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ProxyAction.java index 10a6945ee..3db1c6b02 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ProxyAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ProxyAction.java @@ -16,20 +16,18 @@ package org.apache.maven.archiva.web.action; * limitations under the License. */ +import com.opensymphony.webwork.interceptor.ServletResponseAware; import org.apache.maven.archiva.proxy.ProxyException; import org.apache.maven.archiva.proxy.ProxyManager; import org.apache.maven.wagon.ResourceDoesNotExistException; import org.codehaus.plexus.xwork.action.PlexusActionSupport; +import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream; -import com.opensymphony.webwork.interceptor.ServletResponseAware; - -import javax.servlet.http.HttpServletResponse; - /** * Proxy functionality. * diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java index 9b573b652..bc6f44321 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java @@ -31,8 +31,8 @@ import org.apache.maven.archiva.indexer.RepositoryIndexSearchException; import org.apache.maven.archiva.indexer.lucene.LuceneQuery; import org.apache.maven.archiva.indexer.lucene.LuceneRepositoryArtifactIndex; import org.apache.maven.archiva.indexer.record.StandardIndexRecordFields; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; import org.apache.maven.archiva.web.util.VersionMerger; +import org.codehaus.plexus.xwork.action.PlexusActionSupport; import java.io.File; import java.net.MalformedURLException; diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java index 7ca7cb817..208d92597 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java @@ -28,6 +28,7 @@ import org.apache.maven.archiva.indexer.RepositoryIndexException; import org.apache.maven.archiva.indexer.RepositoryIndexSearchException; import org.apache.maven.archiva.indexer.lucene.LuceneQuery; import org.apache.maven.archiva.indexer.record.StandardArtifactIndexRecord; +import org.apache.maven.archiva.web.util.VersionMerger; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.metadata.ArtifactMetadataSource; @@ -46,7 +47,6 @@ import org.apache.maven.report.projectinfo.dependencies.ReportResolutionListener import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.codehaus.plexus.xwork.action.PlexusActionSupport; -import org.apache.maven.archiva.web.util.VersionMerger; import java.io.File; import java.io.IOException; @@ -55,7 +55,6 @@ import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractConfigureRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractConfigureRepositoryAction.java index b86eaefb7..8d93a4d21 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractConfigureRepositoryAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractConfigureRepositoryAction.java @@ -25,14 +25,14 @@ import org.apache.maven.archiva.configuration.ConfigurationStore; import org.apache.maven.archiva.configuration.ConfigurationStoreException; import org.apache.maven.archiva.configuration.InvalidConfigurationException; import org.apache.maven.archiva.security.ArchivaRoleConstants; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; +import org.codehaus.plexus.rbac.profile.RoleProfileException; +import org.codehaus.plexus.rbac.profile.RoleProfileManager; import org.codehaus.plexus.security.rbac.RbacManagerException; import org.codehaus.plexus.security.rbac.Resource; import org.codehaus.plexus.security.ui.web.interceptor.SecureAction; import org.codehaus.plexus.security.ui.web.interceptor.SecureActionBundle; import org.codehaus.plexus.security.ui.web.interceptor.SecureActionException; -import org.codehaus.plexus.rbac.profile.RoleProfileException; -import org.codehaus.plexus.rbac.profile.RoleProfileManager; +import org.codehaus.plexus.xwork.action.PlexusActionSupport; import java.io.IOException; diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractDeleteRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractDeleteRepositoryAction.java index a93f4dcae..63206a74d 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractDeleteRepositoryAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractDeleteRepositoryAction.java @@ -23,11 +23,11 @@ import org.apache.maven.archiva.configuration.ConfigurationStore; import org.apache.maven.archiva.configuration.ConfigurationStoreException; import org.apache.maven.archiva.configuration.InvalidConfigurationException; import org.apache.maven.archiva.security.ArchivaRoleConstants; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; +import org.codehaus.plexus.security.rbac.Resource; import org.codehaus.plexus.security.ui.web.interceptor.SecureAction; import org.codehaus.plexus.security.ui.web.interceptor.SecureActionBundle; import org.codehaus.plexus.security.ui.web.interceptor.SecureActionException; -import org.codehaus.plexus.security.rbac.Resource; +import org.codehaus.plexus.xwork.action.PlexusActionSupport; import java.io.IOException; diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction.java index 78b5e1d94..3d2a3a396 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction.java @@ -18,11 +18,7 @@ package org.apache.maven.archiva.web.action.admin; import org.apache.maven.archiva.configuration.AbstractRepositoryConfiguration; import org.apache.maven.archiva.configuration.RepositoryConfiguration; -import org.apache.maven.archiva.security.ArchivaRoleConstants; import org.codehaus.plexus.rbac.profile.RoleProfileException; -import org.codehaus.plexus.security.ui.web.interceptor.SecureActionBundle; -import org.codehaus.plexus.security.ui.web.interceptor.SecureActionException; -import org.codehaus.plexus.security.rbac.Resource; import java.io.File; import java.io.IOException; diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java index 8da33970d..e65d586dd 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java @@ -19,11 +19,11 @@ package org.apache.maven.archiva.web.action.admin; import org.apache.maven.archiva.scheduler.RepositoryTaskScheduler; import org.apache.maven.archiva.scheduler.TaskExecutionException; import org.apache.maven.archiva.security.ArchivaRoleConstants; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; +import org.codehaus.plexus.security.rbac.Resource; +import org.codehaus.plexus.security.ui.web.interceptor.SecureAction; import org.codehaus.plexus.security.ui.web.interceptor.SecureActionBundle; import org.codehaus.plexus.security.ui.web.interceptor.SecureActionException; -import org.codehaus.plexus.security.ui.web.interceptor.SecureAction; -import org.codehaus.plexus.security.rbac.Resource; +import org.codehaus.plexus.xwork.action.PlexusActionSupport; /** * Configures the application. diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/check/RoleExistanceEnvironmentCheck.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/check/RoleExistanceEnvironmentCheck.java index 1ab400de5..0e985135f 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/check/RoleExistanceEnvironmentCheck.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/check/RoleExistanceEnvironmentCheck.java @@ -1,17 +1,7 @@ package org.apache.maven.archiva.web.check; -import org.apache.maven.archiva.configuration.ConfigurationStore; -import org.apache.maven.archiva.configuration.ConfigurationStoreException; -import org.apache.maven.archiva.configuration.RepositoryConfiguration; -import org.codehaus.plexus.rbac.profile.RoleProfileException; -import org.codehaus.plexus.rbac.profile.RoleProfileManager; -import org.codehaus.plexus.security.system.check.EnvironmentCheck; -import org.codehaus.plexus.logging.AbstractLogEnabled; - -import java.util.Iterator; -import java.util.List; /* - * Copyright 2006 The Apache Software Foundation. + * Copyright 2005-2006 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +16,17 @@ import java.util.List; * limitations under the License. */ +import org.apache.maven.archiva.configuration.ConfigurationStore; +import org.apache.maven.archiva.configuration.ConfigurationStoreException; +import org.apache.maven.archiva.configuration.RepositoryConfiguration; +import org.codehaus.plexus.logging.AbstractLogEnabled; +import org.codehaus.plexus.rbac.profile.RoleProfileException; +import org.codehaus.plexus.rbac.profile.RoleProfileManager; +import org.codehaus.plexus.security.system.check.EnvironmentCheck; + +import java.util.Iterator; +import java.util.List; + /** * RoleExistanceEnvironmentCheck: * diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryAccess.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryAccess.java index 1eade2b46..3970478f0 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryAccess.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryAccess.java @@ -16,6 +16,8 @@ package org.apache.maven.archiva.web.servlet.repository; * limitations under the License. */ +import it.could.webdav.DAVTransaction; +import it.could.webdav.DAVUtilities; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.ConfigurationStore; import org.apache.maven.archiva.configuration.ConfigurationStoreException; @@ -33,19 +35,15 @@ import org.codehaus.plexus.security.ui.web.filter.authentication.HttpAuthenticat import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.StringUtils; -import it.could.webdav.DAVTransaction; -import it.could.webdav.DAVUtilities; - +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** * RepositoryAccess - access read/write to the repository. * diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryMapping.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryMapping.java index 587b88359..00957372a 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryMapping.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryMapping.java @@ -16,17 +16,16 @@ package org.apache.maven.archiva.web.servlet.repository; * limitations under the License. */ +import it.could.webdav.DAVListener; +import it.could.webdav.DAVProcessor; +import it.could.webdav.DAVRepository; +import it.could.webdav.DAVResource; import org.apache.maven.archiva.configuration.RepositoryConfiguration; import org.codehaus.plexus.logging.Logger; import java.io.File; import java.io.IOException; -import it.could.webdav.DAVListener; -import it.could.webdav.DAVProcessor; -import it.could.webdav.DAVRepository; -import it.could.webdav.DAVResource; - /** * RepositoryMapping * diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/VersionMerger.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/VersionMerger.java index d74799f70..b926ed008 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/VersionMerger.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/VersionMerger.java @@ -16,17 +16,17 @@ package org.apache.maven.archiva.web.util; * limitations under the License. */ -import org.apache.maven.model.Dependency; -import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.archiva.indexer.record.StandardArtifactIndexRecord; +import org.apache.maven.artifact.versioning.DefaultArtifactVersion; +import org.apache.maven.model.Dependency; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.Iterator; -import java.util.List; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import java.util.Set; diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java index 63b9f3995..16b6d8fce 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java @@ -1,62 +1,62 @@ -package org.apache.maven.archiva.web.validator; - -/* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 com.opensymphony.xwork.validator.validators.ValidatorSupport; -import com.opensymphony.xwork.validator.ValidationException; -import com.opensymphony.xwork.validator.ValidatorContext; - -/** - * - * @author Maria Odea Ching - */ -public class IntervalValidator - extends ValidatorSupport -{ - - public void validate( Object obj ) - throws ValidationException - { - String snapshotsPolicy = ( String ) getFieldValue( "snapshotsPolicy", obj ); - String releasesPolicy = ( String ) getFieldValue( "releasesPolicy", obj ); - Integer snapshotsInterval = ( Integer ) getFieldValue( "snapshotsInterval", obj ); - Integer releasesInterval = ( Integer ) getFieldValue( "releasesInterval", obj ); - - ValidatorContext ctxt = getValidatorContext(); - - if( !snapshotsPolicy.equals( "interval" ) ) - { - if( snapshotsInterval.intValue() != 0 ) - { - ctxt.addActionError( "Snapshots Interval must be set to zero." ); - } - } - - if( !releasesPolicy.equals( "interval" ) ) - { - if( releasesInterval.intValue() != 0 ) - { - ctxt.addActionError( "Releases Interval must be set to zero." ); - } - } - - if( ctxt.hasActionErrors() ) - { - return; - } - } -} +package org.apache.maven.archiva.web.validator; + +/* + * Copyright 2005-2006 The Apache Software Foundation. + * + * Licensed 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 com.opensymphony.xwork.validator.ValidationException; +import com.opensymphony.xwork.validator.ValidatorContext; +import com.opensymphony.xwork.validator.validators.ValidatorSupport; + +/** + * + * @author Maria Odea Ching + */ +public class IntervalValidator + extends ValidatorSupport +{ + + public void validate( Object obj ) + throws ValidationException + { + String snapshotsPolicy = ( String ) getFieldValue( "snapshotsPolicy", obj ); + String releasesPolicy = ( String ) getFieldValue( "releasesPolicy", obj ); + Integer snapshotsInterval = ( Integer ) getFieldValue( "snapshotsInterval", obj ); + Integer releasesInterval = ( Integer ) getFieldValue( "releasesInterval", obj ); + + ValidatorContext ctxt = getValidatorContext(); + + if( !snapshotsPolicy.equals( "interval" ) ) + { + if( snapshotsInterval.intValue() != 0 ) + { + ctxt.addActionError( "Snapshots Interval must be set to zero." ); + } + } + + if( !releasesPolicy.equals( "interval" ) ) + { + if( releasesInterval.intValue() != 0 ) + { + ctxt.addActionError( "Releases Interval must be set to zero." ); + } + } + + if( ctxt.hasActionErrors() ) + { + return; + } + } +} diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java index 42977bd08..c515acf46 100644 --- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java +++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java @@ -1,111 +1,111 @@ -package org.apache.maven.archiva.web.validator; - -/* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 com.opensymphony.xwork.validator.validators.ValidatorSupport; -import com.opensymphony.xwork.validator.ValidationException; -import com.opensymphony.xwork.validator.ValidatorContext; - -/** - * Validator for synced repository form. The values to be validated depends on the - * selected sync method to be used. - * - * @author Maria Odea Ching - */ -public class SyncedRepositoryValidator - extends ValidatorSupport -{ - - public void validate( Object obj ) - throws ValidationException - { - - String method = ( String ) getFieldValue( "method", obj ); - ValidatorContext ctxt = getValidatorContext(); - - if( method.equals( "rsync" ) ) - { - String rsyncHost = ( String ) getFieldValue( "rsyncHost", obj ); - if( rsyncHost == null || rsyncHost.equals("") ) - { - ctxt.addActionError( "Rsync host is required." ); - } - - String rsyncDirectory = ( String ) getFieldValue( "rsyncDirectory", obj ); - if( rsyncDirectory == null || rsyncDirectory.equals("") ) - { - ctxt.addActionError( "Rsync directory is required." ); - } - - String rsyncMethod = ( String ) getFieldValue( "rsyncMethod", obj ); - if( rsyncMethod == null || rsyncMethod.equals("") ) - { - ctxt.addActionError( "Rsync method is required." ); - } - else - { - if( !rsyncMethod.equals( "anonymous" ) && !rsyncMethod.equals( "ssh" ) ) - { - ctxt.addActionError( "Invalid rsync method" ); - } - } - - String username = ( String ) getFieldValue( "username", obj ); - if( username == null || username.equals("") ) - { - ctxt.addActionError( "Username is required." ); - } - - } - else if ( method.equals( "svn" ) ) - { - String svnUrl = ( String ) getFieldValue( "svnUrl", obj ); - if( svnUrl == null || svnUrl.equals("") ) - { - ctxt.addActionError( "SVN url is required." ); - } - - String username = ( String ) getFieldValue( "username", obj ); - if( username == null || username.equals("") ) - { - ctxt.addActionError( "Username is required." ); - } - } - else if ( method.equals( "cvs" ) ) - { - String cvsRoot = ( String ) getFieldValue( "cvsRoot", obj ); - if( cvsRoot == null || cvsRoot.equals("") ) - { - ctxt.addActionError( "CVS root is required." ); - } - } - else if ( method.equals( "file" ) ) - { - String directory = ( String ) getFieldValue( "directory", obj ); - if( directory == null || directory.equals("") ) - { - ctxt.addActionError( "Directory is required." ); - } - } - - if( ctxt.hasActionErrors() ) - { - return; - } - } - -} +package org.apache.maven.archiva.web.validator; + +/* + * Copyright 2005-2006 The Apache Software Foundation. + * + * Licensed 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 com.opensymphony.xwork.validator.ValidationException; +import com.opensymphony.xwork.validator.ValidatorContext; +import com.opensymphony.xwork.validator.validators.ValidatorSupport; + +/** + * Validator for synced repository form. The values to be validated depends on the + * selected sync method to be used. + * + * @author Maria Odea Ching + */ +public class SyncedRepositoryValidator + extends ValidatorSupport +{ + + public void validate( Object obj ) + throws ValidationException + { + + String method = ( String ) getFieldValue( "method", obj ); + ValidatorContext ctxt = getValidatorContext(); + + if( method.equals( "rsync" ) ) + { + String rsyncHost = ( String ) getFieldValue( "rsyncHost", obj ); + if( rsyncHost == null || rsyncHost.equals("") ) + { + ctxt.addActionError( "Rsync host is required." ); + } + + String rsyncDirectory = ( String ) getFieldValue( "rsyncDirectory", obj ); + if( rsyncDirectory == null || rsyncDirectory.equals("") ) + { + ctxt.addActionError( "Rsync directory is required." ); + } + + String rsyncMethod = ( String ) getFieldValue( "rsyncMethod", obj ); + if( rsyncMethod == null || rsyncMethod.equals("") ) + { + ctxt.addActionError( "Rsync method is required." ); + } + else + { + if( !rsyncMethod.equals( "anonymous" ) && !rsyncMethod.equals( "ssh" ) ) + { + ctxt.addActionError( "Invalid rsync method" ); + } + } + + String username = ( String ) getFieldValue( "username", obj ); + if( username == null || username.equals("") ) + { + ctxt.addActionError( "Username is required." ); + } + + } + else if ( method.equals( "svn" ) ) + { + String svnUrl = ( String ) getFieldValue( "svnUrl", obj ); + if( svnUrl == null || svnUrl.equals("") ) + { + ctxt.addActionError( "SVN url is required." ); + } + + String username = ( String ) getFieldValue( "username", obj ); + if( username == null || username.equals("") ) + { + ctxt.addActionError( "Username is required." ); + } + } + else if ( method.equals( "cvs" ) ) + { + String cvsRoot = ( String ) getFieldValue( "cvsRoot", obj ); + if( cvsRoot == null || cvsRoot.equals("") ) + { + ctxt.addActionError( "CVS root is required." ); + } + } + else if ( method.equals( "file" ) ) + { + String directory = ( String ) getFieldValue( "directory", obj ); + if( directory == null || directory.equals("") ) + { + ctxt.addActionError( "Directory is required." ); + } + } + + if( ctxt.hasActionErrors() ) + { + return; + } + } + +} diff --git a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml index ddf294dd9..d19eda1c2 100644 --- a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml +++ b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml @@ -1,3 +1,4 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/archiva-webapp/src/main/resources/xwork.xml b/archiva-webapp/src/main/resources/xwork.xml index 35ac7aa93..021d2e9cb 100644 --- a/archiva-webapp/src/main/resources/xwork.xml +++ b/archiva-webapp/src/main/resources/xwork.xml @@ -1,3 +1,4 @@ + + 4.0.0 diff --git a/design/white-site/src/site/site.xml b/design/white-site/src/site/site.xml index bd75d798d..615af85ad 100644 --- a/design/white-site/src/site/site.xml +++ b/design/white-site/src/site/site.xml @@ -1,4 +1,19 @@ + http://www.apache.org/images/asf_logo_wide.gif diff --git a/design/white-site/src/site/xdoc/admin/add-proxied-repository.xml b/design/white-site/src/site/xdoc/admin/add-proxied-repository.xml index e602756e9..d3146e480 100644 --- a/design/white-site/src/site/xdoc/admin/add-proxied-repository.xml +++ b/design/white-site/src/site/xdoc/admin/add-proxied-repository.xml @@ -1,3 +1,4 @@ + + Archiva diff --git a/design/white-site/src/site/xdoc/admin/delete-proxied-repository.xml b/design/white-site/src/site/xdoc/admin/delete-proxied-repository.xml index 4da2ed828..55977afef 100644 --- a/design/white-site/src/site/xdoc/admin/delete-proxied-repository.xml +++ b/design/white-site/src/site/xdoc/admin/delete-proxied-repository.xml @@ -1,3 +1,20 @@ + + + Archiva diff --git a/design/white-site/src/site/xdoc/admin/delete-repository.xml b/design/white-site/src/site/xdoc/admin/delete-repository.xml index db9fe0002..56cf9971d 100644 --- a/design/white-site/src/site/xdoc/admin/delete-repository.xml +++ b/design/white-site/src/site/xdoc/admin/delete-repository.xml @@ -1,3 +1,20 @@ + + + Archiva diff --git a/design/white-site/src/site/xdoc/admin/delete-sync-repository.xml b/design/white-site/src/site/xdoc/admin/delete-sync-repository.xml index e1c417edf..7172efa9d 100644 --- a/design/white-site/src/site/xdoc/admin/delete-sync-repository.xml +++ b/design/white-site/src/site/xdoc/admin/delete-sync-repository.xml @@ -1,3 +1,20 @@ + + + Archiva diff --git a/design/white-site/src/site/xdoc/admin/edit-cvs-sync-repository.xml b/design/white-site/src/site/xdoc/admin/edit-cvs-sync-repository.xml index 1e53a2c7c..89644a759 100644 --- a/design/white-site/src/site/xdoc/admin/edit-cvs-sync-repository.xml +++ b/design/white-site/src/site/xdoc/admin/edit-cvs-sync-repository.xml @@ -1,3 +1,4 @@ + + Archiva diff --git a/design/white-site/src/site/xdoc/admin/login.xml b/design/white-site/src/site/xdoc/admin/login.xml index f98e8f53e..014005d96 100644 --- a/design/white-site/src/site/xdoc/admin/login.xml +++ b/design/white-site/src/site/xdoc/admin/login.xml @@ -1,3 +1,4 @@ + + Archiva diff --git a/design/white-site/src/site/xdoc/browse.xml b/design/white-site/src/site/xdoc/browse.xml index a2b63fe87..ba1e722d9 100644 --- a/design/white-site/src/site/xdoc/browse.xml +++ b/design/white-site/src/site/xdoc/browse.xml @@ -1,3 +1,20 @@ + + + Archiva diff --git a/design/white-site/src/site/xdoc/browse2.xml b/design/white-site/src/site/xdoc/browse2.xml index be7ba01d3..a0674eb57 100644 --- a/design/white-site/src/site/xdoc/browse2.xml +++ b/design/white-site/src/site/xdoc/browse2.xml @@ -1,3 +1,20 @@ + + + Archiva diff --git a/design/white-site/src/site/xdoc/browse3.xml b/design/white-site/src/site/xdoc/browse3.xml index 4f3cb6bff..37af1eef9 100644 --- a/design/white-site/src/site/xdoc/browse3.xml +++ b/design/white-site/src/site/xdoc/browse3.xml @@ -1,3 +1,20 @@ + + + Archiva diff --git a/design/white-site/src/site/xdoc/dependedon.xml b/design/white-site/src/site/xdoc/dependedon.xml index 0787c54f9..7fbcc2f83 100644 --- a/design/white-site/src/site/xdoc/dependedon.xml +++ b/design/white-site/src/site/xdoc/dependedon.xml @@ -1,3 +1,4 @@ + - Archiva diff --git a/design/white-site/src/site/xdoc/dependencies.xml b/design/white-site/src/site/xdoc/dependencies.xml index a88d8d79a..2a6d15d9f 100644 --- a/design/white-site/src/site/xdoc/dependencies.xml +++ b/design/white-site/src/site/xdoc/dependencies.xml @@ -1,3 +1,4 @@ + - Archiva diff --git a/design/white-site/src/site/xdoc/find-artifact.xml b/design/white-site/src/site/xdoc/find-artifact.xml index a81831556..859e64256 100644 --- a/design/white-site/src/site/xdoc/find-artifact.xml +++ b/design/white-site/src/site/xdoc/find-artifact.xml @@ -1,3 +1,20 @@ + + + Archiva diff --git a/design/white-site/src/site/xdoc/index.xml b/design/white-site/src/site/xdoc/index.xml index 3098eb6de..e47b90ce0 100644 --- a/design/white-site/src/site/xdoc/index.xml +++ b/design/white-site/src/site/xdoc/index.xml @@ -1,3 +1,20 @@ + + + Archiva diff --git a/design/white-site/src/site/xdoc/mail-lists.xml b/design/white-site/src/site/xdoc/mail-lists.xml index 497c96836..b55eaad51 100644 --- a/design/white-site/src/site/xdoc/mail-lists.xml +++ b/design/white-site/src/site/xdoc/mail-lists.xml @@ -1,3 +1,4 @@ + - Archiva diff --git a/design/white-site/src/site/xdoc/reports.xml b/design/white-site/src/site/xdoc/reports.xml index f0d95f5f2..0d7b629fb 100644 --- a/design/white-site/src/site/xdoc/reports.xml +++ b/design/white-site/src/site/xdoc/reports.xml @@ -1,3 +1,20 @@ + + + Archiva diff --git a/design/white-site/src/site/xdoc/results.xml b/design/white-site/src/site/xdoc/results.xml index 1fe78a04b..d8aa67a93 100644 --- a/design/white-site/src/site/xdoc/results.xml +++ b/design/white-site/src/site/xdoc/results.xml @@ -1,3 +1,20 @@ + + + Archiva diff --git a/design/white-site/src/site/xdoc/sync.xml b/design/white-site/src/site/xdoc/sync.xml index e09bde156..e17c65c8d 100644 --- a/design/white-site/src/site/xdoc/sync.xml +++ b/design/white-site/src/site/xdoc/sync.xml @@ -1,3 +1,20 @@ + + + Archiva diff --git a/maven-meeper/pom.xml b/maven-meeper/pom.xml index 158a2c353..af343cbdc 100644 --- a/maven-meeper/pom.xml +++ b/maven-meeper/pom.xml @@ -1,5 +1,4 @@ - + 4.0.0 diff --git a/src/site/apt/guides/developing/index.apt b/src/site/apt/guides/developing/index.apt index a271fd722..b29a9e6c1 100644 --- a/src/site/apt/guides/developing/index.apt +++ b/src/site/apt/guides/developing/index.apt @@ -1,33 +1,50 @@ - ----- - Developing Archiva - ----- - Henri Yandell - ----- - 20 October 2006 - ----- - -Goal - - The idea here is to explain how to develop Archiva; or at least to provide some - insight into what is what within the maven/archiva/ directory. - -Subprojects - - The following subprojects exist within Archiva: - - * archiva-applet - The progress bar on the checksum checking page. - * archiva-configuration - A facade on top of the Plexus configuration XML. - * archiva-converter - ???? - * archiva-core - central code, business objects, modello etc. - * archiva-discoverer - monitors the managed repositories and kicks off the indexing. - * archiva-indexer - the lucene indexing. - * archiva-plexus-application - archiva can run on plexus as well as as a war. This creates a plexus app. - * archiva-plexus-runtime - archiva can run on plexus as well as as a war. This runs lots of apps. - * archiva-proxy - proxy repositories? - * archiva-reports-standard - a couple of reports are implemented. Not very pluginable yet. - * archiva-repository-layer - ???? - * archiva-security - webapp security - * archiva-utils - some handy archiva specific utils - * archiva-webapp - creates a war file - * design - contains a mock-up currently - * maven-meeper - rsync scripts to sync repositories. Also converts m1 repositories to m2 repositories. + ----- + Developing Archiva + ----- + Henri Yandell + ----- + 20 October 2006 + ----- + +~~ Copyright 2006 The Apache Software Foundation. +~~ +~~ Licensed 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. + +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/guides/mini/guide-apt-format.html + +Goal + + The idea here is to explain how to develop Archiva; or at least to provide some + insight into what is what within the maven/archiva/ directory. + +Subprojects + + The following subprojects exist within Archiva: + + * archiva-applet - The progress bar on the checksum checking page. + * archiva-configuration - A facade on top of the Plexus configuration XML. + * archiva-converter - ???? + * archiva-core - central code, business objects, modello etc. + * archiva-discoverer - monitors the managed repositories and kicks off the indexing. + * archiva-indexer - the lucene indexing. + * archiva-plexus-application - archiva can run on plexus as well as as a war. This creates a plexus app. + * archiva-plexus-runtime - archiva can run on plexus as well as as a war. This runs lots of apps. + * archiva-proxy - proxy repositories? + * archiva-reports-standard - a couple of reports are implemented. Not very pluginable yet. + * archiva-repository-layer - ???? + * archiva-security - webapp security + * archiva-utils - some handy archiva specific utils + * archiva-webapp - creates a war file + * design - contains a mock-up currently + * maven-meeper - rsync scripts to sync repositories. Also converts m1 repositories to m2 repositories. diff --git a/src/site/apt/guides/getting-started/index.apt b/src/site/apt/guides/getting-started/index.apt index 26c22821e..e6ee4a266 100644 --- a/src/site/apt/guides/getting-started/index.apt +++ b/src/site/apt/guides/getting-started/index.apt @@ -6,6 +6,23 @@ 1 October 2006 ----- +~~ Copyright 2006 The Apache Software Foundation. +~~ +~~ Licensed 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. + +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/guides/mini/guide-apt-format.html + To checkout the latest code Using Subversion, either checkout from {{http://svn.apache.org/repos/asf/maven/archiva/trunk/}} or to get all of Maven 2, checkout from {{http://svn.apache.org/repos/asf/maven/trunks/}}. diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt index c0ff76a54..9142cc08b 100644 --- a/src/site/apt/index.apt +++ b/src/site/apt/index.apt @@ -6,6 +6,23 @@ 25 May 2006 ----- +~~ Copyright 2006 The Apache Software Foundation. +~~ +~~ Licensed 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. + +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/guides/mini/guide-apt-format.html + Welcome to Maven Archiva Archiva (the Maven repository manager) is currently under development. It provides several pieces of functionality for your remote repository: diff --git a/src/site/apt/repository-sync.apt b/src/site/apt/repository-sync.apt index 5c7ed4c88..73e709abc 100644 --- a/src/site/apt/repository-sync.apt +++ b/src/site/apt/repository-sync.apt @@ -6,4 +6,21 @@ 12 October 2006 ------ +~~ Copyright 2006 The Apache Software Foundation. +~~ +~~ Licensed 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. + +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/guides/mini/guide-apt-format.html + Repository Synchronization -- 2.39.5