Modified: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/DefaultArtifactReporterTest.java URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/DefaultArtifactReporterTest.java?view=diff&rev=507550&r1=507549&r2=507550 ============================================================================== --- maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/DefaultArtifactReporterTest.java (original) +++ maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/DefaultArtifactReporterTest.java Wed Feb 14 06:44:59 2007 @@ -21,7 +21,6 @@ import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase; import org.apache.maven.archiva.reporting.database.ReportingDatabase; -import org.apache.maven.archiva.reporting.group.ReportGroup; import org.apache.maven.archiva.reporting.model.ArtifactResults; import org.apache.maven.archiva.reporting.model.MetadataResults; import org.apache.maven.archiva.reporting.model.Result; @@ -34,12 +33,14 @@ import java.util.Iterator; /** + * DefaultArtifactReporterTest * + * @version $Id$ */ public class DefaultArtifactReporterTest extends AbstractRepositoryReportsTestCase { - private ReportingDatabase reportingDatabase; + private ReportingDatabase database; private RepositoryMetadata metadata; @@ -49,23 +50,41 @@ private Artifact artifact; + protected void setUp() + throws Exception + { + super.setUp(); + + database = (ReportingDatabase) lookup( ReportingDatabase.ROLE ); + + ArtifactFactory artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE ); + + artifact = artifactFactory.createBuildArtifact( "groupId", "artifactId", "1.0-alpha-1", "type" ); + + Versioning versioning = new Versioning(); + versioning.addVersion( "1.0-alpha-1" ); + versioning.addVersion( "1.0-alpha-2" ); + + metadata = new ArtifactRepositoryMetadata( artifact, versioning ); + } + public void testEmptyArtifactReporter() { - assertEquals( "No failures", 0, reportingDatabase.getNumFailures() ); - assertEquals( "No warnings", 0, reportingDatabase.getNumWarnings() ); - assertEquals( "check no notices", 0, reportingDatabase.getNumNotices() ); - assertFalse( "No artifact failures", reportingDatabase.getArtifactIterator().hasNext() ); - assertFalse( "No metadata failures", reportingDatabase.getMetadataIterator().hasNext() ); + assertEquals( "No failures", 0, database.getNumFailures() ); + assertEquals( "No warnings", 0, database.getNumWarnings() ); + assertEquals( "check no notices", 0, database.getNumNotices() ); + assertFalse( "No artifact failures", database.getArtifactIterator().hasNext() ); + assertFalse( "No metadata failures", database.getMetadataIterator().hasNext() ); } public void testMetadataSingleFailure() { - reportingDatabase.addFailure( metadata, PROCESSOR, PROBLEM, "Single Failure Reason" ); - assertEquals( "failures count", 1, reportingDatabase.getNumFailures() ); - assertEquals( "warnings count", 0, reportingDatabase.getNumWarnings() ); - assertEquals( "check no notices", 0, reportingDatabase.getNumNotices() ); + database.getMetadataDatabase().addFailure( metadata, PROCESSOR, PROBLEM, "Single Failure Reason" ); + assertEquals( "failures count", 1, database.getNumFailures() ); + assertEquals( "warnings count", 0, database.getNumWarnings() ); + assertEquals( "check no notices", 0, database.getNumNotices() ); - Iterator failures = reportingDatabase.getMetadataIterator(); + Iterator failures = database.getMetadataIterator(); assertTrue( "check there is a failure", failures.hasNext() ); MetadataResults results = (MetadataResults) failures.next(); failures = results.getFailures().iterator(); @@ -87,13 +106,13 @@ public void testMetadataMultipleFailures() { - reportingDatabase.addFailure( metadata, PROCESSOR, PROBLEM, "First Failure Reason" ); - reportingDatabase.addFailure( metadata, PROCESSOR, PROBLEM, "Second Failure Reason" ); - assertEquals( "failures count", 2, reportingDatabase.getNumFailures() ); - assertEquals( "warnings count", 0, reportingDatabase.getNumWarnings() ); - assertEquals( "check no notices", 0, reportingDatabase.getNumNotices() ); + database.getMetadataDatabase().addFailure( metadata, PROCESSOR, PROBLEM, "First Failure Reason" ); + database.getMetadataDatabase().addFailure( metadata, PROCESSOR, PROBLEM, "Second Failure Reason" ); + assertEquals( "failures count", 2, database.getNumFailures() ); + assertEquals( "warnings count", 0, database.getNumWarnings() ); + assertEquals( "check no notices", 0, database.getNumNotices() ); - Iterator failures = reportingDatabase.getMetadataIterator(); + Iterator failures = database.getMetadataIterator(); assertTrue( "check there is a failure", failures.hasNext() ); MetadataResults results = (MetadataResults) failures.next(); failures = results.getFailures().iterator(); @@ -113,12 +132,12 @@ public void testMetadataSingleWarning() { - reportingDatabase.addWarning( metadata, PROCESSOR, PROBLEM, "Single Warning Message" ); - assertEquals( "warnings count", 0, reportingDatabase.getNumFailures() ); - assertEquals( "warnings count", 1, reportingDatabase.getNumWarnings() ); - assertEquals( "check no notices", 0, reportingDatabase.getNumNotices() ); + database.getMetadataDatabase().addWarning( metadata, PROCESSOR, PROBLEM, "Single Warning Message" ); + assertEquals( "warnings count", 0, database.getNumFailures() ); + assertEquals( "warnings count", 1, database.getNumWarnings() ); + assertEquals( "check no notices", 0, database.getNumNotices() ); - Iterator warnings = reportingDatabase.getMetadataIterator(); + Iterator warnings = database.getMetadataIterator(); assertTrue( "check there is a failure", warnings.hasNext() ); MetadataResults results = (MetadataResults) warnings.next(); warnings = results.getWarnings().iterator(); @@ -133,13 +152,13 @@ public void testMetadataMultipleWarnings() { - reportingDatabase.addWarning( metadata, PROCESSOR, PROBLEM, "First Warning" ); - reportingDatabase.addWarning( metadata, PROCESSOR, PROBLEM, "Second Warning" ); - assertEquals( "warnings count", 0, reportingDatabase.getNumFailures() ); - assertEquals( "warnings count", 2, reportingDatabase.getNumWarnings() ); - assertEquals( "check no notices", 0, reportingDatabase.getNumNotices() ); + database.getMetadataDatabase().addWarning( metadata, PROCESSOR, PROBLEM, "First Warning" ); + database.getMetadataDatabase().addWarning( metadata, PROCESSOR, PROBLEM, "Second Warning" ); + assertEquals( "warnings count", 0, database.getNumFailures() ); + assertEquals( "warnings count", 2, database.getNumWarnings() ); + assertEquals( "check no notices", 0, database.getNumNotices() ); - Iterator warnings = reportingDatabase.getMetadataIterator(); + Iterator warnings = database.getMetadataIterator(); assertTrue( "check there is a failure", warnings.hasNext() ); MetadataResults results = (MetadataResults) warnings.next(); warnings = results.getWarnings().iterator(); @@ -159,12 +178,12 @@ public void testMetadataSingleNotice() { - reportingDatabase.addNotice( metadata, PROCESSOR, PROBLEM, "Single Notice Message" ); - assertEquals( "failure count", 0, reportingDatabase.getNumFailures() ); - assertEquals( "warnings count", 0, reportingDatabase.getNumWarnings() ); - assertEquals( "check notices", 1, reportingDatabase.getNumNotices() ); + database.getMetadataDatabase().addNotice( metadata, PROCESSOR, PROBLEM, "Single Notice Message" ); + assertEquals( "failure count", 0, database.getNumFailures() ); + assertEquals( "warnings count", 0, database.getNumWarnings() ); + assertEquals( "check notices", 1, database.getNumNotices() ); - Iterator warnings = reportingDatabase.getMetadataIterator(); + Iterator warnings = database.getMetadataIterator(); assertTrue( "check there is a failure", warnings.hasNext() ); MetadataResults results = (MetadataResults) warnings.next(); warnings = results.getNotices().iterator(); @@ -179,13 +198,13 @@ public void testMetadataMultipleNotices() { - reportingDatabase.addNotice( metadata, PROCESSOR, PROBLEM, "First Notice" ); - reportingDatabase.addNotice( metadata, PROCESSOR, PROBLEM, "Second Notice" ); - assertEquals( "warnings count", 0, reportingDatabase.getNumFailures() ); - assertEquals( "warnings count", 0, reportingDatabase.getNumWarnings() ); - assertEquals( "check no notices", 2, reportingDatabase.getNumNotices() ); + database.getMetadataDatabase().addNotice( metadata, PROCESSOR, PROBLEM, "First Notice" ); + database.getMetadataDatabase().addNotice( metadata, PROCESSOR, PROBLEM, "Second Notice" ); + assertEquals( "warnings count", 0, database.getNumFailures() ); + assertEquals( "warnings count", 0, database.getNumWarnings() ); + assertEquals( "check no notices", 2, database.getNumNotices() ); - Iterator warnings = reportingDatabase.getMetadataIterator(); + Iterator warnings = database.getMetadataIterator(); assertTrue( "check there is a failure", warnings.hasNext() ); MetadataResults results = (MetadataResults) warnings.next(); warnings = results.getNotices().iterator(); @@ -205,12 +224,12 @@ public void testArtifactSingleFailure() { - reportingDatabase.addFailure( artifact, PROCESSOR, PROBLEM, "Single Failure Reason" ); - assertEquals( "failures count", 1, reportingDatabase.getNumFailures() ); - assertEquals( "warnings count", 0, reportingDatabase.getNumWarnings() ); - assertEquals( "check no notices", 0, reportingDatabase.getNumNotices() ); + database.getArtifactDatabase().addFailure( artifact, PROCESSOR, PROBLEM, "Single Failure Reason" ); + assertEquals( "failures count", 1, database.getNumFailures() ); + assertEquals( "warnings count", 0, database.getNumWarnings() ); + assertEquals( "check no notices", 0, database.getNumNotices() ); - Iterator failures = reportingDatabase.getArtifactIterator(); + Iterator failures = database.getArtifactIterator(); assertTrue( "check there is a failure", failures.hasNext() ); ArtifactResults results = (ArtifactResults) failures.next(); failures = results.getFailures().iterator(); @@ -234,13 +253,13 @@ public void testArtifactMultipleFailures() { - reportingDatabase.addFailure( artifact, PROCESSOR, PROBLEM, "First Failure Reason" ); - reportingDatabase.addFailure( artifact, PROCESSOR, PROBLEM, "Second Failure Reason" ); - assertEquals( "failures count", 2, reportingDatabase.getNumFailures() ); - assertEquals( "warnings count", 0, reportingDatabase.getNumWarnings() ); - assertEquals( "check no notices", 0, reportingDatabase.getNumNotices() ); + database.getArtifactDatabase().addFailure( artifact, PROCESSOR, PROBLEM, "First Failure Reason" ); + database.getArtifactDatabase().addFailure( artifact, PROCESSOR, PROBLEM, "Second Failure Reason" ); + assertEquals( "failures count", 2, database.getNumFailures() ); + assertEquals( "warnings count", 0, database.getNumWarnings() ); + assertEquals( "check no notices", 0, database.getNumNotices() ); - Iterator failures = reportingDatabase.getArtifactIterator(); + Iterator failures = database.getArtifactIterator(); assertTrue( "check there is a failure", failures.hasNext() ); ArtifactResults results = (ArtifactResults) failures.next(); failures = results.getFailures().iterator(); @@ -260,12 +279,12 @@ public void testArtifactSingleWarning() { - reportingDatabase.addWarning( artifact, PROCESSOR, PROBLEM, "Single Warning Message" ); - assertEquals( "warnings count", 0, reportingDatabase.getNumFailures() ); - assertEquals( "warnings count", 1, reportingDatabase.getNumWarnings() ); - assertEquals( "check no notices", 0, reportingDatabase.getNumNotices() ); + database.getArtifactDatabase().addWarning( artifact, PROCESSOR, PROBLEM, "Single Warning Message" ); + assertEquals( "warnings count", 0, database.getNumFailures() ); + assertEquals( "warnings count", 1, database.getNumWarnings() ); + assertEquals( "check no notices", 0, database.getNumNotices() ); - Iterator warnings = reportingDatabase.getArtifactIterator(); + Iterator warnings = database.getArtifactIterator(); assertTrue( "check there is a failure", warnings.hasNext() ); ArtifactResults results = (ArtifactResults) warnings.next(); warnings = results.getWarnings().iterator(); @@ -280,13 +299,13 @@ public void testArtifactMultipleWarnings() { - reportingDatabase.addWarning( artifact, PROCESSOR, PROBLEM, "First Warning" ); - reportingDatabase.addWarning( artifact, PROCESSOR, PROBLEM, "Second Warning" ); - assertEquals( "warnings count", 0, reportingDatabase.getNumFailures() ); - assertEquals( "warnings count", 2, reportingDatabase.getNumWarnings() ); - assertEquals( "check no notices", 0, reportingDatabase.getNumNotices() ); + database.getArtifactDatabase().addWarning( artifact, PROCESSOR, PROBLEM, "First Warning" ); + database.getArtifactDatabase().addWarning( artifact, PROCESSOR, PROBLEM, "Second Warning" ); + assertEquals( "warnings count", 0, database.getNumFailures() ); + assertEquals( "warnings count", 2, database.getNumWarnings() ); + assertEquals( "check no notices", 0, database.getNumNotices() ); - Iterator warnings = reportingDatabase.getArtifactIterator(); + Iterator warnings = database.getArtifactIterator(); assertTrue( "check there is a failure", warnings.hasNext() ); ArtifactResults results = (ArtifactResults) warnings.next(); warnings = results.getWarnings().iterator(); @@ -306,12 +325,12 @@ public void testArtifactSingleNotice() { - reportingDatabase.addNotice( artifact, PROCESSOR, PROBLEM, "Single Notice Message" ); - assertEquals( "failure count", 0, reportingDatabase.getNumFailures() ); - assertEquals( "warnings count", 0, reportingDatabase.getNumWarnings() ); - assertEquals( "check notices", 1, reportingDatabase.getNumNotices() ); + database.getArtifactDatabase().addNotice( artifact, PROCESSOR, PROBLEM, "Single Notice Message" ); + assertEquals( "failure count", 0, database.getNumFailures() ); + assertEquals( "warnings count", 0, database.getNumWarnings() ); + assertEquals( "check notices", 1, database.getNumNotices() ); - Iterator warnings = reportingDatabase.getArtifactIterator(); + Iterator warnings = database.getArtifactIterator(); assertTrue( "check there is a failure", warnings.hasNext() ); ArtifactResults results = (ArtifactResults) warnings.next(); warnings = results.getNotices().iterator(); @@ -326,13 +345,13 @@ public void testArtifactMultipleNotices() { - reportingDatabase.addNotice( artifact, PROCESSOR, PROBLEM, "First Notice" ); - reportingDatabase.addNotice( artifact, PROCESSOR, PROBLEM, "Second Notice" ); - assertEquals( "warnings count", 0, reportingDatabase.getNumFailures() ); - assertEquals( "warnings count", 0, reportingDatabase.getNumWarnings() ); - assertEquals( "check no notices", 2, reportingDatabase.getNumNotices() ); + database.getArtifactDatabase().addNotice( artifact, PROCESSOR, PROBLEM, "First Notice" ); + database.getArtifactDatabase().addNotice( artifact, PROCESSOR, PROBLEM, "Second Notice" ); + assertEquals( "warnings count", 0, database.getNumFailures() ); + assertEquals( "warnings count", 0, database.getNumWarnings() ); + assertEquals( "check no notices", 2, database.getNumNotices() ); - Iterator warnings = reportingDatabase.getArtifactIterator(); + Iterator warnings = database.getArtifactIterator(); assertTrue( "check there is a failure", warnings.hasNext() ); ArtifactResults results = (ArtifactResults) warnings.next(); warnings = results.getNotices().iterator(); @@ -350,22 +369,4 @@ assertFalse( "no more warnings", warnings.hasNext() ); } - protected void setUp() - throws Exception - { - super.setUp(); - - ArtifactFactory artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE ); - - artifact = artifactFactory.createBuildArtifact( "groupId", "artifactId", "1.0-alpha-1", "type" ); - - Versioning versioning = new Versioning(); - versioning.addVersion( "1.0-alpha-1" ); - versioning.addVersion( "1.0-alpha-2" ); - - metadata = new ArtifactRepositoryMetadata( artifact, versioning ); - - ReportGroup reportGroup = (ReportGroup) lookup( ReportGroup.ROLE, "health" ); - reportingDatabase = new ReportingDatabase( reportGroup ); - } }
Added: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/META-INF/plexus/components.xml?view=auto&rev=507550 ============================================================================== --- maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/META-INF/plexus/components.xml (added) +++ maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/META-INF/plexus/components.xml Wed Feb 14 06:44:59 2007 @@ -0,0 +1,9 @@ +<component-set> + <components> + <component> + <role>org.codehaus.plexus.jdo.JdoFactory</role> + <role-hint>archiva</role-hint> + <implementation>org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory</implementation> + </component> + </components> +</component-set> Propchange: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/META-INF/plexus/components.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/META-INF/plexus/components.xml ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Propchange: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/META-INF/plexus/components.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/log4j.properties URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/log4j.properties?view=auto&rev=507550 ============================================================================== --- maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/log4j.properties (added) +++ maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/log4j.properties Wed Feb 14 06:44:59 2007 @@ -0,0 +1,10 @@ +# Set root logger level to DEBUG and its only appender to A1. +log4j.rootLogger=WARN, A1 + +# A1 is set to be a ConsoleAppender. +log4j.appender.A1=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n + Modified: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.xml URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.xml?view=diff&rev=507550&r1=507549&r2=507550 ============================================================================== --- maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.xml (original) +++ maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/DuplicateArtifactFileReportProcessorTest.xml Wed Feb 14 06:44:59 2007 @@ -28,9 +28,15 @@ <requirement> <role>org.codehaus.plexus.digest.Digester</role> <role-hint>md5</role-hint> + <field-name>digester</field-name> </requirement> <requirement> <role>org.apache.maven.archiva.indexer.RepositoryArtifactIndexFactory</role> + <field-name>indexFactory</field-name> + </requirement> + <requirement> + <role>org.apache.maven.archiva.reporting.database.ArtifactResultsDatabase</role> + <field-name>database</field-name> </requirement> </requirements> <configuration> Modified: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.xml URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.xml?view=diff&rev=507550&r1=507549&r2=507550 ============================================================================== --- maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.xml (original) +++ maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/OldArtifactReportProcessorTest.xml Wed Feb 14 06:44:59 2007 @@ -24,6 +24,12 @@ <role>org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor</role> <role-hint>old-artifact</role-hint> <implementation>org.apache.maven.archiva.reporting.processor.OldArtifactReportProcessor</implementation> + <requirements> + <requirement> + <role>org.apache.maven.archiva.reporting.database.ArtifactResultsDatabase</role> + <field-name>database</field-name> + </requirement> + </requirements> <configuration> <maxAge>10</maxAge> </configuration> Modified: maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.xml URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.xml?view=diff&rev=507550&r1=507549&r2=507550 ============================================================================== --- maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.xml (original) +++ maven/archiva/branches/archiva-MRM-239/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/processor/OldSnapshotArtifactReportProcessorTest.xml Wed Feb 14 06:44:59 2007 @@ -24,6 +24,12 @@ <role>org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor</role> <role-hint>old-snapshot-artifact</role-hint> <implementation>org.apache.maven.archiva.reporting.processor.OldSnapshotArtifactReportProcessor</implementation> + <requirements> + <requirement> + <role>org.apache.maven.archiva.reporting.database.ArtifactResultsDatabase</role> + <field-name>database</field-name> + </requirement> + </requirements> <configuration> <maxAge>3600</maxAge> <maxSnapshots>2</maxSnapshots> Modified: maven/archiva/branches/archiva-MRM-239/archiva-webapp/pom.xml URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-webapp/pom.xml?view=diff&rev=507550&r1=507549&r2=507550 ============================================================================== --- maven/archiva/branches/archiva-MRM-239/archiva-webapp/pom.xml (original) +++ maven/archiva/branches/archiva-MRM-239/archiva-webapp/pom.xml Wed Feb 14 06:44:59 2007 @@ -168,6 +168,7 @@ <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> + <version>10.1.3.1</version> <scope>provided</scope> </dependency> <dependency> Modified: maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/AuditLog.java URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/AuditLog.java?view=diff&rev=507550&r1=507549&r2=507550 ============================================================================== --- maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/AuditLog.java (original) +++ maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/AuditLog.java Wed Feb 14 06:44:59 2007 @@ -35,7 +35,7 @@ /** * AuditLog - Audit Log. * - * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> + * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> * @version $Id$ * * @plexus.component role="org.apache.maven.archiva.web.repository.AuditLog" Modified: maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java?view=diff&rev=507550&r1=507549&r2=507550 ============================================================================== --- maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java (original) +++ maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java Wed Feb 14 06:44:59 2007 @@ -49,7 +49,7 @@ /** * ProxiedDavServer * - * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> + * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> * @version $Id$ * @plexus.component role="org.codehaus.plexus.webdav.DavServerComponent" * role-hint="proxied" Modified: maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java?view=diff&rev=507550&r1=507549&r2=507550 ============================================================================== --- maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java (original) +++ maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java Wed Feb 14 06:44:59 2007 @@ -52,7 +52,7 @@ /** * RepositoryServlet * - * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> + * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> * @version $Id$ */ public class RepositoryServlet Modified: maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java?view=diff&rev=507550&r1=507549&r2=507550 ============================================================================== --- maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java (original) +++ maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java Wed Feb 14 06:44:59 2007 @@ -44,7 +44,7 @@ /** * DownloadArtifact * - * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> + * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> * @version $Id$ * * @plexus.component role="com.opensymphony.webwork.components.Component" role-hint="download-artifact" Modified: maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java?view=diff&rev=507550&r1=507549&r2=507550 ============================================================================== --- maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java (original) +++ maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java Wed Feb 14 06:44:59 2007 @@ -27,7 +27,7 @@ /** * DownloadArtifactTag * - * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> + * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> * @version $Id$ */ public class DownloadArtifactTag Modified: maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/ExpressionTool.java URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/ExpressionTool.java?view=diff&rev=507550&r1=507549&r2=507550 ============================================================================== --- maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/ExpressionTool.java (original) +++ maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/ExpressionTool.java Wed Feb 14 06:44:59 2007 @@ -29,7 +29,7 @@ /** * ExpressionTool * - * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> + * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> * @version $Id$ */ public class ExpressionTool Modified: maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java?view=diff&rev=507550&r1=507549&r2=507550 ============================================================================== --- maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java (original) +++ maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java Wed Feb 14 06:44:59 2007 @@ -33,7 +33,7 @@ /** * GroupIdLink * - * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> + * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> * @version $Id$ */ public class GroupIdLink Modified: maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLinkTag.java URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLinkTag.java?view=diff&rev=507550&r1=507549&r2=507550 ============================================================================== --- maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLinkTag.java (original) +++ maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLinkTag.java Wed Feb 14 06:44:59 2007 @@ -29,7 +29,7 @@ /** * GroupIdLink * - * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> + * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> * @version $Id$ */ public class GroupIdLinkTag Modified: maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/PlexusTagUtil.java URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/PlexusTagUtil.java?view=diff&rev=507550&r1=507549&r2=507550 ============================================================================== --- maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/PlexusTagUtil.java (original) +++ maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/PlexusTagUtil.java Wed Feb 14 06:44:59 2007 @@ -29,7 +29,7 @@ /** * PlexusTagUtil * - * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> + * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> * @version $Id$ */ public class PlexusTagUtil Modified: maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/META-INF/plexus/application.xml URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=507550&r1=507549&r2=507550 ============================================================================== --- maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/META-INF/plexus/application.xml (original) +++ maven/archiva/branches/archiva-MRM-239/archiva-webapp/src/main/resources/META-INF/plexus/application.xml Wed Feb 14 06:44:59 2007 @@ -251,7 +251,7 @@ </component> <component> <role>org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor</role> - <role-hint>indexer</role-hint> + <role-hint>data-refresh</role-hint> </component> </load-on-start> </plexus> Modified: maven/archiva/branches/archiva-MRM-239/pom.xml URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-MRM-239/pom.xml?view=diff&rev=507550&r1=507549&r2=507550 ============================================================================== --- maven/archiva/branches/archiva-MRM-239/pom.xml (original) +++ maven/archiva/branches/archiva-MRM-239/pom.xml Wed Feb 14 06:44:59 2007 @@ -532,6 +532,18 @@ </snapshots> </repository> </repositories> + <pluginRepositories> + <pluginRepository> + <id>codehaus.org</id> + <url>http://snapshots.repository.codehaus.org</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> <properties> <maven.version>2.0.4</maven.version> <wagon.version>1.0-beta-2</wagon.version>
