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 br...@apache.org on 2005/04/29 05:15:46 UTC
svn commit: r165252 - in /maven/wagon/trunk/wagon-providers/wagon-scm: ./
src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/
src/main/java/org/apache/maven/ src/main/java/org/apache/maven/wagon/
src/main/java/org/apache/maven/wagon/providers/
src/main/java/org/apache/maven/wagon/providers/scm/ src/main/resources/
src/main/resources/META-INF/ src/main/resources/META-INF/plexus/ src/test/
src/test/java/ src/test/java/org/ src/test/java/org/apache/
src/test/java/org/apache/maven/ src/test/java/org/apache/maven/wagon/
src/test/java/org/apache/maven/wagon/providers/
src/test/java/org/apache/maven/wagon/providers/scm/
Author: brett
Date: Thu Apr 28 20:15:44 2005
New Revision: 165252
URL: http://svn.apache.org/viewcvs?rev=165252&view=rev
Log:
draft of a wagon SCM-based provider. Probably need to operate this off a checkout directory rather than
arbitrary destination paths, and then copy to the destination, but also allow that destination might be the same
as the checkout directory.
Will revisit shortly.
Added:
maven/wagon/trunk/wagon-providers/wagon-scm/ (with props)
maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml (with props)
maven/wagon/trunk/wagon-providers/wagon-scm/src/
maven/wagon/trunk/wagon-providers/wagon-scm/src/main/
maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/
maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/
maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/
maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/
maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/
maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/
maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/
maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java (with props)
maven/wagon/trunk/wagon-providers/wagon-scm/src/main/resources/
maven/wagon/trunk/wagon-providers/wagon-scm/src/main/resources/META-INF/
maven/wagon/trunk/wagon-providers/wagon-scm/src/main/resources/META-INF/plexus/
maven/wagon/trunk/wagon-providers/wagon-scm/src/main/resources/META-INF/plexus/components.xml (with props)
maven/wagon/trunk/wagon-providers/wagon-scm/src/test/
maven/wagon/trunk/wagon-providers/wagon-scm/src/test/java/
maven/wagon/trunk/wagon-providers/wagon-scm/src/test/java/org/
maven/wagon/trunk/wagon-providers/wagon-scm/src/test/java/org/apache/
maven/wagon/trunk/wagon-providers/wagon-scm/src/test/java/org/apache/maven/
maven/wagon/trunk/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/
maven/wagon/trunk/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/
maven/wagon/trunk/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/
maven/wagon/trunk/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/ScmWagonTest.java (with props)
Propchange: maven/wagon/trunk/wagon-providers/wagon-scm/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Apr 28 20:15:44 2005
@@ -0,0 +1,5 @@
+target
+*.iml
+*.ipr
+*.iws
+
Added: maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml?rev=165252&view=auto
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml (added)
+++ maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml Thu Apr 28 20:15:44 2005
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-providers</artifactId>
+ <version>1.0-alpha-3-SNAPSHOT</version>
+ </parent>
+ <artifactId>wagon-scm</artifactId>
+ <name>Maven Wagon SCM-based Provider</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-api</artifactId>
+ <version>1.0-alpha-1-SNAPSHOT</version>
+ </dependency>
+ <!-- TODO: should be dynamically registered? -->
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-cvs</artifactId>
+ <version>1.0-alpha-1-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-svn</artifactId>
+ <version>1.0-alpha-1-SNAPSHOT</version>
+ <!-- temporarily required at compile time -->
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java?rev=165252&view=auto
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java (added)
+++ maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java Thu Apr 28 20:15:44 2005
@@ -0,0 +1,184 @@
+package org.apache.maven.wagon.providers.scm;
+
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.commons.httpclient.Credentials;
+import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.HostConfiguration;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpRecoverableException;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
+import org.apache.commons.httpclient.NTCredentials;
+import org.apache.commons.httpclient.UsernamePasswordCredentials;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.methods.PutMethod;
+import org.apache.commons.httpclient.util.DateParseException;
+import org.apache.commons.httpclient.util.DateParser;
+import org.apache.commons.lang.StringUtils;
+import org.apache.maven.scm.manager.NoSuchScmProviderException;
+import org.apache.maven.scm.manager.ScmManager;
+import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
+import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.scm.repository.ScmRepositoryException;
+import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmException;
+import org.apache.maven.wagon.AbstractWagon;
+import org.apache.maven.wagon.ConnectionException;
+import org.apache.maven.wagon.ResourceDoesNotExistException;
+import org.apache.maven.wagon.TransferFailedException;
+import org.apache.maven.wagon.authorization.AuthorizationException;
+import org.apache.maven.wagon.resource.Resource;
+
+import java.io.File;
+
+/**
+ * @author <a href="brett@apache.org">Brett Porter</a>
+ * @version $Id$
+ */
+public class ScmWagon
+ extends AbstractWagon
+{
+ private ScmManager scmManager;
+
+ public ScmManager getScmManager()
+ {
+ return scmManager;
+ }
+
+ public void setScmManager( ScmManager scmManager )
+ {
+ this.scmManager = scmManager;
+ }
+
+ public void openConnection()
+ throws ConnectionException
+ {
+ }
+
+ private ScmRepository getScmRepository( String url )
+ throws TransferFailedException
+ {
+ String username = null;
+
+ String password = null;
+
+ if ( authenticationInfo != null )
+ {
+ username = authenticationInfo.getUserName();
+
+ password = authenticationInfo.getPassword();
+ }
+
+ ScmRepository scmRepository;
+ try
+ {
+ scmRepository = scmManager.makeScmRepository( getRepository().getUrl() );
+ }
+ catch ( ScmRepositoryException e )
+ {
+ throw new TransferFailedException( "Error initialising SCM repository", e );
+ }
+ catch ( NoSuchScmProviderException e )
+ {
+ throw new TransferFailedException( "Unknown SCM type", e );
+ }
+
+ // TODO: this should be generic...
+ if ( scmRepository.getProvider().equals( "svn" ) )
+ {
+ SvnScmProviderRepository svnRepo = (SvnScmProviderRepository) scmRepository.getProviderRepository();
+
+ if ( username != null && username.length() > 0 )
+ {
+ svnRepo.setUser( username );
+ }
+ if ( password != null && password.length() > 0 )
+ {
+ svnRepo.setPassword( password );
+ }
+ }
+ return scmRepository;
+ }
+
+ // put
+ public void put( File source, String resourceName )
+ throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
+ {
+ String url = getRepository().getUrl() + "/" + resourceName;
+
+ Resource resource = new Resource( resourceName );
+
+ firePutInitiated( resource, source );
+
+ firePutStarted( resource, source );
+
+ // TODO: if not exists, checkout
+ // TODO: put file in place
+ // TODO: commit
+
+ firePutCompleted( resource, source );
+ }
+
+ public void closeConnection()
+ {
+ }
+
+ public boolean getIfNewer( String resourceName, File destination, long timestamp )
+ throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
+ {
+ throw new UnsupportedOperationException( "Not currently supported: getIfNewer" );
+ }
+
+ public void get( String resourceName, File destination )
+ throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
+ {
+ Resource resource = new Resource( resourceName );
+
+ fireGetInitiated( resource, destination );
+
+ String url = getRepository().getUrl() + "/" + resourceName;
+
+ ScmRepository scmRepository = getScmRepository( url );
+
+ fireGetStarted( resource, destination );
+
+ // TODO: limitations:
+ // - destination filename must match that in the repository - should allow the "-d" CVS equiv to be passed in
+ // - we don't get granular exceptions from SCM (ie, auth, not found)
+ // - need to make it non-recursive to save time
+ // - exists() check doesn't test if it is in SCM already
+
+ try
+ {
+ if ( destination.exists() )
+ {
+ scmManager.update( scmRepository, new ScmFileSet( destination.getParentFile(), destination ), null );
+ }
+ else
+ {
+ scmManager.checkOut( scmRepository, new ScmFileSet( destination.getParentFile() ), null );
+ }
+ }
+ catch ( ScmException e )
+ {
+ throw new TransferFailedException( "Error getting file from SCM", e );
+ }
+
+ fireGetCompleted( resource, destination );
+ }
+}
Propchange: maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/wagon/trunk/wagon-providers/wagon-scm/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/wagon-scm/src/main/resources/META-INF/plexus/components.xml?rev=165252&view=auto
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-scm/src/main/resources/META-INF/plexus/components.xml (added)
+++ maven/wagon/trunk/wagon-providers/wagon-scm/src/main/resources/META-INF/plexus/components.xml Thu Apr 28 20:15:44 2005
@@ -0,0 +1,15 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.wagon.Wagon</role>
+ <role-hint>scm</role-hint>
+ <implementation>org.apache.maven.wagon.providers.scm.ScmWagon</implementation>
+ <instantiation-strategy>per-lookup</instantiation-strategy>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.scm.manager.ScmManager</role>
+ </requirement>
+ </requirements>
+ </component>
+ </components>
+</component-set>
Propchange: maven/wagon/trunk/wagon-providers/wagon-scm/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/wagon/trunk/wagon-providers/wagon-scm/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/wagon/trunk/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/ScmWagonTest.java
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/ScmWagonTest.java?rev=165252&view=auto
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/ScmWagonTest.java (added)
+++ maven/wagon/trunk/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/ScmWagonTest.java Thu Apr 28 20:15:44 2005
@@ -0,0 +1,45 @@
+package org.apache.maven.wagon.providers.scm;
+
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import org.apache.maven.wagon.FileTestUtils;
+import org.apache.maven.wagon.WagonTestCase;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * @author <a href="brett@apache.org">Brett Porter</a>
+ * @version $Id$
+ */
+public class ScmWagonTest
+ extends WagonTestCase
+{
+ protected String getProtocol()
+ {
+ return "file";
+ }
+
+ protected String getTestRepositoryUrl()
+ throws IOException
+ {
+ File file = FileTestUtils.createUniqueDir( getName() + ".file-repository." );
+
+ return "file://" + file.getPath();
+ }
+}
Propchange: maven/wagon/trunk/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/ScmWagonTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/wagon/trunk/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/ScmWagonTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-cvs-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-cvs-help@maven.apache.org