Move console classes to pgm bundle

Since we updated minimum Java version to Java 7 the console bundle
doesn't need to be a separate bundle anymore. Move the contained classes
to the pgm bundle which is using these classes.

Change-Id: If8e6f2d7405fdfe6f4b178673b4ccf99c67d4b64
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

3 files changed, 0 insertions, 341 deletions

diff --git a/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleAuthenticator.java b/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleAuthenticator.java
deleted file mode 100644
index 941205af32..0000000000
--- a/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleAuthenticator.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2009, Google Inc.
- * Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org>
- * and other copyright owners as documented in the project's IP log.
- *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Distribution License v1.0 which
- * accompanies this distribution, is reproduced below, and is
- * available at http://www.eclipse.org/org/documents/edl-v10.php
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following
- *   disclaimer in the documentation and/or other materials provided
- *   with the distribution.
- *
- * - Neither the name of the Eclipse Foundation, Inc. nor the
- *   names of its contributors may be used to endorse or promote
- *   products derived from this software without specific prior
- *   written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.eclipse.jgit.console;
-
-import java.io.Console;
-import java.net.Authenticator;
-import java.net.PasswordAuthentication;
-import java.text.MessageFormat;
-
-import org.eclipse.jgit.util.CachedAuthenticator;
-
-/** Basic network prompt for username/password when using the console. */
-public class ConsoleAuthenticator extends CachedAuthenticator {
-	/** Install this authenticator implementation into the JVM. */
-	public static void install() {
-		final ConsoleAuthenticator c = new ConsoleAuthenticator();
-		if (c.cons == null)
-			throw new NoClassDefFoundError(ConsoleText.get().noSystemConsoleAvailable);
-		Authenticator.setDefault(c);
-	}
-
-	private final Console cons = System.console();
-
-	@Override
-	protected PasswordAuthentication promptPasswordAuthentication() {
-		final String realm = formatRealm();
-		String username = cons.readLine(MessageFormat.format(ConsoleText.get().usernameFor + " ", realm)); //$NON-NLS-1$
-		if (username == null || username.isEmpty()) {
-			return null;
-		}
-		char[] password = cons.readPassword(ConsoleText.get().password + " "); //$NON-NLS-1$
-		if (password == null) {
-			password = new char[0];
-		}
-		return new PasswordAuthentication(username, password);
-	}
-
-	private String formatRealm() {
-		final StringBuilder realm = new StringBuilder();
-		if (getRequestorType() == RequestorType.PROXY) {
-			realm.append(getRequestorType());
-			realm.append(" "); //$NON-NLS-1$
-			realm.append(getRequestingHost());
-			if (getRequestingPort() > 0) {
-				realm.append(":"); //$NON-NLS-1$
-				realm.append(getRequestingPort());
-			}
-		} else {
-			realm.append(getRequestingURL());
-		}
-		return realm.toString();
-	}
-}
diff --git a/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleCredentialsProvider.java b/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleCredentialsProvider.java
deleted file mode 100644
index a01fd86b4d..0000000000
--- a/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleCredentialsProvider.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (C) 2010, Google Inc.
- * Copyright (C) 2008, Robin Rosenberg <robin.rosenberg@dewire.com>
- * Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org>
- * and other copyright owners as documented in the project's IP log.
- *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Distribution License v1.0 which
- * accompanies this distribution, is reproduced below, and is
- * available at http://www.eclipse.org/org/documents/edl-v10.php
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following
- *   disclaimer in the documentation and/or other materials provided
- *   with the distribution.
- *
- * - Neither the name of the Eclipse Foundation, Inc. nor the
- *   names of its contributors may be used to endorse or promote
- *   products derived from this software without specific prior
- *   written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.eclipse.jgit.console;
-
-import java.io.Console;
-
-import org.eclipse.jgit.errors.UnsupportedCredentialItem;
-import org.eclipse.jgit.transport.ChainingCredentialsProvider;
-import org.eclipse.jgit.transport.CredentialItem;
-import org.eclipse.jgit.transport.CredentialsProvider;
-import org.eclipse.jgit.transport.NetRCCredentialsProvider;
-import org.eclipse.jgit.transport.URIish;
-
-/** Interacts with the user during authentication by using the text console. */
-public class ConsoleCredentialsProvider extends CredentialsProvider {
-	/** Install this implementation as the default. */
-	public static void install() {
-		final ConsoleCredentialsProvider c = new ConsoleCredentialsProvider();
-		if (c.cons == null)
-			throw new NoClassDefFoundError(
-					ConsoleText.get().noSystemConsoleAvailable);
-		CredentialsProvider cp = new ChainingCredentialsProvider(
-				new NetRCCredentialsProvider(), c);
-		CredentialsProvider.setDefault(cp);
-	}
-
-	private final Console cons = System.console();
-
-	@Override
-	public boolean isInteractive() {
-		return true;
-	}
-
-	@Override
-	public boolean supports(CredentialItem... items) {
-		for (CredentialItem i : items) {
-			if (i instanceof CredentialItem.StringType)
-				continue;
-
-			else if (i instanceof CredentialItem.CharArrayType)
-				continue;
-
-			else if (i instanceof CredentialItem.YesNoType)
-				continue;
-
-			else if (i instanceof CredentialItem.InformationalMessage)
-				continue;
-
-			else
-				return false;
-		}
-		return true;
-	}
-
-	@Override
-	public boolean get(URIish uri, CredentialItem... items)
-			throws UnsupportedCredentialItem {
-		boolean ok = true;
-		for (int i = 0; i < items.length && ok; i++) {
-			CredentialItem item = items[i];
-
-			if (item instanceof CredentialItem.StringType)
-				ok = get((CredentialItem.StringType) item);
-
-			else if (item instanceof CredentialItem.CharArrayType)
-				ok = get((CredentialItem.CharArrayType) item);
-
-			else if (item instanceof CredentialItem.YesNoType)
-				ok = get((CredentialItem.YesNoType) item);
-
-			else if (item instanceof CredentialItem.InformationalMessage)
-				ok = get((CredentialItem.InformationalMessage) item);
-
-			else
-				throw new UnsupportedCredentialItem(uri, item.getPromptText());
-		}
-		return ok;
-	}
-
-	private boolean get(CredentialItem.StringType item) {
-		if (item.isValueSecure()) {
-			char[] v = cons.readPassword("%s: ", item.getPromptText()); //$NON-NLS-1$
-			if (v != null) {
-				item.setValue(new String(v));
-				return true;
-			} else {
-				return false;
-			}
-		} else {
-			String v = cons.readLine("%s: ", item.getPromptText()); //$NON-NLS-1$
-			if (v != null) {
-				item.setValue(v);
-				return true;
-			} else {
-				return false;
-			}
-		}
-	}
-
-	private boolean get(CredentialItem.CharArrayType item) {
-		if (item.isValueSecure()) {
-			char[] v = cons.readPassword("%s: ", item.getPromptText()); //$NON-NLS-1$
-			if (v != null) {
-				item.setValueNoCopy(v);
-				return true;
-			} else {
-				return false;
-			}
-		} else {
-			String v = cons.readLine("%s: ", item.getPromptText()); //$NON-NLS-1$
-			if (v != null) {
-				item.setValueNoCopy(v.toCharArray());
-				return true;
-			} else {
-				return false;
-			}
-		}
-	}
-
-	private boolean get(CredentialItem.InformationalMessage item) {
-		cons.printf("%s\n", item.getPromptText()); //$NON-NLS-1$
-		cons.flush();
-		return true;
-	}
-
-	private boolean get(CredentialItem.YesNoType item) {
-		String r = cons.readLine("%s [%s/%s]? ", item.getPromptText(), //$NON-NLS-1$
-				ConsoleText.get().answerYes, ConsoleText.get().answerNo);
-		if (r != null) {
-			item.setValue(ConsoleText.get().answerYes.equalsIgnoreCase(r));
-			return true;
-		} else {
-			return false;
-		}
-	}
-}
diff --git a/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleText.java b/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleText.java
deleted file mode 100644
index 281d9379f7..0000000000
--- a/org.eclipse.jgit.console/src/org/eclipse/jgit/console/ConsoleText.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2010, Sasa Zivkov <sasa.zivkov@sap.com>
- * and other copyright owners as documented in the project's IP log.
- *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Distribution License v1.0 which
- * accompanies this distribution, is reproduced below, and is
- * available at http://www.eclipse.org/org/documents/edl-v10.php
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- *   copyright notice, this list of conditions and the following
- *   disclaimer in the documentation and/or other materials provided
- *   with the distribution.
- *
- * - Neither the name of the Eclipse Foundation, Inc. nor the
- *   names of its contributors may be used to endorse or promote
- *   products derived from this software without specific prior
- *   written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package org.eclipse.jgit.console;
-
-import org.eclipse.jgit.nls.NLS;
-import org.eclipse.jgit.nls.TranslationBundle;
-
-/**
- * Translation bundle for JGit console
- */
-public class ConsoleText extends TranslationBundle {
-
-	/**
-	 * @return an instance of this translation bundle
-	 */
-	public static ConsoleText get() {
-		return NLS.getBundleFor(ConsoleText.class);
-	}
-
-	// @formatter:off
-	/***/ public String answerNo;
-	/***/ public String answerYes;
-	/***/ public String noSystemConsoleAvailable;
-	/***/ public String password;
-	/***/ public String usernameFor;
-}