diff options
Diffstat (limited to 'pki')
-rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java | 12 | ||||
-rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java | 11 |
2 files changed, 17 insertions, 6 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java b/pki/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java index 6a90a7c8f..f2ee46c66 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/model/KeyDAO.java @@ -23,6 +23,7 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.List; +import javax.ws.rs.Path; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; import com.netscape.certsrv.apps.CMS; @@ -34,6 +35,7 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IRequestQueue; import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cms.servlet.key.KeyResource; import com.netscape.cms.servlet.request.model.RecoveryRequestData; /** @@ -186,12 +188,14 @@ public class KeyDAO { public KeyDataInfo createKeyDataInfo(IKeyRecord rec, UriInfo uriInfo) throws EBaseException { KeyDataInfo ret = new KeyDataInfo(); - String serial = null; - serial = (rec.getSerialNumber()).toString(); - + + Path keyPath = KeyResource.class.getAnnotation(Path.class); + BigInteger serial = rec.getSerialNumber(); + UriBuilder keyBuilder = uriInfo.getBaseUriBuilder(); - keyBuilder.path("/key/" + serial); + keyBuilder.path(keyPath.value() + "/" + serial); ret.setKeyURL(keyBuilder.build().toString()); + return ret; } diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java b/pki/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java index 8a32f5d8f..4da4af6d5 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java +++ b/pki/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestDAO.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.List; +import javax.ws.rs.Path; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; @@ -36,9 +37,11 @@ import com.netscape.certsrv.request.IRequestVirtualList; import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.request.RequestStatus; import com.netscape.cms.servlet.base.model.Link; +import com.netscape.cms.servlet.key.KeyResource; import com.netscape.cms.servlet.key.model.KeyDAO; import com.netscape.cms.servlet.key.model.KeyDataInfos; import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.cms.servlet.request.KeyRequestResource; /** * @author alee @@ -272,14 +275,18 @@ public class KeyRequestDAO { ret.setRequestType(request.getRequestType()); ret.setRequestStatus(request.getRequestStatus().toString()); + Path keyRequestPath = KeyRequestResource.class.getAnnotation(Path.class); String rid = request.getRequestId().toString(); + UriBuilder reqBuilder = uriInfo.getBaseUriBuilder(); - reqBuilder.path("/keyrequest/" + rid); + reqBuilder.path(keyRequestPath.value() + "/" + rid); ret.setRequestURL(reqBuilder.build().toString()); + Path keyPath = KeyResource.class.getAnnotation(Path.class); String kid = request.getExtDataInString("keyrecord"); + UriBuilder keyBuilder = uriInfo.getBaseUriBuilder(); - keyBuilder.path("/key/" + kid); + keyBuilder.path(keyPath.value() + "/" + kid); ret.setKeyURL(keyBuilder.build().toString()); return ret; |