roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r497945 - in /incubator/roller/trunk/sandbox/jdobackend: lib/ src/org/apache/roller/business/datamapper/ src/org/apache/roller/business/jdo/ src/org/apache/roller/business/jpa/ src/org/apache/roller/pojos/
Date Fri, 19 Jan 2007 20:35:42 GMT
Author: snoopdave
Date: Fri Jan 19 12:35:41 2007
New Revision: 497945

URL: http://svn.apache.org/viewvc?view=rev&rev=497945
Log:
Ripping out PersistentObject, starting to add PlanetImpl

Added:
    incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperPlanetImpl.java
    incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/jpa/JPAPlanetImpl.java
Removed:
    incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/PersistentObjectHelper.java
Modified:
    incubator/roller/trunk/sandbox/jdobackend/lib/toplink-essentials.jar
    incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperBookmarkManagerImpl.java
    incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperPersistenceStrategy.java
    incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperRefererManagerImpl.java
    incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperUserManagerImpl.java
    incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperWeblogManagerImpl.java
    incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/jdo/JDOPersistenceStrategy.java
    incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/jpa/JPAPersistenceStrategy.java
    incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryData.orm.xml

Modified: incubator/roller/trunk/sandbox/jdobackend/lib/toplink-essentials.jar
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/lib/toplink-essentials.jar?view=diff&rev=497945&r1=497944&r2=497945
==============================================================================
Binary files - no diff available.

