Author: dimuthul
Date: Fri Feb 15 17:54:26 2008
New Revision: 13807
Log:
Doing the changes suggested on commons-dev list yesterday.
Removed:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/admin/OpenIDProfileAdmin.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dao/OpenIDProfileDAO.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/OpenIDProfileValuesDO.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/OpenIDUserProfileDO.java
Modified:
trunk/solutions/identity/modules/identity-provider/conf/wso2identity.hbm.xml
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/IPPersistenceManager.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/mex/MexGetService.java
trunk/solutions/identity/modules/identity-provider/src/test/resources/wso2identity.hbm.xml
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 15 17:54:26 2008
@@ -294,9 +294,9 @@
</class>
<!-- ######################################################### -->
- <!-- #### OpenIDUserProfileDO(openid_user_profile) #### -->
+ <!-- #### UserProfileDO(user_profile) #### -->
<!-- ######################################################### -->
- <class
name="org.wso2.solutions.identity.persistence.dataobject.OpenIDUserProfileDO"
+ <class
name="org.wso2.solutions.identity.persistence.dataobject.UserProfileDO"
table="openid_user_profile">
<id name="id" column="id">
<generator class="native"/>
@@ -307,14 +307,14 @@
<property name="isDefault" column="is_default" not-null="true"/>
<set name="profileProperties" lazy="true" cascade="all">
<key column="profile_id"/>
- <one-to-many
class="org.wso2.solutions.identity.persistence.dataobject.OpenIDUserProfileDO"/>
+ <one-to-many
class="org.wso2.solutions.identity.persistence.dataobject.UserProfileValuesDO"/>
</set>
</class>
<!-- ######################################################### -->
- <!-- #### OpenIDProfileValuesDO(openid_profile_values) #### -->
+ <!-- #### UserProfileValuesDO(user_profile_values) #### -->
<!-- ######################################################### -->
- <class
name="org.wso2.solutions.identity.persistence.dataobject.OpenIDProfileValuesDO"
+ <class
name="org.wso2.solutions.identity.persistence.dataobject.UserProfileValuesDO"
table="openid_user_profile">
<id name="id" column="id">
<generator class="native"/>
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/IPPersistenceManager.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/IPPersistenceManager.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/IPPersistenceManager.java
Fri Feb 15 17:54:26 2008
@@ -25,7 +25,7 @@
import org.wso2.solutions.identity.persistence.dao.DialectDAO;
import org.wso2.solutions.identity.persistence.dao.InfoCardDAO;
import org.wso2.solutions.identity.persistence.dao.IssuedTokenDAO;
-import org.wso2.solutions.identity.persistence.dao.OpenIDProfileDAO;
+import org.wso2.solutions.identity.persistence.dao.UserProfileDAO;
import org.wso2.solutions.identity.persistence.dao.OpenIDUserRPDAO;
import org.wso2.solutions.identity.persistence.dao.PPIDValueDAO;
import org.wso2.solutions.identity.persistence.dao.ParameterDAO;
@@ -42,7 +42,7 @@
import org.wso2.solutions.identity.persistence.dataobject.DialectDO;
import org.wso2.solutions.identity.persistence.dataobject.InfoCardDO;
import org.wso2.solutions.identity.persistence.dataobject.IssuedTokensDO;
-import org.wso2.solutions.identity.persistence.dataobject.OpenIDUserProfileDO;
+import org.wso2.solutions.identity.persistence.dataobject.UserProfileDO;
import org.wso2.solutions.identity.persistence.dataobject.OpenIDUserRPDO;
import org.wso2.solutions.identity.persistence.dataobject.PPIDValueDO;
import org.wso2.solutions.identity.persistence.dataobject.ParameterDO;
@@ -51,6 +51,7 @@
import
org.wso2.solutions.identity.persistence.dataobject.RegisteredInfoCardInfoDO;
import org.wso2.solutions.identity.persistence.dataobject.RelyingPartyDO;
import org.wso2.solutions.identity.persistence.dataobject.RevokedInfoCardDO;
+import org.wso2.solutions.identity.persistence.dataobject.UserProfileValuesDO;
import org.wso2.solutions.identity.persistence.dataobject.UserTrustedRPDO;
import java.util.Date;
@@ -451,14 +452,19 @@
return dao.getOpenIDUserRP(userId);
}
- public OpenIDUserProfileDO[] getUserProfiles(String userId){
- OpenIDProfileDAO dao = new OpenIDProfileDAO(hbConfig);
+ public UserProfileDO[] getUserProfiles(String userId){
+ UserProfileDAO dao = new UserProfileDAO(hbConfig);
return dao.getUserProfiles(userId);
}
- public OpenIDUserProfileDO getUserProfile(String userId, String
profileName){
- OpenIDProfileDAO dao = new OpenIDProfileDAO(hbConfig);
+ public UserProfileDO getUserProfile(String userId, String profileName){
+ UserProfileDAO dao = new UserProfileDAO(hbConfig);
return dao.getUserProfile(userId, profileName);
}
+
+ public UserProfileValuesDO[] getUserProfileValues(String userId,String
profileName){
+ UserProfileDAO dao = new UserProfileDAO(hbConfig);
+ return dao.getUserProfileValues(userId, profileName);
+ }
}
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/mex/MexGetService.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/mex/MexGetService.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/mex/MexGetService.java
Fri Feb 15 17:54:26 2008
@@ -18,7 +18,6 @@
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Iterator;
-import java.util.List;
import javax.xml.crypto.dsig.XMLSignature;
import javax.xml.namespace.QName;
@@ -31,14 +30,10 @@
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.EndpointReferenceHelper;
-import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.mex.om.Metadata;
-import org.apache.axis2.mex.om.MetadataSection;
import org.apache.axis2.namespace.Constants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.rahas.RahasConstants;
import org.wso2.solutions.identity.IdentityConstants;
import org.wso2.solutions.identity.IdentityProviderConstants;
import org.wso2.solutions.identity.sts.KeyUtil;
@@ -91,7 +86,7 @@
throw new AxisFault("Invalid Mex Service");
}
- OMElement retElement = admin.getWSDL(stsName).getFirstElement();
+ /* OMElement retElement = admin.getWSDL(stsName).getFirstElement();
OMElement defElement = retElement.getFirstChildWithName(new QName(
Constants.NS_URI_WSDL11, "definitions"));
setIdentityAddressing(defElement);
@@ -106,7 +101,7 @@
Metadata mdata = new Metadata();
mdata.setMetadatSections(lst);
- elem = mdata.toOM();
+ elem = mdata.toOM();*/
if (log.isDebugEnabled()) {
log.debug("Mex processing DONE -> RESPONSE : " + elem);
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 15 17:54:26 2008
@@ -201,6 +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="openIDTag" column="openid_tag"/>
<many-to-one name="dialect" column="dialect_id" not-null="true" />
</class>
@@ -293,9 +294,9 @@
</class>
<!-- ######################################################### -->
- <!-- #### OpenIDUserProfileDO(openid_user_profile) #### -->
+ <!-- #### UserProfileDO(user_profile) #### -->
<!-- ######################################################### -->
- <class
name="org.wso2.solutions.identity.persistence.dataobject.OpenIDUserProfileDO"
+ <class
name="org.wso2.solutions.identity.persistence.dataobject.UserProfileDO"
table="openid_user_profile">
<id name="id" column="id">
<generator class="native"/>
@@ -306,14 +307,14 @@
<property name="isDefault" column="is_default" not-null="true"/>
<set name="profileProperties" lazy="true" cascade="all">
<key column="profile_id"/>
- <one-to-many
class="org.wso2.solutions.identity.persistence.dataobject.OpenIDUserProfileDO"/>
+ <one-to-many
class="org.wso2.solutions.identity.persistence.dataobject.UserProfileValuesDO"/>
</set>
</class>
<!-- ######################################################### -->
- <!-- #### OpenIDProfileValuesDO(openid_profile_values) #### -->
+ <!-- #### UserProfileValuesDO(user_profile_values) #### -->
<!-- ######################################################### -->
- <class
name="org.wso2.solutions.identity.persistence.dataobject.OpenIDProfileValuesDO"
+ <class
name="org.wso2.solutions.identity.persistence.dataobject.UserProfileValuesDO"
table="openid_user_profile">
<id name="id" column="id">
<generator class="native"/>
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
