Author: prabath
Date: Fri Feb 22 03:17:23 2008
New Revision: 14043
Log:
newly added claims are by default not required
Modified:
trunk/solutions/identity/modules/identity-provider/conf/wso2identity.hbm.xml
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/Initializer.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/ClaimDO.java
trunk/solutions/identity/modules/identity-provider/src/test/resources/wso2identity.hbm.xml
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/AddUserProfileSubmitAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/InfoCardUserRegisterationAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/InfoCardUserRegistrationSubmitAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/UserRegistrationFormSubmitAction.java
trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/userregistration.jsp
Modified:
trunk/solutions/identity/modules/identity-provider/conf/wso2identity.hbm.xml
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/conf/wso2identity.hbm.xml
(original)
+++
trunk/solutions/identity/modules/identity-provider/conf/wso2identity.hbm.xml
Fri Feb 22 03:17:23 2008
@@ -201,7 +201,7 @@
<property name="userEditable" column="is_user_editable"/>
<property name="attrId" column="attr_id"/>
<property name="supported" column="is_supported"/>
- <property name="optional" column="is_optional"/>
+ <property name="required" column="is_required"/>
<property name="openIDTag" column="openid_tag"/>
<many-to-one name="dialect" column="dialect_id" not-null="true" />
</class>
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/Initializer.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/Initializer.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/Initializer.java
Fri Feb 22 03:17:23 2008
@@ -187,17 +187,17 @@
paramAdmin.createOrUpdatearameter(
IdentityProviderConstants.PARAM_NAME_ALLOW_USER_REGISTRATION,
null);
-
+
// Enable OpenID registration
- paramAdmin.createOrUpdatearameter(
-
IdentityProviderConstants.PARAM_NAME_ENABLE_OPENID_REGISTRATION,
- null);
+ paramAdmin
+ .createOrUpdatearameter(
+
IdentityProviderConstants.PARAM_NAME_ENABLE_OPENID_REGISTRATION,
+ null);
}
/**
* Setup the user store for the identity provider sample.
- *
* @param db
* @param jdbcRealm
* @throws Exception
@@ -307,35 +307,34 @@
if (claim.getUri().equals(IdentityConstants.CLAIM_EMAIL_ADDRESS)) {
claim.setAttrId(IdentityConstants.CLAIM_EMAIL_ADDRESS);
+ claim.setRequired(true);
} else if
(claim.getUri().equals(IdentityConstants.CLAIM_NICKNAME)) {
claim.setAttrId(IdentityConstants.CLAIM_NICKNAME);
- claim.setOptional(true);
} else if (claim.getUri().equals(IdentityConstants.CLAIM_DOB)) {
claim.setAttrId(IdentityConstants.CLAIM_DOB);
- claim.setOptional(true);
} else if (claim.getUri().equals(IdentityConstants.CLAIM_GENDER)) {
claim.setAttrId(IdentityConstants.CLAIM_GENDER);
- claim.setOptional(true);
} else if (claim.getUri().equals(
IdentityConstants.CLAIM_POSTAL_CODE)) {
claim.setAttrId(IdentityConstants.CLAIM_POSTAL_CODE);
- claim.setOptional(true);
} else if (claim.getUri().equals(IdentityConstants.CLAIM_COUNTRY))
{
claim.setAttrId(IdentityConstants.CLAIM_COUNTRY);
+ claim.setRequired(true);
} else if
(claim.getUri().equals(IdentityConstants.CLAIM_LANGUAGE)) {
claim.setAttrId(IdentityConstants.CLAIM_LANGUAGE);
- claim.setOptional(true);
} else if
(claim.getUri().equals(IdentityConstants.CLAIM_TIME_ZONE)) {
claim.setAttrId(IdentityConstants.CLAIM_TIME_ZONE);
- claim.setOptional(true);
- }else if (claim.getUri().equals(IdentityConstants.CLAIM_FULLNAME))
{
+ } else if
(claim.getUri().equals(IdentityConstants.CLAIM_FULLNAME)) {
claim.setAttrId(IdentityConstants.CLAIM_FULLNAME);
- claim.setOptional(true);
- }else if (claim.getUri()
+ } else if (claim.getUri()
.equals(IdentityConstants.CLAIM_GIVEN_NAME)) {
claim.setAttrId(IdentityConstants.CLAIM_GIVEN_NAME);
+ claim.setRequired(true);
} else if (claim.getUri().equals(IdentityConstants.CLAIM_SURNAME))
{
claim.setAttrId(IdentityConstants.CLAIM_SURNAME);
+ claim.setRequired(true);
+ } else if (claim.getUri().equals(IdentityConstants.CLAIM_PPID)) {
+ claim.setRequired(true);
} else if (claim.getUri().equals(IdentityConstants.CLAIM_OPENID)) {
claim.setAttrId(IdentityConstants.CLAIM_OPENID);
claim.setUserEditable(false);
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/ClaimDO.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/ClaimDO.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/ClaimDO.java
Fri Feb 22 03:17:23 2008
@@ -38,7 +38,7 @@
private String openIDTag;
- private boolean optional;
+ private boolean required;
public String getOpenIDTag() {
return openIDTag;
@@ -118,12 +118,12 @@
this.dialect = dialect;
}
- public boolean isOptional() {
- return optional;
+ public boolean isRequired() {
+ return required;
}
- public void setOptional(boolean optional) {
- this.optional = optional;
+ public void setRequired(boolean required) {
+ this.required = required;
}
}
Modified:
trunk/solutions/identity/modules/identity-provider/src/test/resources/wso2identity.hbm.xml
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/test/resources/wso2identity.hbm.xml
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/test/resources/wso2identity.hbm.xml
Fri Feb 22 03:17:23 2008
@@ -201,7 +201,7 @@
<property name="userEditable" column="is_user_editable"/>
<property name="attrId" column="attr_id"/>
<property name="supported" column="is_supported"/>
- <property name="optional" column="is_optional"/>
+ <property name="required" column="is_required"/>
<property name="openIDTag" column="openid_tag"/>
<many-to-one name="dialect" column="dialect_id" not-null="true" />
</class>
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/AddUserProfileSubmitAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/AddUserProfileSubmitAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/AddUserProfileSubmitAction.java
Fri Feb 22 03:17:23 2008
@@ -61,7 +61,7 @@
String uri = claimDOs[i].getUri();
if (!uri.equals(IdentityConstants.CLAIM_PPID)) {
- if (!claimDOs[i].isOptional()
+ if (claimDOs[i].isRequired()
&& (request.getParameter(uri) == null || request
.getParameter(uri).trim().length() == 0)) {
this.addErrorMessage(getText("required_feilds_missing"));
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/InfoCardUserRegisterationAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/InfoCardUserRegisterationAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/InfoCardUserRegisterationAction.java
Fri Feb 22 03:17:23 2008
@@ -35,7 +35,7 @@
StringBuffer tmpClaims = new StringBuffer();
for (int i = 0; i < claimDOs.length; i++) {
- if (!claimDOs[i].isOptional())
+ if (claimDOs[i].isRequired())
tmpClaims.append(claimDOs[i].getUri() + " ");
}
this.claimsParamValue = tmpClaims.toString();
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/InfoCardUserRegistrationSubmitAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/InfoCardUserRegistrationSubmitAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/InfoCardUserRegistrationSubmitAction.java
Fri Feb 22 03:17:23 2008
@@ -71,7 +71,7 @@
HashMap props = new HashMap();
for (int i = 0; i < claimDOs.length; i++) {
- if (!claimDOs[i].isOptional())
+ if (claimDOs[i].isRequired())
props.put(claimDOs[i].getUri(), (String) request
.getAttribute(claimDOs[i].getUri()));
}
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/UserRegistrationFormSubmitAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/UserRegistrationFormSubmitAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/UserRegistrationFormSubmitAction.java
Fri Feb 22 03:17:23 2008
@@ -71,7 +71,7 @@
String uri = claimDOs[i].getUri();
if (!uri.equals(IdentityConstants.CLAIM_PPID)) {
- if (!claimDOs[i].isOptional()
+ if (claimDOs[i].isRequired()
&& (request.getParameter(uri) == null || request
.getParameter(uri).trim().length() == 0)) {
this.addErrorMessage(getText("required_feilds_missing"));
Modified:
trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/userregistration.jsp
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/userregistration.jsp
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/userregistration.jsp
Fri Feb 22 03:17:23 2008
@@ -51,7 +51,7 @@
<s:iterator value="claims">
<tr><td><s:property value="displayTag" /> </td>
<td width="2">
- <s:if test="optional==false">
+ <s:if test="required==true">
<font class="required">*</font>
</s:if>
</td>
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
