You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/06/27 13:16:39 UTC
[1/3] incubator-taverna-workbench git commit:
taverna-credential-manager-api
Repository: incubator-taverna-workbench
Updated Branches:
refs/heads/master a3ee663dd -> f229d5ea8
taverna-credential-manager-api
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/1835be04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/1835be04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/1835be04
Branch: refs/heads/master
Commit: 1835be042e346565449269acfb304fbbd3fc95c2
Parents: a3ee663
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Jun 27 13:48:39 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Jun 27 13:48:39 2016 +0100
----------------------------------------------------------------------
taverna-credential-manager-ui/pom.xml | 2 +-
taverna-perspective-myexperiment/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/1835be04/taverna-credential-manager-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-credential-manager-ui/pom.xml b/taverna-credential-manager-ui/pom.xml
index b952b1b..d16cb5d 100644
--- a/taverna-credential-manager-ui/pom.xml
+++ b/taverna-credential-manager-ui/pom.xml
@@ -47,7 +47,7 @@
</dependency>
<dependency>
<groupId>org.apache.taverna.engine</groupId>
- <artifactId>taverna-credential-manager</artifactId>
+ <artifactId>taverna-credential-manager-api</artifactId>
<version>${taverna.engine.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/1835be04/taverna-perspective-myexperiment/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-perspective-myexperiment/pom.xml b/taverna-perspective-myexperiment/pom.xml
index 391bf4f..2d460c1 100644
--- a/taverna-perspective-myexperiment/pom.xml
+++ b/taverna-perspective-myexperiment/pom.xml
@@ -85,7 +85,7 @@
</dependency>
<dependency>
<groupId>org.apache.taverna.engine</groupId>
- <artifactId>taverna-credential-manager</artifactId>
+ <artifactId>taverna-credential-manager-api</artifactId>
<version>${taverna.engine.version}</version>
</dependency>
[2/3] incubator-taverna-workbench git commit: bouncycastle dependency
Posted by st...@apache.org.
bouncycastle dependency
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/fec4a268
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/fec4a268
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/fec4a268
Branch: refs/heads/master
Commit: fec4a2689fe43663438d35b9afd5fc7974d96c51
Parents: 1835be0
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Jun 27 13:54:57 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Jun 27 13:54:57 2016 +0100
----------------------------------------------------------------------
taverna-credential-manager-ui/pom.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/fec4a268/taverna-credential-manager-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-credential-manager-ui/pom.xml b/taverna-credential-manager-ui/pom.xml
index d16cb5d..318acb8 100644
--- a/taverna-credential-manager-ui/pom.xml
+++ b/taverna-credential-manager-ui/pom.xml
@@ -65,5 +65,10 @@
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>${bcprov.version}</version>
+ </dependency>
</dependencies>
</project>
[3/3] incubator-taverna-workbench git commit: Update for newer
BouncyCastle
Posted by st...@apache.org.
Update for newer BouncyCastle
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/f229d5ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/f229d5ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/f229d5ea
Branch: refs/heads/master
Commit: f229d5ea8b073b5ff89dd903d014fb54c7d3f153
Parents: fec4a26
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Jun 27 14:16:22 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Jun 27 14:16:22 2016 +0100
----------------------------------------------------------------------
taverna-credential-manager-ui/pom.xml | 6 ++++++
.../credentialmanager/CredentialManagerUI.java | 21 ++++++++++----------
.../WarnUserAboutJCEPolicyDialog.java | 2 +-
3 files changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/f229d5ea/taverna-credential-manager-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-credential-manager-ui/pom.xml b/taverna-credential-manager-ui/pom.xml
index 318acb8..be4a3ad 100644
--- a/taverna-credential-manager-ui/pom.xml
+++ b/taverna-credential-manager-ui/pom.xml
@@ -70,5 +70,11 @@
<artifactId>bcprov-jdk15on</artifactId>
<version>${bcprov.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ <version>${bcprov.version}</version>
+ </dependency>
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/f229d5ea/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/CredentialManagerUI.java
----------------------------------------------------------------------
diff --git a/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/CredentialManagerUI.java b/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/CredentialManagerUI.java
index 7547918..cc0684c 100644
--- a/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/CredentialManagerUI.java
+++ b/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/CredentialManagerUI.java
@@ -78,15 +78,14 @@ import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.table.TableColumn;
+import org.apache.log4j.Logger;
import org.apache.taverna.security.credentialmanager.CMException;
import org.apache.taverna.security.credentialmanager.CredentialManager;
import org.apache.taverna.security.credentialmanager.CredentialManager.KeystoreType;
import org.apache.taverna.security.credentialmanager.DistinguishedNameParser;
import org.apache.taverna.security.credentialmanager.UsernamePassword;
-
-import org.apache.log4j.Logger;
-import org.bouncycastle.openssl.PEMReader;
-import org.bouncycastle.openssl.PEMWriter;
+import org.bouncycastle.openssl.PEMParser;
+import org.bouncycastle.openssl.jcajce.JcaPEMWriter;
/**
* Provides a UI for the Credential Manager for users to manage their
@@ -1139,7 +1138,7 @@ public class CredentialManagerUI extends JFrame {
try {
// Load the PKCS #12 keystore from the file
// (this is using the BouncyCastle provider !!!)
- KeyStore pkcs12Keystore = credManager.loadPKCS12Keystore(importFile,
+ KeyStore pkcs12Keystore = credManager.loadPKCS12Keystore(importFile.toPath(),
pkcs12Password);
/*
@@ -1239,7 +1238,7 @@ public class CredentialManagerUI extends JFrame {
// Export the key pair
try {
- credManager.exportKeyPair(alias, exportFile, pkcs12Password);
+ credManager.exportKeyPair(alias, exportFile.toPath(), pkcs12Password);
showMessageDialog(this, "Key pair export successful", ALERT_TITLE,
INFORMATION_MESSAGE);
} catch (CMException cme) {
@@ -1316,10 +1315,9 @@ public class CredentialManagerUI extends JFrame {
if (trustCertsList.size() == 0) {
// Could not load certificates as any of the above types
- try (FileInputStream fis = new FileInputStream(certFile);
- PEMReader pr = new PEMReader(
- new InputStreamReader(fis), null, cf
- .getProvider().getName())) {
+
+ try (PEMParser pr = new PEMParser(
+ new InputStreamReader(new FileInputStream(certFile)))) {
/*
* Try as openssl PEM format - which sligtly differs from
* the one supported by JCE
@@ -1407,7 +1405,8 @@ public class CredentialManagerUI extends JFrame {
return false;
// Export the trusted certificate
- try (PEMWriter pw = new PEMWriter(new FileWriter(exportFile))) {
+ try (JcaPEMWriter pw = new JcaPEMWriter(new FileWriter(exportFile))) {
+ //try (PEMWriter pw = new PEMWriter(new FileWriter(exportFile))) {
// Get the trusted certificate
pw.writeObject(credManager.getCertificate(TRUSTSTORE, alias));
} catch (Exception ex) {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/f229d5ea/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/WarnUserAboutJCEPolicyDialog.java
----------------------------------------------------------------------
diff --git a/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/WarnUserAboutJCEPolicyDialog.java b/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/WarnUserAboutJCEPolicyDialog.java
index c88c090..86b202e 100644
--- a/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/WarnUserAboutJCEPolicyDialog.java
+++ b/taverna-credential-manager-ui/src/main/java/org/apache/taverna/workbench/ui/credentialmanager/WarnUserAboutJCEPolicyDialog.java
@@ -197,7 +197,7 @@ public class WarnUserAboutJCEPolicyDialog extends NonBlockedHelpEnabledDialog {
ApplicationConfiguration applicationConfiguration,
DistinguishedNameParser dnParser) {
return new File(
- dnParser.getCredentialManagerDefaultDirectory(applicationConfiguration),
+ dnParser.getCredentialManagerDefaultDirectory(applicationConfiguration).toFile(),
DO_NOT_WARN_ABOUT_JCE_POLICY);
}