summaryrefslogtreecommitdiffstats
path: root/base/common/src/org
diff options
context:
space:
mode:
authorChristina Fu <cfu@redhat.com>2015-05-13 08:35:34 -0700
committerChristina Fu <cfu@redhat.com>2015-05-21 16:46:45 -0700
commit2e6537e80d42c208a96e218d84ed4fb5c6b7a9d4 (patch)
treee59a9a92af2097a338305a940015c22f10c1ba31 /base/common/src/org
parente444af55a920534d34ccc63406eb53a27eed0356 (diff)
downloadpki-2e6537e80d42c208a96e218d84ed4fb5c6b7a9d4.tar.gz
pki-2e6537e80d42c208a96e218d84ed4fb5c6b7a9d4.tar.xz
pki-2e6537e80d42c208a96e218d84ed4fb5c6b7a9d4.zip
Ticket 1307 (part1 refactoring) [RFE] Support multiple keySets for different cards for ExternalReg This patch is mainly refactoring the names of the Mapping Resolver framework in preparation for ticket 1307 to support keySet mapping in addition to the original purpose of resolving tokenType mapping. The reason to separate out refactoring from the real code is for ease of reviewing. TPS is currently a Tech Preview feature, so upgrade is not of consideration at the moment.
Diffstat (limited to 'base/common/src/org')
-rw-r--r--base/common/src/org/dogtagpki/tps/msg/EndOpMsg.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/base/common/src/org/dogtagpki/tps/msg/EndOpMsg.java b/base/common/src/org/dogtagpki/tps/msg/EndOpMsg.java
index 251898591..d9064769b 100644
--- a/base/common/src/org/dogtagpki/tps/msg/EndOpMsg.java
+++ b/base/common/src/org/dogtagpki/tps/msg/EndOpMsg.java
@@ -44,8 +44,8 @@ public class EndOpMsg extends TPSMessage {
STATUS_ERROR_UPGRADE_APPLET,
STATUS_ERROR_KEY_CHANGE_OVER,
STATUS_ERROR_EXTERNAL_AUTH,
- STATUS_ERROR_DEFAULT_TOKENTYPE_NOT_FOUND,
- STATUS_ERROR_DEFAULT_TOKENTYPE_PARAMS_NOT_FOUND,
+ STATUS_ERROR_MAPPING_RESOLVER_FAILED, // was STATUS_ERROR_DEFAULT_TOKENTYPE_NOT_FOUND
+ STATUS_ERROR_MAPPING_RESOLVER_PARAMS_NOT_FOUND, // was STATUS_ERROR_DEFAULT_TOKENTYPE_PARAMS_NOT_FOUND
STATUS_ERROR_PUBLISH,
STATUS_ERROR_LDAP_CONN,
STATUS_ERROR_DISABLED_TOKEN,
@@ -153,10 +153,10 @@ public class EndOpMsg extends TPSMessage {
case STATUS_ERROR_EXTERNAL_AUTH:
result = 21;
break;
- case STATUS_ERROR_DEFAULT_TOKENTYPE_NOT_FOUND:
+ case STATUS_ERROR_MAPPING_RESOLVER_FAILED:
result = 22;
break;
- case STATUS_ERROR_DEFAULT_TOKENTYPE_PARAMS_NOT_FOUND:
+ case STATUS_ERROR_MAPPING_RESOLVER_PARAMS_NOT_FOUND:
result = 23;
break;
case STATUS_ERROR_PUBLISH: