You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ep...@apache.org on 2006/10/26 11:15:28 UTC
svn commit: r467926 [1/3] - in /maven/archiva/trunk: ./ archiva-applet/
archiva-configuration/ archiva-configuration/src/test/conf/
archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/
archiva-configuration/src/test/resources/org...
Author: epunzalan
Date: Thu Oct 26 02:15:23 2006
New Revision: 467926
URL: http://svn.apache.org/viewvc?view=rev&rev=467926
Log:
- verified copyright headers
- optimized imports
- ran code formatting
Modified:
maven/archiva/trunk/archiva-applet/pom.xml
maven/archiva/trunk/archiva-configuration/pom.xml
maven/archiva/trunk/archiva-configuration/src/test/conf/corrupt.xml
maven/archiva/trunk/archiva-configuration/src/test/conf/repository-manager.xml
maven/archiva/trunk/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationStoreTest.java
maven/archiva/trunk/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java
maven/archiva/trunk/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ConfigurationStoreTest.xml
maven/archiva/trunk/archiva-converter/pom.xml
maven/archiva/trunk/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml
maven/archiva/trunk/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml
maven/archiva/trunk/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml
maven/archiva/trunk/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml
maven/archiva/trunk/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml
maven/archiva/trunk/archiva-core/pom.xml
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutor.java
maven/archiva/trunk/archiva-core/src/main/resources/META-INF/plexus/components.xml
maven/archiva/trunk/archiva-core/src/test/java/org/apache/maven/archiva/RepositoryManagerTest.java
maven/archiva/trunk/archiva-discoverer/pom.xml
maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java
maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/Discoverer.java
maven/archiva/trunk/archiva-discoverer/src/site/apt/design.apt
maven/archiva/trunk/archiva-discoverer/src/test/repository/javax/maven-metadata.xml
maven/archiva/trunk/archiva-discoverer/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml
maven/archiva/trunk/archiva-discoverer/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml
maven/archiva/trunk/archiva-discoverer/src/test/repository/javax/sql/maven-metadata-repository.xml
maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/maven/maven-metadata.xml
maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml
maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml
maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml
maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml
maven/archiva/trunk/archiva-indexer/pom.xml
maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecord.java
maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecord.java
maven/archiva/trunk/archiva-indexer/src/site/apt/design.apt
maven/archiva/trunk/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml
maven/archiva/trunk/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml
maven/archiva/trunk/archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml
maven/archiva/trunk/archiva-indexer/src/test/repository/test/maven-metadata.xml
maven/archiva/trunk/archiva-plexus-application/pom.xml
maven/archiva/trunk/archiva-plexus-application/src/conf/application.xml
maven/archiva/trunk/archiva-plexus-application/src/conf/plexus.xml
maven/archiva/trunk/archiva-plexus-runtime/pom.xml
maven/archiva/trunk/archiva-plexus-runtime/src/conf/plexus.xml
maven/archiva/trunk/archiva-plexus-runtime/src/main/assembly/bin.xml
maven/archiva/trunk/archiva-proxy/pom.xml
maven/archiva/trunk/archiva-proxy/src/site/apt/how-to.apt
maven/archiva/trunk/archiva-reports-standard/pom.xml
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportGroup.java
maven/archiva/trunk/archiva-reports-standard/src/test/repository/groupId/artifactId/maven-metadata.xml
maven/archiva/trunk/archiva-reports-standard/src/test/repository/groupId/unexpectedfile.xml
maven/archiva/trunk/archiva-reports-standard/src/test/repository/maven-metadata.xml
maven/archiva/trunk/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml
maven/archiva/trunk/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldArtifactReportProcessorTest.xml
maven/archiva/trunk/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldSnapshotArtifactReportProcessorTest.xml
maven/archiva/trunk/archiva-repository-layer/pom.xml
maven/archiva/trunk/archiva-repository-layer/src/test/repository/groupId/artifactId/maven-metadata.xml
maven/archiva/trunk/archiva-security/pom.xml
maven/archiva/trunk/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaGuestRoleProfile.java
maven/archiva/trunk/archiva-security/src/main/java/org/apache/maven/archiva/security/RepositoryObserverDynamicRoleProfile.java
maven/archiva/trunk/archiva-security/src/main/resources/META-INF/plexus/components.xml
maven/archiva/trunk/archiva-utils/pom.xml
maven/archiva/trunk/archiva-webapp/pom.xml
maven/archiva/trunk/archiva-webapp/src/jetty-env.xml
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ProxyAction.java
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractConfigureRepositoryAction.java
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/AbstractDeleteRepositoryAction.java
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction.java
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/RunRepositoryTaskAction.java
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/check/RoleExistanceEnvironmentCheck.java
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryAccess.java
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/servlet/repository/RepositoryMapping.java
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/VersionMerger.java
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java
maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-checksumSearch-validation.xml
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/SearchAction-quickSearch-validation.xml
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureAction-validation.xml
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureProxiedRepositoryAction-validation.xml
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureRepositoryAction-validation.xml
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-addSelectedSyncedRepository-validation.xml
maven/archiva/trunk/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/ConfigureSyncedRepositoryAction-validation.xml
maven/archiva/trunk/archiva-webapp/src/main/resources/validators.xml
maven/archiva/trunk/archiva-webapp/src/main/resources/xwork.xml
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml
maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/web.xml
maven/archiva/trunk/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/servlet/repository/RepositoryAccessTest.xml
maven/archiva/trunk/design/white-site/pom.xml
maven/archiva/trunk/design/white-site/src/site/site.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/admin/add-proxied-repository.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/admin/add-repository.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/admin/add-sync-repository.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/admin/config.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/admin/delete-proxied-repository.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/admin/delete-repository.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/admin/delete-sync-repository.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/admin/edit-cvs-sync-repository.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/admin/edit-file-sync-repository.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/admin/edit-rsync-sync-repository.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/admin/edit-svn-sync-repository.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/admin/index.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/admin/login.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/admin/proxies.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/admin/sync.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/admin/user-details.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/admin/user-results.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/admin/users.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/artifact.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/browse.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/browse2.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/browse3.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/dependedon.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/dependencies.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/find-artifact.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/index.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/mail-lists.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/reports.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/results.xml
maven/archiva/trunk/design/white-site/src/site/xdoc/sync.xml
maven/archiva/trunk/maven-meeper/pom.xml
maven/archiva/trunk/maven-meeper/src/site/apt/repository-synchronization-refactor-20050406.apt
maven/archiva/trunk/pom.xml
maven/archiva/trunk/src/site/apt/guides/developing/index.apt
maven/archiva/trunk/src/site/apt/guides/getting-started/index.apt
maven/archiva/trunk/src/site/apt/index.apt
maven/archiva/trunk/src/site/apt/repository-sync.apt
Modified: maven/archiva/trunk/archiva-applet/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-applet/pom.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-applet/pom.xml (original)
+++ maven/archiva/trunk/archiva-applet/pom.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
@@ -15,7 +16,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.archiva</groupId>
Modified: maven/archiva/trunk/archiva-configuration/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-configuration/pom.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-configuration/pom.xml (original)
+++ maven/archiva/trunk/archiva-configuration/pom.xml Thu Oct 26 02:15:23 2006
@@ -1,5 +1,22 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>archiva</artifactId>
<groupId>org.apache.maven.archiva</groupId>
Modified: maven/archiva/trunk/archiva-configuration/src/test/conf/corrupt.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-configuration/src/test/conf/corrupt.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-configuration/src/test/conf/corrupt.xml (original)
+++ maven/archiva/trunk/archiva-configuration/src/test/conf/corrupt.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
@@ -5,7 +6,7 @@
~ 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,
Modified: maven/archiva/trunk/archiva-configuration/src/test/conf/repository-manager.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-configuration/src/test/conf/repository-manager.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-configuration/src/test/conf/repository-manager.xml (original)
+++ maven/archiva/trunk/archiva-configuration/src/test/conf/repository-manager.xml Thu Oct 26 02:15:23 2006
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
@@ -7,7 +6,7 @@
~ 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,
Modified: maven/archiva/trunk/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationStoreTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationStoreTest.java?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationStoreTest.java (original)
+++ maven/archiva/trunk/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ConfigurationStoreTest.java Thu Oct 26 02:15:23 2006
@@ -1,11 +1,5 @@
package org.apache.maven.archiva.configuration;
-import org.codehaus.plexus.PlexusTestCase;
-import org.easymock.MockControl;
-
-import java.io.File;
-import java.util.Properties;
-
/*
* Copyright 2005-2006 The Apache Software Foundation.
*
@@ -13,7 +7,7 @@
* 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,
@@ -21,6 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import org.codehaus.plexus.PlexusTestCase;
+import org.easymock.MockControl;
+
+import java.io.File;
+import java.util.Properties;
/**
* Test the configuration store.
Modified: maven/archiva/trunk/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java (original)
+++ maven/archiva/trunk/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoaderTest.java Thu Oct 26 02:15:23 2006
@@ -1,103 +1,103 @@
-package org.apache.maven.archiva.configuration;
-
-/*
- * 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;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * @author Edwin Punzalan
- */
-public class MavenProxyPropertyLoaderTest
- extends PlexusTestCase
-{
- private static final int DEFAULT_CACHE_PERIOD = 3600;
-
- private MavenProxyPropertyLoader loader;
-
- public void testLoadValidMavenProxyConfiguration()
- throws IOException, InvalidConfigurationException
- {
- File confFile = getTestFile( "src/test/conf/maven-proxy-complete.conf" );
-
- Configuration configuration = new Configuration();
- Proxy proxy = new Proxy();
- proxy.setHost( "original-host" );
- configuration.setProxy( proxy ); // overwritten
- configuration.setIndexPath( "index-path" ); // existing value
-
- loader.load( new FileInputStream( confFile ), configuration );
-
- List list = configuration.getRepositories();
- assertEquals( "check single managed repository", 1, list.size() );
- RepositoryConfiguration managedRepository = (RepositoryConfiguration) list.iterator().next();
- assertEquals( "cache path changed", "target", managedRepository.getDirectory() );
-
- assertEquals( "Count repositories", 4, configuration.getProxiedRepositories().size() );
-
- list = configuration.getProxiedRepositories();
- ProxiedRepositoryConfiguration repo = (ProxiedRepositoryConfiguration) list.get( 0 );
- assertEquals( "Repository name not as expected", "local-repo", repo.getId() );
- assertEquals( "Repository url does not match its name", "file://target", repo.getUrl() );
- assertEquals( "Repository cache period check failed", 0, repo.getSnapshotsInterval() );
- assertFalse( "Repository failure caching check failed", repo.isCacheFailures() );
-
- repo = (ProxiedRepositoryConfiguration) list.get( 1 );
- assertEquals( "Repository name not as expected", "www-ibiblio-org", repo.getId() );
- assertEquals( "Repository url does not match its name", "http://www.ibiblio.org/maven2", repo.getUrl() );
- assertEquals( "Repository cache period check failed", DEFAULT_CACHE_PERIOD, repo.getSnapshotsInterval() );
- assertTrue( "Repository failure caching check failed", repo.isCacheFailures() );
-
- repo = (ProxiedRepositoryConfiguration) list.get( 2 );
- assertEquals( "Repository name not as expected", "dist-codehaus-org", repo.getId() );
- assertEquals( "Repository url does not match its name", "http://dist.codehaus.org", repo.getUrl() );
- assertEquals( "Repository cache period check failed", DEFAULT_CACHE_PERIOD, repo.getSnapshotsInterval() );
- assertTrue( "Repository failure caching check failed", repo.isCacheFailures() );
-
- repo = (ProxiedRepositoryConfiguration) list.get( 3 );
- assertEquals( "Repository name not as expected", "private-example-com", repo.getId() );
- assertEquals( "Repository url does not match its name", "http://private.example.com/internal", repo.getUrl() );
- assertEquals( "Repository cache period check failed", DEFAULT_CACHE_PERIOD, repo.getSnapshotsInterval() );
- assertFalse( "Repository failure caching check failed", repo.isCacheFailures() );
- }
-
- public void testInvalidConfiguration()
- {
- Configuration configuration = new Configuration();
- try
- {
- loader.load( new Properties(), configuration );
- fail( "Incomplete config should have failed" );
- }
- catch ( InvalidConfigurationException e )
- {
- assertTrue( true );
- }
- }
-
- protected void setUp()
- throws Exception
- {
- super.setUp();
- loader = new MavenProxyPropertyLoader();
- }
-}
+package org.apache.maven.archiva.configuration;
+
+/*
+ * 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;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * @author Edwin Punzalan
+ */
+public class MavenProxyPropertyLoaderTest
+ extends PlexusTestCase
+{
+ private static final int DEFAULT_CACHE_PERIOD = 3600;
+
+ private MavenProxyPropertyLoader loader;
+
+ public void testLoadValidMavenProxyConfiguration()
+ throws IOException, InvalidConfigurationException
+ {
+ File confFile = getTestFile( "src/test/conf/maven-proxy-complete.conf" );
+
+ Configuration configuration = new Configuration();
+ Proxy proxy = new Proxy();
+ proxy.setHost( "original-host" );
+ configuration.setProxy( proxy ); // overwritten
+ configuration.setIndexPath( "index-path" ); // existing value
+
+ loader.load( new FileInputStream( confFile ), configuration );
+
+ List list = configuration.getRepositories();
+ assertEquals( "check single managed repository", 1, list.size() );
+ RepositoryConfiguration managedRepository = (RepositoryConfiguration) list.iterator().next();
+ assertEquals( "cache path changed", "target", managedRepository.getDirectory() );
+
+ assertEquals( "Count repositories", 4, configuration.getProxiedRepositories().size() );
+
+ list = configuration.getProxiedRepositories();
+ ProxiedRepositoryConfiguration repo = (ProxiedRepositoryConfiguration) list.get( 0 );
+ assertEquals( "Repository name not as expected", "local-repo", repo.getId() );
+ assertEquals( "Repository url does not match its name", "file://target", repo.getUrl() );
+ assertEquals( "Repository cache period check failed", 0, repo.getSnapshotsInterval() );
+ assertFalse( "Repository failure caching check failed", repo.isCacheFailures() );
+
+ repo = (ProxiedRepositoryConfiguration) list.get( 1 );
+ assertEquals( "Repository name not as expected", "www-ibiblio-org", repo.getId() );
+ assertEquals( "Repository url does not match its name", "http://www.ibiblio.org/maven2", repo.getUrl() );
+ assertEquals( "Repository cache period check failed", DEFAULT_CACHE_PERIOD, repo.getSnapshotsInterval() );
+ assertTrue( "Repository failure caching check failed", repo.isCacheFailures() );
+
+ repo = (ProxiedRepositoryConfiguration) list.get( 2 );
+ assertEquals( "Repository name not as expected", "dist-codehaus-org", repo.getId() );
+ assertEquals( "Repository url does not match its name", "http://dist.codehaus.org", repo.getUrl() );
+ assertEquals( "Repository cache period check failed", DEFAULT_CACHE_PERIOD, repo.getSnapshotsInterval() );
+ assertTrue( "Repository failure caching check failed", repo.isCacheFailures() );
+
+ repo = (ProxiedRepositoryConfiguration) list.get( 3 );
+ assertEquals( "Repository name not as expected", "private-example-com", repo.getId() );
+ assertEquals( "Repository url does not match its name", "http://private.example.com/internal", repo.getUrl() );
+ assertEquals( "Repository cache period check failed", DEFAULT_CACHE_PERIOD, repo.getSnapshotsInterval() );
+ assertFalse( "Repository failure caching check failed", repo.isCacheFailures() );
+ }
+
+ public void testInvalidConfiguration()
+ {
+ Configuration configuration = new Configuration();
+ try
+ {
+ loader.load( new Properties(), configuration );
+ fail( "Incomplete config should have failed" );
+ }
+ catch ( InvalidConfigurationException e )
+ {
+ assertTrue( true );
+ }
+ }
+
+ protected void setUp()
+ throws Exception
+ {
+ super.setUp();
+ loader = new MavenProxyPropertyLoader();
+ }
+}
Modified: maven/archiva/trunk/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ConfigurationStoreTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ConfigurationStoreTest.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ConfigurationStoreTest.xml (original)
+++ maven/archiva/trunk/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/ConfigurationStoreTest.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
@@ -5,7 +6,7 @@
~ 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,
Modified: maven/archiva/trunk/archiva-converter/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/pom.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-converter/pom.xml (original)
+++ maven/archiva/trunk/archiva-converter/pom.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
Modified: maven/archiva/trunk/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml (original)
+++ maven/archiva/trunk/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
Modified: maven/archiva/trunk/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml (original)
+++ maven/archiva/trunk/archiva-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
Modified: maven/archiva/trunk/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml (original)
+++ maven/archiva/trunk/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
Modified: maven/archiva/trunk/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml (original)
+++ maven/archiva/trunk/archiva-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
Modified: maven/archiva/trunk/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml (original)
+++ maven/archiva/trunk/archiva-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+
<metadata>
<groupId>test</groupId>
<artifactId>newversion-artifact</artifactId>
Modified: maven/archiva/trunk/archiva-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/pom.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-core/pom.xml (original)
+++ maven/archiva/trunk/archiva-core/pom.xml Thu Oct 26 02:15:23 2006
@@ -1,5 +1,22 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>archiva</artifactId>
<groupId>org.apache.maven.archiva</groupId>
Modified: maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java (original)
+++ maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java Thu Oct 26 02:15:23 2006
@@ -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;
Modified: maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java (original)
+++ maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java Thu Oct 26 02:15:23 2006
@@ -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;
Modified: maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java (original)
+++ maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyManager.java Thu Oct 26 02:15:23 2006
@@ -17,15 +17,15 @@
*/
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;
Modified: maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutor.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutor.java?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutor.java (original)
+++ maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/IndexerTaskExecutor.java Thu Oct 26 02:15:23 2006
@@ -18,9 +18,9 @@
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;
Modified: maven/archiva/trunk/archiva-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/archiva/trunk/archiva-core/src/main/resources/META-INF/plexus/components.xml Thu Oct 26 02:15:23 2006
@@ -1,4 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+
<component-set>
<components>
Modified: maven/archiva/trunk/archiva-core/src/test/java/org/apache/maven/archiva/RepositoryManagerTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/test/java/org/apache/maven/archiva/RepositoryManagerTest.java?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-core/src/test/java/org/apache/maven/archiva/RepositoryManagerTest.java (original)
+++ maven/archiva/trunk/archiva-core/src/test/java/org/apache/maven/archiva/RepositoryManagerTest.java Thu Oct 26 02:15:23 2006
@@ -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;
Modified: maven/archiva/trunk/archiva-discoverer/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/pom.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-discoverer/pom.xml (original)
+++ maven/archiva/trunk/archiva-discoverer/pom.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
Modified: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java (original)
+++ maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java Thu Oct 26 02:15:23 2006
@@ -22,7 +22,6 @@
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
Modified: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/Discoverer.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/Discoverer.java?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/Discoverer.java (original)
+++ maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/Discoverer.java Thu Oct 26 02:15:23 2006
@@ -1,7 +1,5 @@
package org.apache.maven.archiva.discoverer;
-import java.util.Iterator;
-
/*
* Copyright 2005-2006 The Apache Software Foundation.
*
@@ -17,6 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import java.util.Iterator;
/**
* @author Edwin Punzalan
Modified: maven/archiva/trunk/archiva-discoverer/src/site/apt/design.apt
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/site/apt/design.apt?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-discoverer/src/site/apt/design.apt (original)
+++ maven/archiva/trunk/archiva-discoverer/src/site/apt/design.apt Thu Oct 26 02:15:23 2006
@@ -6,6 +6,23 @@
24 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
+
Discoverer Design
The artifact discoverer is designed to traverse the paths in the repository and identify files that are part of
Modified: maven/archiva/trunk/archiva-discoverer/src/test/repository/javax/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/repository/javax/maven-metadata.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-discoverer/src/test/repository/javax/maven-metadata.xml (original)
+++ maven/archiva/trunk/archiva-discoverer/src/test/repository/javax/maven-metadata.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
Modified: maven/archiva/trunk/archiva-discoverer/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-discoverer/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml (original)
+++ maven/archiva/trunk/archiva-discoverer/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
Modified: maven/archiva/trunk/archiva-discoverer/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-discoverer/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml (original)
+++ maven/archiva/trunk/archiva-discoverer/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
Modified: maven/archiva/trunk/archiva-discoverer/src/test/repository/javax/sql/maven-metadata-repository.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/repository/javax/sql/maven-metadata-repository.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-discoverer/src/test/repository/javax/sql/maven-metadata-repository.xml (original)
+++ maven/archiva/trunk/archiva-discoverer/src/test/repository/javax/sql/maven-metadata-repository.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
Modified: maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/maven/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/maven/maven-metadata.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/maven/maven-metadata.xml (original)
+++ maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/maven/maven-metadata.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+
<metadata>
<groupId>org.apache.maven</groupId>
</metadata>
Modified: maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml (original)
+++ maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+
<metadata>
<groupId>org.apache.maven.update</groupId>
<artifactId>test-not-updated</artifactId>
Modified: maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml (original)
+++ maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+
<metadata>
<groupId>org.apache.maven.update</groupId>
<artifactId>test-updated</artifactId>
Modified: maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml (original)
+++ maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+
<metadata>
<groupId>org.apache.testgroup</groupId>
<artifactId>discovery</artifactId>
Modified: maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml (original)
+++ maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+
<metadata>
<groupId>org.apache.testgroup</groupId>
<artifactId>discovery</artifactId>
Modified: maven/archiva/trunk/archiva-indexer/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-indexer/pom.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-indexer/pom.xml (original)
+++ maven/archiva/trunk/archiva-indexer/pom.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
@@ -15,7 +16,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.archiva</groupId>
<artifactId>archiva</artifactId>
Modified: maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecord.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecord.java?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecord.java (original)
+++ maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecord.java Thu Oct 26 02:15:23 2006
@@ -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.
*
@@ -18,6 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import java.util.Date;
+import java.util.List;
/**
* The a record with the fields in the minimal index.
Modified: maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecord.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecord.java?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecord.java (original)
+++ maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecord.java Thu Oct 26 02:15:23 2006
@@ -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.
*
@@ -19,6 +15,10 @@
* See the License for the specific language governing permissions and
* 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.
Modified: maven/archiva/trunk/archiva-indexer/src/site/apt/design.apt
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-indexer/src/site/apt/design.apt?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-indexer/src/site/apt/design.apt (original)
+++ maven/archiva/trunk/archiva-indexer/src/site/apt/design.apt Thu Oct 26 02:15:23 2006
@@ -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
<<Note: The current indexer design is under review. This document will grow into what it should be, and the code and
Modified: maven/archiva/trunk/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml (original)
+++ maven/archiva/trunk/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/2.0.1/maven-metadata.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+
<metadata>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
Modified: maven/archiva/trunk/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml (original)
+++ maven/archiva/trunk/archiva-indexer/src/test/repository/org/apache/maven/maven-artifact/maven-metadata.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+
<metadata>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
Modified: maven/archiva/trunk/archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml (original)
+++ maven/archiva/trunk/archiva-indexer/src/test/repository/org/apache/maven/maven-metadata.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+
<metadata>
<groupId>org.apache.maven</groupId>
<plugins>
Modified: maven/archiva/trunk/archiva-indexer/src/test/repository/test/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-indexer/src/test/repository/test/maven-metadata.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-indexer/src/test/repository/test/maven-metadata.xml (original)
+++ maven/archiva/trunk/archiva-indexer/src/test/repository/test/maven-metadata.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+
<metadata>
<groupId>test</groupId>
<plugins>
Modified: maven/archiva/trunk/archiva-plexus-application/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-plexus-application/pom.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-plexus-application/pom.xml (original)
+++ maven/archiva/trunk/archiva-plexus-application/pom.xml Thu Oct 26 02:15:23 2006
@@ -1,4 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>archiva</artifactId>
<groupId>org.apache.maven.archiva</groupId>
Modified: maven/archiva/trunk/archiva-plexus-application/src/conf/application.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-plexus-application/src/conf/application.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-plexus-application/src/conf/application.xml (original)
+++ maven/archiva/trunk/archiva-plexus-application/src/conf/application.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+
<application>
<services>
Modified: maven/archiva/trunk/archiva-plexus-application/src/conf/plexus.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-plexus-application/src/conf/plexus.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-plexus-application/src/conf/plexus.xml (original)
+++ maven/archiva/trunk/archiva-plexus-application/src/conf/plexus.xml Thu Oct 26 02:15:23 2006
@@ -1 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+
<plexus/>
Modified: maven/archiva/trunk/archiva-plexus-runtime/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-plexus-runtime/pom.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-plexus-runtime/pom.xml (original)
+++ maven/archiva/trunk/archiva-plexus-runtime/pom.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
Modified: maven/archiva/trunk/archiva-plexus-runtime/src/conf/plexus.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-plexus-runtime/src/conf/plexus.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-plexus-runtime/src/conf/plexus.xml (original)
+++ maven/archiva/trunk/archiva-plexus-runtime/src/conf/plexus.xml Thu Oct 26 02:15:23 2006
@@ -1,4 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
<plexus>
<load-on-start>
Modified: maven/archiva/trunk/archiva-plexus-runtime/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-plexus-runtime/src/main/assembly/bin.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-plexus-runtime/src/main/assembly/bin.xml (original)
+++ maven/archiva/trunk/archiva-plexus-runtime/src/main/assembly/bin.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+
<assembly>
<id>bin</id>
<formats>
Modified: maven/archiva/trunk/archiva-proxy/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-proxy/pom.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-proxy/pom.xml (original)
+++ maven/archiva/trunk/archiva-proxy/pom.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
Modified: maven/archiva/trunk/archiva-proxy/src/site/apt/how-to.apt
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-proxy/src/site/apt/how-to.apt?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-proxy/src/site/apt/how-to.apt (original)
+++ maven/archiva/trunk/archiva-proxy/src/site/apt/how-to.apt Thu Oct 26 02:15:23 2006
@@ -1,3 +1,20 @@
+~~ 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
+
ProxyManager
The ProxyManager is designed to be used as a simple object or bean for use by
Modified: maven/archiva/trunk/archiva-reports-standard/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/pom.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/pom.xml (original)
+++ maven/archiva/trunk/archiva-reports-standard/pom.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
Modified: maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportGroup.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportGroup.java?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportGroup.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ReportGroup.java Thu Oct 26 02:15:23 2006
@@ -1,12 +1,5 @@
package org.apache.maven.archiva.reporting;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
-import org.apache.maven.model.Model;
-
-import java.util.Map;
-
/*
* Copyright 2005-2006 The Apache Software Foundation.
*
@@ -22,6 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
+import org.apache.maven.model.Model;
+
+import java.util.Map;
/**
* A grouping or report processors for execution as a visible report from the web interface - eg, "health",
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/repository/groupId/artifactId/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/repository/groupId/artifactId/maven-metadata.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/test/repository/groupId/artifactId/maven-metadata.xml (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/test/repository/groupId/artifactId/maven-metadata.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/repository/groupId/unexpectedfile.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/repository/groupId/unexpectedfile.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/test/repository/groupId/unexpectedfile.xml (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/test/repository/groupId/unexpectedfile.xml Thu Oct 26 02:15:23 2006
@@ -1,4 +1,5 @@
-This file is here to make sure that it will not be processed during unit <!--
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,4 +15,5 @@
~ limitations under the License.
-->
+This file is here to make sure that it will not be processed during unit
test.
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/repository/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/repository/maven-metadata.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/test/repository/maven-metadata.xml (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/test/repository/maven-metadata.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+
<component-set>
<components>
<component>
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldArtifactReportProcessorTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldArtifactReportProcessorTest.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldArtifactReportProcessorTest.xml (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldArtifactReportProcessorTest.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldSnapshotArtifactReportProcessorTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldSnapshotArtifactReportProcessorTest.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldSnapshotArtifactReportProcessorTest.xml (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/OldSnapshotArtifactReportProcessorTest.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
Modified: maven/archiva/trunk/archiva-repository-layer/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-repository-layer/pom.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-repository-layer/pom.xml (original)
+++ maven/archiva/trunk/archiva-repository-layer/pom.xml Thu Oct 26 02:15:23 2006
@@ -1,5 +1,4 @@
-<?xml version="1.0"?>
-
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~
@@ -16,7 +15,8 @@
~ limitations under the License.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>archiva</artifactId>
<groupId>org.apache.maven.archiva</groupId>
Modified: maven/archiva/trunk/archiva-repository-layer/src/test/repository/groupId/artifactId/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-repository-layer/src/test/repository/groupId/artifactId/maven-metadata.xml?view=diff&rev=467926&r1=467925&r2=467926
==============================================================================
--- maven/archiva/trunk/archiva-repository-layer/src/test/repository/groupId/artifactId/maven-metadata.xml (original)
+++ maven/archiva/trunk/archiva-repository-layer/src/test/repository/groupId/artifactId/maven-metadata.xml Thu Oct 26 02:15:23 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
~ Copyright 2005-2006 The Apache Software Foundation.
~