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 jo...@apache.org on 2007/03/07 00:23:35 UTC
svn commit: r515353 [1/2] - in /maven/wagon/branches/wagon-1.x: ./
wagon-provider-api/ wagon-provider-test/ wagon-providers/wagon-file/
wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/
wagon-providers/wagon-file/src/main/...
Author: joakime
Date: Tue Mar 6 15:23:30 2007
New Revision: 515353
URL: http://svn.apache.org/viewvc?view=rev&rev=515353
Log:
Merging select changes from trunk into branch.
Avoiding all work around wagon-manager.
-r488245:504200,512812,513942,514011
Added:
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpsWagon.java
- copied unchanged from r504200, maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpsWagon.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalCommandExecutor.java
- copied unchanged from r504200, maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalCommandExecutor.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-ganymed/src/main/java/org/apache/maven/wagon/providers/ssh/ganymed/ScpCommandExecutor.java
- copied unchanged from r504200, maven/wagon/trunk/wagon-providers/wagon-ssh-ganymed/src/main/java/org/apache/maven/wagon/providers/ssh/ganymed/ScpCommandExecutor.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpCommandExecutor.java
- copied unchanged from r504200, maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpCommandExecutor.java
Removed:
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-file/src/main/resources/META-INF/
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ftp/src/main/resources/META-INF/
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http-lightweight/src/main/resources/META-INF/
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/resources/META-INF/
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-external/src/main/resources/META-INF/
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-ganymed/src/main/resources/META-INF/
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/resources/META-INF/
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-webdav/src/main/resources/META-INF/
Modified:
maven/wagon/branches/wagon-1.x/pom.xml
maven/wagon/branches/wagon-1.x/wagon-provider-api/ (props changed)
maven/wagon/branches/wagon-1.x/wagon-provider-test/ (props changed)
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-file/ (props changed)
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ftp/ (props changed)
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http/ (props changed)
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http-lightweight/ (props changed)
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http-lightweight/pom.xml
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http-shared/ (props changed)
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/PutInputStream.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/ (props changed)
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/ (props changed)
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common-test/ (props changed)
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/CommandExecutorStreamProcessor.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/SshWagon.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/ConsoleInteractiveUserInfo.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/AbstractKnownHostsProvider.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/FileKnownHostsProvider.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/NullKnownHostProvider.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/StreamKnownHostsProvider.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-external/ (props changed)
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-ganymed/ (props changed)
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-ganymed/src/main/java/org/apache/maven/wagon/providers/ssh/ganymed/AbstractGanymedWagon.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-ganymed/src/main/java/org/apache/maven/wagon/providers/ssh/ganymed/ScpWagon.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/WagonUserInfo.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/interactive/PrompterUIKeyboardInteractive.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/interactive/TraditionalUIKeyboardInteractive.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/interactive/UserInfoUIKeyboardInteractiveProxy.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-webdav/ (props changed)
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-webdav/pom.xml
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-webdav/src/test/java/org/apache/maven/wagon/providers/webdav/ServletServer.java
maven/wagon/branches/wagon-1.x/wagon-providers/wagon-webdav/src/test/java/org/apache/maven/wagon/providers/webdav/WebDavWagonTest.java
Modified: maven/wagon/branches/wagon-1.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/pom.xml?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/pom.xml (original)
+++ maven/wagon/branches/wagon-1.x/pom.xml Tue Mar 6 15:23:30 2007
@@ -67,6 +67,28 @@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate</id>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<modules>
<module>wagon-provider-api</module>
@@ -110,7 +132,17 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interactivity-api</artifactId>
- <version>1.0-alpha-4</version>
+ <version>1.0-alpha-6-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>classworlds</groupId>
+ <artifactId>classworlds</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Propchange: maven/wagon/branches/wagon-1.x/wagon-provider-api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 6 15:23:30 2007
@@ -1,13 +1,15 @@
-
-*.log
target
-.classpath
-.project
-default.lst
-test.out
-default.ajsym
-*.iml
+*~
+.*.swp
+*.log
+*.patch
+*.diff
*.ipr
*.iws
-destination
+*.iml
+.classpath
+.project
+.m2eclipse
+.settings
+.wtpmodules
cobertura.ser
Propchange: maven/wagon/branches/wagon-1.x/wagon-provider-test/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 6 15:23:30 2007
@@ -1,12 +1,15 @@
-
-*.log
target
-.classpath
-.project
-default.lst
-test.out
-default.ajsym
-*.iml
+*~
+.*.swp
+*.log
+*.patch
+*.diff
*.ipr
*.iws
+*.iml
+.classpath
+.project
+.m2eclipse
+.settings
+.wtpmodules
cobertura.ser
Propchange: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-file/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 6 15:23:30 2007
@@ -1,13 +1,15 @@
-
-*.log
target
-.classpath
-.project
-default.lst
-test.out
-default.ajsym
-*.iml
+*~
+.*.swp
+*.log
+*.patch
+*.diff
*.ipr
*.iws
-destination
+*.iml
+.classpath
+.project
+.m2eclipse
+.settings
+.wtpmodules
cobertura.ser
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java Tue Mar 6 15:23:30 2007
@@ -1,19 +1,22 @@
package org.apache.maven.wagon.providers.file;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.ConnectionException;
@@ -42,6 +45,10 @@
*
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
* @version $Id$
+ *
+ * @plexus.component role="org.apache.maven.wagon.Wagon"
+ * role-hint="file"
+ * instantiation-strategy="per-lookup"
*/
public class FileWagon
extends StreamWagon
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java Tue Mar 6 15:23:30 2007
@@ -1,21 +1,23 @@
package org.apache.maven.wagon.providers.file;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.ConnectionException;
import org.apache.maven.wagon.FileTestUtils;
Propchange: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ftp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 6 15:23:30 2007
@@ -1,11 +1,15 @@
-*.log
target
-.classpath
-.project
-default.lst
-test.out
-default.ajsym
-*.iml
+*~
+.*.swp
+*.log
+*.patch
+*.diff
*.ipr
*.iws
+*.iml
+.classpath
+.project
+.m2eclipse
+.settings
+.wtpmodules
cobertura.ser
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java Tue Mar 6 15:23:30 2007
@@ -1,19 +1,22 @@
package org.apache.maven.wagon.providers.ftp;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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 java.io.File;
@@ -43,6 +46,15 @@
import org.apache.maven.wagon.repository.RepositoryPermissions;
import org.apache.maven.wagon.resource.Resource;
+/**
+ * FtpWagon
+ *
+ * @version $Id$
+ *
+ * @plexus.component role="org.apache.maven.wagon.Wagon"
+ * role-hint="ftp"
+ * instantiation-strategy="per-lookup"
+ */
public class FtpWagon
extends StreamWagon
{
Propchange: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 6 15:23:30 2007
@@ -1,12 +1,15 @@
-
-*.log
target
-.classpath
-.project
-default.lst
-test.out
-default.ajsym
-*.iml
+*~
+.*.swp
+*.log
+*.patch
+*.diff
*.ipr
*.iws
+*.iml
+.classpath
+.project
+.m2eclipse
+.settings
+.wtpmodules
cobertura.ser
Propchange: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http-lightweight/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 6 15:23:30 2007
@@ -1,12 +1,15 @@
-*.log
target
-.classpath
-.project
-default.lst
-test.out
-default.ajsym
-*.iml
+*~
+.*.swp
+*.log
+*.patch
+*.diff
*.ipr
*.iws
-destination
+*.iml
+.classpath
+.project
+.m2eclipse
+.settings
+.wtpmodules
cobertura.ser
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http-lightweight/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http-lightweight/pom.xml?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http-lightweight/pom.xml (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http-lightweight/pom.xml Tue Mar 6 15:23:30 2007
@@ -24,11 +24,6 @@
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.0.b2</version>
- </dependency>
- <dependency>
<groupId>plexus</groupId>
<artifactId>plexus-jetty-httpd</artifactId>
<version>1.0-beta-1</version>
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java Tue Mar 6 15:23:30 2007
@@ -42,8 +42,14 @@
import org.apache.maven.wagon.shared.http.HtmlFileListParser;
/**
+ * LightweightHttpWagon
+ *
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
* @version $Id$
+ *
+ * @plexus.component role="org.apache.maven.wagon.Wagon"
+ * role-hint="http"
+ * instantiation-strategy="per-lookup"
*/
public class LightweightHttpWagon
extends StreamWagon
@@ -52,12 +58,8 @@
private String previousHttpProxyHost;
- private String previousHttpsProxyHost;
-
private String previousHttpProxyPort;
- private String previousHttpsProxyPort;
-
private HttpURLConnection putConnection;
/**
@@ -186,17 +188,13 @@
previousHttpProxyHost = System.getProperty( "http.proxyHost" );
previousHttpProxyPort = System.getProperty( "http.proxyPort" );
- previousHttpsProxyHost = System.getProperty( "https.proxyHost" );
- previousHttpsProxyPort = System.getProperty( "https.proxyPort" );
previousProxyExclusions = System.getProperty( "http.nonProxyHosts" );
final ProxyInfo proxyInfo = this.proxyInfo;
if ( proxyInfo != null )
{
System.setProperty( "http.proxyHost", proxyInfo.getHost() );
- System.setProperty( "https.proxyHost", proxyInfo.getHost() );
System.setProperty( "http.proxyPort", String.valueOf( proxyInfo.getPort() ) );
- System.setProperty( "https.proxyPort", String.valueOf( proxyInfo.getPort() ) );
if ( proxyInfo.getNonProxyHosts() != null )
{
System.setProperty( "http.nonProxyHosts", proxyInfo.getNonProxyHosts() );
@@ -250,17 +248,9 @@
{
System.setProperty( "http.proxyHost", previousHttpProxyHost );
}
- if ( previousHttpsProxyHost != null )
- {
- System.setProperty( "https.proxyHost", previousHttpsProxyHost );
- }
if ( previousHttpProxyPort != null )
{
System.setProperty( "http.proxyPort", previousHttpProxyPort );
- }
- if ( previousHttpsProxyPort != null )
- {
- System.setProperty( "https.proxyPort", previousHttpsProxyPort );
}
if ( previousProxyExclusions != null )
{
Propchange: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http-shared/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 6 15:23:30 2007
@@ -1,5 +1,15 @@
+target
+*~
+.*.swp
+*.log
+*.patch
+*.diff
+*.ipr
+*.iws
+*.iml
.classpath
.project
-*.iml
+.m2eclipse
+.settings
+.wtpmodules
cobertura.ser
-target
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java Tue Mar 6 15:23:30 2007
@@ -1,19 +1,22 @@
package org.apache.maven.wagon.providers.http;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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;
@@ -54,6 +57,10 @@
/**
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
* @version $Id$
+ *
+ * @plexus.component role="org.apache.maven.wagon.Wagon"
+ * role-hint="http"
+ * instantiation-strategy="per-lookup"
*/
public class HttpWagon
extends AbstractWagon
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/PutInputStream.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/PutInputStream.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/PutInputStream.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/PutInputStream.java Tue Mar 6 15:23:30 2007
@@ -1,19 +1,22 @@
package org.apache.maven.wagon.providers.http;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.Wagon;
Propchange: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 6 15:23:30 2007
@@ -1,11 +1,15 @@
-*.log
target
-.classpath
-.project
-default.lst
-test.out
-default.ajsym
-*.iml
+*~
+.*.swp
+*.log
+*.patch
+*.diff
*.ipr
*.iws
+*.iml
+.classpath
+.project
+.m2eclipse
+.settings
+.wtpmodules
cobertura.ser
Propchange: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 6 15:23:30 2007
@@ -9,6 +9,7 @@
*.iml
.classpath
.project
+.m2eclipse
.settings
.wtpmodules
cobertura.ser
Propchange: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common-test/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 6 15:23:30 2007
@@ -9,6 +9,7 @@
*.iml
.classpath
.project
+.m2eclipse
.settings
.wtpmodules
cobertura.ser
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java Tue Mar 6 15:23:30 2007
@@ -29,9 +29,6 @@
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.authorization.AuthorizationException;
import org.apache.maven.wagon.events.TransferEvent;
-import org.apache.maven.wagon.providers.ssh.interactive.InteractiveUserInfo;
-import org.apache.maven.wagon.providers.ssh.interactive.NullInteractiveUserInfo;
-import org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider;
import org.apache.maven.wagon.repository.RepositoryPermissions;
import org.apache.maven.wagon.resource.Resource;
import org.codehaus.plexus.util.FileUtils;
@@ -51,12 +48,8 @@
*/
public abstract class AbstractSshWagon
extends AbstractWagon
- implements CommandExecutor, SshWagon
+ implements CommandExecutor
{
- protected KnownHostsProvider knownHostsProvider;
-
- protected InteractiveUserInfo interactiveUserInfo;
-
protected static final char PATH_SEPARATOR = '/';
protected static final int DEFAULT_SSH_PORT = 22;
@@ -165,11 +158,6 @@
{
authenticationInfo.setUserName( System.getProperty( "user.name" ) );
}
-
- if ( !interactive )
- {
- interactiveUserInfo = new NullInteractiveUserInfo();
- }
}
protected File getPrivateKey()
@@ -238,35 +226,7 @@
executeCommand( command, false );
}
-
- public final KnownHostsProvider getKnownHostsProvider()
- {
- return knownHostsProvider;
- }
-
- public final void setKnownHostsProvider( KnownHostsProvider knownHostsProvider )
- {
- if ( knownHostsProvider == null )
- {
- throw new IllegalArgumentException( "knownHostsProvider can't be null" );
- }
- this.knownHostsProvider = knownHostsProvider;
- }
-
- public InteractiveUserInfo getInteractiveUserInfo()
- {
- return interactiveUserInfo;
- }
-
- public void setInteractiveUserInfo( InteractiveUserInfo interactiveUserInfo )
- {
- if ( interactiveUserInfo == null )
- {
- throw new IllegalArgumentException( "interactiveUserInfo can't be null" );
- }
- this.interactiveUserInfo = interactiveUserInfo;
- }
-
+
public void putDirectory( File sourceDirectory, String destinationDirectory )
throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
{
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/CommandExecutorStreamProcessor.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/CommandExecutorStreamProcessor.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/CommandExecutorStreamProcessor.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/CommandExecutorStreamProcessor.java Tue Mar 6 15:23:30 2007
@@ -1,19 +1,22 @@
package org.apache.maven.wagon.providers.ssh;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.CommandExecutionException;
@@ -22,6 +25,12 @@
import java.io.BufferedReader;
import java.io.IOException;
+/**
+ * CommandExecutorStreamProcessor
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
public class CommandExecutorStreamProcessor
{
private CommandExecutorStreamProcessor()
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/SshWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/SshWagon.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/SshWagon.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/SshWagon.java Tue Mar 6 15:23:30 2007
@@ -19,6 +19,14 @@
import org.apache.maven.wagon.Wagon;
import org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider;
+/**
+ * SshWagon - identifier for 100% java implementations of Ssh.
+ *
+ * NOTE: External or native ssh implementations cannot use this interface.
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
public interface SshWagon
extends Wagon
{
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/ConsoleInteractiveUserInfo.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/ConsoleInteractiveUserInfo.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/ConsoleInteractiveUserInfo.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/ConsoleInteractiveUserInfo.java Tue Mar 6 15:23:30 2007
@@ -26,10 +26,16 @@
*
* @author Juan F. Codagnone
* @since Sep 12, 2005
+ *
+ * @plexus.component role="org.apache.maven.wagon.providers.ssh.interactive.InteractiveUserInfo"
+ * instantiation-strategy="per-lookup"
*/
public class ConsoleInteractiveUserInfo
implements InteractiveUserInfo
{
+ /**
+ * @plexus.requirement role-hint="default"
+ */
private Prompter prompter;
public ConsoleInteractiveUserInfo()
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/AbstractKnownHostsProvider.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/AbstractKnownHostsProvider.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/AbstractKnownHostsProvider.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/AbstractKnownHostsProvider.java Tue Mar 6 15:23:30 2007
@@ -29,8 +29,10 @@
{
/**
* Valid values are ask, yes, no.
+ *
+ * @plexus.configuration default-value="ask"
*/
- private String hostKeyChecking = "yes";
+ private String hostKeyChecking = "ask";
/**
* the known hosts, in the openssh format
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/FileKnownHostsProvider.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/FileKnownHostsProvider.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/FileKnownHostsProvider.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/FileKnownHostsProvider.java Tue Mar 6 15:23:30 2007
@@ -1,19 +1,22 @@
package org.apache.maven.wagon.providers.ssh.knownhost;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.codehaus.plexus.util.FileUtils;
@@ -29,6 +32,10 @@
*
* @author Juan F. Codagnone
* @since Sep 12, 2005
+ *
+ * @plexus.component role="org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider"
+ * role-hint="file"
+ * instantiation-strategy="per-lookup"
*/
public class FileKnownHostsProvider
extends StreamKnownHostsProvider
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/NullKnownHostProvider.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/NullKnownHostProvider.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/NullKnownHostProvider.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/NullKnownHostProvider.java Tue Mar 6 15:23:30 2007
@@ -1,19 +1,22 @@
package org.apache.maven.wagon.providers.ssh.knownhost;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.
*/
/**
@@ -21,6 +24,10 @@
*
* @author Juan F. Codagnone
* @since Sep 12, 2005
+ *
+ * @plexus.component role="org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider"
+ * role-hint="null"
+ * instantiation-strategy="per-lookup"
*/
public final class NullKnownHostProvider
extends AbstractKnownHostsProvider
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/StreamKnownHostsProvider.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/StreamKnownHostsProvider.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/StreamKnownHostsProvider.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/StreamKnownHostsProvider.java Tue Mar 6 15:23:30 2007
@@ -1,19 +1,22 @@
package org.apache.maven.wagon.providers.ssh.knownhost;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.codehaus.plexus.util.IOUtil;
Propchange: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-external/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 6 15:23:30 2007
@@ -1,12 +1,15 @@
-
-*.log
target
-.classpath
-.project
-default.lst
-test.out
-default.ajsym
-*.iml
+*~
+.*.swp
+*.log
+*.patch
+*.diff
*.ipr
*.iws
+*.iml
+.classpath
+.project
+.m2eclipse
+.settings
+.wtpmodules
cobertura.ser
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java Tue Mar 6 15:23:30 2007
@@ -1,19 +1,22 @@
package org.apache.maven.wagon.providers.ssh.external;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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.CommandExecutionException;
@@ -45,6 +48,10 @@
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @version $Id:ScpExternalWagon.java 477260 2006-11-20 17:11:39Z brett $
* @todo [BP] add compression flag
+ *
+ * @plexus.component role="org.apache.maven.wagon.Wagon"
+ * role-hint="scpexe"
+ * instantiation-strategy="per-lookup"
*/
public class ScpExternalWagon
extends AbstractSshWagon
Propchange: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-ganymed/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 6 15:23:30 2007
@@ -9,6 +9,7 @@
*.iml
.classpath
.project
+.m2eclipse
.settings
.wtpmodules
cobertura.ser
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-ganymed/src/main/java/org/apache/maven/wagon/providers/ssh/ganymed/AbstractGanymedWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-ganymed/src/main/java/org/apache/maven/wagon/providers/ssh/ganymed/AbstractGanymedWagon.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-ganymed/src/main/java/org/apache/maven/wagon/providers/ssh/ganymed/AbstractGanymedWagon.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-ganymed/src/main/java/org/apache/maven/wagon/providers/ssh/ganymed/AbstractGanymedWagon.java Tue Mar 6 15:23:30 2007
@@ -1,19 +1,22 @@
package org.apache.maven.wagon.providers.ssh.ganymed;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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 ch.ethz.ssh2.Connection;
@@ -21,11 +24,15 @@
import ch.ethz.ssh2.ProxyData;
import ch.ethz.ssh2.Session;
import ch.ethz.ssh2.StreamGobbler;
+
import org.apache.maven.wagon.CommandExecutionException;
import org.apache.maven.wagon.Streams;
import org.apache.maven.wagon.authentication.AuthenticationException;
import org.apache.maven.wagon.providers.ssh.AbstractSshWagon;
import org.apache.maven.wagon.providers.ssh.CommandExecutorStreamProcessor;
+import org.apache.maven.wagon.providers.ssh.SshWagon;
+import org.apache.maven.wagon.providers.ssh.interactive.InteractiveUserInfo;
+import org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider;
import org.codehaus.plexus.util.IOUtil;
import java.io.BufferedReader;
@@ -34,9 +41,25 @@
import java.io.InputStream;
import java.io.InputStreamReader;
+/**
+ * AbstractGanymedWagon
+ *
+ * @version $Id$
+ */
public abstract class AbstractGanymedWagon
extends AbstractSshWagon
+ implements SshWagon
{
+ /**
+ * @plexus.requirement role-hint="file"
+ */
+ private KnownHostsProvider knownHostsProvider;
+
+ /**
+ * @plexus.requirement
+ */
+ private InteractiveUserInfo interactiveUserInfo;
+
protected Connection connection;
public void openConnection()
@@ -49,13 +72,13 @@
File privateKey = getPrivateKey();
-/* TODO!
+ /*
if ( !interactive )
{
- interactiveUserInfo = new NullInteractiveUserInfo();
uIKeyboardInteractive = null;
+ setInteractiveUserInfo( new NullInteractiveUserInfo() );
}
-*/
+ */
connection = new Connection( host, port );
@@ -70,11 +93,11 @@
/* TODO! need to create a custom ServerHostKeyVerifier, and then pass that to connect later on.
Note: the verifier will also need to add to ~/.ssh/known_hosts if it happens to be updated
- if ( knownHostsProvider != null )
+ if ( getKnownHostsProvider() != null )
{
try
{
- String contents = knownHostsProvider.getContents();
+ String contents = getKnownHostsProvider().getContents();
if ( contents != null )
{
sch.setKnownHosts( new StringInputStream( contents ) );
@@ -189,5 +212,26 @@
connection.close();
connection = null;
}
+ }
+
+
+ public InteractiveUserInfo getInteractiveUserInfo()
+ {
+ return this.interactiveUserInfo;
+ }
+
+ public KnownHostsProvider getKnownHostsProvider()
+ {
+ return this.knownHostsProvider;
+ }
+
+ public void setInteractiveUserInfo( InteractiveUserInfo interactiveUserInfo )
+ {
+ this.interactiveUserInfo = interactiveUserInfo;
+ }
+
+ public void setKnownHostsProvider( KnownHostsProvider knownHostsProvider )
+ {
+ this.knownHostsProvider = knownHostsProvider;
}
}
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-ganymed/src/main/java/org/apache/maven/wagon/providers/ssh/ganymed/ScpWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-ganymed/src/main/java/org/apache/maven/wagon/providers/ssh/ganymed/ScpWagon.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-ganymed/src/main/java/org/apache/maven/wagon/providers/ssh/ganymed/ScpWagon.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-ganymed/src/main/java/org/apache/maven/wagon/providers/ssh/ganymed/ScpWagon.java Tue Mar 6 15:23:30 2007
@@ -46,6 +46,10 @@
*
* @version $Id: ScpWagon.java 430944 2006-08-12 02:02:20Z carlos $
* @todo [BP] add compression flag
+ *
+ * @plexus.component role="org.apache.maven.wagon.Wagon"
+ * role-hint="scp"
+ * instantiation-strategy="per-lookup"
*/
public class ScpWagon
extends AbstractGanymedWagon
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java Tue Mar 6 15:23:30 2007
@@ -1,19 +1,22 @@
package org.apache.maven.wagon.providers.ssh.jsch;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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 com.jcraft.jsch.ChannelExec;
@@ -27,13 +30,18 @@
import com.jcraft.jsch.Session;
import com.jcraft.jsch.UIKeyboardInteractive;
import com.jcraft.jsch.UserInfo;
+
import org.apache.maven.wagon.CommandExecutionException;
import org.apache.maven.wagon.Streams;
import org.apache.maven.wagon.authentication.AuthenticationException;
import org.apache.maven.wagon.providers.ssh.AbstractSshWagon;
import org.apache.maven.wagon.providers.ssh.CommandExecutorStreamProcessor;
+import org.apache.maven.wagon.providers.ssh.SshWagon;
+import org.apache.maven.wagon.providers.ssh.interactive.InteractiveUserInfo;
+import org.apache.maven.wagon.providers.ssh.interactive.NullInteractiveUserInfo;
import org.apache.maven.wagon.providers.ssh.jsch.interactive.UserInfoUIKeyboardInteractiveProxy;
import org.apache.maven.wagon.providers.ssh.knownhost.KnownHostChangedException;
+import org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider;
import org.apache.maven.wagon.providers.ssh.knownhost.UnknownHostException;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringInputStream;
@@ -47,11 +55,30 @@
import java.io.StringWriter;
import java.util.Properties;
+/**
+ * AbstractJschWagon
+ *
+ * @version $Id$
+ */
public abstract class AbstractJschWagon
extends AbstractSshWagon
+ implements SshWagon
{
protected Session session;
-
+
+ /**
+ * @plexus.requirement role-hint="file"
+ */
+ private KnownHostsProvider knownHostsProvider;
+
+ /**
+ * @plexus.requirement
+ */
+ private InteractiveUserInfo interactiveUserInfo;
+
+ /**
+ * @plexus.requirement
+ */
private UIKeyboardInteractive uIKeyboardInteractive;
private static final int SOCKS5_PROXY_PORT = 1080;
@@ -66,6 +93,7 @@
if ( !interactive )
{
uIKeyboardInteractive = null;
+ setInteractiveUserInfo( new NullInteractiveUserInfo() );
}
JSch sch = new JSch();
@@ -121,7 +149,7 @@
}
// username and password will be given via UserInfo interface.
- UserInfo ui = new WagonUserInfo( authenticationInfo, interactiveUserInfo );
+ UserInfo ui = new WagonUserInfo( authenticationInfo, getInteractiveUserInfo() );
if ( uIKeyboardInteractive != null )
{
@@ -129,11 +157,11 @@
}
Properties config = new Properties();
- if ( knownHostsProvider != null )
+ if ( getKnownHostsProvider() != null )
{
try
{
- String contents = knownHostsProvider.getContents();
+ String contents = getKnownHostsProvider().getContents();
if ( contents != null )
{
sch.setKnownHosts( new StringInputStream( contents ) );
@@ -143,7 +171,7 @@
{
// continue without known_hosts
}
- config.setProperty( "StrictHostKeyChecking", knownHostsProvider.getHostKeyChecking() );
+ config.setProperty( "StrictHostKeyChecking", getKnownHostsProvider().getHostKeyChecking() );
}
config.setProperty( "BatchMode", interactive ? "no" : "yes" );
@@ -157,7 +185,7 @@
{
session.connect();
- if ( knownHostsProvider != null )
+ if ( getKnownHostsProvider() != null )
{
PrintWriter w = new PrintWriter( stringWriter );
@@ -189,7 +217,7 @@
try
{
- knownHostsProvider.storeKnownHosts( stringWriter.toString() );
+ getKnownHostsProvider().storeKnownHosts( stringWriter.toString() );
}
catch ( IOException e )
{
@@ -256,5 +284,25 @@
channel.disconnect();
}
}
+ }
+
+ public InteractiveUserInfo getInteractiveUserInfo()
+ {
+ return this.interactiveUserInfo;
+ }
+
+ public KnownHostsProvider getKnownHostsProvider()
+ {
+ return this.knownHostsProvider;
+ }
+
+ public void setInteractiveUserInfo( InteractiveUserInfo interactiveUserInfo )
+ {
+ this.interactiveUserInfo = interactiveUserInfo;
+ }
+
+ public void setKnownHostsProvider( KnownHostsProvider knownHostsProvider )
+ {
+ this.knownHostsProvider = knownHostsProvider;
}
}
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java Tue Mar 6 15:23:30 2007
@@ -1,19 +1,22 @@
package org.apache.maven.wagon.providers.ssh.jsch;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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 com.jcraft.jsch.ChannelExec;
@@ -34,16 +37,22 @@
import java.io.OutputStream;
/**
+ * SFTP protocol wagon.
+ *
* A base class for deployers and fetchers using protocols from SSH2 family and
- * JSch library for underlying implementation
- * <p/>
+ * JSch library for underlying implementation.
+ *
* This is responsible for authentification stage of the process.
- * <p/>
+ *
* We will first try to use public keys for authentication and if that doesn't
- * work then we fall back to using the login and password
+ * work then we fall back to using the login and password.
*
* @version $Id$
* @todo [BP] add compression flag
+ *
+ * @plexus.component role="org.apache.maven.wagon.Wagon"
+ * role-hint="scp"
+ * instantiation-strategy="per-lookup"
*/
public class ScpWagon
extends AbstractJschWagon
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java Tue Mar 6 15:23:30 2007
@@ -1,19 +1,22 @@
package org.apache.maven.wagon.providers.ssh.jsch;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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 com.jcraft.jsch.ChannelSftp;
@@ -36,6 +39,10 @@
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @version $Id$
* @todo [BP] add compression flag
+ *
+ * @plexus.component role="org.apache.maven.wagon.Wagon"
+ * role-hint="sftp"
+ * instantiation-strategy="per-lookup"
*/
public class SftpWagon
extends AbstractJschWagon
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/WagonUserInfo.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/WagonUserInfo.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/WagonUserInfo.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/WagonUserInfo.java Tue Mar 6 15:23:30 2007
@@ -1,25 +1,33 @@
package org.apache.maven.wagon.providers.ssh.jsch;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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 com.jcraft.jsch.UserInfo;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.providers.ssh.interactive.InteractiveUserInfo;
+/**
+ * WagonUserInfo
+ *
+ * @version $Id$
+ */
class WagonUserInfo
implements UserInfo
{
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/interactive/PrompterUIKeyboardInteractive.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/interactive/PrompterUIKeyboardInteractive.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/interactive/PrompterUIKeyboardInteractive.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/interactive/PrompterUIKeyboardInteractive.java Tue Mar 6 15:23:30 2007
@@ -1,19 +1,22 @@
package org.apache.maven.wagon.providers.ssh.jsch.interactive;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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 com.jcraft.jsch.UIKeyboardInteractive;
@@ -21,18 +24,23 @@
import org.codehaus.plexus.components.interactivity.PrompterException;
/**
- * UIKeyboardInteractive that use pluxus-prompter
- * <p/>
+ * UIKeyboardInteractive that use plexus-prompter.
+ *
* <code>UIKeyboardInteractive</code> are usefull when you don't use user with
* password authentication with a server that use keyboard-interactive and
* doesn't allow password method <code>PasswordAuthentication no</code>.
*
* @author <a href="mailto:juam at users.sourceforge.net">Juan F. Codagnone</a>
* @since Sep 22, 2005
+ *
+ * @plexus.component role="com.jcraft.jsch.UIKeyboardInteractive"
*/
public class PrompterUIKeyboardInteractive
implements UIKeyboardInteractive
{
+ /**
+ * @plexus.requirement role-hint="default"
+ */
private Prompter prompter;
public PrompterUIKeyboardInteractive()
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/interactive/TraditionalUIKeyboardInteractive.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/interactive/TraditionalUIKeyboardInteractive.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/interactive/TraditionalUIKeyboardInteractive.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/interactive/TraditionalUIKeyboardInteractive.java Tue Mar 6 15:23:30 2007
@@ -1,19 +1,22 @@
package org.apache.maven.wagon.providers.ssh.jsch.interactive;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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 com.jcraft.jsch.UIKeyboardInteractive;
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/interactive/UserInfoUIKeyboardInteractiveProxy.java
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/interactive/UserInfoUIKeyboardInteractiveProxy.java?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/interactive/UserInfoUIKeyboardInteractiveProxy.java (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/interactive/UserInfoUIKeyboardInteractiveProxy.java Tue Mar 6 15:23:30 2007
@@ -1,19 +1,22 @@
package org.apache.maven.wagon.providers.ssh.jsch.interactive;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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
*
- * 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
*
- * 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.
+ * 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 com.jcraft.jsch.UIKeyboardInteractive;
Propchange: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-webdav/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 6 15:23:30 2007
@@ -9,6 +9,7 @@
*.iml
.classpath
.project
+.m2eclipse
.settings
.wtpmodules
cobertura.ser
Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-webdav/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-webdav/pom.xml?view=diff&rev=515353&r1=515352&r2=515353
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-webdav/pom.xml (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-webdav/pom.xml Tue Mar 6 15:23:30 2007
@@ -16,10 +16,6 @@
<name>Henry Isidro</name>
<email>hisidro@exist.com</email>
</contributor>
- <contributor>
- <name>Joakim Erdfelt</name>
- <email>joakim@erdfelt.com</email>
- </contributor>
</contributors>
<dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-commits-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-commits-help@maven.apache.org