Return-Path: Delivered-To: apmail-maven-archiva-commits-archive@locus.apache.org Received: (qmail 87283 invoked from network); 1 Sep 2006 01:48:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 Sep 2006 01:48:14 -0000 Received: (qmail 65919 invoked by uid 500); 1 Sep 2006 01:48:14 -0000 Delivered-To: apmail-maven-archiva-commits-archive@maven.apache.org Received: (qmail 65887 invoked by uid 500); 1 Sep 2006 01:48:13 -0000 Mailing-List: contact archiva-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: archiva-dev@maven.apache.org Delivered-To: mailing list archiva-commits@maven.apache.org Received: (qmail 65878 invoked by uid 99); 1 Sep 2006 01:48:13 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Aug 2006 18:48:13 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Aug 2006 18:48:12 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 47F021A981A; Thu, 31 Aug 2006 18:47:52 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r439134 - in /maven/archiva/trunk: archiva-configuration/src/main/mdo/ archiva-core/src/main/java/org/apache/maven/archiva/scheduler/ archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/ archiva-discoverer/src/test/java/org/... Date: Fri, 01 Sep 2006 01:47:49 -0000 To: archiva-commits@maven.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060901014752.47F021A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: brett Date: Thu Aug 31 18:47:48 2006 New Revision: 439134 URL: http://svn.apache.org/viewvc?rev=439134&view=rev Log: [MRM-144] various minor improvements to code Added: maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/tags/displayUpdatePolicy.tag (with props) Modified: maven/archiva/trunk/archiva-configuration/src/main/mdo/configuration.mdo maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/IndexerTask.java maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractArtifactDiscoverer.java maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractDiscoverer.java maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/ArtifactDiscoverer.java maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DefaultMetadataDiscoverer.java maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/MetadataDiscoverer.java maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscovererTest.java maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/LegacyArtifactDiscovererTest.java maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/DeleteProxiedRepositoryAction.java maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf Modified: maven/archiva/trunk/archiva-configuration/src/main/mdo/configuration.mdo URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-configuration/src/main/mdo/configuration.mdo?rev=439134&r1=439133&r2=439134&view=diff ============================================================================== --- maven/archiva/trunk/archiva-configuration/src/main/mdo/configuration.mdo (original) +++ maven/archiva/trunk/archiva-configuration/src/main/mdo/configuration.mdo Thu Aug 31 18:47:48 2006 @@ -10,7 +10,6 @@ org.apache.maven.archiva.configuration - Configuration @@ -83,8 +82,11 @@ globalBlackListPatterns 1.0.0 - String Blacklisted patterns in the discovery process + + String + * + proxy @@ -287,8 +289,11 @@ blackListPatterns 1.0.0 - String Blacklisted patterns in the discovery process + + String + * + Modified: maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/IndexerTask.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/IndexerTask.java?rev=439134&r1=439133&r2=439134&view=diff ============================================================================== --- maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/IndexerTask.java (original) +++ maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/IndexerTask.java Thu Aug 31 18:47:48 2006 @@ -106,8 +106,15 @@ if ( repositoryConfiguration.isIndexed() ) { - // TODO! include global ones - String blacklistedPatterns = repositoryConfiguration.getBlackListPatterns(); + List blacklistedPatterns = new ArrayList(); + if ( repositoryConfiguration.getBlackListPatterns() != null ) + { + blacklistedPatterns.addAll( repositoryConfiguration.getBlackListPatterns() ); + } + if ( configuration.getGlobalBlackListPatterns() != null ) + { + blacklistedPatterns.addAll( configuration.getGlobalBlackListPatterns() ); + } boolean includeSnapshots = repositoryConfiguration.isIncludeSnapshots(); ArtifactRepository repository = repoFactory.createRepository( repositoryConfiguration ); Modified: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractArtifactDiscoverer.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractArtifactDiscoverer.java?rev=439134&r1=439133&r2=439134&view=diff ============================================================================== --- maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractArtifactDiscoverer.java (original) +++ maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractArtifactDiscoverer.java Thu Aug 31 18:47:48 2006 @@ -46,13 +46,13 @@ "**/*.MD5", "**/*.sha1", "**/*.SHA1", "**/*snapshot-version", "*/website/**", "*/licenses/**", "*/licences/**", "**/.htaccess", "**/*.html", "**/*.asc", "**/*.txt", "**/*.xml", "**/README*", "**/CHANGELOG*", "**/KEYS*"}; - private List scanForArtifactPaths( File repositoryBase, String blacklistedPatterns, long comparisonTimestamp ) + private List scanForArtifactPaths( File repositoryBase, List blacklistedPatterns, long comparisonTimestamp ) { return scanForArtifactPaths( repositoryBase, blacklistedPatterns, null, STANDARD_DISCOVERY_EXCLUDES, comparisonTimestamp ); } - public List discoverArtifacts( ArtifactRepository repository, String operation, String blacklistedPatterns, + public List discoverArtifacts( ArtifactRepository repository, String operation, List blacklistedPatterns, boolean includeSnapshots ) throws DiscovererException { Modified: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractDiscoverer.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractDiscoverer.java?rev=439134&r1=439133&r2=439134&view=diff ============================================================================== --- maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractDiscoverer.java (original) +++ maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractDiscoverer.java Thu Aug 31 18:47:48 2006 @@ -22,7 +22,6 @@ import org.codehaus.plexus.util.DirectoryScanner; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.IOUtil; -import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; import org.codehaus.plexus.util.xml.Xpp3DomWriter; @@ -89,7 +88,7 @@ return kickedOutPaths.iterator(); } - protected List scanForArtifactPaths( File repositoryBase, String blacklistedPatterns, String[] includes, + protected List scanForArtifactPaths( File repositoryBase, List blacklistedPatterns, String[] includes, String[] excludes, long comparisonTimestamp ) { List allExcludes = new ArrayList(); @@ -98,10 +97,9 @@ { allExcludes.addAll( Arrays.asList( excludes ) ); } - - if ( !StringUtils.isEmpty( blacklistedPatterns ) ) + if ( blacklistedPatterns != null ) { - allExcludes.addAll( Arrays.asList( blacklistedPatterns.split( "," ) ) ); + allExcludes.addAll( blacklistedPatterns ); } DirectoryScanner scanner = new DirectoryScanner(); Modified: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/ArtifactDiscoverer.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/ArtifactDiscoverer.java?rev=439134&r1=439133&r2=439134&view=diff ============================================================================== --- maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/ArtifactDiscoverer.java (original) +++ maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/ArtifactDiscoverer.java Thu Aug 31 18:47:48 2006 @@ -47,7 +47,7 @@ * @return the list of artifacts discovered * @throws DiscovererException if there was an unrecoverable problem discovering artifacts or recording progress */ - List discoverArtifacts( ArtifactRepository repository, String operation, String blacklistedPatterns, + List discoverArtifacts( ArtifactRepository repository, String operation, List blacklistedPatterns, boolean includeSnapshots ) throws DiscovererException; Modified: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DefaultMetadataDiscoverer.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DefaultMetadataDiscoverer.java?rev=439134&r1=439133&r2=439134&view=diff ============================================================================== --- maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DefaultMetadataDiscoverer.java (original) +++ maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DefaultMetadataDiscoverer.java Thu Aug 31 18:47:48 2006 @@ -62,7 +62,7 @@ */ private static final String[] STANDARD_DISCOVERY_INCLUDES = {"**/maven-metadata.xml"}; - public List discoverMetadata( ArtifactRepository repository, String operation, String blacklistedPatterns ) + public List discoverMetadata( ArtifactRepository repository, String operation, List blacklistedPatterns ) throws DiscovererException { if ( !"file".equals( repository.getProtocol() ) ) Modified: maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/MetadataDiscoverer.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/MetadataDiscoverer.java?rev=439134&r1=439133&r2=439134&view=diff ============================================================================== --- maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/MetadataDiscoverer.java (original) +++ maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/MetadataDiscoverer.java Thu Aug 31 18:47:48 2006 @@ -35,7 +35,8 @@ * @param operation the operation being performed (used for timestamp comparison) * @param blacklistedPatterns Patterns that are to be excluded from the discovery process. * @return the list of artifacts found + * @throws DiscovererException if there is a problem during the discovery process */ - List discoverMetadata( ArtifactRepository repository, String operation, String blacklistedPatterns ) + List discoverMetadata( ArtifactRepository repository, String operation, List blacklistedPatterns ) throws DiscovererException; } Modified: maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscovererTest.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscovererTest.java?rev=439134&r1=439133&r2=439134&view=diff ============================================================================== --- maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscovererTest.java (original) +++ maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscovererTest.java Thu Aug 31 18:47:48 2006 @@ -37,6 +37,8 @@ public class DefaultArtifactDiscovererTest extends AbstractArtifactDiscovererTest { + private static final List JAVAX_BLACKLIST = Collections.singletonList( "javax/**" ); + protected String getLayout() { return "default"; @@ -105,7 +107,7 @@ public void testBlacklistedExclude() throws DiscovererException { - List artifacts = discoverer.discoverArtifacts( repository, TEST_OPERATION, "javax/**", false ); + List artifacts = discoverer.discoverArtifacts( repository, TEST_OPERATION, JAVAX_BLACKLIST, false ); assertNotNull( "Check artifacts not null", artifacts ); boolean found = false; for ( Iterator i = discoverer.getExcludedPathsIterator(); i.hasNext() && !found; ) Modified: maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/LegacyArtifactDiscovererTest.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/LegacyArtifactDiscovererTest.java?rev=439134&r1=439133&r2=439134&view=diff ============================================================================== --- maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/LegacyArtifactDiscovererTest.java (original) +++ maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/LegacyArtifactDiscovererTest.java Thu Aug 31 18:47:48 2006 @@ -21,6 +21,7 @@ import java.io.File; import java.net.MalformedURLException; +import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -28,11 +29,13 @@ * Test the legacy artifact discoverer. * * @author Brett Porter - * @version $Id$ + * @version $Id:LegacyArtifactDiscovererTest.java 437105 2006-08-26 17:22:22 +1000 (Sat, 26 Aug 2006) brett $ */ public class LegacyArtifactDiscovererTest extends AbstractArtifactDiscovererTest { + private static final List JAVAX_SQL_BLACKLIST = Collections.singletonList( "javax.sql/**" ); + protected String getLayout() { return "legacy"; @@ -100,7 +103,7 @@ public void testBlacklistedExclude() throws DiscovererException { - List artifacts = discoverer.discoverArtifacts( repository, TEST_OPERATION, "javax.sql/**", false ); + List artifacts = discoverer.discoverArtifacts( repository, TEST_OPERATION, JAVAX_SQL_BLACKLIST, false ); assertNotNull( "Check artifacts not null", artifacts ); boolean found = false; for ( Iterator i = discoverer.getExcludedPathsIterator(); i.hasNext() && !found; ) Modified: maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/DeleteProxiedRepositoryAction.java URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/DeleteProxiedRepositoryAction.java?rev=439134&r1=439133&r2=439134&view=diff ============================================================================== --- maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/DeleteProxiedRepositoryAction.java (original) +++ maven/archiva/trunk/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/DeleteProxiedRepositoryAction.java Thu Aug 31 18:47:48 2006 @@ -43,6 +43,6 @@ protected void removeContents( AbstractRepositoryConfiguration existingRepository ) throws IOException { - // TODO! + // TODO! delete it } } Modified: maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp?rev=439134&r1=439133&r2=439134&view=diff ============================================================================== --- maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp (original) +++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp Thu Aug 31 18:47:48 2006 @@ -16,6 +16,7 @@ <%@ taglib prefix="ww" uri="/webwork" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %> @@ -28,120 +29,86 @@

