maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r682819 - in /maven/artifact/branches/MNG-2477: ./ src/main/java/org/apache/maven/artifact/manager/ src/test/java/org/apache/maven/artifact/manager/ src/test/resources/
Date Tue, 05 Aug 2008 17:34:07 GMT
Author: brett
Date: Tue Aug  5 10:34:07 2008
New Revision: 682819

URL: http://svn.apache.org/viewvc?rev=682819&view=rev
Log:
[MNG-2477] move classes into artifact

Added:
    maven/artifact/branches/MNG-2477/src/main/java/org/apache/maven/artifact/manager/WagonOpenPgpSignatureVerifierObserver.java
      - copied, changed from r677161, maven/sandbox/trunk/wagon/wagon-openpgp/src/main/java/org/apache/maven/wagon/openpgp/WagonOpenPgpSignatureVerifierObserver.java
    maven/artifact/branches/MNG-2477/src/main/java/org/apache/maven/artifact/manager/WagonOpenPgpSignerObserver.java
      - copied, changed from r677161, maven/sandbox/trunk/wagon/wagon-openpgp/src/main/java/org/apache/maven/wagon/openpgp/WagonOpenPgpSignerObserver.java
    maven/artifact/branches/MNG-2477/src/test/java/org/apache/maven/artifact/manager/WagonOpenPgpObserverTest.java
      - copied, changed from r677161, maven/sandbox/trunk/wagon/wagon-openpgp/src/test/java/org/apache/maven/wagon/openpgp/WagonOpenPgpObserverTest.java
    maven/artifact/branches/MNG-2477/src/test/resources/test-input.txt
      - copied unchanged from r677161, maven/sandbox/trunk/wagon/wagon-openpgp/src/test/resources/test-input.txt
    maven/artifact/branches/MNG-2477/src/test/resources/test-input.txt.asc
      - copied unchanged from r677161, maven/sandbox/trunk/wagon/wagon-openpgp/src/test/resources/test-input.txt.asc
    maven/artifact/branches/MNG-2477/src/test/resources/test-input.txt.sig
      - copied unchanged from r677161, maven/sandbox/trunk/wagon/wagon-openpgp/src/test/resources/test-input.txt.sig
Modified:
    maven/artifact/branches/MNG-2477/pom.xml
    maven/artifact/branches/MNG-2477/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java

