Author: veithen
Date: Tue Jan 10 21:56:23 2017
New Revision: 1778212
URL: http://svn.apache.org/viewvc?rev=1778212&view=rev
Log:
Merge r1777916 to the 1.7 branch.
Modified:
axis/axis2/java/rampart/branches/1_7/ (props changed)
axis/axis2/java/rampart/branches/1_7/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
axis/axis2/java/rampart/branches/1_7/modules/rampart-core/src/main/resources/org/apache/rampart/errors.properties
Propchange: axis/axis2/java/rampart/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 10 21:56:23 2017
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1726516,1726520,1726559,1727871
+/axis/axis2/java/rampart/trunk:1726516,1726520,1726559,1727871,1777916
Modified:
axis/axis2/java/rampart/branches/1_7/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_7/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java?rev=1778212&r1=1778211&r2=1778212&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_7/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
(original)
+++
axis/axis2/java/rampart/branches/1_7/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
Tue Jan 10 21:56:23 2017
@@ -390,7 +390,7 @@ public class RampartMessageData {
private void setWSSecurityVersions(String namespace) throws
RampartException {
if (namespace == null || namespace.equals("")) {
- throw new RampartException("Security policy namespace cannot be
null.");
+ throw new RampartException("securityPolicyNamespaceCannotBeNull");
}
if (SP11Constants.SP_NS.equals(namespace)) {
Modified:
axis/axis2/java/rampart/branches/1_7/modules/rampart-core/src/main/resources/org/apache/rampart/errors.properties
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_7/modules/rampart-core/src/main/resources/org/apache/rampart/errors.properties?rev=1778212&r1=1778211&r2=1778212&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_7/modules/rampart-core/src/main/resources/org/apache/rampart/errors.properties
(original)
+++
axis/axis2/java/rampart/branches/1_7/modules/rampart-core/src/main/resources/org/apache/rampart/errors.properties
Tue Jan 10 21:56:23 2017
@@ -36,6 +36,7 @@ missingCallbackHandler=Password callback
errorInObtainingSct=Error in obtaining SCT from \"{0}\"
errorInObtainingToken=Error in obtaining a token
errorInExtractingMsgProps = Error in extracting message properties
+securityPolicyNamespaceCannotBeNull=Security policy namespace cannot be null
userMissing = No user value in the rampart configuration policy
cbHandlerMissing = Password CallbackHandler not specified in rampart
configuration policy or the CallbackHandler instance not available in the
MessageContext
errorInGettingPasswordForUser = Error in getting password for user : \"{0}\"
