Author: ruchith
Date: Mon Jan 28 00:09:05 2008
New Revision: 13033
Log:
cleaned up some unwanted tables
Removed:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/admin/TokenVerifierServiceAdmin.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dao/VerifierServiceDAO.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/VerifierServiceIdpDO.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/VerifierServiceRPDO.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/VerifierServiceTokenDO.java
Modified:
trunk/solutions/identity/keys/wso2ca/index.txt
trunk/solutions/identity/keys/wso2ca/index.txt.old
trunk/solutions/identity/keys/wso2ca/serial
trunk/solutions/identity/keys/wso2ca/serial.old
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/test/resources/wso2identity.hbm.xml
Modified: trunk/solutions/identity/keys/wso2ca/index.txt
==============================================================================
--- trunk/solutions/identity/keys/wso2ca/index.txt (original)
+++ trunk/solutions/identity/keys/wso2ca/index.txt Mon Jan 28 00:09:05 2008
@@ -7,3 +7,4 @@
V 240321093339Z 8852BD6D9041B0C5 unknown
/C=LK/ST=Western/L=Colombo/O=WSO2/OU=Identity Solution/CN=www.wso2.org
V 240321100029Z 8852BD6D9041B0C6 unknown
/C=LK/ST=Western/L=Colombo/O=WSO2/OU=Identity Solution/CN=ww2.wso2.org
V 240321132926Z 8852BD6D9041B0C7 unknown
/C=LK/ST=Western/L=Colombo/O=WSO2/OU=Mashups/CN=mashups.wso2.org
+V 240611052608Z 8852BD6D9041B0C8 unknown
/C=LK/ST=Western/L=Colombo/O=WSO2/OU=Mashup/CN=localhost
Modified: trunk/solutions/identity/keys/wso2ca/index.txt.old
==============================================================================
--- trunk/solutions/identity/keys/wso2ca/index.txt.old (original)
+++ trunk/solutions/identity/keys/wso2ca/index.txt.old Mon Jan 28 00:09:05 2008
@@ -6,3 +6,4 @@
V 240304103820Z 8852BD6D9041B0C4 unknown
/C=LK/ST=Western/L=Colombo/O=WSO2/OU=Identity Solution/CN=samplerp
V 240321093339Z 8852BD6D9041B0C5 unknown
/C=LK/ST=Western/L=Colombo/O=WSO2/OU=Identity Solution/CN=www.wso2.org
V 240321100029Z 8852BD6D9041B0C6 unknown
/C=LK/ST=Western/L=Colombo/O=WSO2/OU=Identity Solution/CN=ww2.wso2.org
+V 240321132926Z 8852BD6D9041B0C7 unknown
/C=LK/ST=Western/L=Colombo/O=WSO2/OU=Mashups/CN=mashups.wso2.org
Modified: trunk/solutions/identity/keys/wso2ca/serial
==============================================================================
--- trunk/solutions/identity/keys/wso2ca/serial (original)
+++ trunk/solutions/identity/keys/wso2ca/serial Mon Jan 28 00:09:05 2008
@@ -1 +1 @@
-8852BD6D9041B0C8
+8852BD6D9041B0C9
Modified: trunk/solutions/identity/keys/wso2ca/serial.old
==============================================================================
--- trunk/solutions/identity/keys/wso2ca/serial.old (original)
+++ trunk/solutions/identity/keys/wso2ca/serial.old Mon Jan 28 00:09:05 2008
@@ -1 +1 @@
-8852BD6D9041B0C7
+8852BD6D9041B0C8
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
Mon Jan 28 00:09:05 2008
@@ -288,62 +288,6 @@
<property name="value" column="value"/>
</class>
-<!-- ********************** Start Verifier service Database
**************************** -->
-
- <!-- ####################################################################
-->
- <!-- ##### VerifierServiceIDP(verifier_service_idps) #####
-->
- <!-- ####################################################################
-->
- <class
name="org.wso2.solutions.identity.persistence.dataobject.VerifierServiceIdpDO"
- table="verifier_service_idps">
- <id name="id" column="id">
- <generator class="native"/>
- </id>
- <property name="lastUpdatedTime" type="timestamp"
column="c_last_updated" not-null="true"/>
- <property name="hostName" column="host_name" not-null="true"/>
- <property name="isGlobal" column="is_global" not-null="true"/>
- <set name="tokens">
- <key column="idp_id"/>
- <one-to-many
class="org.wso2.solutions.identity.persistence.dataobject.VerifierServiceTokenDO"/>
- </set>
- <set name="relyingParties">
- <key column="relying_party_id"/>
- <many-to-many
class="org.wso2.solutions.identity.persistence.dataobject.VerifierServiceRPDO"/>
- </set>
- </class>
-
- <class
name="org.wso2.solutions.identity.persistence.dataobject.VerifierServiceTokenDO"
- table="verifier_service_tokens">
- <id name="id" column="id">
- <generator class="native"/>
- </id>
- <property name="lastUpdatedTime" type="timestamp"
column="last_updated" not-null="true"/>
- <property name="assertionId" column="assertion_Id" not-null="true"/>
- <property name="dateIssued" column="date_Issued" not-null="true"/>
- <property name="dateExpires" column="date_Expires" not-null="true"/>
- <property name="token" column="token" type="blob"/>
- <many-to-one name="issuedBy" column="idp_id" not-null="true"/>
- <many-to-one name="relyingParty" column="relying_party_id"
not-null="true"/>
- </class>
-
- <class
name="org.wso2.solutions.identity.persistence.dataobject.VerifierServiceRPDO"
- table="verifier_service_rps">
- <id name="id" column="id">
- <generator class="native"/>
- </id>
- <property name="lastUpdatedTime" type="timestamp"
column="c_last_updated" not-null="true"/>
- <property name="username" column="user_Id" not-null="true"/>
- <property name="password" column="card_Id" not-null="true"/>
- <set name="tokens">
- <key column="relying_party_id"/>
- <one-to-many
class="org.wso2.solutions.identity.persistence.dataobject.VerifierServiceTokenDO"/>
- </set>
- <set name="idps" inverse="true">
- <key column="idp_id"/>
- <many-to-many
class="org.wso2.solutions.identity.persistence.dataobject.VerifierServiceIdpDO"/>
- </set>
- </class>
-
-<!-- ********************** End Verifier service Database
**************************** -->
</hibernate-mapping>
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
Mon Jan 28 00:09:05 2008
@@ -15,9 +15,6 @@
*/
package org.wso2.solutions.identity.persistence;
-import java.util.Date;
-import java.util.List;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.Session;
@@ -37,7 +34,6 @@
import org.wso2.solutions.identity.persistence.dao.ReportDAO;
import org.wso2.solutions.identity.persistence.dao.RevokedInfoCardDAO;
import org.wso2.solutions.identity.persistence.dao.UserPersonalRelyingPartyDAO;
-import org.wso2.solutions.identity.persistence.dao.VerifierServiceDAO;
import org.wso2.solutions.identity.persistence.dataobject.AbstractDataObject;
import org.wso2.solutions.identity.persistence.dataobject.ActionDO;
import org.wso2.solutions.identity.persistence.dataobject.ClaimDO;
@@ -52,8 +48,9 @@
import org.wso2.solutions.identity.persistence.dataobject.RelyingPartyDO;
import org.wso2.solutions.identity.persistence.dataobject.RevokedInfoCardDO;
import org.wso2.solutions.identity.persistence.dataobject.UserTrustedRPDO;
-import org.wso2.solutions.identity.persistence.dataobject.VerifierServiceIdpDO;
-import org.wso2.solutions.identity.persistence.dataobject.VerifierServiceRPDO;
+
+import java.util.Date;
+import java.util.List;
/**
* Handles all database persistence related operations of WSO2 Identity
@@ -306,15 +303,6 @@
return dao.getRealm(className);
}
- public VerifierServiceIdpDO[] getAllVerifierServiceIdpDO() {
- VerifierServiceDAO dao = new VerifierServiceDAO(hbConfig);
- return dao.getAllVerifierServiceIdpDO();
- }
-
- public VerifierServiceRPDO[] getAllVerifierServiceRpDO() {
- VerifierServiceDAO dao = new VerifierServiceDAO(hbConfig);
- return dao.getAllVerifierServiceRpDO();
- }
public void RevokeInfoCard(InfoCardDO infoCard)
throws IdentityProviderException {
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
Mon Jan 28 00:09:05 2008
@@ -145,7 +145,7 @@
<property name="name" column="name" not-null="true" unique="true"/>
<property name="effective" column="effective" not-null="true"/>
<many-to-one name="realm" column="realm_id" not-null="true"
lazy="false"/>
- <set name="configProperties" lazy="false">
+ <set name="configProperties" lazy="false" cascade="all">
<key column="realm_config_id"/>
<one-to-many
class="org.wso2.solutions.identity.persistence.dataobject.RealmConfigurationPropertyDO"/>
</set>
@@ -162,8 +162,8 @@
<property name="lastUpdatedTime" type="timestamp"
column="c_last_updated" not-null="true"/>
<property name="name" column="name" not-null="true"/>
- <property name="value" column="value" not-null="true"/>
- <many-to-one name="config" column="realm_config_id" not-null="true"
lazy="false"/>
+ <property name="value" column="value" not-null="true"/>
+ <many-to-one name="config" column="realm_config_id" lazy="false"/>
</class>
<!-- #################################################### -->
@@ -200,7 +200,8 @@
<property name="simple" column="is_simple"/>
<property name="userEditable" column="is_user_editable"/>
<property name="attrId" column="attr_id"/>
- <property name="supported" column="is_supported"/>
+ <property name="supported" column="is_supported"/>
+ <property name="openIDTag" column="openid_tag"/>
<many-to-one name="dialect" column="dialect_id" not-null="true" />
</class>
@@ -287,62 +288,6 @@
<property name="value" column="value"/>
</class>
-<!-- ********************** Start Verifier service Database
**************************** -->
-
- <!-- ####################################################################
-->
- <!-- ##### VerifierServiceIDP(verifier_service_idps) #####
-->
- <!-- ####################################################################
-->
- <class
name="org.wso2.solutions.identity.persistence.dataobject.VerifierServiceIdpDO"
- table="verifier_service_idps">
- <id name="id" column="id">
- <generator class="native"/>
- </id>
- <property name="lastUpdatedTime" type="timestamp"
column="c_last_updated" not-null="true"/>
- <property name="hostName" column="host_name" not-null="true"/>
- <property name="isGlobal" column="is_global" not-null="true"/>
- <set name="tokens">
- <key column="idp_id"/>
- <one-to-many
class="org.wso2.solutions.identity.persistence.dataobject.VerifierServiceTokenDO"/>
- </set>
- <set name="relyingParties">
- <key column="relying_party_id"/>
- <many-to-many
class="org.wso2.solutions.identity.persistence.dataobject.VerifierServiceRPDO"/>
- </set>
- </class>
-
- <class
name="org.wso2.solutions.identity.persistence.dataobject.VerifierServiceTokenDO"
- table="verifier_service_tokens">
- <id name="id" column="id">
- <generator class="native"/>
- </id>
- <property name="lastUpdatedTime" type="timestamp"
column="last_updated" not-null="true"/>
- <property name="assertionId" column="assertion_Id" not-null="true"/>
- <property name="dateIssued" column="date_Issued" not-null="true"/>
- <property name="dateExpires" column="date_Expires" not-null="true"/>
- <property name="token" column="token" type="blob"/>
- <many-to-one name="issuedBy" column="idp_id" not-null="true"/>
- <many-to-one name="relyingParty" column="relying_party_id"
not-null="true"/>
- </class>
-
- <class
name="org.wso2.solutions.identity.persistence.dataobject.VerifierServiceRPDO"
- table="verifier_service_rps">
- <id name="id" column="id">
- <generator class="native"/>
- </id>
- <property name="lastUpdatedTime" type="timestamp"
column="c_last_updated" not-null="true"/>
- <property name="username" column="user_Id" not-null="true"/>
- <property name="password" column="card_Id" not-null="true"/>
- <set name="tokens">
- <key column="relying_party_id"/>
- <one-to-many
class="org.wso2.solutions.identity.persistence.dataobject.VerifierServiceTokenDO"/>
- </set>
- <set name="idps" inverse="true">
- <key column="idp_id"/>
- <many-to-many
class="org.wso2.solutions.identity.persistence.dataobject.VerifierServiceIdpDO"/>
- </set>
- </class>
-
-<!-- ********************** End Verifier service Database
**************************** -->
</hibernate-mapping>
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
