You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by re...@apache.org on 2015/03/23 12:16:08 UTC
incubator-taverna-commandline git commit:
Repository: incubator-taverna-commandline
Updated Branches:
refs/heads/master e3c781db0 -> 7db5214de
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/commit/7db5214d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/tree/7db5214d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/diff/7db5214d
Branch: refs/heads/master
Commit: 7db5214dea3a28c7fcf1d4409324858cdc008600
Parents: e3c781d
Author: redmitry <re...@84.88.50.62>
Authored: Mon Mar 23 12:15:21 2015 +0100
Committer: redmitry <re...@84.88.50.62>
Committed: Mon Mar 23 12:15:21 2015 +0100
----------------------------------------------------------------------
.../t2/commandline/CommandLineMasterPasswordProvider.java | 2 +-
.../main/java/net/sf/taverna/t2/commandline/CommandLineTool.java | 4 ++--
.../META-INF/spring/taverna-commandline-common-context-osgi.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/7db5214d/taverna-commandline-common/src/main/java/net/sf/taverna/t2/commandline/CommandLineMasterPasswordProvider.java
----------------------------------------------------------------------
diff --git a/taverna-commandline-common/src/main/java/net/sf/taverna/t2/commandline/CommandLineMasterPasswordProvider.java b/taverna-commandline-common/src/main/java/net/sf/taverna/t2/commandline/CommandLineMasterPasswordProvider.java
index 048e582..f9a0171 100644
--- a/taverna-commandline-common/src/main/java/net/sf/taverna/t2/commandline/CommandLineMasterPasswordProvider.java
+++ b/taverna-commandline-common/src/main/java/net/sf/taverna/t2/commandline/CommandLineMasterPasswordProvider.java
@@ -29,7 +29,7 @@ import java.io.InputStreamReader;
import net.sf.taverna.t2.commandline.exceptions.CommandLineMasterPasswordException;
import net.sf.taverna.t2.commandline.options.CommandLineOptions;
-import net.sf.taverna.t2.security.credentialmanager.MasterPasswordProvider;
+import org.apache.taverna.security.credentialmanager.MasterPasswordProvider;
import org.apache.log4j.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/7db5214d/taverna-commandline-common/src/main/java/net/sf/taverna/t2/commandline/CommandLineTool.java
----------------------------------------------------------------------
diff --git a/taverna-commandline-common/src/main/java/net/sf/taverna/t2/commandline/CommandLineTool.java b/taverna-commandline-common/src/main/java/net/sf/taverna/t2/commandline/CommandLineTool.java
index 649a12f..87be64b 100644
--- a/taverna-commandline-common/src/main/java/net/sf/taverna/t2/commandline/CommandLineTool.java
+++ b/taverna-commandline-common/src/main/java/net/sf/taverna/t2/commandline/CommandLineTool.java
@@ -43,8 +43,8 @@ import net.sf.taverna.t2.commandline.exceptions.InvalidOptionException;
import net.sf.taverna.t2.commandline.exceptions.OpenDataflowException;
import net.sf.taverna.t2.commandline.exceptions.ReadInputException;
import net.sf.taverna.t2.commandline.options.CommandLineOptions;
-import net.sf.taverna.t2.security.credentialmanager.CMException;
-import net.sf.taverna.t2.security.credentialmanager.CredentialManager;
+import org.apache.taverna.security.credentialmanager.CMException;
+import org.apache.taverna.security.credentialmanager.CredentialManager;
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/7db5214d/taverna-commandline-common/src/main/resources/META-INF/spring/taverna-commandline-common-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-commandline-common/src/main/resources/META-INF/spring/taverna-commandline-common-context-osgi.xml b/taverna-commandline-common/src/main/resources/META-INF/spring/taverna-commandline-common-context-osgi.xml
index e7ae701..18b5426 100644
--- a/taverna-commandline-common/src/main/resources/META-INF/spring/taverna-commandline-common-context-osgi.xml
+++ b/taverna-commandline-common/src/main/resources/META-INF/spring/taverna-commandline-common-context-osgi.xml
@@ -11,7 +11,7 @@
<reference id="commandLineOptions" interface="net.sf.taverna.t2.commandline.options.CommandLineOptions"/>
<reference id="runService" interface="uk.org.taverna.platform.run.api.RunService"/>
- <reference id="credentialManager" interface="net.sf.taverna.t2.security.credentialmanager.CredentialManager" />
+ <reference id="credentialManager" interface="org.apache.taverna.security.credentialmanager.CredentialManager" />
<reference id="databaseConfiguration" interface="uk.org.taverna.configuration.database.DatabaseConfiguration" />
<reference id="databaseManager" interface="uk.org.taverna.configuration.database.DatabaseManager" />