Administration

-

Proxied Repositories

+

Proxied Repositories

- - - There are no proxied repositories configured yet. - - -
-
- <%-- TODO replace with icons --%> - ">Edit - Repository | ">Delete - Repository -
-

${repository.name}

- - - - - - - - - - - - <%-- TODO: can probably just use layout appended to a key prefix in i18n to simplify this --%> - - - - - - - - - - - - - - - - - - - - - - - - - - -
Identifier - ${repository.id} -
URL${repository.url}
Type - - - Maven 2.x Repository - - - Maven 1.x Repository - - -
Snapshots - <%-- TODO! turn into a tag --%> - - - Disabled - - - Updated every request - - - Updated hourly - - - Updated daily - - - Updated every ${repository.snapshotsInterval} minutes - - -
Releases - <%-- TODO! turn into a tag --%> - - - Disabled - - - Updated every request - - - Updated hourly - - - Updated daily - - - Updated every ${repository.releasesInterval} minutes - - -
Proxied through - <%-- TODO: this is the hard way! would be nice if there was a ref in the model so it was directly linked --%> - ${repositoriesMap[repository.managedRepository].name} - (${repositoriesMap[repository.managedRepository].id}) -
Use HTTP Proxy
Cache Failures
Fail Whole Group
-
- - -

- ">Add Repository -

+ + + There are no proxied repositories configured yet. + + +
+
+ <%-- TODO replace with icons --%> + ">Edit + Repository | ">Delete + Repository +
+

${repository.name}

+ + + + + + + + + + + + <%-- TODO: can probably just use layout appended to a key prefix in i18n to simplify this --%> + + + + + + + + + + + + + + + + + + + + + + + + + + +
Identifier + ${repository.id} +
URL${repository.url}
Type + + + Maven 2.x Repository + + + Maven 1.x Repository + + +
Snapshots + +
Releases + +
Proxied through + <%-- TODO: this is the hard way! would be nice if there was a ref in the model so it was directly linked --%> + ${repositoriesMap[repository.managedRepository].name} + (${repositoriesMap[repository.managedRepository].id}) +
Use HTTP Proxy
Cache Failures
Fail Whole Group
+
+ + +

+ ">Add Repository +

Modified: maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf?rev=439134&r1=439133&r2=439134&view=diff ============================================================================== --- maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf (original) +++ maven/archiva/trunk/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/quickSearchForm.jspf Thu Aug 31 18:47:48 2006 @@ -16,7 +16,7 @@ --%>