Modified: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperBookmarkManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperBookmarkManagerImpl.java?view=diff&rev=497945&r1=497944&r2=497945
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperBookmarkManagerImpl.java
(original)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperBookmarkManagerImpl.java
Fri Jan 19 12:35:41 2007
@@ -65,7 +65,7 @@
     }
 
     public void saveBookmark(BookmarkData bookmark) throws RollerException {
-        if(!PersistentObjectHelper.isObjectPersistent(bookmark)) {
+        if (bookmark.getId() == null) { //(!PersistentObjectHelper.isObjectPersistent(bookmark))
{
             // This is a new object make sure that relationship is set on managed
             // copy of other side
             bookmark.getFolder().getBookmarks().add(bookmark);
@@ -98,12 +98,12 @@
             throw new RollerException("Duplicate folder name");
         }
 
-        if(!PersistentObjectHelper.isObjectPersistent(folder)) {
+        if (folder.getId() == null) { //(!PersistentObjectHelper.isObjectPersistent(folder))
{
             // Newly added object. If it has a parent,
             // maintain relationship from both sides
             FolderData parent = folder.getParent();
             if(parent != null) {
-                parent.getFolders().add(folder);
+                //parent.getFolders().add(folder);
             }
         }
 

Modified: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperPersistenceStrategy.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperPersistenceStrategy.java?view=diff&rev=497945&r1=497944&r2=497945
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperPersistenceStrategy.java
(original)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperPersistenceStrategy.java
Fri Jan 19 12:35:41 2007
@@ -21,7 +21,6 @@
 
 import org.apache.roller.RollerException;
 
-import org.apache.roller.pojos.PersistentObject;
 
 /**
  *
@@ -47,7 +46,7 @@
      * @return the object persisted
      * @throws org.apache.roller.RollerException on any error
      */
-    Object store(PersistentObject obj) 
+    Object store(Object obj) 
             throws RollerException;
 
     /**

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperPlanetImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperPlanetImpl.java?view=auto&rev=497945
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperPlanetImpl.java
(added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperPlanetImpl.java
Fri Jan 19 12:35:41 2007
@@ -0,0 +1,83 @@
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+package org.apache.roller.business.datamapper;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.roller.RollerException;
+import org.apache.roller.planet.business.Planet;
+import org.apache.roller.planet.business.PlanetManager;
+
+/**
+ * A Datamapper specific implementation of the Roller business layer.
+ */
+public abstract class DatamapperPlanetImpl implements Planet {
+
+    protected static Log logger = LogFactory.getLog(DatamapperPlanetImpl.class);
+
+    // our singleton instance
+    private static DatamapperPlanetImpl me = null;
+
+    // a persistence utility class
+    protected DatamapperPersistenceStrategy strategy = null;
+
+    // references to the managers we maintain
+    private PlanetManager planetManager = null;
+
+    
+    protected DatamapperPlanetImpl() throws RollerException {
+    }
+
+    
+    public void flush() throws RollerException {
+        this.strategy.flush();
+    }
+
+    
+    public void release() {
+
+        // release our own stuff first
+        //if (planetManager != null) planetManager.release();
+
+        // tell Datamapper to close down
+        this.strategy.release();
+    }
+
+    
+    public void shutdown() {
+
+        // do our own shutdown first
+        this.release();
+    }
+    
+    /**
+     * @see org.apache.roller.business.Roller#getBookmarkManager()
+     */
+    public PlanetManager getPlanetManager() {
+        if ( planetManager == null ) {
+            planetManager = createDatamapperPlanetManager(strategy);
+        }
+        return planetManager;
+    }
+
+    protected PlanetManager createDatamapperPlanetManager(
+            DatamapperPersistenceStrategy strategy) {
+        return new DatamapperPlanetManagerImpl(strategy);
+    }    
+}

Modified: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperRefererManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperRefererManagerImpl.java?view=diff&rev=497945&r1=497944&r2=497945
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperRefererManagerImpl.java
(original)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperRefererManagerImpl.java
Fri Jan 19 12:35:41 2007
@@ -41,7 +41,6 @@
 import org.apache.roller.pojos.StatCount;
 import org.apache.roller.pojos.WeblogEntryData;
 import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.pojos.WebsiteDisplayData;
 import org.apache.roller.util.LinkbackExtractor;
 import org.apache.roller.util.Utilities;
 
@@ -208,53 +207,6 @@
                 websiteName,
                 "statCount.weblogDayHits",
                 hits.longValue()));              
-        }
-        //TODO Uncomment following once integrated with code
-        //Collections.sort(results, StatCount.getComparator());
-        Collections.reverse(results);
-        return results;
-    }
-
-    /**
-     * Get most popular websites based on referer day hits.
-     * @param offset Offset into results (for paging)
-     * @param length Maximum number of results to return (for paging)
-     * @return List of WebsiteDisplayData objects.
-     */
-    public List getDaysPopularWebsites(int offset, int length)
-            throws RollerException {
-
-        // TODO: ATLAS getDaysPopularWebsites DONE TESTED
-        String msg = "Getting popular websites";
-        List results = new ArrayList();
-        
-        if (length == -1) {
-            length = Integer.MAX_VALUE - offset;
-        }
-
-        DatamapperQuery query = strategy.newQuery(RefererData.class, 
-            "RefererData.getDaysPopularWebsitesByWebsite.enabled&Website.active");
-        
-        if (offset != 0 || length != -1) {
-            query.setRange(offset, length);
-        }
-
-        List queryResults = (List) query.execute(
-            new Object[] {Boolean.TRUE, Boolean.TRUE}); 
-        
-        for (Iterator it = queryResults.iterator(); it.hasNext(); ) {
-            Object[] row = (Object[])it.next();
-            Long hits = (Long)row[0];
-            String websiteId = (String)row[1];
-            String websiteName = (String)row[2];
-            String websiteHandle = (String)row[3];
-            results.add(new WebsiteDisplayData(
-                websiteId,
-                websiteName,
-                websiteHandle,
-                // TODO: DataMapperport The query is retrieving SUM(DISTINCT r.dayHits) which
should be a long
-                // Change WebsiteDisplayData to accept hits as long 
-                Integer.valueOf(hits.intValue())));
         }
         //TODO Uncomment following once integrated with code
         //Collections.sort(results, StatCount.getComparator());

Modified: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperUserManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperUserManagerImpl.java?view=diff&rev=497945&r1=497944&r2=497945
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperUserManagerImpl.java
(original)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperUserManagerImpl.java
Fri Jan 19 12:35:41 2007
@@ -46,7 +46,6 @@
 import org.apache.roller.pojos.WeblogEntryTagData;
 import org.apache.roller.pojos.WeblogEntryTagAggregateData;
 import org.apache.roller.pojos.RoleData;
-import org.apache.roller.pojos.PersistentObject;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -219,7 +218,7 @@
             //Remove it from website
             iterator.remove();
             //Remove it from corresponding user
-            UserData user = (UserData) getManagedObject(perms.getUser());
+            UserData user = perms.getUser(); //(UserData) getManagedObject(perms.getUser());
             user.getPermissions().remove(perms);
         }
 
@@ -246,7 +245,7 @@
                 //Remove it from website
                 iterator.remove();
                 //Remove it from corresponding user
-                WebsiteData website = (WebsiteData) getManagedObject(perms.getWebsite());
+                WebsiteData website = perms.getWebsite(); //(WebsiteData) getManagedObject(perms.getWebsite());
                 website.getPermissions().remove(perms);
         }
 
