svn commit: r593215 - /maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java
Author: joakime
Date: Thu Nov 8 07:59:34 2007
New Revision: 593215
URL: http://svn.apache.org/viewvc?rev=593215view=rev
Log:
[MRM-440] If webdav URL lacks a trailing /, navigating to all links in the
listing return 404.
Fixed by redirecting to proper url in the situation of a GET request on an
existing directory.
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java?rev=593215r1=593214r2=593215view=diff
==
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java
Thu Nov 8 07:59:34 2007
@@ -146,8 +146,15 @@
// If this a directory resource, then we are likely browsing.
if ( resourceFile.exists() resourceFile.isDirectory() )
{
-// TODO: [MRM-440] - If webdav URL lacks a trailing /,
navigating to all links in the listing return 404.
-// TODO: Issue redirect with proper pathing.
+String requestURL =
request.getRequest().getRequestURL().toString();
+
+// [MRM-440] - If webdav URL lacks a trailing /, navigating to
all links in the listing return 404.
+if( !requestURL.endsWith( / ) )
+{
+String redirectToLocation = requestURL + /;
+response.sendRedirect( redirectToLocation );
+return;
+}
// Process the request.
davServer.process( request, response );
svn commit: r593220 - in /maven/archiva/trunk/archiva-base: archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ archiva-configuration/src/test/conf/ archiva-configuration/src/t
Author: joakime
Date: Thu Nov 8 08:19:05 2007
New Revision: 593220
URL: http://svn.apache.org/viewvc?rev=593220view=rev
Log:
[MRM-582] Remote Repositories with empty username and password fields
shouldn't be created in configuration.
Implemented on-load cleanup of remote repo username/password (instead of
on-save)
Implemented proper check for blank username/password in proxy connectors.
Modified:
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
maven/archiva/trunk/archiva-base/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultRepositoryProxyConnectors.java
Modified:
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java?rev=593220r1=593219r2=593220view=diff
==
---
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
Thu Nov 8 08:19:05 2007
@@ -22,6 +22,7 @@
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
import
org.apache.maven.archiva.configuration.functors.ProxyConnectorConfigurationOrderComparator;
import
org.apache.maven.archiva.configuration.io.registry.ConfigurationRegistryReader;
import
org.apache.maven.archiva.configuration.io.registry.ConfigurationRegistryWriter;
@@ -41,7 +42,6 @@
import org.codehaus.plexus.registry.Registry;
import org.codehaus.plexus.registry.RegistryException;
import org.codehaus.plexus.registry.RegistryListener;
-import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.io.IOException;
@@ -195,6 +195,24 @@
config.getRepositories().clear();
registry.removeSubset( KEY + .repositories );
+}
+
+if ( !CollectionUtils.isEmpty( config.getRemoteRepositories() ) )
+{
+ListRemoteRepositoryConfiguration remoteRepos =
config.getRemoteRepositories();
+for ( RemoteRepositoryConfiguration repo : remoteRepos )
+{
+// [MRM-582] Remote Repositories with empty username and
password fields shouldn't be created in configuration.
+if( StringUtils.isBlank( repo.getUsername() ) )
+{
+repo.setUsername( null );
+}
+
+if( StringUtils.isBlank( repo.getPassword() ) )
+{
+repo.setPassword( null );
+}
+}
}
if ( !config.getProxyConnectors().isEmpty() )
Modified:
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml?rev=593220r1=593219r2=593220view=diff
==
---
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
(original)
+++
maven/archiva/trunk/archiva-base/archiva-configuration/src/test/conf/repository-manager.xml
Thu Nov 8 08:19:05 2007
@@ -54,6 +54,8 @@
nameJava.net Repository for Maven 2/name
urlhttps://maven2-repository.dev.java.net/nonav/repository/url
layoutdefault/layout
+ username/username
+ password/password
/remoteRepository
/remoteRepositories
@@ -62,17 +64,21 @@
sourceRepoIdinternal/sourceRepoId
targetRepoIdcentral/targetRepoId
proxyId/
- snapshotsPolicydisabled/snapshotsPolicy
- releasePolicynever/releasePolicy
- failurePolicynot-found/failurePolicy
+ policies
+releasesignored/releases
+snapshotsdisabled/snapshots
+cache-failurescached/cache-failures
+ /policies
/proxyConnector
proxyConnector
sourceRepoIdinternal/sourceRepoId
targetRepoIdmaven2-repository.dev.java.net/targetRepoId
proxyId/
- snapshotsPolicydisabled/snapshotsPolicy
- releasePolicynever/releasePolicy
- failurePolicynot-found/failurePolicy
+ policies
+releasesignored/releases
+
svn commit: r593246 - in /maven/archiva/trunk: archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/ archiva-web/archiva-webapp/ archiva-web/archiva-webapp/src
Author: joakime
Date: Thu Nov 8 10:36:12 2007
New Revision: 593246
URL: http://svn.apache.org/viewvc?rev=593246view=rev
Log:
[MRM-564] Audit log is not populated when artifacts are deployed.
Expanded Audit concepts into listener / event / log.
Using log4j for audit log (for consistency with other logging)
Moved AuditLog from webapp to repository-layer.
Added:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditEvent.java
(with props)
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditListener.java
(with props)
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditLog.java
(with props)
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/Auditable.java
(with props)
Removed:
maven/archiva/trunk/archiva-web/archiva-webapp/src/appserver-base/conf/archiva.xml
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/AuditLog.java
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/log4j.xml
Added:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditEvent.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditEvent.java?rev=593246view=auto
==
---
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditEvent.java
(added)
+++
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditEvent.java
Thu Nov 8 10:36:12 2007
@@ -0,0 +1,112 @@
+package org.apache.maven.archiva.repository.audit;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * AuditEvent
+ *
+ * @author a href=mailto:[EMAIL PROTECTED]Joakim Erdfelt/a
+ * @version $Id$
+ */
+public class AuditEvent
+{
+public static final String CREATE_DIR = Created Directory;
+
+public static final String CREATE_FILE = Created File;
+
+public static final String REMOVE_DIR = Removed Directory;
+
+public static final String REMOVE_FILE = Removed File;
+
+public static final String MODIFY_FILE = Modify File;
+
+private String repositoryId;
+
+private String userId;
+
+private String remoteIP;
+
+private String resource;
+
+private String action;
+
+public AuditEvent()
+{
+/* do nothing */
+}
+
+public AuditEvent( String repoId, String user, String resource, String
action )
+{
+this.repositoryId = repoId;
+this.userId = user;
+this.resource = resource;
+this.action = action;
+}
+
+public String getRepositoryId()
+{
+return repositoryId;
+}
+
+public void setRepositoryId( String repositoryId )
+{
+this.repositoryId = repositoryId;
+}
+
+public String getUserId()
+{
+return userId;
+}
+
+public void setUserId( String userId )
+{
+this.userId = userId;
+}
+
+public String getResource()
+{
+return resource;
+}
+
+public void setResource( String resource )
+{
+this.resource = resource;
+}
+
+public String getAction()
+{
+return action;
+}
+
+public void setAction( String action )
+{
+this.action = action;
+}
+
+public String getRemoteIP()
+{
+return
svn commit: r593414 - in /maven/archiva/trunk: archiva-database/pom.xml archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml archiva-web/archiva-webapp/pom.xml pom.xml
Author: brett Date: Thu Nov 8 19:27:30 2007 New Revision: 593414 URL: http://svn.apache.org/viewvc?rev=593414view=rev Log: [MRM-459] better rationalisation of commons-logging and partially revert r593206 as logging had stopped working altogether Modified: maven/archiva/trunk/archiva-database/pom.xml maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml maven/archiva/trunk/pom.xml Modified: maven/archiva/trunk/archiva-database/pom.xml URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-database/pom.xml?rev=593414r1=593413r2=593414view=diff == --- maven/archiva/trunk/archiva-database/pom.xml (original) +++ maven/archiva/trunk/archiva-database/pom.xml Thu Nov 8 19:27:30 2007 @@ -83,16 +83,6 @@ artifactIdcommons-io/artifactId /dependency dependency - groupIdcommons-logging/groupId - artifactIdcommons-logging/artifactId - exclusions -exclusion - groupIdlogkit/groupId - artifactIdlogkit/artifactId -/exclusion - /exclusions -/dependency -dependency groupIdlog4j/groupId artifactIdlog4j/artifactId /dependency Modified: maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml?rev=593414r1=593413r2=593414view=diff == --- maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml (original) +++ maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml Thu Nov 8 19:27:30 2007 @@ -64,7 +64,7 @@ /dependency dependency groupIdcommons-logging/groupId - artifactIdcommons-logging/artifactId + artifactIdcommons-logging-api/artifactId /dependency dependency groupIdorg.apache.derby/groupId @@ -115,7 +115,7 @@ runtimeConfigurationPropertiessrc/plexus.properties/runtimeConfigurationProperties runtimePathtarget/plexus-archiva-runtime/runtimePath additionalCoreArtifacts - additionalCoreArtifactcommons-logging:commons-logging/additionalCoreArtifact + additionalCoreArtifactcommons-logging:commons-logging-api/additionalCoreArtifact additionalCoreArtifactlog4j:log4j/additionalCoreArtifact additionalCoreArtifactorg.apache.derby:derby/additionalCoreArtifact additionalCoreArtifactorg.codehaus.plexus:plexus-naming/additionalCoreArtifact Modified: maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml?rev=593414r1=593413r2=593414view=diff == --- maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml (original) +++ maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml Thu Nov 8 19:27:30 2007 @@ -120,11 +120,6 @@ artifactIdslf4j-log4j12/artifactId /dependency dependency - groupIdcommons-logging/groupId - artifactIdcommons-logging/artifactId - scoperuntime/scope -/dependency -dependency groupIdcommons-lang/groupId artifactIdcommons-lang/artifactId /dependency Modified: maven/archiva/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/archiva/trunk/pom.xml?rev=593414r1=593413r2=593414view=diff == --- maven/archiva/trunk/pom.xml (original) +++ maven/archiva/trunk/pom.xml Thu Nov 8 19:27:30 2007 @@ -353,7 +353,7 @@ /dependency dependency groupIdcommons-logging/groupId -artifactIdcommons-logging/artifactId +artifactIdcommons-logging-api/artifactId version1.0.4/version /dependency dependency
svn commit: r593089 - in /maven/enforcer/trunk: enforcer-api/pom.xml enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java maven-enforcer-plugin/pom.xml pom.xml
Author: brianf Date: Thu Nov 8 01:20:20 2007 New Revision: 593089 URL: http://svn.apache.org/viewvc?rev=593089view=rev Log: aligned versions Modified: maven/enforcer/trunk/enforcer-api/pom.xml maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java maven/enforcer/trunk/maven-enforcer-plugin/pom.xml maven/enforcer/trunk/pom.xml Modified: maven/enforcer/trunk/enforcer-api/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/pom.xml?rev=593089r1=593088r2=593089view=diff == --- maven/enforcer/trunk/enforcer-api/pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/pom.xml Thu Nov 8 01:20:20 2007 @@ -28,7 +28,7 @@ artifactIdenforcer-api/artifactId packagingjar/packaging - version1.0-alpha-3-SNAPSHOT/version + version1.0-SNAPSHOT/version nameEnforcer API/name descriptionThis component provides the generic interfaces needed to implement custom rules for the maven-enforcer-plugin./description @@ -58,18 +58,12 @@ dependency groupIdorg.apache.maven/groupId artifactIdmaven-plugin-api/artifactId - version2.0.5/version /dependency dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-container-default/artifactId version1.0-alpha-9/version /dependency - dependency - groupIdjunit/groupId - artifactIdjunit/artifactId - version3.8.1/version - scopetest/scope - /dependency + /dependencies /project Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java?rev=593089r1=593088r2=593089view=diff == --- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java Thu Nov 8 01:20:20 2007 @@ -19,14 +19,8 @@ * under the License. */ -import java.util.HashSet; import java.util.Iterator; -import java.util.Locale; -import java.util.Set; -import org.apache.maven.enforcer.rule.api.EnforcerRule; -import org.apache.maven.enforcer.rule.api.EnforcerRuleException; -import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; import org.apache.maven.model.Activation; import org.apache.maven.model.ActivationOS; import org.apache.maven.model.Profile; @@ -34,6 +28,9 @@ import org.apache.maven.profiles.activation.OperatingSystemProfileActivator; import org.codehaus.plexus.util.Os; import org.codehaus.plexus.util.StringUtils; +import org.apache.maven.enforcer.rule.api.EnforcerRule; +import org.apache.maven.enforcer.rule.api.EnforcerRuleException; +import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; /** * This rule checks that the OS is allowed by combinations Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=593089r1=593088r2=593089view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Thu Nov 8 01:20:20 2007 @@ -29,7 +29,7 @@ packagingmaven-plugin/packaging nameMaven Enforcer Plugin/name descriptionThe Loving Iron Fist of Maven/description - version1.0-alpha-4-SNAPSHOT/version + version1.0-SNAPSHOT/version issueManagement systemJIRA/system urlhttp://jira.codehaus.org/browse/MENFORCER/url @@ -123,11 +123,6 @@ groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer-rules/artifactId classifiertests/classifier -/dependency -dependency -groupIdorg.beanshell/groupId -artifactIdbsh/artifactId - version2.0b4/version /dependency dependency groupIdorg.apache.maven.shared/groupId Modified: maven/enforcer/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=593089r1=593088r2=593089view=diff == --- maven/enforcer/trunk/pom.xml (original) +++ maven/enforcer/trunk/pom.xml Thu Nov 8 01:20:20 2007 @@ -110,6 +110,11 @@ urlhttp://svn.apache.org/viewcvs.cgi/maven/enforcer/trunk/url /scm +
svn commit: r593081 - in /maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src: main/java/org/apache/maven/archiva/consumers/core/repository/ test/java/org/apache/maven/archiv
Author: oching
Date: Thu Nov 8 01:03:44 2007
New Revision: 593081
URL: http://svn.apache.org/viewvc?rev=593081view=rev
Log:
- Updated repository purge tests to reflect the changes made in r592297 as
suggested in the dev list
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/DaysOldRepositoryPurgeTest.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RetentionCountRepositoryPurgeTest.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/stubs/LuceneRepositoryContentIndexFactoryStub.java
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/stubs/LuceneRepositoryContentIndexStub.java
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java?rev=593081r1=593080r2=593081view=diff
==
---
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurge.java
Thu Nov 8 01:03:44 2007
@@ -95,60 +95,63 @@
* @throws RepositoryIndexException
*/
protected void purge( SetArtifactReference references )
-{
-ListLuceneRepositoryContentRecord fileContentRecords = new
ArrayListLuceneRepositoryContentRecord();
-ListLuceneRepositoryContentRecord hashcodeRecords = new
ArrayListLuceneRepositoryContentRecord();
-ListLuceneRepositoryContentRecord bytecodeRecords = new
ArrayListLuceneRepositoryContentRecord();
-
-for ( ArtifactReference reference : references )
+{
+if( references != null !references.isEmpty() )
{
-File artifactFile = repository.toFile( reference );
-
-ArchivaArtifact artifact =
-new ArchivaArtifact( reference.getGroupId(),
reference.getArtifactId(), reference.getVersion(),
- reference.getClassifier(),
reference.getType() );
-
-FileContentRecord fileContentRecord = new FileContentRecord();
-fileContentRecord.setFilename( repository.toPath( artifact ) );
-fileContentRecords.add( fileContentRecord );
-
-HashcodesRecord hashcodesRecord = new HashcodesRecord();
-hashcodesRecord.setArtifact( artifact );
-hashcodeRecords.add( hashcodesRecord );
-
-BytecodeRecord bytecodeRecord = new BytecodeRecord();
-bytecodeRecord.setArtifact( artifact );
-bytecodeRecords.add( bytecodeRecord );
-
-// TODO: this needs to be logged
-artifactFile.delete();
-purgeSupportFiles( artifactFile );
-
-// intended to be swallowed
-// continue updating the database for all artifacts
-try
-{
-String artifactPath = toRelativePath( artifactFile );
-updateDatabase( artifactPath );
+ListLuceneRepositoryContentRecord fileContentRecords = new
ArrayListLuceneRepositoryContentRecord();
+ListLuceneRepositoryContentRecord hashcodeRecords = new
ArrayListLuceneRepositoryContentRecord();
+ListLuceneRepositoryContentRecord bytecodeRecords = new
ArrayListLuceneRepositoryContentRecord();
+
+for ( ArtifactReference reference : references )
+{
+File artifactFile = repository.toFile( reference );
+
+ArchivaArtifact
svn commit: r593232 - /maven/plugins/trunk/maven-source-plugin/pom.xml
Author: dennisl Date: Thu Nov 8 09:15:48 2007 New Revision: 593232 URL: http://svn.apache.org/viewvc?rev=593232view=rev Log: [maven-release-plugin] prepare release maven-source-plugin-2.0.4 Modified: maven/plugins/trunk/maven-source-plugin/pom.xml Modified: maven/plugins/trunk/maven-source-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/pom.xml?rev=593232r1=593231r2=593232view=diff == --- maven/plugins/trunk/maven-source-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-source-plugin/pom.xml Thu Nov 8 09:15:48 2007 @@ -26,7 +26,7 @@ artifactIdmaven-source-plugin/artifactId packagingmaven-plugin/packaging nameMaven Source Plugin/name - version2.0.4-SNAPSHOT/version + version2.0.4/version prerequisites maven2.0/maven /prerequisites @@ -35,9 +35,9 @@ urlhttp://jira.codehaus.org/browse/MSOURCES/url /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-source-plugin//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-source-plugin//developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-source-plugin-2.0.4/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-source-plugin-2.0.4/developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-source-plugin-2.0.4/url /scm dependencies dependency
svn commit: r593233 - in /maven/plugins/tags/maven-source-plugin-2.0.4: ./ pom.xml
Author: dennisl Date: Thu Nov 8 09:16:00 2007 New Revision: 593233 URL: http://svn.apache.org/viewvc?rev=593233view=rev Log: [maven-release-plugin] copy for tag maven-source-plugin-2.0.4 Added: maven/plugins/tags/maven-source-plugin-2.0.4/ - copied from r593230, maven/plugins/trunk/maven-source-plugin/ maven/plugins/tags/maven-source-plugin-2.0.4/pom.xml - copied unchanged from r593232, maven/plugins/trunk/maven-source-plugin/pom.xml
svn commit: r593234 - /maven/plugins/trunk/maven-source-plugin/pom.xml
Author: dennisl Date: Thu Nov 8 09:16:07 2007 New Revision: 593234 URL: http://svn.apache.org/viewvc?rev=593234view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/plugins/trunk/maven-source-plugin/pom.xml Modified: maven/plugins/trunk/maven-source-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/pom.xml?rev=593234r1=593233r2=593234view=diff == --- maven/plugins/trunk/maven-source-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-source-plugin/pom.xml Thu Nov 8 09:16:07 2007 @@ -26,7 +26,7 @@ artifactIdmaven-source-plugin/artifactId packagingmaven-plugin/packaging nameMaven Source Plugin/name - version2.0.4/version + version2.0.5-SNAPSHOT/version prerequisites maven2.0/maven /prerequisites @@ -35,9 +35,9 @@ urlhttp://jira.codehaus.org/browse/MSOURCES/url /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-source-plugin-2.0.4/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-source-plugin-2.0.4/developerConnection - urlhttp://svn.apache.org/viewvc/maven/plugins/tags/maven-source-plugin-2.0.4/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-source-plugin//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-source-plugin//developerConnection + urlhttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin//url /scm dependencies dependency
svn commit: r593310 - /maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/compat/plugin/Maven20xCompatAspect.aj
Author: jdcasey
Date: Thu Nov 8 13:06:31 2007
New Revision: 593310
URL: http://svn.apache.org/viewvc?rev=593310view=rev
Log:
[MNG-3193] Adding pointcut and advice to provide backward compat on invalid
lifecycle phase names (these bindings will be ignored).
Modified:
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/compat/plugin/Maven20xCompatAspect.aj
Modified:
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/compat/plugin/Maven20xCompatAspect.aj
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/compat/plugin/Maven20xCompatAspect.aj?rev=593310r1=593309r2=593310view=diff
==
---
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/compat/plugin/Maven20xCompatAspect.aj
(original)
+++
maven/components/trunk/maven-core/src/main/aspect/org/apache/maven/compat/plugin/Maven20xCompatAspect.aj
Thu Nov 8 13:06:31 2007
@@ -1,5 +1,8 @@
package org.apache.maven.compat.plugin;
+import org.apache.maven.lifecycle.MojoBindingUtils;
+import org.apache.maven.lifecycle.LifecycleUtils;
+import org.apache.maven.lifecycle.NoSuchPhaseException;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.execution.MavenSession;
@@ -14,6 +17,7 @@
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.lifecycle.model.MojoBinding;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.DefaultPluginManager;
import org.apache.maven.plugin.InvalidPluginException;
@@ -31,6 +35,8 @@
import org.codehaus.plexus.classworlds.realm.NoSuchRealmException;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.context.Context;
@@ -156,6 +162,7 @@
}
// GRAB the request when it's passed into a method that returns a
corresponding result.
+// NOTE: We'll use this in multiple places below...
private MavenExecutionRequest request;
private pointcut methodsTakingRequest( MavenExecutionRequest request ):
@@ -243,6 +250,39 @@
}
return pluginRealm;
+}
+
+// Grab this so we have a voice!
+private Logger logger;
+
+private pointcut enableLoggingCall( Logger logger ):
+execution( void LogEnabled+.enableLogging( Logger ) )
+ args( logger );
+
+after( Logger logger ): enableLoggingCall( logger )
+{
+if ( this.logger == null )
+{
+this.logger = logger;
+}
+}
+
+private pointcut addMojoBindingCall( String phase, MojoBinding binding ):
+call( void LifecycleUtils.addMojoBinding( String, MojoBinding, .. ) )
+ args( phase, binding, .. );
+
+void around( String phase, MojoBinding binding ): addMojoBindingCall(
phase, binding )
+{
+try
+{
+proceed( phase, binding );
+}
+catch ( NoSuchPhaseException e )
+{
+logger.debug( Mojo execution: + MojoBindingUtils.toString(
binding )
+ + cannot be attached to lifecycle phase: + phase
+ + ; it does not exist. Ignoring this binding. );
+}
}
// --
svn commit: r593294 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/lifecycle/ maven-core/src/main/java/org/apache/maven/plugin/ maven-embedder/src/main/java/org/apache/maven/c
Author: jdcasey
Date: Thu Nov 8 12:33:27 2007
New Revision: 593294
URL: http://svn.apache.org/viewvc?rev=593294view=rev
Log:
Working on cleaning up exceptions and reporting (these changes are from before
the break I took to work on memory profiling in maven and plexus).
Added:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java
(with props)
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManagerException.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
maven/components/trunk/maven-lifecycle/src/main/java/org/apache/maven/lifecycle/LifecycleException.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=593294r1=593293r2=593294view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Thu Nov 8 12:33:27 2007
@@ -36,7 +36,6 @@
import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.monitor.event.MavenEvents;
import org.apache.maven.plugin.MojoExecution;
-import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.PluginConfigurationException;
import org.apache.maven.plugin.PluginManager;
@@ -533,13 +532,6 @@
e );
}
catch ( ArtifactResolutionException e )
-{
-throw new LifecycleExecutionException(
-e.getMessage(),
-project,
-e );
-}
-catch ( MojoExecutionException e )
{
throw new LifecycleExecutionException(
e.getMessage(),
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java?rev=593294r1=593293r2=593294view=diff
==
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
Thu Nov 8 12:33:27 2007
@@ -4,7 +4,6 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.plugin.InvalidPluginException;
-import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.PluginConfigurationException;
import org.apache.maven.plugin.PluginManagerException;
import org.apache.maven.plugin.PluginNotFoundException;
@@ -13,7 +12,6 @@
import org.apache.maven.plugin.version.PluginVersionResolutionException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.codehaus.plexus.PlexusContainerException;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -120,13 +118,6 @@
}
public LifecycleExecutionException( String message, MavenProject project,
-MojoExecutionException cause )
-{
-super( message, cause );
-this.project = project;
-}
-
-public LifecycleExecutionException( String message, MavenProject project,
PluginConfigurationException cause )
{
super( message, cause );
@@ -135,14 +126,6 @@
public LifecycleExecutionException( String message, MavenProject project,
PluginVersionNotFoundException cause )
-{
-super( message, cause );
-this.project = project;
-}
-
-public LifecycleExecutionException( String message,
-MavenProject project,
-
svn commit: r593287 - in /maven/components/trunk/maven-project/src: main/java/org/apache/maven/project/build/ test/java/org/apache/maven/project/inheritance/t03/ test/java/org/apache/maven/project/inh
Author: jdcasey
Date: Thu Nov 8 12:15:20 2007
New Revision: 593287
URL: http://svn.apache.org/viewvc?rev=593287view=rev
Log:
Clean up the caching to use weak hashmaps, to conserve some memory in large
builds.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/ProjectBuildCache.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t06/ProjectInheritanceTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t08/ProjectInheritanceTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t09/ProjectInheritanceTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t11/ProjectInheritanceTest.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/ProjectBuildCache.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/ProjectBuildCache.java?rev=593287r1=593286r2=593287view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/ProjectBuildCache.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/ProjectBuildCache.java
Thu Nov 8 12:15:20 2007
@@ -30,6 +30,7 @@
import java.io.File;
import java.util.HashMap;
import java.util.Map;
+import java.util.WeakHashMap;
/**
* This cache is meant to provide a reference of the project instances that
are in the current build
@@ -37,30 +38,30 @@
* to store inter-project references as such in MavenProject instances. An
ArtifactResolver instance
* will be used that can utilize this cache, but will also wrap the default
ArtifactResolver
* instance, so that can be used as a target for replacement implementations.
- *
+ *
* To retrieve from the build context: buildContext.retrieve( new
ProjectBuildCache( false ) );
- *
+ *
* @author jdcasey
*/
public class ProjectBuildCache
implements ManagedBuildData
{
-
+
private static final String BUILD_CONTEXT_KEY =
ProjectBuildCache.class.getName();
-
+
private static final String PROJECT_CACHE = project-cache;
-
+
private static final String POM_FILE_CACHE = pom-file-cache;
-
+
private Map projectCache;
-
+
private Map pomFileCache;
-
+
public ProjectBuildCache()
{
this( true );
}
-
+
/**
* @param liveInstance If false, this instance's state is meant to be
retrieved from the build
* context. If true, this instance can serve as the authoritative
instance where the cache is
@@ -70,26 +71,26 @@
{
if ( liveInstance )
{
-projectCache = new HashMap();
-pomFileCache = new HashMap();
+projectCache = new WeakHashMap();
+pomFileCache = new WeakHashMap();
}
}
-
+
public void cacheProject( MavenProject project )
{
projectCache.put( generateCacheKey( project ), project );
}
-
+
public MavenProject getCachedProject( String groupId, String artifactId,
String version )
{
return (MavenProject) projectCache.get( generateCacheKey( groupId,
artifactId, version ) );
}
-
+
public MavenProject getCachedProject( Artifact artifact )
{
return (MavenProject) projectCache.get( generateCacheKey( artifact ) );
}
-
+
public MavenProject getCachedProject( MavenProject exampleInstance )
{
return (MavenProject) projectCache.get( generateCacheKey(
exampleInstance ) );
@@ -99,7 +100,7 @@
{
pomFileCache.put( generateCacheKey( model ), modelFile );
}
-
+
public File getCachedModelFile( Artifact artifact )
{
return (File) pomFileCache.get( generateCacheKey( artifact ) );
@@ -118,10 +119,10 @@
public Map getData()
{
Map data = new HashMap( 2 );
-
+
data.put( PROJECT_CACHE, projectCache );
data.put( POM_FILE_CACHE, pomFileCache );
-
+
return data;
}
@@ -132,8 +133,8 @@
public void setData( Map data )
{
-
