You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrp4j-dev@portals.apache.org by dl...@apache.org on 2006/12/29 01:39:30 UTC
svn commit: r490883 - in
/portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons:
consumer/driver/page/ consumer/driver/portlet/ consumer/driver/producer/
consumer/driver/user/ persistence/driver/ producer/driver/
producer/provider...
Author: dlouzan
Date: Thu Dec 28 16:39:29 2006
New Revision: 490883
URL: http://svn.apache.org/viewvc?view=rev&rev=490883
Log:
Refined Hibernate mappings.
Modified:
portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/page/PageImpl.hbm.xml
portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/portlet/ConsumerPortletContext.hbm.xml
portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/portlet/WSRPPortletImpl.hbm.xml
portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/producer/ProducerImpl.hbm.xml
portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/user/UserImpl.hbm.xml
portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/persistence/driver/WSRPServiceDescription.hbm.xml
portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/producer/driver/RegistrationImpl.hbm.xml
portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/producer/provider/driver/ConsumerConfiguredPortletImpl.hbm.xml
portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/producer/provider/driver/ConsumerPortletRegistrationImpl.hbm.xml
Modified: portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/page/PageImpl.hbm.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/page/PageImpl.hbm.xml?view=diff&rev=490883&r1=490882&r2=490883
==============================================================================
--- portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/page/PageImpl.hbm.xml (original)
+++ portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/page/PageImpl.hbm.xml Thu Dec 28 16:39:29 2006
@@ -24,14 +24,19 @@
<class name="org.apache.wsrp4j.commons.consumer.driver.page.PageImpl"
table="PAGE">
- <id name="pageID" type="string" column="ID"/>
+ <id name="pageID" type="string" column="PAGEID"/>
<property name="title" type="string" column="TITLE"/>
<property name="maximizedPortletInstanceKey" type="string"
- column="MAX_PORTLET_INST_KEY"/>
+ column="MAXIMIZED_PORTLET_INST_KEY"/>
<map name="portlets" table="PAGE_PORTLETS">
<key column="ID"/>
<map-key column="IDX" type="string"/>
- <composite-element class="org.apache.wsrp4j.commons.consumer.interfaces.portlet.PortletKey"/>
+ <composite-element class="org.apache.wsrp4j.commons.consumer.interfaces.portlet.PortletKey">
+ <property name="portletHandle" type="string" column="PORTLET_HANDLE"
+ not-null="true"/>
+ <property name="producerId" type="string" column="PRODUCER_ID"
+ not-null="true"/>
+ </composite-element>
</map>
</class>
Modified: portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/portlet/ConsumerPortletContext.hbm.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/portlet/ConsumerPortletContext.hbm.xml?view=diff&rev=490883&r1=490882&r2=490883
==============================================================================
--- portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/portlet/ConsumerPortletContext.hbm.xml (original)
+++ portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/portlet/ConsumerPortletContext.hbm.xml Thu Dec 28 16:39:29 2006
@@ -24,9 +24,13 @@
<class name="org.apache.wsrp4j.commons.consumer.driver.portlet.ConsumerPortletContext"
table="CONSUMER_PORTLET_CTXT">
- <id name="portletKey"
- type="org.apache.wsrp4j.commons.consumer.interfaces.portlet.PortletKey"
- column="PORTLET_KEY"/>
+ <composite-id name="portletKey"
+ class="org.apache.wsrp4j.commons.consumer.interfaces.portlet.PortletKey">
+ <key-property name="portletHandle" type="string"
+ column="PORTLET_HANDLE"/>
+ <key-property name="producerId" type="string"
+ column="PRODUCER_ID"/>
+ </composite-id>
<property name="portletContext"
type="oasis.names.tc.wsrp.v1.types.PortletContext"
column="PORTLET_CTXT"/>
Modified: portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/portlet/WSRPPortletImpl.hbm.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/portlet/WSRPPortletImpl.hbm.xml?view=diff&rev=490883&r1=490882&r2=490883
==============================================================================
--- portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/portlet/WSRPPortletImpl.hbm.xml (original)
+++ portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/portlet/WSRPPortletImpl.hbm.xml Thu Dec 28 16:39:29 2006
@@ -23,10 +23,14 @@
<class name="org.apache.wsrp4j.commons.consumer.driver.portlet.WSRPPortletImpl"
table="PORTLET">
-
- <id name="portletKey"
- type="org.apache.wsrp4j.commons.consumer.interfaces.portlet.PortletKey"
- column="PORTLET_KEY"/>
+
+ <composite-id name="portletKey"
+ class="org.apache.wsrp4j.commons.consumer.interfaces.portlet.PortletKey">
+ <key-property name="portletHandle" type="string"
+ column="PORTLET_HANDLE"/>
+ <key-property name="producerId" type="string"
+ column="PRODUCER_ID"/>
+ </composite-id>
<property name="parent" type="string" column="PARENT_ID"/>
</class>
Modified: portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/producer/ProducerImpl.hbm.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/producer/ProducerImpl.hbm.xml?view=diff&rev=490883&r1=490882&r2=490883
==============================================================================
--- portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/producer/ProducerImpl.hbm.xml (original)
+++ portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/producer/ProducerImpl.hbm.xml Thu Dec 28 16:39:29 2006
@@ -23,22 +23,31 @@
<class name="org.apache.wsrp4j.commons.consumer.driver.producer.ProducerImpl"
table="PRODUCER">
-
- <id name="ID" type="string" column="ID"/>
+
+ <id name="ID" type="string" column="PROD_ID"/>
+ <property name="name" type="string" column="PROD_NAME"/>
+ <property name="description" type="string" column="PROD_DESC"/>
<property name="registrationRequired" type="boolean" column="REG_RQR"/>
- <property name="registrationData"
- type="oasis.names.tc.wsrp.v1.types.RegistrationData"
- column="REG_DATA"/>
+
+ <component name="registrationData"
+ class="oasis.names.tc.wsrp.v1.types.RegistrationData">
+ <property name="consumerName" type="string"
+ column="REGDATA_CONS_NAME"/>
+ <property name="consumerAgent" type="string"
+ column="REGDATA_CONS_AGENT"/>
+ <property name="methodGetSupported" type="boolean"
+ column="REGDATA_GET_SUPPORTED"/>
+ </component>
+
<property name="markupInterfaceEndpoint" type="string"
- column="MARKUP_INTERFACE"/>
+ column="MARKUP_INTERFACE" not-null="true"/>
<property name="serviceDescriptionInterfaceEndpoint" type="string"
- column="SERVICE_DESC_INTERFACE"/>
+ column="SERVICE_DESC_INTERFACE" not-null="true"/>
<property name="registrationInterfaceEndpoint" type="string"
column="REGISTRATION_INTERFACE"/>
<property name="portletManagementInterfaceEndpoint" type="string"
column="PORTLET_MGM_INTERFACE"/>
- <property name="name" type="string" column="NAME"/>
- <property name="description" type="string" column="DESC"/>
+
<property name="registrationContext"
type="oasis.names.tc.wsrp.v1.types.RegistrationContext"
column="REG_CTXT"/>
Modified: portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/user/UserImpl.hbm.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/user/UserImpl.hbm.xml?view=diff&rev=490883&r1=490882&r2=490883
==============================================================================
--- portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/user/UserImpl.hbm.xml (original)
+++ portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/consumer/driver/user/UserImpl.hbm.xml Thu Dec 28 16:39:29 2006
@@ -22,9 +22,9 @@
<hibernate-mapping>
<class name="org.apache.wsrp4j.commons.consumer.driver.user.UserImpl"
- table="USER">
+ table="WSRPUSER">
- <id name="userID" type="string" column="ID"/>
+ <id name="userID" type="string" column="USERID"/>
<property name="userContext"
type="oasis.names.tc.wsrp.v1.types.UserContext"
column="USER_CTXT"/>
Modified: portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/persistence/driver/WSRPServiceDescription.hbm.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/persistence/driver/WSRPServiceDescription.hbm.xml?view=diff&rev=490883&r1=490882&r2=490883
==============================================================================
--- portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/persistence/driver/WSRPServiceDescription.hbm.xml (original)
+++ portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/persistence/driver/WSRPServiceDescription.hbm.xml Thu Dec 28 16:39:29 2006
@@ -23,7 +23,8 @@
<class name="org.apache.wsrp4j.commons.persistence.driver.WSRPServiceDescription"
table="SERVICE_DESC">
- <id name="id" type="string" column="ID"/>
+
+ <id name="id" type="string" column="SERVICE_DESC_ID"/>
<property name="initCookieRequired" type="string" column="RQRCOOKIE"/>
<property name="requiresRegistration" type="boolean" column="RQRREG"/>
<property name="registrationPropertyDescription"
@@ -59,6 +60,7 @@
<list-index column="IDX"/>
<composite-element class="oasis.names.tc.wsrp.v1.types.Extension"/>
</array>
+
</class>
</hibernate-mapping>
Modified: portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/producer/driver/RegistrationImpl.hbm.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/producer/driver/RegistrationImpl.hbm.xml?view=diff&rev=490883&r1=490882&r2=490883
==============================================================================
--- portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/producer/driver/RegistrationImpl.hbm.xml (original)
+++ portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/producer/driver/RegistrationImpl.hbm.xml Thu Dec 28 16:39:29 2006
@@ -23,12 +23,14 @@
<class name="org.apache.wsrp4j.commons.producer.driver.RegistrationImpl"
table="REGISTRATION">
+
<id name="registrationContext"
type="oasis.names.tc.wsrp.v1.types.RegistrationContext"
column="REGCTXT"/>
<property name="registrationData"
type="oasis.names.tc.wsrp.v1.types.RegistrationData"
column="REGDATA"/>
+
</class>
</hibernate-mapping>
Modified: portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/producer/provider/driver/ConsumerConfiguredPortletImpl.hbm.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/producer/provider/driver/ConsumerConfiguredPortletImpl.hbm.xml?view=diff&rev=490883&r1=490882&r2=490883
==============================================================================
--- portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/producer/provider/driver/ConsumerConfiguredPortletImpl.hbm.xml (original)
+++ portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/producer/provider/driver/ConsumerConfiguredPortletImpl.hbm.xml Thu Dec 28 16:39:29 2006
@@ -23,8 +23,10 @@
<class name="org.apache.wsrp4j.commons.producer.provider.driver.ConsumerConfiguredPortletImpl"
table="CONSUMER_CONF_PORTLET">
- <id name="portletHandle" type="string" column="PORTLETHANDLE"/>
- <property name="parentHandle" type="string" column="PARENTHANDLE"/>
+
+ <id name="portletHandle" type="string" column="PORTLET_HANDLE"/>
+ <property name="parentHandle" type="string" column="PARENT_HANDLE"/>
+
</class>
</hibernate-mapping>
Modified: portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/producer/provider/driver/ConsumerPortletRegistrationImpl.hbm.xml
URL: http://svn.apache.org/viewvc/portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/producer/provider/driver/ConsumerPortletRegistrationImpl.hbm.xml?view=diff&rev=490883&r1=490882&r2=490883
==============================================================================
--- portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/producer/provider/driver/ConsumerPortletRegistrationImpl.hbm.xml (original)
+++ portals/wsrp4j/trunk/persistence-db/src/resources/org/apache/wsrp4j/commons/producer/provider/driver/ConsumerPortletRegistrationImpl.hbm.xml Thu Dec 28 16:39:29 2006
@@ -23,11 +23,13 @@
<class name="org.apache.wsrp4j.commons.producer.provider.driver.ConsumerPortletRegistrationImpl"
table="CONSUMER_PORTLET_REG">
+
<id name="registrationHandle" type="string" column="REG_HANDLE"/>
<set name="portletHandles" table="CONSPORTLREG_PORTLET_HANDLE">
- <key column="REG_HANDLE"/>
+ <key column="ID"/>
<element column="PORTLET_HANDLE" type="string"/>
</set>
+
</class>
</hibernate-mapping>