@@ -258,13 +257,13 @@
 
     public void savePermissions(PermissionsData perms) 
             throws RollerException {
-        if(!PersistentObjectHelper.isObjectPersistent(perms)) {
+        if (perms.getId() == null) { //(!PersistentObjectHelper.isObjectPersistent(perms))
{
             // This is a new object make sure that relationship is set on managed
             // copy of other side
-            WebsiteData website = (WebsiteData) getManagedObject(perms.getWebsite());
+            WebsiteData website = perms.getWebsite(); //(WebsiteData) getManagedObject(perms.getWebsite());
             website.getPermissions().add(perms);
 
-            UserData user = (UserData) getManagedObject(perms.getUser());
+            UserData user = perms.getUser(); //(UserData) getManagedObject(perms.getUser());
             user.getPermissions().add(perms);
         }
         this.strategy.store(perms);
@@ -275,10 +274,10 @@
         this.strategy.remove(perms);
         // make sure that relationship is set on managed
         // copy of other side
-        WebsiteData website = (WebsiteData) getManagedObject(perms.getWebsite());
+        WebsiteData website = perms.getWebsite(); //WebsiteData) getManagedObject(perms.getWebsite());
         website.getPermissions().remove(perms);
 
-        UserData user = (UserData) getManagedObject(perms.getUser());
+        UserData user = perms.getUser(); //(UserData) getManagedObject(perms.getUser());
         user.getPermissions().remove(perms);
     }
 
@@ -1139,22 +1138,6 @@
         ret =((Long)results.get(0)).longValue();
 
         return ret;
-    }
-
-    /**
-     * Returns a manged copy of given persistent object.
-     * @param obj Given persistent object
-     * @return Managed version of obj
-     * @throws RollerException
-     * The method is required to handle case when a newly created object is made
-     * to refer to a object stored in web session. The object stored in web session
-     * should be merged into current persistence context before it is being
-     * referred by any other object.
-     * It should be our goal to not require this method. All the caller of this
-     * method should be modfied to see make sure that the obj passed managed
-     */
-    private PersistentObject getManagedObject(PersistentObject obj) throws RollerException
{
-        return (PersistentObject) strategy.load(obj.getClass(), obj.getId());
     }
     
 }

Modified: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperWeblogManagerImpl.java?view=diff&rev=497945&r1=497944&r2=497945
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperWeblogManagerImpl.java
(original)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperWeblogManagerImpl.java
Fri Jan 19 12:35:41 2007
@@ -88,7 +88,7 @@
             throw new RollerException("Duplicate category name, cannot save category");
         }
 
