You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/03/02 15:25:21 UTC
svn commit: r513779 - in /maven/archiva/trunk:
archiva-core/src/main/java/org/apache/maven/archiva/consumers/
archiva-model/src/main/java/org/apache/maven/archiva/model/health/
archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/p...
Author: joakime
Date: Fri Mar 2 06:25:20 2007
New Revision: 513779
URL: http://svn.apache.org/viewvc?view=rev&rev=513779
Log:
[MRM-297] Result.processor can't be null.
Modified:
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/consumers/ArtifactHealthConsumer.java
maven/archiva/trunk/archiva-model/src/main/java/org/apache/maven/archiva/model/health/ArtifactHealth.java
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/LocationArtifactReportProcessor.java
Modified: maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/consumers/ArtifactHealthConsumer.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/consumers/ArtifactHealthConsumer.java?view=diff&rev=513779&r1=513778&r2=513779
==============================================================================
--- maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/consumers/ArtifactHealthConsumer.java (original)
+++ maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/consumers/ArtifactHealthConsumer.java Fri Mar 2 06:25:20 2007
@@ -73,11 +73,11 @@
}
catch ( InvalidArtifactRTException e )
{
- database.addWarning( artifact, null, null, "Invalid artifact [" + artifact + "] : " + e );
+ database.addWarning( artifact, "health", "invalid", "Invalid artifact [" + artifact + "] : " + e );
}
catch ( ProjectBuildingException e )
{
- database.addWarning( artifact, null, null, "Error reading project model: " + e );
+ database.addWarning( artifact, "health", "project-build", "Error reading project model: " + e );
}
database.remove( artifact );
Modified: maven/archiva/trunk/archiva-model/src/main/java/org/apache/maven/archiva/model/health/ArtifactHealth.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-model/src/main/java/org/apache/maven/archiva/model/health/ArtifactHealth.java?view=diff&rev=513779&r1=513778&r2=513779
==============================================================================
--- maven/archiva/trunk/archiva-model/src/main/java/org/apache/maven/archiva/model/health/ArtifactHealth.java (original)
+++ maven/archiva/trunk/archiva-model/src/main/java/org/apache/maven/archiva/model/health/ArtifactHealth.java Fri Mar 2 06:25:20 2007
@@ -1,6 +1,63 @@
package org.apache.maven.archiva.model.health;
+/*
+ * 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.
+ */
+
+import org.apache.maven.archiva.model.ArchivaArtifact;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * ArtifactHealth
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
public class ArtifactHealth
{
+ private ArchivaArtifact artifact;
+
+ private List problems = new ArrayList();
+
+ public void addProblem( HealthProblem problem )
+ {
+ this.problems.add( problem );
+ }
+
+ public ArchivaArtifact getArtifact()
+ {
+ return artifact;
+ }
+
+ public List getProblems()
+ {
+ return problems;
+ }
+
+ public void setArtifact( ArchivaArtifact artifact )
+ {
+ this.artifact = artifact;
+ }
+ public void setProblems( List problems )
+ {
+ this.problems = problems;
+ }
}
Modified: maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/LocationArtifactReportProcessor.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/LocationArtifactReportProcessor.java?view=diff&rev=513779&r1=513778&r2=513779
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/LocationArtifactReportProcessor.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/LocationArtifactReportProcessor.java Fri Mar 2 06:25:20 2007
@@ -226,7 +226,7 @@
private void addWarning( Artifact artifact, String reason )
{
// TODO: reason could be an i18n key derived from the processor and the problem ID and the
- database.addWarning( artifact, ROLE_HINT, null, reason );
+ database.addWarning( artifact, ROLE_HINT, "bad-location", reason );
}
private Model readModel( InputStream entryStream )