You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2011/06/15 11:36:07 UTC
svn commit: r1135978 [2/2] - in /archiva/trunk: ./
archiva-modules/archiva-base/ archiva-modules/archiva-base/archiva-common/
archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/
archiva-modules/archiva-base/...
Added: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java?rev=1135978&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java (added)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MockWagon.java Wed Jun 15 09:36:05 2011
@@ -0,0 +1,190 @@
+package org.apache.archiva.metadata.repository.storage.maven2;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.maven.wagon.ConnectionException;
+import org.apache.maven.wagon.ResourceDoesNotExistException;
+import org.apache.maven.wagon.TransferFailedException;
+import org.apache.maven.wagon.Wagon;
+import org.apache.maven.wagon.authentication.AuthenticationException;
+import org.apache.maven.wagon.authentication.AuthenticationInfo;
+import org.apache.maven.wagon.authorization.AuthorizationException;
+import org.apache.maven.wagon.events.SessionListener;
+import org.apache.maven.wagon.events.TransferListener;
+import org.apache.maven.wagon.proxy.ProxyInfo;
+import org.apache.maven.wagon.proxy.ProxyInfoProvider;
+import org.apache.maven.wagon.repository.Repository;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+public class MockWagon
+ implements Wagon
+{
+ public void get( String s, File file )
+ throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
+ {
+ String sourceFile = getBasedir() + "/target/test-classes/" + s;
+
+ try
+ {
+ FileUtils.copyFile( new File( sourceFile ), file );
+ assert( file.exists() );
+ }
+ catch( IOException e )
+ {
+ throw new ResourceDoesNotExistException( e.getMessage() );
+ }
+ }
+
+ public boolean getIfNewer( String s, File file, long l )
+ throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
+ {
+ return false;
+ }
+
+ public void put( File file, String s )
+ throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
+ {
+
+ }
+
+ public void putDirectory( File file, String s )
+ throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
+ {
+
+ }
+
+ public boolean resourceExists( String s )
+ throws TransferFailedException, AuthorizationException
+ {
+ return false;
+ }
+
+ public List getFileList( String s )
+ throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
+ {
+ return null;
+ }
+
+ public boolean supportsDirectoryCopy()
+ {
+ return false;
+ }
+
+ public Repository getRepository()
+ {
+ return null;
+ }
+
+ public void connect( Repository repository )
+ throws ConnectionException, AuthenticationException
+ {
+
+ }
+
+ public void connect( Repository repository, ProxyInfo proxyInfo )
+ throws ConnectionException, AuthenticationException
+ {
+
+ }
+
+ public void connect( Repository repository, ProxyInfoProvider proxyInfoProvider )
+ throws ConnectionException, AuthenticationException
+ {
+
+ }
+
+ public void connect( Repository repository, AuthenticationInfo authenticationInfo )
+ throws ConnectionException, AuthenticationException
+ {
+
+ }
+
+ public void connect( Repository repository, AuthenticationInfo authenticationInfo, ProxyInfo proxyInfo )
+ throws ConnectionException, AuthenticationException
+ {
+
+ }
+
+ public void connect( Repository repository, AuthenticationInfo authenticationInfo,
+ ProxyInfoProvider proxyInfoProvider )
+ throws ConnectionException, AuthenticationException
+ {
+
+ }
+
+ public void openConnection()
+ throws ConnectionException, AuthenticationException
+ {
+
+ }
+
+ public void disconnect()
+ throws ConnectionException
+ {
+
+ }
+
+ public void setTimeout( int i )
+ {
+
+ }
+
+ public int getTimeout()
+ {
+ return 0;
+ }
+
+ public void addSessionListener( SessionListener sessionListener )
+ {
+
+ }
+
+ public void removeSessionListener( SessionListener sessionListener )
+ {
+
+ }
+
+ public boolean hasSessionListener( SessionListener sessionListener )
+ {
+ return false;
+ }
+
+ public void addTransferListener( TransferListener transferListener )
+ {
+
+ }
+
+ public void removeTransferListener( TransferListener transferListener )
+ {
+
+ }
+
+ public boolean hasTransferListener( TransferListener transferListener )
+ {
+ return false;
+ }
+
+ public boolean isInteractive()
+ {
+ return false;
+ }
+
+ public void setInteractive( boolean b )
+ {
+
+ }
+
+ public String getBasedir()
+ {
+ String basedir = System.getProperty( "basedir" );
+
+ if ( basedir == null )
+ {
+ basedir = new File( "" ).getAbsolutePath();
+ }
+
+ return basedir;
+ }
+}
Added: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.jar
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.jar?rev=1135978&view=auto
==============================================================================
Binary file - no diff available.
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.jar.md5
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.jar.md5?rev=1135978&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.jar.md5 (added)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.jar.md5 Wed Jun 15 09:36:05 2011
@@ -0,0 +1 @@
+37786de9e272ed6db8541855e0e2d5dc
Added: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.jar.sha1
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.jar.sha1?rev=1135978&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.jar.sha1 (added)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.jar.sha1 Wed Jun 15 09:36:05 2011
@@ -0,0 +1 @@
+bb1ca7834422926d0cb79ef303b715bc17f41661
Added: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom?rev=1135978&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom (added)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom Wed Jun 15 09:36:05 2011
@@ -0,0 +1,19 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.example.test</groupId>
+ <artifactId>test-artifact-root</artifactId>
+ <version>1.0</version>
+ </parent>
+ <artifactId>test-artifact-module-a</artifactId>
+ <packaging>jar</packaging>
+ <name>Test Artifact :: Module A</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Added: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom.md5
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom.md5?rev=1135978&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom.md5 (added)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom.md5 Wed Jun 15 09:36:05 2011
@@ -0,0 +1 @@
+61a4d030260fc6bee0681cf99ba54674
Added: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom.sha1
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom.sha1?rev=1135978&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom.sha1 (added)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-module-a/1.0/test-artifact-module-a-1.0.pom.sha1 Wed Jun 15 09:36:05 2011
@@ -0,0 +1 @@
+6f54bc4223bc39d7880420f66baa3a24d7f9c181
Added: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom?rev=1135978&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom (added)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom Wed Jun 15 09:36:05 2011
@@ -0,0 +1,41 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.example.test</groupId>
+ <artifactId>test-artifact-parent</artifactId>
+ <version>1</version>
+ <packaging>pom</packaging>
+ <name>Test Artifact :: Parent</name>
+ <description>This is the uber parent POM.</description>
+ <url>http://test.com</url>
+ <scm>
+ <connection>scm:svn:http://svn.example.com/repos/test-artifact-parent/trunk</connection>
+ <developerConnection>scm:svn:https://svn.example.com/repos/test-artifact-parent/trunk</developerConnection>
+ <url>http://svn.example.com/repos/test-artifact-parent/trunk</url>
+ </scm>
+ <distributionManagement>
+ <repository>
+ <id>releases</id>
+ <name>Releases Repository</name>
+ <url>http://repo.test.com/archiva/repository/releases</url>
+ </repository>
+ <snapshotRepository>
+ <id>snapshots</id>
+ <name>Snapshots Repository</name>
+ <url>http://repo.test.com/archiva/repository/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+ <developers>
+ <developer>
+ <id>jsmith</id>
+ <name>John Smith</name>
+ <email>jsmith@mail.com</email>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
+</project>
Added: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom.md5
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom.md5?rev=1135978&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom.md5 (added)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom.md5 Wed Jun 15 09:36:05 2011
@@ -0,0 +1 @@
+92c60efe85e23fe5afd8a854cea87209
Added: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom.sha1
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom.sha1?rev=1135978&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom.sha1 (added)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-parent/1/test-artifact-parent-1.pom.sha1 Wed Jun 15 09:36:05 2011
@@ -0,0 +1 @@
+6eca3509acf66023c29e2bc17f73e79d1d1a341a
Added: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom?rev=1135978&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom (added)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom Wed Jun 15 09:36:05 2011
@@ -0,0 +1,40 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.example.test</groupId>
+ <artifactId>test-artifact-parent</artifactId>
+ <version>1</version>
+ </parent>
+ <artifactId>test-artifact-root</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+ <name>Test Artifact :: Root</name>
+ <description>This is the Test project.</description>
+ <modules>
+ <module>test-artifact-module-a</module>
+ <module>test-artifact-module-b</module>
+ </modules>
+ <scm>
+ <connection>scm:svn:http://svn.example.com/repos/test-artifact/trunk</connection>
+ <developerConnection>scm:svn:https://svn.example.com/repos/test-artifact/trunk</developerConnection>
+ <url>http://svn.example.com/repos/test-artifact/trunk</url>
+ </scm>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom.md5
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom.md5?rev=1135978&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom.md5 (added)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom.md5 Wed Jun 15 09:36:05 2011
@@ -0,0 +1 @@
+034449f8696981edce2485b841a02a47
Added: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom.sha1
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom.sha1?rev=1135978&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom.sha1 (added)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/com/example/test/test-artifact-root/1.0/test-artifact-root-1.0.pom.sha1 Wed Jun 15 09:36:05 2011
@@ -0,0 +1 @@
+bef26aec1a0714cec7fa56cdbb7ebcdb452295eb
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1135978&r1=1135977&r2=1135978&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Wed Jun 15 09:36:05 2011
@@ -274,7 +274,7 @@
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-plexus-bridge</artifactId>
- <version>${project.version}</version>
+ <version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
@@ -293,6 +293,11 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-proxy-common</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-repository-layer</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>