-        if(!PersistentObjectHelper.isObjectPersistent(cat)) {
+        if (cat.getId() == null) { //(!PersistentObjectHelper.isObjectPersistent(cat)) {
             // Newly added object. If it has a parent,
             // maintain relationship from both sides
             WeblogCategoryData parent = cat.getParent();
@@ -336,6 +336,8 @@
             for(Iterator it = entry.getTags().iterator(); it.hasNext(); ) {
                 WeblogEntryTagData tag = (WeblogEntryTagData) it.next();
                 updateTagCount(tag.getName(), entry.getWebsite(), -1);
+                it.remove();
+                this.strategy.remove(tag);
             }
         }
         
@@ -1154,13 +1156,15 @@
         cal.add(Calendar.DATE, -1 * sinceDays);
         Date startDate = cal.getTime();
         
-        DatamapperQuery query = strategy.newQuery(HitCountData.class, 
+        DatamapperQuery query = strategy.newQuery(HitCountData.class,
                 "HitCountData.getByWeblogEnabledTrueAndActiveTrue&DailyHitsGreaterThenZero&WeblogLastModifiedGreaterOrderByDailyHitsDesc");
 
         if (length != -1) {
-            query.setRange(offset, length);
+            // Commented out due to https://glassfish.dev.java.net/issues/show_bug.cgi?id=2084
+            // Should uncomment once the issue is fixed
+            //query.setRange(offset, length);
         }
-        
+
         return (List) query.execute(startDate);
     }
     

Modified: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/jdo/JDOPersistenceStrategy.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/jdo/JDOPersistenceStrategy.java?view=diff&rev=497945&r1=497944&r2=497945
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/jdo/JDOPersistenceStrategy.java
(original)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/jdo/JDOPersistenceStrategy.java
Fri Jan 19 12:35:41 2007
@@ -27,7 +27,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.pojos.PersistentObject;
 import org.apache.roller.business.datamapper.DatamapperPersistenceStrategy;
 import org.apache.roller.business.datamapper.DatamapperQuery;
 import org.apache.roller.business.datamapper.DatamapperRemoveQuery;
@@ -94,7 +93,7 @@
      * @return the object persisted
      * @throws org.apache.roller.RollerException on any error
      */
-    public Object store(PersistentObject obj) 
+    public Object store(Object obj) 
             throws RollerException {
         PersistenceManager pm = getPersistenceManager(true);
         pm.makePersistent(obj);

Modified: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/jpa/JPAPersistenceStrategy.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/jpa/JPAPersistenceStrategy.java?view=diff&rev=497945&r1=497944&r2=497945
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/jpa/JPAPersistenceStrategy.java
(original)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/jpa/JPAPersistenceStrategy.java
Fri Jan 19 12:35:41 2007
@@ -30,11 +30,9 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.pojos.PersistentObject;
 import org.apache.roller.business.datamapper.DatamapperPersistenceStrategy;
 import org.apache.roller.business.datamapper.DatamapperQuery;
 import org.apache.roller.business.datamapper.DatamapperRemoveQuery;
-import org.apache.roller.business.datamapper.PersistentObjectHelper;
 
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityManager;
@@ -110,22 +108,11 @@
      * @return the object persisted
      * @throws org.apache.roller.RollerException on any error
      */
-    public Object store(PersistentObject obj) throws RollerException {
+    public Object store(Object obj) throws RollerException {
         EntityManager em = getEntityManager(true);
-        // Roller code calls store even on already managed entity
-        // Till Roller code is fixed, we will need to have following
-        if (!PersistentObjectHelper.isObjectPersistent(obj)) {
-            // Object has never been written to database, so save it.
-            // This makes obj into a persistent instance.
+        if (!em.contains(obj)) {
+            // If entity is not managed we can assume it is new
             em.persist(obj);
-        }
-        if ( !em.contains(obj) ) {
-            // Object has been written to database, but instance passed in
-            // is not a persistent instance, so must be loaded into em.
-            PersistentObject vo =
-                    (PersistentObject)load(obj.getClass(),obj.getId());
-            vo.setData(obj);
-            obj = vo;
         }
         return obj;
     }

Added: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/jpa/JPAPlanetImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/jpa/JPAPlanetImpl.java?view=auto&rev=497945
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/jpa/JPAPlanetImpl.java
(added)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/business/jpa/JPAPlanetImpl.java
Fri Jan 19 12:35:41 2007
@@ -0,0 +1,68 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+*  contributor license agreements.  The ASF licenses this file to You
+* under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.  For additional information regarding
+* copyright in this work, please see the NOTICE file in the top level
+* directory of this distribution.
+*/
+
+package org.apache.roller.business.jpa;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.roller.RollerException;
+import org.apache.roller.business.datamapper.DatamapperPlanetImpl;
+import org.apache.roller.business.datamapper.DatamapperPlanetManagerImpl;
+import org.apache.roller.planet.business.Planet;
+import org.apache.roller.planet.business.PlanetManager;
+
+
+
+/**
+ * A Hibernate specific implementation of the Roller business layer.
+ */
+public class JPAPlanetImpl extends DatamapperPlanetImpl {   
+    
+    private static Log log = LogFactory.getLog(JPAPlanetImpl.class);
+    
+    // our singleton instance
+    private static JPAPlanetImpl me = null;
+        
+    // references to the managers we maintain
+    protected PlanetManager planetManager = null;
+    
+        
+    protected JPAPlanetImpl() throws RollerException {
+    }
+    
+    
+    /**
+     * Instantiates and returns an instance of JPAPlanetImpl.
+     */
+    public static Planet instantiate() throws RollerException {
+        if (me == null) {
+            log.debug("Instantiating JPAPlanetImpl");
+            me = new JPAPlanetImpl();
+        }
+        
+        return me;
+    }
+    
+    
+    public PlanetManager getPlanetManager() {
+        if ( planetManager == null ) {
+            planetManager = new DatamapperPlanetManagerImpl(strategy);  
+        }
+        return planetManager;
+    }           
+}

Modified: incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryData.orm.xml?view=diff&rev=497945&r1=497944&r2=497945
==============================================================================
--- incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryData.orm.xml
(original)
+++ incubator/roller/trunk/sandbox/jdobackend/src/org/apache/roller/pojos/WeblogEntryData.orm.xml
Fri Jan 19 12:35:41 2007
@@ -149,7 +149,6 @@
             <one-to-many name="tags" mapped-by="weblogEntry" target-entity="org.apache.roller.pojos.WeblogEntryTagData"
fetch="LAZY">
                 <cascade>
                     <cascade-persist/> <!-- Added so entry added by addTag() gets
persisted -->
-                    <cascade-remove/>
                 </cascade>
             </one-to-many>
             <transient name="categories"/>



Mime
View raw message