You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wagon-commits@maven.apache.org by jv...@apache.org on 2004/06/09 05:11:23 UTC
cvs commit: maven-wagon/wagon-providers/ssh pom.xml project.properties project.xml
jvanzyl 2004/06/08 20:11:23
Modified: wagon-api/src/main/java/org/apache/maven/wagon
WagonTestCase.java
wagon-api/src/test/java/org/apache/maven/wagon
AbstractWagonTest.java
Added: . pom.xml
wagon-ant pom.xml
wagon-api pom.xml
wagon-providers/ftp pom.xml
wagon-providers/http pom.xml
wagon-providers/ssh pom.xml
Removed: . project.properties project.xml
wagon-ant project.xml
wagon-api project.properties project.xml repositories.xml
wagon-providers/ftp project.properties project.xml
wagon-providers/http project.properties project.xml
wagon-providers/ssh project.properties project.xml
Log:
o doing the pom.xml thing
Revision Changes Path
1.1 maven-wagon/pom.xml
Index: pom.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<project>
<pomVersion>3</pomVersion>
<groupId>maven</groupId>
<artifactId>wagon</artifactId>
<name>Wagon</name>
<currentVersion>0.9-SNAPSHOT</currentVersion>
<description></description>
<shortDescription>Tools to manage artifacts and deployment</shortDescription>
<package>org.apache.maven.wagon</package>
<inceptionYear>2003</inceptionYear>
<organization>
<name>Apache Software Foundation</name>
<url>http://www.apache.org/</url>
<logo>http://maven.apache.org/images/apache-maven-project.png</logo>
</organization>
<mailingLists>
<mailingList>
<name>Wgaon User List</name>
<subscribe>wagon-users-subscribe@maven.apache.org</subscribe>
<unsubscribe>wagon-users-unsubscribe@maven.apache.org</unsubscribe>
<archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=wagon-users@maven.apache.org</archive>
</mailingList>
<mailingList>
<name>Wagon Developer List</name>
<subscribe>wagon-dev-subscribe@maven.apache.org</subscribe>
<unsubscribe>wagon-dev-unsubscribe@maven.apache.org</unsubscribe>
<archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=wagon-dev@maven.apache.org</archive>
</mailingList>
</mailingLists>
<developers>
<developer>
<name>Michal Maczka</name>
<id>michal</id>
<email>michal@dimatics.com</email>
<organization>Dimatics</organization>
<roles>
<role>Architect</role>
</roles>
</developer>
</developers>
<licenses>
<license>
<name>The Apache Software License, Version 1.1</name>
<url>http://cvs.apache.org/viewcvs.cgi/*checkout*/maven/LICENSE.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<dependencies>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus</artifactId>
<version>0.14-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
<version>1.1.3.3</version>
</dependency>
<dependency>
<groupId>classworlds</groupId>
<artifactId>classworlds</artifactId>
<version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!-- Testing -->
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/*Test.java</include>
</includes>
<resources>
<resource>
<directory>src/test/resources</directory>
</resource>
<resource>
<directory>src/test/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</resource>
</resources>
</unitTest>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
</build>
</project>
1.1 maven-wagon/wagon-ant/pom.xml
Index: pom.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<project>
<parent>
<groupId>maven</groupId>
<artifactId>wagon</artifactId>
<version>0.9-SNAPSHOT</version>
</parent>
<groupId>maven</groupId>
<artifactId>wagon-ant</artifactId>
<name>Wagon Ant</name>
<currentVersion>0.9-SNAPSHOT</currentVersion>
<description></description>
<shortDescription>Tools to manage artifacts and deployment</shortDescription>
<package>org.apache.maven.wagon.ant</package>
<inceptionYear>2003</inceptionYear>
<dependencies>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus</artifactId>
<version>0.14-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
<version>1.1.3.3</version>
</dependency>
<dependency>
<groupId>classworlds</groupId>
<artifactId>classworlds</artifactId>
<version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>maven</groupId>
<artifactId>wagon-api</artifactId>
<version>0.9-SNAPSHOT</version>
</dependency>
<!-- Ant -->
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>1.6</version>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>1.6</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
<unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
<unitTest>
<includes>
<include>**/*Test.java</include>
</includes>
<resources>
<resource>
<directory>src/test/resources</directory>
</resource>
<resource>
<directory>src/test/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</resource>
</resources>
</unitTest>
<resources>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
</build>
</project>
1.1 maven-wagon/wagon-api/pom.xml
Index: pom.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<project>
<parent>
<groupId>maven</groupId>
<artifactId>wagon</artifactId>
<version>0.9-SNAPSHOT</version>
</parent>
<groupId>maven</groupId>
<artifactId>wagon-api</artifactId>
<name>Wagon API</name>
<version>0.9-SNAPSHOT</version>
<description></description>
<shortDescription>Tools to manage artifacts and deployment</shortDescription>
<description>
Wagon in general utility resource transport framework.
The Wagon API defines
the interfaces, clasess and their respective roles.
</description>
<package>org.apache.maven.wagon</package>
<inceptionYear>2003</inceptionYear>
<url>http://maven.apache.org/wagon/wagon-api</url>
<issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10319</issueTrackingUrl>
<developers>
<developer>
<name>Michal Maczka</name>
<id>michal</id>
<email>michal@dimatics.com</email>
<organization>Dimatics</organization>
<roles>
<role>Architect</role>
</roles>
</developer>
<developer>
<name>Jason van Zyl</name>
<id>jvanzyl</id>
<email>jason@maven.org</email>
<roles>
<role>Developer</role>
</roles>
</developer>
</developers>
</project>
1.8 +6 -4 maven-wagon/wagon-api/src/main/java/org/apache/maven/wagon/WagonTestCase.java
Index: WagonTestCase.java
===================================================================
RCS file: /home/cvs/maven-wagon/wagon-api/src/main/java/org/apache/maven/wagon/WagonTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WagonTestCase.java 3 Jun 2004 18:27:00 -0000 1.7
+++ WagonTestCase.java 9 Jun 2004 03:11:22 -0000 1.8
@@ -39,6 +39,8 @@
public abstract class WagonTestCase
extends PlexusTestCase
{
+ protected static String POM = "pom.xml";
+
protected Repository localRepository;
protected Repository testRepository;
@@ -217,7 +219,7 @@
wagon.connect( testRepository );
- sourceFile = new File( basedir, "project.xml" );
+ sourceFile = new File( basedir, POM );
wagon.put( sourceFile, resource );
@@ -287,7 +289,7 @@
wagon.connect( testRepository );
- artifactSourceFile = new File( basedir, "project.xml" );
+ artifactSourceFile = new File( basedir, POM );
wagon.put( artifactSourceFile, getTestArtifact() );
@@ -355,7 +357,7 @@
{
if ( artifact == null )
{
- //Model model = modelReader.read( new FileReader( new File( basedir, "project.xml" ) ) );
+ //Model model = modelReader.read( new FileReader( new File( basedir, POM ) ) );
artifact = new DefaultArtifact( "groupId", "artifactId", "1.0", "pom" );
}
1.5 +8 -2 maven-wagon/wagon-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java
Index: AbstractWagonTest.java
===================================================================
RCS file: /home/cvs/maven-wagon/wagon-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractWagonTest.java 3 Jun 2004 18:27:01 -0000 1.4
+++ AbstractWagonTest.java 9 Jun 2004 03:11:22 -0000 1.5
@@ -35,11 +35,17 @@
public class AbstractWagonTest extends TestCase
{
private String basedir;
+
private MockWagon wagon = null;
+
private Artifact artifact;
+
private File destination;
+
private File source;
+
private MockSessionListener sessionListener = null;
+
private MockTransferListener transferListener = null;
protected void setUp() throws Exception
@@ -52,7 +58,7 @@
destination = new File( basedir, "target/folder/subfolder" );
- source = new File( basedir, "project.xml" );
+ source = new File( basedir, "pom.xml" );
wagon = new MockWagon();
1.1 maven-wagon/wagon-providers/ftp/pom.xml
Index: pom.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<project>
<parent>
<groupId>maven</groupId>
<artifactId>wagon</artifactId>
<version>0.9-SNAPSHOT</version>
</parent>
<groupId>maven</groupId>
<artifactId>wagon-ftp</artifactId>
<name>Wagon FTP Provider</name>
<version>0.9-SNAPSHOT</version>
<description></description>
<shortDescription>Provider for FTP protocol for Wagon</shortDescription>
<package>org.apache.maven.wagon.providers.ftp</package>
<inceptionYear>2003</inceptionYear>
<url>http://maven.apache.org/wagon/wagon-providers/ftp</url>
<issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10319</issueTrackingUrl>
<siteDirectory>/www/maven.apache.org/wagon/wagon-providers/ftp</siteDirectory>
<repository>
<connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-wagon/wagon-providers/ftp</connection>
<url>http://cvs.apache.org/viewcvs/maven-wagon/wagon-providers/ftp/</url>
</repository>
<developers>
<developer>
<name>Michal Maczka</name>
<id>michal</id>
<email>michal.maczka@dimatics.com</email>
<organization>Dimatics</organization>
<roles>
<role>Creator</role>
<role>Developer</role>
<role>Release Manager</role>
</roles>
</developer>
</developers>
<dependencies>
<dependency>
<groupId>maven</groupId>
<artifactId>wagon-api</artifactId>
<version>0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>1.1.0</version>
</dependency>
<!-- Embedded Ftp Server -->
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-ftp</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>avalon</groupId>
<artifactId>avalon-framework</artifactId>
<version>4.1.4</version>
</dependency>
<dependency>
<groupId>cornerstone-threads</groupId>
<artifactId>cornerstone-threads-api</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>cornerstone-threads</groupId>
<artifactId>cornerstone-threads-impl</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>excalibur-thread</groupId>
<artifactId>excalibur-thread</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>excalibur-pool</groupId>
<artifactId>excalibur-pool-api</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>excalibur-pool</groupId>
<artifactId>excalibur-pool-impl</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>cornerstone-connection</groupId>
<artifactId>cornerstone-connection-api</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>cornerstone-connection</groupId>
<artifactId>cornerstone-connection-impl</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>cornerstone-sockets</groupId>
<artifactId>cornerstone-sockets-api</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>cornerstone-sockets</groupId>
<artifactId>cornerstone-sockets-impl</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-avalon-personality</artifactId>
<version>0.12</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.0</version>
</dependency>
</dependencies>
</project>
1.1 maven-wagon/wagon-providers/http/pom.xml
Index: pom.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<project>
<parent>
<groupId>maven</groupId>
<artifactId>wagon</artifactId>
<version>0.9-SNAPSHOT</version>
</parent>
<groupId>maven</groupId>
<artifactId>wagon-http</artifactId>
<name>Wagon HTTP provider</name>
<version>0.9-SNAPSHOT</version>
<shortDescription>Wagon Provider for HTTP/HTTPS protocols based on jakarta-commons-httpclient</shortDescription>
<package>org.apache.maven.wagon.providers.http</package>
<inceptionYear>2003</inceptionYear>
<url>http://maven.apache.org/wagon/wagon-providers/http</url>
<issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10319</issueTrackingUrl>
<siteDirectory>/www/maven.apache.org/wagon/wagon-providers/http</siteDirectory>
<developers>
<developer>
<name>Michal Maczka</name>
<id>michal</id>
<email>michal.maczka@dimatics.com</email>
<organization>Dimatics</organization>
<roles>
<role>Creator</role>
<role>Developer</role>
<role>Release Manager</role>
</roles>
</developer>
</developers>
<dependencies>
<dependency>
<groupId>maven</groupId>
<artifactId>wagon-api</artifactId>
<version>0.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>2.0-rc2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>1.0.1</version>
<type>jar</type>
</dependency>
<!-- Testing -->
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-jetty-httpd</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>jetty</groupId>
<artifactId>jetty</artifactId>
<version>4.2.10</version>
</dependency>
<dependency>
<groupId>servletapi</groupId>
<artifactId>servletapi</artifactId>
<version>2.3</version>
</dependency>
</dependencies>
</project>
1.1 maven-wagon/wagon-providers/ssh/pom.xml
Index: pom.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<project>
<parent>
<groupId>maven</groupId>
<artifactId>wagon</artifactId>
<version>0.9-SNAPSHOT</version>
</parent>
<groupId>maven</groupId>
<artifactId>wagon-ssh</artifactId>
<name>Wagon SSH provider</name>
<version>0.9-SNAPSHOT</version>
<description></description>
<shortDescription>Wagon Provider for protocols from SSH2 family based on JSCH</shortDescription>
<package>org.apache.maven.wagon.providers.ssh</package>
<inceptionYear>2003</inceptionYear>
<developers>
<developer>
<name>Michal Maczka</name>
<id>michal</id>
<email>michal.maczka@dimatics.com</email>
<organization>Dimatics</organization>
<roles>
<role>Creator</role>
<role>Developer</role>
<role>Release Manager</role>
</roles>
</developer>
</developers>
<dependencies>
<dependency>
<groupId>maven</groupId>
<artifactId>wagon-api</artifactId>
<version>0.9-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>jsch</groupId>
<artifactId>jsch</artifactId>
<version>0.1.14</version>
<type>jar</type>
</dependency>
</dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-cvs-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-cvs-help@maven.apache.org