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 2006/11/20 15:24:32 UTC
svn commit: r477189 - in /maven/wagon/trunk: ./
wagon-providers/wagon-ssh-common/
wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/
wagon-providers/wagon-ssh-common/src/main/resources/META-INF/plexus/ wago...
Author: brett
Date: Mon Nov 20 06:24:28 2006
New Revision: 477189
URL: http://svn.apache.org/viewvc?view=rev&rev=477189
Log:
move common prompting SSH code to ssh-common
Added:
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/ConsoleInteractiveUserInfo.java (contents, props changed)
- copied, changed from r477184, maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/ConsoleInteractiveUserInfo.java
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/InteractiveUserInfo.java (contents, props changed)
- copied, changed from r477184, maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/InteractiveUserInfo.java
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/NullInteractiveUserInfo.java (contents, props changed)
- copied, changed from r477184, maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/NullInteractiveUserInfo.java
Removed:
maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/ConsoleInteractiveUserInfo.java
maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/InteractiveUserInfo.java
maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/NullInteractiveUserInfo.java
Modified:
maven/wagon/trunk/pom.xml
maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/resources/META-INF/plexus/components.xml
maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml
maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/resources/META-INF/plexus/components.xml
Modified: maven/wagon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/pom.xml?view=diff&rev=477189&r1=477188&r2=477189
==============================================================================
--- maven/wagon/trunk/pom.xml (original)
+++ maven/wagon/trunk/pom.xml Mon Nov 20 06:24:28 2006
@@ -110,6 +110,11 @@
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-interactivity-api</artifactId>
+ <version>1.0-alpha-4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-8</version>
</dependency>
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml?view=diff&rev=477189&r1=477188&r2=477189
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml Mon Nov 20 06:24:28 2006
@@ -19,5 +19,9 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-interactivity-api</artifactId>
+ </dependency>
</dependencies>
</project>
Copied: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/ConsoleInteractiveUserInfo.java (from r477184, maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/ConsoleInteractiveUserInfo.java)
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/ConsoleInteractiveUserInfo.java?view=diff&rev=477189&p1=maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/ConsoleInteractiveUserInfo.java&r1=477184&p2=maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/ConsoleInteractiveUserInfo.java&r2=477189
==============================================================================
(empty)
Propchange: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/ConsoleInteractiveUserInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/ConsoleInteractiveUserInfo.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Copied: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/InteractiveUserInfo.java (from r477184, maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/InteractiveUserInfo.java)
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/InteractiveUserInfo.java?view=diff&rev=477189&p1=maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/InteractiveUserInfo.java&r1=477184&p2=maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/InteractiveUserInfo.java&r2=477189
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/InteractiveUserInfo.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/InteractiveUserInfo.java Mon Nov 20 06:24:28 2006
@@ -20,22 +20,18 @@
* Interactive part for <code>UserInfo</code>
*
* @author Juan F. Codagnone
- * @since Sep 12, 2005
* @see com.jcraft.jsch.UserInfo
+ * @since Sep 12, 2005
*/
public interface InteractiveUserInfo
{
String ROLE = InteractiveUserInfo.class.getName();
- /** @see com.jcraft.jsch.UserInfo#promptYesNo(java.lang.String) */
boolean promptYesNo( String message );
- /*** @see com.jcraft.jsch.UserInfo#showMessage(java.lang.String) */
void showMessage( String message );
- /** @see com.jcraft.jsch.UserInfo#promptPassword(String) */
String promptPassword( String message );
- /** @see com.jcraft.jsch.UserInfo#promptPassphrase(String) */
String promptPassphrase( String message );
}
Propchange: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/InteractiveUserInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/InteractiveUserInfo.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Copied: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/NullInteractiveUserInfo.java (from r477184, maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/NullInteractiveUserInfo.java)
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/NullInteractiveUserInfo.java?view=diff&rev=477189&p1=maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/NullInteractiveUserInfo.java&r1=477184&p2=maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/NullInteractiveUserInfo.java&r2=477189
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/NullInteractiveUserInfo.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/NullInteractiveUserInfo.java Mon Nov 20 06:24:28 2006
@@ -16,31 +16,31 @@
* limitations under the License.
*/
-import org.apache.maven.wagon.providers.ssh.interactive.InteractiveUserInfo;
-
/**
* Dummy Implementation for <code>InteractiveUserInfo</code>, nice for
* non-Interactive environments
*
* @author Juan F. Codagnone
- * @since Sep 12, 2005
* @see org.apache.maven.wagon.providers.ssh.interactive.InteractiveUserInfo
+ * @since Sep 12, 2005
*/
public class NullInteractiveUserInfo
implements InteractiveUserInfo
{
private final boolean promptYesNoResult;
- /** @see #NullInteractiveUserInfo(boolean) */
+ /**
+ * @see #NullInteractiveUserInfo(boolean)
+ */
public NullInteractiveUserInfo()
{
this( false ); // the safest value
}
/**
- * Creates a <code>NullInteractiveUserInfo</code> with a hardcoded
+ * Creates a <code>NullInteractiveUserInfo</code> with a hardcoded
* prompYesNo result
- *
+ *
* @param promptYesNoResult the hardcoded result
*/
public NullInteractiveUserInfo( final boolean promptYesNoResult )
@@ -48,13 +48,17 @@
this.promptYesNoResult = promptYesNoResult;
}
- /** @see InteractiveUserInfo#promptYesNo(java.lang.String) */
+ /**
+ * @see InteractiveUserInfo#promptYesNo(java.lang.String)
+ */
public boolean promptYesNo( final String message )
{
return promptYesNoResult;
}
- /** @see InteractiveUserInfo#showMessage(java.lang.String) */
+ /**
+ * @see InteractiveUserInfo#showMessage(java.lang.String)
+ */
public void showMessage( final String message )
{
// nothing to do
Propchange: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/NullInteractiveUserInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/interactive/NullInteractiveUserInfo.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=477189&r1=477188&r2=477189
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/resources/META-INF/plexus/components.xml Mon Nov 20 06:24:28 2006
@@ -1,5 +1,6 @@
<component-set>
<components>
+ <!-- TODO! generate this using plexus:descriptor (same for all) -->
<component>
<role>org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider</role>
<role-hint>file</role-hint>
@@ -17,6 +18,16 @@
<configuration>
<hostKeyChecking>ask</hostKeyChecking>
</configuration>
+ </component>
+ <component>
+ <role>org.apache.maven.wagon.providers.ssh.interactive.InteractiveUserInfo</role>
+ <implementation>org.apache.maven.wagon.providers.ssh.interactive.ConsoleInteractiveUserInfo</implementation>
+ <instantiation-strategy>per-lookup</instantiation-strategy>
+ <requirements>
+ <requirement>
+ <role>org.codehaus.plexus.components.interactivity.Prompter</role>
+ </requirement>
+ </requirements>
</component>
</components>
</component-set>
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml?view=diff&rev=477189&r1=477188&r2=477189
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml Mon Nov 20 06:24:28 2006
@@ -40,7 +40,6 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interactivity-api</artifactId>
- <version>1.0-alpha-4</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=477189&r1=477188&r2=477189
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/resources/META-INF/plexus/components.xml Mon Nov 20 06:24:28 2006
@@ -54,16 +54,6 @@
</requirements>
</component>
<component>
- <role>org.apache.maven.wagon.providers.ssh.interactive.InteractiveUserInfo</role>
- <implementation>org.apache.maven.wagon.providers.ssh.interactive.ConsoleInteractiveUserInfo</implementation>
- <instantiation-strategy>per-lookup</instantiation-strategy>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.components.interactivity.Prompter</role>
- </requirement>
- </requirements>
- </component>
- <component>
<role>com.jcraft.jsch.UIKeyboardInteractive</role>
<implementation>org.apache.maven.wagon.providers.ssh.interactive.PrompterUIKeyboardInteractive</implementation>
<requirements>
---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-commits-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-commits-help@maven.apache.org