### Eclipse Workspace Patch 1.0
#P org.eclipse.pde.core
Index: src/org/eclipse/pde/internal/core/exports/FeatureExportOperation.java
===================================================================
RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/FeatureExportOperation.java,v
retrieving revision 1.26
diff -u -r1.26 FeatureExportOperation.java
--- src/org/eclipse/pde/internal/core/exports/FeatureExportOperation.java	24 Feb 2009 03:06:22 -0000	1.26
+++ src/org/eclipse/pde/internal/core/exports/FeatureExportOperation.java	24 Feb 2009 22:43:23 -0000
@@ -396,13 +396,14 @@
 			}
 
 			if (fInfo.signingInfo != null) {
-				fAntBuildProperties.put("sign.alias", fInfo.signingInfo[0]); //$NON-NLS-1$
-				fAntBuildProperties.put("sign.keystore", fInfo.signingInfo[1]); //$NON-NLS-1$
-				fAntBuildProperties.put("sign.storepass", fInfo.signingInfo[2]); //$NON-NLS-1$
+				fAntBuildProperties.put(IXMLConstants.PROPERTY_SIGN_ALIAS, fInfo.signingInfo[0]);
+				fAntBuildProperties.put(IXMLConstants.PROPERTY_SIGN_KEYSTORE, fInfo.signingInfo[1]);
+				fAntBuildProperties.put(IXMLConstants.PROPERTY_SIGN_STOREPASS, fInfo.signingInfo[2]);
+				fAntBuildProperties.put(IXMLConstants.PROPERTY_SIGN_KEYPASS, fInfo.signingInfo[3]);
 			}
 			if (fInfo.jnlpInfo != null) {
-				fAntBuildProperties.put("jnlp.codebase", fInfo.jnlpInfo[0]); //$NON-NLS-1$
-				fAntBuildProperties.put("jnlp.j2se", fInfo.jnlpInfo[1]); //$NON-NLS-1$
+				fAntBuildProperties.put(IXMLConstants.PROPERTY_JNLP_CODEBASE, fInfo.jnlpInfo[0]);
+				fAntBuildProperties.put(IXMLConstants.PROPERTY_JNLP_J2SE, fInfo.jnlpInfo[1]);
 			}
 
 			fAntBuildProperties.put(IXMLConstants.PROPERTY_BUILD_TEMP, fBuildTempLocation + "/destination"); //$NON-NLS-1$
#P org.eclipse.pde.ui
Index: src/org/eclipse/pde/internal/ui/pderesources.properties
===================================================================
RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties,v
retrieving revision 1.1043
diff -u -r1.1043 pderesources.properties
--- src/org/eclipse/pde/internal/ui/pderesources.properties	24 Feb 2009 03:10:34 -0000	1.1043
+++ src/org/eclipse/pde/internal/ui/pderesources.properties	24 Feb 2009 22:43:26 -0000
@@ -500,6 +500,7 @@
 AdvancedLauncherTab_workingSet=Add Wor&king Set...
 AdvancedFeatureExportPage_jnlp=Ja&va Web Start
 AdvancedPluginExportPage_alias=A&lias:
+JARSigningTab_keypass=K&eypass:
 AdvancedLauncherTab_includeOptional=Include &optional dependencies when computing required {0}
 AdvancedFeatureExportPage_siteURL=Si&te URL:
 AdvancedPluginExportPage_keystore=Keys&tore location:
Index: src/org/eclipse/pde/internal/ui/PDEUIMessages.java
===================================================================
RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java,v
retrieving revision 1.413
diff -u -r1.413 PDEUIMessages.java
--- src/org/eclipse/pde/internal/ui/PDEUIMessages.java	24 Feb 2009 03:10:35 -0000	1.413
+++ src/org/eclipse/pde/internal/ui/PDEUIMessages.java	24 Feb 2009 22:43:25 -0000
@@ -905,6 +905,7 @@
 	public static String AdvancedLauncherTab_selectedBundles;
 	public static String AdvancedFeatureExportPage_jnlp;
 	public static String AdvancedPluginExportPage_alias;
+	public static String JARSigningTab_keypass;
 	public static String AdvancedLauncherTab_includeOptional;
 	public static String AdvancedFeatureExportPage_siteURL;
 	public static String AdvancedPluginExportPage_keystore;
Index: src/org/eclipse/pde/internal/ui/wizards/exports/JARSigningTab.java
===================================================================
RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/exports/JARSigningTab.java,v
retrieving revision 1.5
diff -u -r1.5 JARSigningTab.java
--- src/org/eclipse/pde/internal/ui/wizards/exports/JARSigningTab.java	16 Jan 2008 17:08:25 -0000	1.5
+++ src/org/eclipse/pde/internal/ui/wizards/exports/JARSigningTab.java	24 Feb 2009 22:43:26 -0000
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     EclipseSource Corporation - ongoing enhancements
  *******************************************************************************/
 package org.eclipse.pde.internal.ui.wizards.exports;
 
@@ -25,6 +26,7 @@
 
 	private static final String S_SIGN_JARS = "signJAR"; //$NON-NLS-1$
 	private static final String S_KEYSTORE = "keystore"; //$NON-NLS-1$
+	private static final String S_KEYPASS = "keypass"; //$NON-NLS-1$ 
 	private static final String S_ALIAS = "alias"; //$NON-NLS-1$
 	private static final String S_PASSWORD = "password"; //$NON-NLS-1$
 
@@ -33,6 +35,9 @@
 	private Label fKeystoreLabel;
 	private Text fKeystoreText;
 
+	private Label fKeypassLabel;
+	private Text fKeypassText;
+
 	private Label fAliasLabel;
 	private Text fAliasText;
 
@@ -83,6 +88,9 @@
 			}
 		});
 
+		fKeypassLabel = createLabel(comp, PDEUIMessages.JARSigningTab_keypass);
+		fKeypassText = createText(comp, 2);
+
 		fAliasLabel = createLabel(comp, PDEUIMessages.AdvancedPluginExportPage_alias);
 		fAliasText = createText(comp, 2);
 
@@ -97,6 +105,7 @@
 
 	protected void initialize(IDialogSettings settings) {
 		fKeystoreText.setText(getString(settings, S_KEYSTORE));
+		fKeypassText.setText(getString(settings, S_KEYPASS));
 		fAliasText.setText(getString(settings, S_ALIAS));
 		fPasswordText.setText(getString(settings, S_PASSWORD));
 		fButton.setSelection(settings.getBoolean(S_SIGN_JARS));
@@ -152,6 +161,8 @@
 		fAliasText.setEnabled(enabled);
 		fPasswordLabel.setEnabled(enabled);
 		fPasswordText.setEnabled(enabled);
+		fKeypassLabel.setEnabled(enabled);
+		fKeypassText.setEnabled(enabled);
 	}
 
 	protected void saveSettings(IDialogSettings settings) {
@@ -159,11 +170,12 @@
 		settings.put(S_KEYSTORE, fKeystoreText.getText().trim());
 		settings.put(S_ALIAS, fAliasText.getText().trim());
 		settings.put(S_PASSWORD, fPasswordText.getText().trim());
+		settings.put(S_KEYPASS, fKeypassText.getText().trim());
 	}
 
 	protected String[] getSigningInfo() {
 		if (fButton.getSelection()) {
-			return new String[] {fAliasText.getText().trim(), fKeystoreText.getText().trim(), fPasswordText.getText().trim()};
+			return new String[] {fAliasText.getText().trim(), fKeystoreText.getText().trim(), fPasswordText.getText().trim(), fKeypassText.getText().trim()};
 		}
 		return null;
 	}