Add proxy authentication

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@465 174cde9d-5d70-4d2a-aa98-46368bc2aaf7

7 files changed, 247 insertions, 25 deletions

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigManipulator.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigManipulator.java
index 58b9e453..68b48242 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigManipulator.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigManipulator.java
@@ -76,6 +76,18 @@ public interface ConfigManipulator {
 	public void setProxyPort(int port);
 
 	/**
+	 * Sets the proxy username
+	 * @param user the proxy username
+	 */
+	public void setProxyUser(String user);
+
+	/**
+	 * Sets the proxy password
+	 * @param pass the proxy password
+	 */
+	public void setProxyPass(String pass);
+
+	/**
 	 * Sets the default output folder
 	 * @param outputFolder the default output folder
 	 */
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigOverlayManipulator.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigOverlayManipulator.java
index 952116ec..e3fec9f5 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigOverlayManipulator.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigOverlayManipulator.java
@@ -61,6 +61,18 @@ public interface ConfigOverlayManipulator {
 	public void setProxyPortOverlay(int port);
 
 	/**
+	 * Sets the proxy username
+	 * @param user the proxy username
+	 */
+	public void setProxyUserOverlay(String user);
+
+	/**
+	 * Sets the proxy password
+	 * @param pass the proxy password
+	 */
+	public void setProxyPassOverlay(String pass);
+
+	/**
 	 * Sets the default output folder
 	 * @param outputFolder the default output folder
 	 */
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProvider.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProvider.java
index 1adf39e4..91bd5ecf 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProvider.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProvider.java
@@ -85,6 +85,18 @@ public interface ConfigProvider {
 	public int getProxyPort();
 
 	/**
+	 * Gets the proxy username
+	 * @return the proxy username
+	 */
+	public String getProxyUser();
+
+	/**
+	 * Gets the proxy password
+	 * @return the proxy password
+	 */
+	public String getProxyPass();
+
+	/**
 	 * Get the default configured BKU
 	 * @return the default configured BKU
 	 */
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java
index 3225c92d..3010868b 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java
@@ -101,6 +101,14 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator,
 		this.setProxyHost(config
 				.getProperty(Constants.CFG_PROXY_HOST));
 
+		// Set Proxy User
+		this.setProxyUser(config
+				.getProperty(Constants.CFG_PROXY_USER));
+
+		// Set Proxy Password
+		this.setProxyPass(config
+				.getProperty(Constants.CFG_PROXY_PASS));
+
 		// Set Output Folder
 		this.setDefaultOutputFolder(config
 				.getProperty(Constants.CFG_OUTPUT_FOLDER));
@@ -279,6 +287,8 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator,
 		props.setProperty(Constants.CFG_PROXY_HOST, this.getProxyHostPersistent());
 		props.setProperty(Constants.CFG_PROXY_PORT,
 				Integer.toString(getProxyPortPersistent()));
+		props.setProperty(Constants.CFG_PROXY_USER, this.getProxyUserPersistent());
+		props.setProperty(Constants.CFG_PROXY_PASS, this.getProxyPassPersistent());
 		props.setProperty(Constants.CFG_EMBLEM, this.getDefaultEmblemPersistent());
 		props.setProperty(Constants.CFG_SIGNATURE_NOTE, this.getSignatureNote());
 		props.setProperty(Constants.CFG_MOBILE_NUMBER, this.getDefaultMobileNumberPersistent());
@@ -758,6 +768,104 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator,
 		return this.configuration.getProxyPort();
 	}
 
+	/**
+	 * Sets the proxy username
+	 * 
+	 * @param user
+	 *            the proxy username
+	 */
+	@Override
+	public void setProxyUser(String user) {
+		if (user == null || user.trim().isEmpty()) {
+			this.configuration.setProxyUser(STRING_EMPTY);
+		} else {
+			this.configuration.setProxyUser(user);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see at.asit.pdfover.gui.workflow.config.ConfigOverlayManipulator#setProxyUserOverlay(java.lang.String)
+	 */
+	@Override
+	public void setProxyUserOverlay(String user) {
+		if (user == null || user.trim().isEmpty()) {
+			this.configurationOverlay.setProxyUser(STRING_EMPTY);
+		} else {
+			this.configurationOverlay.setProxyUser(user);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see at.asit.pdfover.gui.workflow.config.ConfigProvider#getProxyUser()
+	 */
+	@Override
+	public String getProxyUser() {
+		String user = this.configurationOverlay.getProxyUser();
+		if (user == null)
+			user = getProxyUserPersistent();
+		return user;
+	}
+
+	/* (non-Javadoc)
+	 * @see at.asit.pdfover.gui.workflow.config.PersistentConfigProvider#getProxyUserPersistent()
+	 */
+	@Override
+	public String getProxyUserPersistent() {
+		String user = this.configuration.getProxyUser();
+		if (user == null)
+			user = STRING_EMPTY;
+		return user;
+	}
+
+	/**
+	 * Sets the proxy password
+	 * 
+	 * @param pass
+	 *            the proxy password
+	 */
+	@Override
+	public void setProxyPass(String pass) {
+		if (pass == null || pass.trim().isEmpty()) {
+			this.configuration.setProxyPass(STRING_EMPTY);
+		} else {
+			this.configuration.setProxyPass(pass);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see at.asit.pdfover.gui.workflow.config.ConfigOverlayManipulator#setProxyPassOverlay(java.lang.String)
+	 */
+	@Override
+	public void setProxyPassOverlay(String pass) {
+		if (pass == null || pass.trim().isEmpty()) {
+			this.configurationOverlay.setProxyPass(STRING_EMPTY);
+		} else {
+			this.configurationOverlay.setProxyPass(pass);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see at.asit.pdfover.gui.workflow.config.ConfigProvider#getProxyPass()
+	 */
+	@Override
+	public String getProxyPass() {
+		String pass = this.configurationOverlay.getProxyPass();
+		if (pass == null)
+			pass = getProxyPassPersistent();
+		return pass;
+	}
+
+	/* (non-Javadoc)
+	 * @see at.asit.pdfover.gui.workflow.config.PersistentConfigProvider#getProxyPassPersistent()
+	 */
+	@Override
+	public String getProxyPassPersistent() {
+		String pass = this.configuration.getProxyPass();
+		if (pass == null)
+			pass = STRING_EMPTY;
+		return pass;
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * 
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainer.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainer.java
index 383f5e9b..486647cc 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainer.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainer.java
@@ -81,18 +81,6 @@ public interface ConfigurationContainer {
 	public void setProxyHost(String host);
 
 	/**
-	 * Gets the signature note
-	 * @return the signature note
-	 */
-	public String getSignatureNote();
-
-	/**
-	 * Sets the signature note
-	 * @param note the signature note
-	 */
-	public void setSignatureNote(String note);
-
-	/**
 	 * Gets the proxy port
 	 * 
 	 * if port is -1 no port is selected
@@ -112,6 +100,42 @@ public interface ConfigurationContainer {
 	public void setProxyPort(int port) throws InvalidPortException;
 
 	/**
+	 * Gets the proxy username
+	 * @return the proxy username
+	 */
+	public String getProxyUser();
+
+	/**
+	 * Sets the proxy username
+	 * @param user the proxy username
+	 */
+	public void setProxyUser(String user);
+
+	/**
+	 * Gets the proxy password
+	 * @return the proxy password
+	 */
+	public String getProxyPass();
+
+	/**
+	 * Sets the proxy password
+	 * @param pass the proxy password
+	 */
+	public void setProxyPass(String pass);
+
+	/**
+	 * Gets the signature note
+	 * @return the signature note
+	 */
+	public String getSignatureNote();
+
+	/**
+	 * Sets the signature note
+	 * @param note the signature note
+	 */
+	public void setSignatureNote(String note);
+
+	/**
 	 * Gets the transparency of the placeholder
 	 * @return transparency of the placeholder (0-255)
 	 */
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java
index d878f59e..ec79b403 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationContainerImpl.java
@@ -54,31 +54,37 @@ public class ConfigurationContainerImpl implements ConfigurationContainer {
 
 	/** The mobile phone number */
 	protected String mobileNumber = null;
-	
+
 	/** The mobile phone password */
 	protected String mobilePassword = null;
-	
-	/** Holds the proxy Host */
+
+	/** Holds the proxy host */
 	protected String proxyHost = null;
-	
-	/** Holds the signatureNote */
-	protected String signatureNote = null;
-	
+
 	/** Holds the proxy port number */
 	protected int proxyPort = -1;
-	
+
+	/** Holds the proxy username */
+	protected String proxyUser = null;
+
+	/** Holds the proxy password */
+	protected String proxyPass = null;
+
+	/** Holds the signatureNote */
+	protected String signatureNote = null;
+
 	/** Holds the locale */
 	protected Locale locale = null;
-	
+
 	/** Holds the signature locale */
 	protected Locale signLocale = null;
-	
+
 	/** Holds the output folder */
 	protected String folder = null;
-	
+
 	/** Holds the default BKU to use */
 	protected BKUs defaultBKU = BKUs.NONE;
-	
+
 	/** Holds the automatic positioning value */
 	protected boolean automaticPositioning = false;
 
@@ -225,6 +231,42 @@ public class ConfigurationContainerImpl implements ConfigurationContainer {
 
 
 	/* (non-Javadoc)
+	 * @see at.asit.pdfover.gui.workflow.config.ConfigurationContainer#getProxyUser()
+	 */
+	@Override
+	public String getProxyUser() {
+		return this.proxyUser;
+	}
+
+
+	/* (non-Javadoc)
+	 * @see at.asit.pdfover.gui.workflow.config.ConfigurationContainer#setProxyUser(java.lang.String)
+	 */
+	@Override
+	public void setProxyUser(String user) {
+		this.proxyUser = user;
+	}
+
+
+	/* (non-Javadoc)
+	 * @see at.asit.pdfover.gui.workflow.config.ConfigurationContainer#getProxyPass()
+	 */
+	@Override
+	public String getProxyPass() {
+		return this.proxyPass;
+	}
+
+
+	/* (non-Javadoc)
+	 * @see at.asit.pdfover.gui.workflow.config.ConfigurationContainer#setProxyPass(java.lang.String)
+	 */
+	@Override
+	public void setProxyPass(String pass) {
+		this.proxyPass = pass;
+	}
+
+
+	/* (non-Javadoc)
 	 * @see at.asit.pdfover.gui.workflow.ConfigurationContainer#getPlaceholderTransparency()
 	 */
 	@Override
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/PersistentConfigProvider.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/PersistentConfigProvider.java
index ea2c97b1..fe4fceb3 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/PersistentConfigProvider.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/PersistentConfigProvider.java
@@ -52,7 +52,7 @@ public interface PersistentConfigProvider {
 	 * @return the emblem
 	 */
 	public String getDefaultEmblemPersistent();
-	
+
 	/**
 	 * Gets the proxy host
 	 * @return the proxy hostname or ip address
@@ -66,6 +66,18 @@ public interface PersistentConfigProvider {
 	public int getProxyPortPersistent();
 
 	/**
+	 * Gets the proxy username
+	 * @return the proxy username
+	 */
+	public String getProxyUserPersistent();
+
+	/**
+	 * Gets the proxy password
+	 * @return the proxy password
+	 */
+	public String getProxyPassPersistent();
+
+	/**
 	 * Gets the default output folder for signed documents
 	 * @return the default output folder 
 	 */