Author: prabath
Date: Wed Feb 20 22:54:54 2008
New Revision: 13935
Log:
application of constants
Modified:
trunk/solutions/identity/modules/base/src/main/java/org/wso2/solutions/identity/IdentityConstants.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/IdentityProviderConstants.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDServerManager.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthVerificationAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthenticationAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDUserApprovalAction.java
Modified:
trunk/solutions/identity/modules/base/src/main/java/org/wso2/solutions/identity/IdentityConstants.java
==============================================================================
---
trunk/solutions/identity/modules/base/src/main/java/org/wso2/solutions/identity/IdentityConstants.java
(original)
+++
trunk/solutions/identity/modules/base/src/main/java/org/wso2/solutions/identity/IdentityConstants.java
Wed Feb 20 22:54:54 2008
@@ -153,6 +153,7 @@
public final static String OPENOD_RESPONSE = "id_res";
public static final String AUTHENTICATED_AND_APPROVED =
"authenticatedAndApproved";
public final static String CANCEL = "cancel";
+ public final static String PARAM_LIST = "parameterlist";
public static class SimpleRegAttributes {
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/IdentityProviderConstants.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/IdentityProviderConstants.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/IdentityProviderConstants.java
Wed Feb 20 22:54:54 2008
@@ -235,9 +235,7 @@
/**
* OpenID related constants of the identity provider
*/
- public static class OpenId {
-
- public final static String PARAM_LIST = "parameterlist";
+ public static class OpenId {
public final static String PASSWORD = "password";
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java
Wed Feb 20 22:54:54 2008
@@ -26,7 +26,6 @@
import org.openid4java.server.ServerException;
import org.openid4java.server.ServerManager;
import org.wso2.solutions.identity.IdentityConstants;
-import org.wso2.solutions.identity.IdentityProviderConstants;
import org.wso2.solutions.identity.IdentityProviderException;
import org.wso2.solutions.identity.persistence.IPPersistenceManager;
import org.wso2.solutions.identity.persistence.dataobject.OpenIDUserRPDO;
@@ -86,7 +85,7 @@
.getParameter(IdentityConstants.OpenId.ACTION))) {
// Authentication completed.
request = (ParameterList) session
-
.getAttribute(IdentityProviderConstants.OpenId.PARAM_LIST);
+ .getAttribute(IdentityConstants.OpenId.PARAM_LIST);
} else {
// Extract the parameters from the request.
// Authentication not completed.
@@ -157,8 +156,7 @@
// Not authenticated, redirect to the authentication
// page.
- session.setAttribute(
- IdentityProviderConstants.OpenId.PARAM_LIST,
+ session.setAttribute(IdentityConstants.OpenId.PARAM_LIST,
request);
return authPage;
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDServerManager.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDServerManager.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDServerManager.java
Wed Feb 20 22:54:54 2008
@@ -13,6 +13,7 @@
import org.openid4java.message.Message;
import org.openid4java.message.ParameterList;
import org.openid4java.server.ServerManager;
+import org.wso2.solutions.identity.IdentityConstants;
public class OpenIDServerManager extends ServerManager {
@@ -22,7 +23,8 @@
*
*/
public Message associationResponse(ParameterList requestParams) {
- boolean isVersion2 = requestParams.hasParameter("openid.ns");
+ boolean isVersion2 = requestParams
+ .hasParameter(IdentityConstants.OpenId.ATTR_NS);
log.info("Processing association request...");
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthVerificationAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthVerificationAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthVerificationAction.java
Wed Feb 20 22:54:54 2008
@@ -62,7 +62,8 @@
infoCardSignin = request.getParameter("InfoCardSignin");
- requestParam = (ParameterList) session.getAttribute("parameterlist");
+ requestParam = (ParameterList) session
+ .getAttribute(IdentityConstants.OpenId.PARAM_LIST);
if (requestParam != null
&& requestParam
@@ -247,7 +248,7 @@
IPPersistenceManager db = null;
requestParam = (ParameterList) request.getSession().getAttribute(
- "parameterlist");
+ IdentityConstants.OpenId.PARAM_LIST);
String openID = requestParam.getParameter(
IdentityConstants.OpenId.ATTR_IDENTITY).getValue();
String rpUrl = requestParam
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthenticationAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthenticationAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthenticationAction.java
Wed Feb 20 22:54:54 2008
@@ -33,9 +33,12 @@
response = (HttpServletResponse) context
.get(StrutsStatics.HTTP_RESPONSE);
session = request.getSession();
- requestParam = (ParameterList) session.getAttribute("parameterlist");
+ requestParam = (ParameterList) session
+ .getAttribute(IdentityConstants.OpenId.PARAM_LIST);
- if (requestParam != null &&
requestParam.hasParameter(IdentityConstants.OpenId.ATTR_IDENTITY)) {
+ if (requestParam != null
+ && requestParam
+ .hasParameter(IdentityConstants.OpenId.ATTR_IDENTITY))
{
openID = requestParam.getParameter(
IdentityConstants.OpenId.ATTR_IDENTITY).getValue();
} else {
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDUserApprovalAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDUserApprovalAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDUserApprovalAction.java
Wed Feb 20 22:54:54 2008
@@ -48,7 +48,7 @@
map = ActionContext.getContext().getSession();
ParameterList requestp = (ParameterList) request.getSession()
- .getAttribute("parameterlist");
+ .getAttribute(IdentityConstants.OpenId.PARAM_LIST);
submitAction = ((String[]) request.getParameterMap()
.get("approval"))[0];
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