Modified: maven/artifact/branches/MNG-2477/pom.xml
URL: http://svn.apache.org/viewvc/maven/artifact/branches/MNG-2477/pom.xml?rev=682819&r1=682818&r2=682819&view=diff
==============================================================================
--- maven/artifact/branches/MNG-2477/pom.xml (original)
+++ maven/artifact/branches/MNG-2477/pom.xml Tue Aug  5 10:34:07 2008
@@ -85,12 +85,9 @@
       <version>${wagon.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-openpgp</artifactId>
-      <!-- 
-      <version>${wagon.version}</version>
-       -->
-      <version>1.0-beta-4-SNAPSHOT</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-openpgp</artifactId>
+      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>aspectj</groupId>

Modified: maven/artifact/branches/MNG-2477/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/MNG-2477/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=682819&r1=682818&r2=682819&view=diff
==============================================================================
--- maven/artifact/branches/MNG-2477/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
(original)
+++ maven/artifact/branches/MNG-2477/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Tue Aug  5 10:34:07 2008
@@ -53,7 +53,6 @@
 import org.apache.maven.wagon.authorization.AuthorizationException;
 import org.apache.maven.wagon.events.TransferListener;
 import org.apache.maven.wagon.observers.ChecksumObserver;
-import org.apache.maven.wagon.openpgp.WagonOpenPgpSignatureVerifierObserver;
 import org.apache.maven.wagon.proxy.ProxyInfo;
 import org.apache.maven.wagon.repository.Repository;
 import org.apache.maven.wagon.repository.RepositoryPermissions;

Copied: maven/artifact/branches/MNG-2477/src/main/java/org/apache/maven/artifact/manager/WagonOpenPgpSignatureVerifierObserver.java
(from r677161, maven/sandbox/trunk/wagon/wagon-openpgp/src/main/java/org/apache/maven/wagon/openpgp/WagonOpenPgpSignatureVerifierObserver.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/MNG-2477/src/main/java/org/apache/maven/artifact/manager/WagonOpenPgpSignatureVerifierObserver.java?p2=maven/artifact/branches/MNG-2477/src/main/java/org/apache/maven/artifact/manager/WagonOpenPgpSignatureVerifierObserver.java&p1=maven/sandbox/trunk/wagon/wagon-openpgp/src/main/java/org/apache/maven/wagon/openpgp/WagonOpenPgpSignatureVerifierObserver.java&r1=677161&r2=682819&rev=682819&view=diff
==============================================================================
--- maven/sandbox/trunk/wagon/wagon-openpgp/src/main/java/org/apache/maven/wagon/openpgp/WagonOpenPgpSignatureVerifierObserver.java
(original)
+++ maven/artifact/branches/MNG-2477/src/main/java/org/apache/maven/artifact/manager/WagonOpenPgpSignatureVerifierObserver.java
Tue Aug  5 10:34:07 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.wagon.openpgp;
+package org.apache.maven.artifact.manager;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: maven/artifact/branches/MNG-2477/src/main/java/org/apache/maven/artifact/manager/WagonOpenPgpSignerObserver.java
(from r677161, maven/sandbox/trunk/wagon/wagon-openpgp/src/main/java/org/apache/maven/wagon/openpgp/WagonOpenPgpSignerObserver.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/MNG-2477/src/main/java/org/apache/maven/artifact/manager/WagonOpenPgpSignerObserver.java?p2=maven/artifact/branches/MNG-2477/src/main/java/org/apache/maven/artifact/manager/WagonOpenPgpSignerObserver.java&p1=maven/sandbox/trunk/wagon/wagon-openpgp/src/main/java/org/apache/maven/wagon/openpgp/WagonOpenPgpSignerObserver.java&r1=677161&r2=682819&rev=682819&view=diff
==============================================================================
--- maven/sandbox/trunk/wagon/wagon-openpgp/src/main/java/org/apache/maven/wagon/openpgp/WagonOpenPgpSignerObserver.java
(original)
+++ maven/artifact/branches/MNG-2477/src/main/java/org/apache/maven/artifact/manager/WagonOpenPgpSignerObserver.java
Tue Aug  5 10:34:07 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.wagon.openpgp;
+package org.apache.maven.artifact.manager;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: maven/artifact/branches/MNG-2477/src/test/java/org/apache/maven/artifact/manager/WagonOpenPgpObserverTest.java
(from r677161, maven/sandbox/trunk/wagon/wagon-openpgp/src/test/java/org/apache/maven/wagon/openpgp/WagonOpenPgpObserverTest.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/MNG-2477/src/test/java/org/apache/maven/artifact/manager/WagonOpenPgpObserverTest.java?p2=maven/artifact/branches/MNG-2477/src/test/java/org/apache/maven/artifact/manager/WagonOpenPgpObserverTest.java&p1=maven/sandbox/trunk/wagon/wagon-openpgp/src/test/java/org/apache/maven/wagon/openpgp/WagonOpenPgpObserverTest.java&r1=677161&r2=682819&rev=682819&view=diff
==============================================================================
--- maven/sandbox/trunk/wagon/wagon-openpgp/src/test/java/org/apache/maven/wagon/openpgp/WagonOpenPgpObserverTest.java
(original)
+++ maven/artifact/branches/MNG-2477/src/test/java/org/apache/maven/artifact/manager/WagonOpenPgpObserverTest.java
Tue Aug  5 10:34:07 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.wagon.openpgp;
+package org.apache.maven.artifact.manager;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,7 +26,6 @@
 import org.apache.commons.openpgp.OpenPgpSignatureVerifier;
 import org.apache.commons.openpgp.SignatureStatus;
 import org.apache.maven.wagon.ConnectionException;
-import org.apache.maven.wagon.FileTestUtils;
 import org.apache.maven.wagon.ResourceDoesNotExistException;
 import org.apache.maven.wagon.TransferFailedException;
 import org.apache.maven.wagon.Wagon;
@@ -72,7 +71,7 @@
 
         wagon.addTransferListener( observer );
 
-        File tempDir = new File( FileTestUtils.getTestOutputDir(), "openpgp-repo" );
+        File tempDir = getTestFile( "target/test-data/openpgp-repo" );
         tempDir.mkdirs();
         tempDir.deleteOnExit();
 
@@ -117,7 +116,7 @@
 
         wagon.addTransferListener( observer );
 
-        File tempDir = new File( FileTestUtils.getTestOutputDir(), "openpgp-repo" );
+        File tempDir = getTestFile( "target/test-data/openpgp-repo" );
         tempDir.mkdirs();
         tempDir.deleteOnExit();
 



Mime
View raw message