portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r746440 - in /portals/jetspeed-2/portal/trunk: components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/ components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/ jetspeed-portal-resources/src/main/ddl-schema/
Date Sat, 21 Feb 2009 06:30:26 GMT
Author: taylor
Date: Sat Feb 21 06:30:25 2009
New Revision: 746440

URL: http://svn.apache.org/viewvc?rev=746440&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-927
Portlet 2.0 object model persistence for OJB. Modified to be more inline with JPA persistence
This commit still does not cover filters, filter mappings

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/SupportedPublicRenderParameterImpl.java
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml?rev=746440&r1=746439&r2=746440&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/JETSPEED-INF/ojb/registry_repository.xml
Sat Feb 21 06:30:25 2009
@@ -308,12 +308,6 @@
           auto-retrieve = "true"
       >
          <inverse-foreignkey field-ref="ownerId"/>
-         <query-customizer class="org.apache.jetspeed.util.ojb.CollectionOwnerClassDiscriminatorQueryCustomizer">
-            <attribute
-              attribute-name="discriminatorField"
-              attribute-value="owner"
-            />
-         </query-customizer>
       </collection-descriptor>
       
    </class-descriptor>
@@ -525,13 +519,6 @@
 
       >
          <inverse-foreignkey field-ref="ownerId"/>
-         <query-customizer class="org.apache.jetspeed.util.ojb.CollectionOwnerClassDiscriminatorQueryCustomizer">
-            <attribute
-              attribute-name="discriminatorField"
-              attribute-value="owner"
-            />
-         </query-customizer>
-
       </collection-descriptor>
 
    <collection-descriptor
@@ -542,12 +529,6 @@
           auto-retrieve = "true"
       >
          <inverse-foreignkey field-ref="ownerId"/>
-         <query-customizer class="org.apache.jetspeed.util.ojb.CollectionOwnerClassDiscriminatorQueryCustomizer">
-            <attribute
-              attribute-name="discriminatorField"
-              attribute-value="owner"
-            />
-         </query-customizer>
       </collection-descriptor>
 
    <!--
@@ -1418,13 +1399,6 @@
 
       >
          <inverse-foreignkey field-ref="ownerId"/>
-         <query-customizer class="org.apache.jetspeed.util.ojb.CollectionOwnerClassDiscriminatorQueryCustomizer">
-            <attribute
-              attribute-name="discriminatorField"
-              attribute-value="owner"
-            />
-         </query-customizer>
-
       </collection-descriptor>
    
 	</class-descriptor>
@@ -1630,13 +1604,6 @@
          access="anonymous"
       />
 
-
-      <field-descriptor
-         name="owner"
-         column="OWNER_CLASS_NAME"
-         jdbc-type="VARCHAR"
-      />
-
       <field-descriptor
          name="name"
          column="NAME"
@@ -1784,12 +1751,6 @@
 
       >
          <inverse-foreignkey field-ref="ownerId"/>
-         <query-customizer class="org.apache.jetspeed.util.ojb.CollectionOwnerClassDiscriminatorQueryCustomizer">
-            <attribute
-              attribute-name="discriminatorField"
-              attribute-value="owner"
-            />
-         </query-customizer>
 
       </collection-descriptor>
 
@@ -1801,14 +1762,7 @@
          auto-retrieve = "true"
 
       >
-         <inverse-foreignkey field-ref="ownerId"/>
-         <query-customizer class="org.apache.jetspeed.util.ojb.CollectionOwnerClassDiscriminatorQueryCustomizer">
-            <attribute
-              attribute-name="discriminatorField"
-              attribute-value="owner"
-            />
-         </query-customizer>
-
+       <inverse-foreignkey field-ref="ownerId"/>
       </collection-descriptor>
    
 	</class-descriptor>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java?rev=746440&r1=746439&r2=746440&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
Sat Feb 21 06:30:25 2009
@@ -685,7 +685,7 @@
                 throw new IllegalArgumentException("Support for public render parameter with
identifier: "+identifier+" already defined");
             }
         }
-        supportedPublicRenderParameters.add(new SupportedPublicRenderParameterImpl(this,
identifier));        
+        supportedPublicRenderParameters.add(new SupportedPublicRenderParameterImpl(identifier));
       
     }
 
 

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/SupportedPublicRenderParameterImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/SupportedPublicRenderParameterImpl.java?rev=746440&r1=746439&r2=746440&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/SupportedPublicRenderParameterImpl.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/om/portlet/impl/SupportedPublicRenderParameterImpl.java
Sat Feb 21 06:30:25 2009
@@ -6,14 +6,12 @@
 public class SupportedPublicRenderParameterImpl implements SupportedPublicRenderParameter
 {
     private String name;
-    protected String owner;    
 
     public SupportedPublicRenderParameterImpl()
     {}
     
-    public SupportedPublicRenderParameterImpl(Object owner, String name)
+    public SupportedPublicRenderParameterImpl(String name)
     {
-        this.owner = owner.getClass().getName();        
         this.name = name;
     }
     

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml?rev=746440&r1=746439&r2=746440&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml
Sat Feb 21 06:30:25 2009
@@ -340,7 +340,6 @@
     <table name="NAMED_PARAMETER">                                            
         <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
         <column name="OWNER_ID" required="true" type="INTEGER"/>
-        <column name="OWNER_CLASS_NAME" required="true" size="255" type="VARCHAR"/>
         <column name="NAME" required="true" size="150" type="VARCHAR"/>
     </table> 
        



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message