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 2006/10/30 20:32:44 UTC
svn commit: r469245 - in /maven/archiva/trunk: ./
archiva-converter/src/main/java/org/apache/maven/archiva/converter/
archiva-converter/src/test/resources/org/apache/maven/archiva/converter/
archiva-indexer/ archiva-indexer/src/main/java/org/apache/mav...
Author: joakime
Date: Mon Oct 30 11:32:43 2006
New Revision: 469245
URL: http://svn.apache.org/viewvc?view=rev&rev=469245
Log:
Moving from internal Digest routines to plexus-digest.
Removed:
maven/archiva/trunk/archiva-utils/src/main/java/org/
maven/archiva/trunk/archiva-utils/src/test/java/org/
Modified:
maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java
maven/archiva/trunk/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml
maven/archiva/trunk/archiva-indexer/pom.xml
maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/AbstractArtifactIndexRecordFactory.java
maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactory.java
maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactory.java
maven/archiva/trunk/archiva-proxy/pom.xml
maven/archiva/trunk/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumArtifactReportProcessor.java
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumMetadataReportProcessor.java
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessor.java
maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractChecksumArtifactReporterTestCase.java
maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ChecksumArtifactReporterTest.java
maven/archiva/trunk/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml
maven/archiva/trunk/pom.xml
Modified: maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java?view=diff&rev=469245&r1=469244&r2=469245
==============================================================================
--- maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java (original)
+++ maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java Mon Oct 30 11:32:43 2006
@@ -17,8 +17,6 @@
*/
import org.apache.maven.archiva.converter.transaction.FileTransaction;
-import org.apache.maven.archiva.digest.Digester;
-import org.apache.maven.archiva.digest.DigesterException;
import org.apache.maven.archiva.reporting.ReportingDatabase;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -39,6 +37,8 @@
import org.apache.maven.model.converter.PomTranslationException;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.model.v3_0_0.io.xpp3.MavenXpp3Reader;
+import org.codehaus.plexus.digest.Digester;
+import org.codehaus.plexus.digest.DigesterException;
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
Modified: maven/archiva/trunk/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml?view=diff&rev=469245&r1=469244&r2=469245
==============================================================================
--- maven/archiva/trunk/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml (original)
+++ maven/archiva/trunk/archiva-converter/src/test/resources/org/apache/maven/archiva/converter/RepositoryConverterTest.xml Mon Oct 30 11:32:43 2006
@@ -26,12 +26,12 @@
</configuration>
<requirements>
<requirement>
- <role>org.apache.maven.archiva.digest.Digester</role>
+ <role>org.codehaus.plexus.digest.Digester</role>
<role-hint>sha1</role-hint>
<field-name>sha1Digester</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.digest.Digester</role>
+ <role>org.codehaus.plexus.digest.Digester</role>
<role-hint>md5</role-hint>
<field-name>md5Digester</field-name>
</requirement>
@@ -58,12 +58,12 @@
</configuration>
<requirements>
<requirement>
- <role>org.apache.maven.archiva.digest.Digester</role>
+ <role>org.codehaus.plexus.digest.Digester</role>
<role-hint>sha1</role-hint>
<field-name>sha1Digester</field-name>
</requirement>
<requirement>
- <role>org.apache.maven.archiva.digest.Digester</role>
+ <role>org.codehaus.plexus.digest.Digester</role>
<role-hint>md5</role-hint>
<field-name>md5Digester</field-name>
</requirement>
@@ -82,4 +82,4 @@
</requirements>
</component>
</components>
-</component-set>
\ No newline at end of file
+</component-set>
Modified: maven/archiva/trunk/archiva-indexer/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-indexer/pom.xml?view=diff&rev=469245&r1=469244&r2=469245
==============================================================================
--- maven/archiva/trunk/archiva-indexer/pom.xml (original)
+++ maven/archiva/trunk/archiva-indexer/pom.xml Mon Oct 30 11:32:43 2006
@@ -60,6 +60,10 @@
<artifactId>archiva-utils</artifactId>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-digest</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-repository-metadata</artifactId>
</dependency>
Modified: maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/AbstractArtifactIndexRecordFactory.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/AbstractArtifactIndexRecordFactory.java?view=diff&rev=469245&r1=469244&r2=469245
==============================================================================
--- maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/AbstractArtifactIndexRecordFactory.java (original)
+++ maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/AbstractArtifactIndexRecordFactory.java Mon Oct 30 11:32:43 2006
@@ -16,8 +16,8 @@
* limitations under the License.
*/
-import org.apache.maven.archiva.digest.Digester;
-import org.apache.maven.archiva.digest.DigesterException;
+import org.codehaus.plexus.digest.Digester;
+import org.codehaus.plexus.digest.DigesterException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import java.io.File;
Modified: maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactory.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactory.java?view=diff&rev=469245&r1=469244&r2=469245
==============================================================================
--- maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactory.java (original)
+++ maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/MinimalArtifactIndexRecordFactory.java Mon Oct 30 11:32:43 2006
@@ -16,8 +16,8 @@
* limitations under the License.
*/
-import org.apache.maven.archiva.digest.Digester;
import org.apache.maven.artifact.Artifact;
+import org.codehaus.plexus.digest.Digester;
import java.io.File;
import java.io.IOException;
Modified: maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactory.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactory.java?view=diff&rev=469245&r1=469244&r2=469245
==============================================================================
--- maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactory.java (original)
+++ maven/archiva/trunk/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/record/StandardArtifactIndexRecordFactory.java Mon Oct 30 11:32:43 2006
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import org.apache.maven.archiva.digest.Digester;
import org.apache.maven.archiva.indexer.RepositoryIndexException;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -27,6 +26,7 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
+import org.codehaus.plexus.digest.Digester;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
Modified: maven/archiva/trunk/archiva-proxy/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-proxy/pom.xml?view=diff&rev=469245&r1=469244&r2=469245
==============================================================================
--- maven/archiva/trunk/archiva-proxy/pom.xml (original)
+++ maven/archiva/trunk/archiva-proxy/pom.xml Mon Oct 30 11:32:43 2006
@@ -44,6 +44,10 @@
<artifactId>wagon-provider-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-digest</artifactId>
+ </dependency>
+ <dependency>
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
<version>1.2_Java1.3</version>
Modified: maven/archiva/trunk/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java?view=diff&rev=469245&r1=469244&r2=469245
==============================================================================
--- maven/archiva/trunk/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java (original)
+++ maven/archiva/trunk/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java Mon Oct 30 11:32:43 2006
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import org.apache.maven.archiva.digest.DigestUtils;
-import org.apache.maven.archiva.digest.DigesterException;
import org.apache.maven.archiva.discoverer.ArtifactDiscoverer;
import org.apache.maven.archiva.discoverer.DiscovererException;
import org.apache.maven.artifact.Artifact;
@@ -40,6 +38,8 @@
import org.apache.maven.wagon.observers.ChecksumObserver;
import org.apache.maven.wagon.proxy.ProxyInfo;
import org.apache.maven.wagon.repository.Repository;
+import org.codehaus.plexus.digest.DigestUtils;
+import org.codehaus.plexus.digest.DigesterException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
Modified: maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumArtifactReportProcessor.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumArtifactReportProcessor.java?view=diff&rev=469245&r1=469244&r2=469245
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumArtifactReportProcessor.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumArtifactReportProcessor.java Mon Oct 30 11:32:43 2006
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-import org.apache.maven.archiva.digest.Digester;
-import org.apache.maven.archiva.digest.DigesterException;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Model;
+import org.codehaus.plexus.digest.Digester;
+import org.codehaus.plexus.digest.DigesterException;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
Modified: maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumMetadataReportProcessor.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumMetadataReportProcessor.java?view=diff&rev=469245&r1=469244&r2=469245
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumMetadataReportProcessor.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/ChecksumMetadataReportProcessor.java Mon Oct 30 11:32:43 2006
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import org.apache.maven.archiva.digest.Digester;
-import org.apache.maven.archiva.digest.DigesterException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
+import org.codehaus.plexus.digest.Digester;
+import org.codehaus.plexus.digest.DigesterException;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
Modified: maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessor.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessor.java?view=diff&rev=469245&r1=469244&r2=469245
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessor.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessor.java Mon Oct 30 11:32:43 2006
@@ -18,8 +18,6 @@
import org.apache.lucene.index.Term;
import org.apache.lucene.search.TermQuery;
-import org.apache.maven.archiva.digest.Digester;
-import org.apache.maven.archiva.digest.DigesterException;
import org.apache.maven.archiva.indexer.RepositoryArtifactIndex;
import org.apache.maven.archiva.indexer.RepositoryArtifactIndexFactory;
import org.apache.maven.archiva.indexer.RepositoryIndexSearchException;
@@ -29,6 +27,8 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Model;
+import org.codehaus.plexus.digest.Digester;
+import org.codehaus.plexus.digest.DigesterException;
import java.io.File;
import java.util.Iterator;
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractChecksumArtifactReporterTestCase.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractChecksumArtifactReporterTestCase.java?view=diff&rev=469245&r1=469244&r2=469245
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractChecksumArtifactReporterTestCase.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/AbstractChecksumArtifactReporterTestCase.java Mon Oct 30 11:32:43 2006
@@ -16,8 +16,8 @@
* limitations under the License.
*/
-import org.apache.maven.archiva.digest.Digester;
-import org.apache.maven.archiva.digest.DigesterException;
+import org.codehaus.plexus.digest.Digester;
+import org.codehaus.plexus.digest.DigesterException;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ChecksumArtifactReporterTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ChecksumArtifactReporterTest.java?view=diff&rev=469245&r1=469244&r2=469245
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ChecksumArtifactReporterTest.java (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/ChecksumArtifactReporterTest.java Mon Oct 30 11:32:43 2006
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-import org.apache.maven.archiva.digest.DigesterException;
import org.apache.maven.archiva.reporting.model.MetadataResults;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.GroupRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
+import org.codehaus.plexus.digest.DigesterException;
import java.io.File;
import java.io.IOException;
Modified: maven/archiva/trunk/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml?view=diff&rev=469245&r1=469244&r2=469245
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml (original)
+++ maven/archiva/trunk/archiva-reports-standard/src/test/resources/org/apache/maven/archiva/reporting/DuplicateArtifactFileReportProcessorTest.xml Mon Oct 30 11:32:43 2006
@@ -23,7 +23,7 @@
<implementation>org.apache.maven.archiva.reporting.DuplicateArtifactFileReportProcessor</implementation>
<requirements>
<requirement>
- <role>org.apache.maven.archiva.digest.Digester</role>
+ <role>org.codehaus.plexus.digest.Digester</role>
<role-hint>md5</role-hint>
</requirement>
<requirement>
Modified: maven/archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/pom.xml?view=diff&rev=469245&r1=469244&r2=469245
==============================================================================
--- maven/archiva/trunk/pom.xml (original)
+++ maven/archiva/trunk/pom.xml Mon Oct 30 11:32:43 2006
@@ -260,6 +260,11 @@
<version>${pom.version}</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-digest</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus.security</groupId>
<artifactId>plexus-security-rbac-profile</artifactId>
<version>${plexus-security.version}</version>