roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r552017 [1/2] - in /roller/trunk/apps/planet: ./ src/java/META-INF/ src/java/org/apache/roller/planet/business/ src/java/org/apache/roller/planet/business/hibernate/ src/java/org/apache/roller/planet/business/jpa/ src/java/org/apache/roller...
Date Fri, 29 Jun 2007 20:06:03 GMT
Author: agilliland
Date: Fri Jun 29 13:05:57 2007
New Revision: 552017

URL: http://svn.apache.org/viewvc?view=rev&rev=552017
Log:
do some pojo renaming like we did in the weblogger app.  this just shortens the names a bit to be more concise and also better reflects the object relationships.


Added:
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/Planet.java
      - copied, changed from r552006, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/Planet.orm.xml
      - copied, changed from r552006, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroup.java
      - copied, changed from r552006, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroup.orm.xml
      - copied, changed from r552006, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.orm.xml
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/RuntimeConfigProperty.java
      - copied, changed from r552006, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PropertyData.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml
      - copied, changed from r552006, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PropertyData.orm.xml
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/Subscription.java
      - copied, changed from r552006, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/Subscription.orm.xml
      - copied, changed from r552006, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/SubscriptionEntry.java
      - copied, changed from r552006, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml
      - copied, changed from r552006, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.orm.xml
Removed:
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.orm.xml
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.orm.xml
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PropertyData.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PropertyData.orm.xml
Modified:
    roller/trunk/apps/planet/build.xml
    roller/trunk/apps/planet/src/java/META-INF/persistence.xml
    roller/trunk/apps/planet/src/java/META-INF/planet-hibernate.cfg.xml
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/PlanetManager.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/PropertiesManager.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/RomeFeedFetcher.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePropertiesManagerImpl.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPropertiesManagerImpl.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/tasks/StaticPlanetModel.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/tasks/TechnoratiRankingsTask.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/ConfigForm.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetForm.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetSubscriptionForm.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetsList.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/MultiPlanetRequestMapper.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/FeedModel.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/PageModel.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/PlanetGroupModel.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/PlanetURLModel.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/SiteURLModel.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/pagers/PlanetEntriesPager.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/FeedServlet.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/HomepageServlet.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/OpmlServlet.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/PageServlet.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupRequest.java
    roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/PlanetRequest.java
    roller/trunk/apps/planet/test/java/org/apache/roller/planet/TestUtils.java
    roller/trunk/apps/planet/test/java/org/apache/roller/planet/business/EntryBasicTests.java
    roller/trunk/apps/planet/test/java/org/apache/roller/planet/business/EntryFunctionalTests.java
    roller/trunk/apps/planet/test/java/org/apache/roller/planet/business/GroupBasicTests.java
    roller/trunk/apps/planet/test/java/org/apache/roller/planet/business/GroupFunctionalTests.java
    roller/trunk/apps/planet/test/java/org/apache/roller/planet/business/PlanetBasicTests.java
    roller/trunk/apps/planet/test/java/org/apache/roller/planet/business/PlanetFunctionalTests.java
    roller/trunk/apps/planet/test/java/org/apache/roller/planet/business/PropertiesTest.java
    roller/trunk/apps/planet/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
    roller/trunk/apps/planet/test/java/org/apache/roller/planet/business/SubscriptionBasicTests.java
    roller/trunk/apps/planet/test/java/org/apache/roller/planet/business/SubscriptionFunctionalTests.java

Modified: roller/trunk/apps/planet/build.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/build.xml?view=diff&rev=552017&r1=552016&r2=552017
==============================================================================
--- roller/trunk/apps/planet/build.xml (original)
+++ roller/trunk/apps/planet/build.xml Fri Jun 29 13:05:57 2007
@@ -172,7 +172,7 @@
             addedtags="@xdoclet-generated at ${TODAY}"
             force="true">
             
-            <fileset dir="${src}" includes="org/apache/roller/planet/pojos/*Data.java" />
+            <fileset dir="${src}" includes="org/apache/roller/planet/pojos/*.java" />
             <hibernate validatexml="true" version="3.0"/>
             
         </hibernatedoclet>

Modified: roller/trunk/apps/planet/src/java/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/META-INF/persistence.xml?view=diff&rev=552017&r1=552016&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/META-INF/persistence.xml (original)
+++ roller/trunk/apps/planet/src/java/META-INF/persistence.xml Fri Jun 29 13:05:57 2007
@@ -6,11 +6,13 @@
         <provider>oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider</provider>
         <provider>org.hibernate.ejb.HibernatePersistence</provider>
         -->
-        <mapping-file>org/apache/roller/planet/pojos/PlanetData.orm.xml</mapping-file>
-        <mapping-file>org/apache/roller/planet/pojos/PlanetGroupData.orm.xml</mapping-file>
-        <mapping-file>org/apache/roller/planet/pojos/PropertyData.orm.xml</mapping-file>
-        <mapping-file>org/apache/roller/planet/pojos/PlanetEntryData.orm.xml</mapping-file>
-        <mapping-file>org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml</mapping-file> 
+        
+        <mapping-file>org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml</mapping-file>
+        
+        <mapping-file>org/apache/roller/planet/pojos/Planet.orm.xml</mapping-file>
+        <mapping-file>org/apache/roller/planet/pojos/PlanetGroup.orm.xml</mapping-file>
+        <mapping-file>org/apache/roller/planet/pojos/Subscription.orm.xml</mapping-file>
+        <mapping-file>org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml</mapping-file> 
     </persistence-unit>
     
 </persistence>

Modified: roller/trunk/apps/planet/src/java/META-INF/planet-hibernate.cfg.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/META-INF/planet-hibernate.cfg.xml?view=diff&rev=552017&r1=552016&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/META-INF/planet-hibernate.cfg.xml (original)
+++ roller/trunk/apps/planet/src/java/META-INF/planet-hibernate.cfg.xml Fri Jun 29 13:05:57 2007
@@ -42,11 +42,12 @@
         <property name="hibernate.cache.use_structured_entries">true</property>
         
         <!-- Map Planet POJO classes -->
-        <mapping resource="org/apache/roller/planet/pojos/PlanetData.hbm.xml" />
-        <mapping resource="org/apache/roller/planet/pojos/PlanetGroupData.hbm.xml" />
-        <mapping resource="org/apache/roller/planet/pojos/PlanetEntryData.hbm.xml" />
-        <mapping resource="org/apache/roller/planet/pojos/PlanetSubscriptionData.hbm.xml" />
-        <mapping resource="org/apache/roller/planet/pojos/PropertyData.hbm.xml" />
+        <mapping resource="org/apache/roller/planet/pojos/RuntimeConfigProperty.hbm.xml" />
+        
+        <mapping resource="org/apache/roller/planet/pojos/Planet.hbm.xml" />
+        <mapping resource="org/apache/roller/planet/pojos/PlanetGroup.hbm.xml" />
+        <mapping resource="org/apache/roller/planet/pojos/Subscription.hbm.xml" />
+        <mapping resource="org/apache/roller/planet/pojos/SubscriptionEntry.hbm.xml" />
                 
     </session-factory>
 </hibernate-configuration>

Modified: roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/PlanetManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/PlanetManager.java?view=diff&rev=552017&r1=552016&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/PlanetManager.java (original)
+++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/PlanetManager.java Fri Jun 29 13:05:57 2007
@@ -23,10 +23,10 @@
 import java.util.Iterator;
 import java.util.List;
 import org.apache.roller.planet.PlanetException;
-import org.apache.roller.planet.pojos.PlanetData;
-import org.apache.roller.planet.pojos.PlanetEntryData;
-import org.apache.roller.planet.pojos.PlanetGroupData;
-import org.apache.roller.planet.pojos.PlanetSubscriptionData;
+import org.apache.roller.planet.pojos.Planet;
+import org.apache.roller.planet.pojos.SubscriptionEntry;
+import org.apache.roller.planet.pojos.PlanetGroup;
+import org.apache.roller.planet.pojos.Subscription;
 
 
 /**
@@ -35,16 +35,16 @@
 public interface PlanetManager extends Manager {
     
     
-    public void savePlanet(PlanetData planet) throws PlanetException;
+    public void savePlanet(Planet planet) throws PlanetException;
     
     
-    public void deletePlanet(PlanetData planet) throws PlanetException;
+    public void deletePlanet(Planet planet) throws PlanetException;
     
     
-    public PlanetData getPlanet(String handle) throws PlanetException;
+    public Planet getPlanet(String handle) throws PlanetException;
     
     
-    public PlanetData getPlanetById(String id) throws PlanetException;
+    public Planet getPlanetById(String id) throws PlanetException;
     
     
     public List getPlanets() throws PlanetException;
@@ -53,46 +53,46 @@
     /**
      * Save new or update existing a group
      */
-    public void saveGroup(PlanetGroupData sub) throws PlanetException;
+    public void saveGroup(PlanetGroup sub) throws PlanetException;
     
     
     /** 
      * Delete group and any subscriptions that are orphaned. 
      */
-    public void deleteGroup(PlanetGroupData group) throws PlanetException;
+    public void deleteGroup(PlanetGroup group) throws PlanetException;
     
     
-    public PlanetGroupData getGroup(PlanetData planet, String handle) throws PlanetException;
+    public PlanetGroup getGroup(Planet planet, String handle) throws PlanetException;
     
     
     /**
      * Get group by ID rather than handle.
      */
-    public PlanetGroupData getGroupById(String id) throws PlanetException;
+    public PlanetGroup getGroupById(String id) throws PlanetException;
     
     
     /**
      * Save or update a subscription
      */
-    public void saveSubscription(PlanetSubscriptionData sub) throws PlanetException;
+    public void saveSubscription(Subscription sub) throws PlanetException;
     
     
     /** 
      * Delete subscription, remove it from groups, cache, etc. 
      */
-    public void deleteSubscription(PlanetSubscriptionData group) throws PlanetException;
+    public void deleteSubscription(Subscription group) throws PlanetException;
     
     
     /**
      * Get subscription by feedUrl.
      */
-    public PlanetSubscriptionData getSubscription(String feedUrl) throws PlanetException;
+    public Subscription getSubscription(String feedUrl) throws PlanetException;
     
     
     /**
      * Get subscription by ID rather than feedUrl.
      */
-    public PlanetSubscriptionData getSubscriptionById(String id) throws PlanetException;
+    public Subscription getSubscriptionById(String id) throws PlanetException;
     
     
     /**
@@ -116,20 +116,20 @@
     /**
      * Get top X subscriptions, restricted by group.
      */
-    public List getTopSubscriptions(PlanetGroupData group, int offset, int len) 
+    public List getTopSubscriptions(PlanetGroup group, int offset, int len) 
         throws PlanetException;
     
     
     /**
      * Save new or update existing entry
      */
-    public void saveEntry(PlanetEntryData entry) throws PlanetException;
+    public void saveEntry(SubscriptionEntry entry) throws PlanetException;
     
     
     /** 
      * Delete entry. 
      */
-    public void deleteEntry(PlanetEntryData entry) throws PlanetException;
+    public void deleteEntry(SubscriptionEntry entry) throws PlanetException;
     
     
     /**
@@ -138,19 +138,19 @@
      * @param subscription The subscription to delete entries from.
      * @throws PlanetException If there is a problem doing the delete.
      */
-    public void deleteEntries(PlanetSubscriptionData sub) throws PlanetException;
+    public void deleteEntries(Subscription sub) throws PlanetException;
     
     
     /**
      * Lookup an entry by id.
      */
-    public PlanetEntryData getEntryById(String id) throws PlanetException;
+    public SubscriptionEntry getEntryById(String id) throws PlanetException;
     
     
     /**
-     * Get entries in a single feed as list of PlanetEntryData objects.
+     * Get entries in a single feed as list of SubscriptionEntry objects.
      */
-    public List getEntries(PlanetSubscriptionData sub, int offset, int len) 
+    public List getEntries(Subscription sub, int offset, int len) 
         throws PlanetException;
     
     
@@ -161,7 +161,7 @@
      * @param offset Offset into results (for paging)
      * @param len Maximum number of results to return (for paging)
      */
-    public List getEntries(PlanetGroupData group, int offset, int len) 
+    public List getEntries(PlanetGroup group, int offset, int len) 
         throws PlanetException;
     
     
@@ -175,7 +175,7 @@
      * @param offset Offset into results (for paging)
      * @param len Maximum number of results to return (for paging)
      */
-    public List getEntries(PlanetGroupData group, 
+    public List getEntries(PlanetGroup group, 
                            Date startDate, 
                            Date endDate,
                            int offset, 

Modified: roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/PropertiesManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/PropertiesManager.java?view=diff&rev=552017&r1=552016&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/PropertiesManager.java (original)
+++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/PropertiesManager.java Fri Jun 29 13:05:57 2007
@@ -20,7 +20,7 @@
 
 import java.util.Map;
 import org.apache.roller.planet.PlanetException;
-import org.apache.roller.planet.pojos.PropertyData;
+import org.apache.roller.planet.pojos.RuntimeConfigProperty;
 
 
 /**
@@ -31,7 +31,7 @@
     /** 
      * Save a single property 
      */
-    public void saveProperty(PropertyData property) throws PlanetException;
+    public void saveProperty(RuntimeConfigProperty property) throws PlanetException;
     
     
     /** 
@@ -43,7 +43,7 @@
     /** 
      * Retrieve a single property by name 
      */
-    public PropertyData getProperty(String name) throws PlanetException;
+    public RuntimeConfigProperty getProperty(String name) throws PlanetException;
     
     
     /** 

Modified: roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/RomeFeedFetcher.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/RomeFeedFetcher.java?view=diff&rev=552017&r1=552016&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/RomeFeedFetcher.java (original)
+++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/RomeFeedFetcher.java Fri Jun 29 13:05:57 2007
@@ -37,8 +37,8 @@
 import org.apache.roller.planet.PlanetException;
 import org.apache.roller.planet.business.hibernate.HibernatePlanetManagerImpl;
 import org.apache.roller.planet.config.PlanetRuntimeConfig;
-import org.apache.roller.planet.pojos.PlanetEntryData;
-import org.apache.roller.planet.pojos.PlanetSubscriptionData;
+import org.apache.roller.planet.pojos.SubscriptionEntry;
+import org.apache.roller.planet.pojos.Subscription;
 import org.apache.roller.planet.util.rome.DiskFeedInfoCache;
 
 
@@ -119,7 +119,7 @@
             
             long subStartTime = System.currentTimeMillis();
             
-            PlanetSubscriptionData sub = (PlanetSubscriptionData)subs.next();
+            Subscription sub = (Subscription)subs.next();
             
             // reattach sub.  sub gets detached as we iterate
             sub = mgr.getSubscriptionById(sub.getId());
@@ -148,7 +148,7 @@
     
     
     // get new Entries for a specific Subscription
-    protected Set getNewEntries(PlanetSubscriptionData sub,
+    protected Set getNewEntries(Subscription sub,
                                 com.sun.syndication.fetcher.FeedFetcher feedFetcher,
                                 FeedFetcherCache feedInfoCache)
             throws PlanetException {
@@ -215,8 +215,8 @@
         while (entries.hasNext()) {
             try {
                 SyndEntry romeEntry = (SyndEntry) entries.next();
-                PlanetEntryData entry =
-                        new PlanetEntryData(feed, romeEntry, sub);
+                SubscriptionEntry entry =
+                        new SubscriptionEntry(feed, romeEntry, sub);
                 log.debug("Entry title=" + entry.getTitle() + " content size=" + entry.getContent().length());
                 if (entry.getPubTime() == null) {
                     log.debug("No published date, assigning fake date for "+feedURL);

Modified: roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java?view=diff&rev=552017&r1=552016&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java (original)
+++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java Fri Jun 29 13:05:57 2007
@@ -32,10 +32,10 @@
 import org.apache.roller.planet.business.hibernate.HibernatePersistenceStrategy;
 import org.apache.roller.planet.business.AbstractManagerImpl;
 import org.apache.roller.planet.business.PlanetManager;
-import org.apache.roller.planet.pojos.PlanetData;
-import org.apache.roller.planet.pojos.PlanetEntryData;
-import org.apache.roller.planet.pojos.PlanetGroupData;
-import org.apache.roller.planet.pojos.PlanetSubscriptionData;
+import org.apache.roller.planet.pojos.Planet;
+import org.apache.roller.planet.pojos.SubscriptionEntry;
+import org.apache.roller.planet.pojos.PlanetGroup;
+import org.apache.roller.planet.pojos.Subscription;
 
 
 /**
@@ -56,24 +56,24 @@
     
     
     // save a Planet
-    public void savePlanet(PlanetData planet) throws PlanetException {
+    public void savePlanet(Planet planet) throws PlanetException {
         strategy.store(planet);
     }
         
     // delete a Planet
-    public void deletePlanet(PlanetData planet) throws PlanetException {
+    public void deletePlanet(Planet planet) throws PlanetException {
         strategy.remove(planet);
     }
     
     
     // lookup Planet by handle
-    public PlanetData getPlanet(String handle) throws PlanetException {
-        PlanetData planet = null;
+    public Planet getPlanet(String handle) throws PlanetException {
+        Planet planet = null;
         try {
             Session session = ((HibernatePersistenceStrategy)strategy).getSession();
-            Criteria criteria = session.createCriteria(PlanetData.class);
+            Criteria criteria = session.createCriteria(Planet.class);
             criteria.add(Expression.ilike("handle", handle));
-            planet = (PlanetData) criteria.uniqueResult();
+            planet = (Planet) criteria.uniqueResult();
         } catch (HibernateException e) {
             throw new PlanetException(e);
         }
@@ -82,8 +82,8 @@
     
     
     // lookup Planet by id
-    public PlanetData getPlanetById(String id) throws PlanetException {
-        return (PlanetData) strategy.load(id, PlanetData.class);
+    public Planet getPlanetById(String id) throws PlanetException {
+        return (Planet) strategy.load(id, Planet.class);
     }
     
     
@@ -91,7 +91,7 @@
     public List getPlanets() throws PlanetException {
         try {
             Session session = ((HibernatePersistenceStrategy)strategy).getSession();
-            Criteria criteria = session.createCriteria(PlanetData.class);
+            Criteria criteria = session.createCriteria(Planet.class);
             criteria.addOrder(Order.asc("title"));
             return criteria.list();
         } catch (HibernateException e) {
@@ -101,19 +101,19 @@
     
     
     // save a Group
-    public void saveGroup(PlanetGroupData group)  throws PlanetException {
+    public void saveGroup(PlanetGroup group)  throws PlanetException {
         strategy.store(group);
     }
         
     
     // delete a Group
-    public void deleteGroup(PlanetGroupData group) throws PlanetException {
+    public void deleteGroup(PlanetGroup group) throws PlanetException {
         strategy.remove(group);
     }
     
     
     // lookup a Group by Planet & handle
-    public PlanetGroupData getGroup(PlanetData planet, String handle) 
+    public PlanetGroup getGroup(Planet planet, String handle) 
             throws PlanetException {
         
         if(planet == null) {
@@ -122,10 +122,10 @@
         
         try {
             Session session = strategy.getSession();
-            Criteria criteria = session.createCriteria(PlanetGroupData.class);
+            Criteria criteria = session.createCriteria(PlanetGroup.class);
             criteria.add(Expression.eq("planet", planet));
             criteria.add(Expression.eq("handle", handle));
-            return (PlanetGroupData) criteria.uniqueResult();
+            return (PlanetGroup) criteria.uniqueResult();
         } catch (HibernateException e) {
             throw new PlanetException(e);
         }
@@ -133,15 +133,15 @@
     
     
     // lookup a Planet by id
-    public PlanetGroupData getGroupById(String id) throws PlanetException {
-        return (PlanetGroupData) strategy.load(id, PlanetGroupData.class);
+    public PlanetGroup getGroupById(String id) throws PlanetException {
+        return (PlanetGroup) strategy.load(id, PlanetGroup.class);
     }
     
     
     // save a Subscription
-    public void saveSubscription(PlanetSubscriptionData sub) 
+    public void saveSubscription(Subscription sub) 
             throws PlanetException {
-        PlanetSubscriptionData existing = getSubscription(sub.getFeedURL());
+        Subscription existing = getSubscription(sub.getFeedURL());
         if (existing == null || (existing.getId().equals(sub.getId()))) {
             this.strategy.store(sub);
         } else {
@@ -151,21 +151,21 @@
     
     
     // delete a Subscription
-    public void deleteSubscription(PlanetSubscriptionData sub) 
+    public void deleteSubscription(Subscription sub) 
             throws PlanetException {
         strategy.remove(sub);
     }
     
     
     // lookup a Subscription by url
-    public PlanetSubscriptionData getSubscription(String feedURL) 
+    public Subscription getSubscription(String feedURL) 
             throws PlanetException {
         try {
             Session session = ((HibernatePersistenceStrategy)strategy).getSession();
             Criteria criteria =
-                    session.createCriteria(PlanetSubscriptionData.class);
+                    session.createCriteria(Subscription.class);
             criteria.add(Expression.eq("feedURL", feedURL));
-            return (PlanetSubscriptionData) criteria.uniqueResult();
+            return (Subscription) criteria.uniqueResult();
         } catch (HibernateException e) {
             throw new PlanetException(e);
         }
@@ -173,9 +173,9 @@
     
     
     // lookup a Subscription by id
-    public PlanetSubscriptionData getSubscriptionById(String id) 
+    public Subscription getSubscriptionById(String id) 
             throws PlanetException {
-        return (PlanetSubscriptionData) strategy.load(id, PlanetSubscriptionData.class);
+        return (Subscription) strategy.load(id, Subscription.class);
     }
     
     
@@ -185,7 +185,7 @@
         try {
             Session session = ((HibernatePersistenceStrategy)strategy).getSession();
             Criteria criteria =
-                    session.createCriteria(PlanetSubscriptionData.class);
+                    session.createCriteria(Subscription.class);
             criteria.addOrder(Order.asc("feedURL"));
             return criteria.list();
         } catch (Throwable e) {
@@ -199,7 +199,7 @@
         try {
             Session session = ((HibernatePersistenceStrategy)strategy).getSession();
             Integer count = (Integer)session.createQuery(
-                    "select count(*) from org.apache.roller.planet.pojos.PlanetSubscriptionData").uniqueResult();
+                    "select count(*) from org.apache.roller.planet.pojos.Subscription").uniqueResult();
             return count.intValue();
         } catch (Throwable e) {
             throw new PlanetException("ERROR fetching subscription count", e);
@@ -218,7 +218,7 @@
     
     // get popular Subscriptions from a specific Group
     // TODO: test this method
-    public List getTopSubscriptions(PlanetGroupData group, int offset, int length) 
+    public List getTopSubscriptions(PlanetGroup group, int offset, int length) 
             throws PlanetException {
         
         List ret = null;
@@ -227,14 +227,14 @@
             Query query = null;
             if (group != null) {
                 query = session.createQuery(
-                    "select sub from org.apache.roller.planet.pojos.PlanetSubscriptionData sub "
+                    "select sub from org.apache.roller.planet.pojos.Subscription sub "
                     +"join sub.groups group "
                     +"where group=:group "
                     +"order by sub.inboundblogs desc");
                 query.setSerializable("group", group);
             } else {
                 query = session.createQuery(
-                    "select sub from org.apache.roller.planet.pojos.PlanetSubscriptionData sub "
+                    "select sub from org.apache.roller.planet.pojos.Subscription sub "
                     +"order by sub.inboundblogs desc");
             }
             if (offset != 0) {
@@ -251,19 +251,19 @@
     }
         
     // save an Entry
-    public void saveEntry(PlanetEntryData entry) throws PlanetException {
+    public void saveEntry(SubscriptionEntry entry) throws PlanetException {
         strategy.store(entry);
     }
     
     
     // delete an Entry
-    public void deleteEntry(PlanetEntryData entry) throws PlanetException {
+    public void deleteEntry(SubscriptionEntry entry) throws PlanetException {
         strategy.remove(entry);
     }
     
     
     // delete all Entries from a Subscription
-    public void deleteEntries(PlanetSubscriptionData sub) 
+    public void deleteEntries(Subscription sub) 
             throws PlanetException {
         Iterator entries = sub.getEntries().iterator();
         while(entries.hasNext()) {
@@ -276,13 +276,13 @@
     
     
     // lookup Entry by id
-    public PlanetEntryData getEntryById(String id) throws PlanetException {
-        return (PlanetEntryData)strategy.load(id, PlanetEntryData.class);
+    public SubscriptionEntry getEntryById(String id) throws PlanetException {
+        return (SubscriptionEntry)strategy.load(id, SubscriptionEntry.class);
     }
     
     
     // lookup Entries from a specific Subscription
-    public List getEntries(PlanetSubscriptionData sub, int offset, int length)
+    public List getEntries(Subscription sub, int offset, int length)
             throws PlanetException {
             
         if(sub == null) {
@@ -291,7 +291,7 @@
         
         try {
             Session session = ((HibernatePersistenceStrategy)strategy).getSession();
-            Criteria criteria = session.createCriteria(PlanetEntryData.class);
+            Criteria criteria = session.createCriteria(SubscriptionEntry.class);
             criteria.add(Expression.eq("subscription", sub));
             criteria.addOrder(Order.desc("pubTime"));
             criteria.setFirstResult(offset);
@@ -304,14 +304,14 @@
     
     
     // lookup Entries from a specific Group
-    public List getEntries(PlanetGroupData group, int offset, int len) 
+    public List getEntries(PlanetGroup group, int offset, int len) 
             throws PlanetException {
         return getEntries(group, null, null, offset, len);
     } 
     
     
     // Lookup Entries from a specific group
-    public List getEntries(PlanetGroupData group, Date startDate, Date endDate, 
+    public List getEntries(PlanetGroup group, Date startDate, Date endDate, 
                            int offset, int length) 
             throws PlanetException {
         
@@ -326,7 +326,7 @@
             Session session = ((HibernatePersistenceStrategy)strategy).getSession();
             
             StringBuffer sb = new StringBuffer();
-            sb.append("select e from PlanetEntryData e ");
+            sb.append("select e from SubscriptionEntry e ");
             sb.append("join e.subscription.groups g ");
             sb.append("where g=:group ");
             

Modified: roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePropertiesManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePropertiesManagerImpl.java?view=diff&rev=552017&r1=552016&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePropertiesManagerImpl.java (original)
+++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePropertiesManagerImpl.java Fri Jun 29 13:05:57 2007
@@ -36,7 +36,7 @@
 import org.apache.roller.planet.config.runtime.DisplayGroup;
 import org.apache.roller.planet.config.runtime.PropertyDef;
 import org.apache.roller.planet.config.runtime.RuntimeConfigDefs;
-import org.apache.roller.planet.pojos.PropertyData;
+import org.apache.roller.planet.pojos.RuntimeConfigProperty;
 
 
 /**
@@ -66,9 +66,9 @@
     /**
      * Retrieve a single property by name.
      */
-    public PropertyData getProperty(String name) throws PlanetException {
+    public RuntimeConfigProperty getProperty(String name) throws PlanetException {
         try {
-            return (PropertyData) strategy.load(name, PropertyData.class);
+            return (RuntimeConfigProperty) strategy.load(name, RuntimeConfigProperty.class);
         } catch (HibernateException e) {
             throw new PlanetException(e);
         }
@@ -77,9 +77,9 @@
     
     /**
      * Retrieve all properties.
-     *
+     * 
      * Properties are returned in a Map to make them easy to lookup.  The Map
-     * uses the property name as the key and the PropertyData object
+     * uses the property name as the key and the RuntimeConfigProperty object
      * as the value.
      */
     public Map getProperties() throws PlanetException {
@@ -88,19 +88,19 @@
         
         try {
             Session session = strategy.getSession();
-            Criteria criteria = session.createCriteria(PropertyData.class);
+            Criteria criteria = session.createCriteria(RuntimeConfigProperty.class);
             List list = criteria.list();
             
             /*
              * for convenience sake we are going to put the list of props
              * into a map for users to access it.  The value element of the
-             * hash still needs to be the PropertyData object so that
+             * hash still needs to be the RuntimeConfigProperty object so that
              * we can save the elements again after they have been updated
              */
-            PropertyData prop = null;
+            RuntimeConfigProperty prop = null;
             Iterator it = list.iterator();
             while(it.hasNext()) {
-                prop = (PropertyData) it.next();
+                prop = (RuntimeConfigProperty) it.next();
                 props.put(prop.getName(), prop);
             }
         } catch (HibernateException e) {
@@ -114,7 +114,7 @@
     /**
      * Save a single property.
      */
-    public void saveProperty(PropertyData property) throws PlanetException {
+    public void saveProperty(RuntimeConfigProperty property) throws PlanetException {
         
         this.strategy.store(property);
     }
@@ -128,7 +128,7 @@
         // just go through the list and saveProperties each property
         Iterator props = properties.values().iterator();
         while (props.hasNext()) {
-            this.strategy.store((PropertyData) props.next());
+            this.strategy.store((RuntimeConfigProperty) props.next());
         }
     }
     
@@ -195,8 +195,8 @@
                     
                     // do we already have this prop?  if not then add it
                     if(!props.containsKey(propDef.getName())) {
-                        PropertyData newprop =
-                                new PropertyData(propDef.getName(), propDef.getDefaultValue());
+                        RuntimeConfigProperty newprop =
+                                new RuntimeConfigProperty(propDef.getName(), propDef.getDefaultValue());
                         
                         props.put(propDef.getName(), newprop);
                         

Modified: roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java?view=diff&rev=552017&r1=552016&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java (original)
+++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java Fri Jun 29 13:05:57 2007
@@ -33,10 +33,10 @@
 
 import org.apache.roller.planet.PlanetException;
 import org.apache.roller.planet.business.PlanetManager;
-import org.apache.roller.planet.pojos.PlanetData;
-import org.apache.roller.planet.pojos.PlanetEntryData;
-import org.apache.roller.planet.pojos.PlanetGroupData;
-import org.apache.roller.planet.pojos.PlanetSubscriptionData;
+import org.apache.roller.planet.pojos.Planet;
+import org.apache.roller.planet.pojos.SubscriptionEntry;
+import org.apache.roller.planet.pojos.PlanetGroup;
+import org.apache.roller.planet.pojos.Subscription;
 import org.apache.roller.planet.business.AbstractManagerImpl;
 
 /**
@@ -64,17 +64,17 @@
     }
     
     
-    public void saveGroup(PlanetGroupData group) throws PlanetException {
+    public void saveGroup(PlanetGroup group) throws PlanetException {
         strategy.store(group);
     }
     
-    public void saveEntry(PlanetEntryData entry) throws PlanetException {
+    public void saveEntry(SubscriptionEntry entry) throws PlanetException {
         strategy.store(entry);
     }
     
-    public void saveSubscription(PlanetSubscriptionData sub)
+    public void saveSubscription(Subscription sub)
     throws PlanetException {
-        PlanetSubscriptionData existing = getSubscription(sub.getFeedURL());
+        Subscription existing = getSubscription(sub.getFeedURL());
         if (existing == null || (existing.getId().equals(sub.getId()))) {
             strategy.store(sub);
         } else {
@@ -82,40 +82,40 @@
         }
     }
     
-    public void deleteEntry(PlanetEntryData entry) throws PlanetException {
+    public void deleteEntry(SubscriptionEntry entry) throws PlanetException {
         strategy.remove(entry);
     }
     
-    public void deleteGroup(PlanetGroupData group) throws PlanetException {
+    public void deleteGroup(PlanetGroup group) throws PlanetException {
         strategy.remove(group);
     }
     
-    public void deleteSubscription(PlanetSubscriptionData sub)
+    public void deleteSubscription(Subscription sub)
     throws PlanetException {
         strategy.remove(sub);
     }
     
-    public PlanetSubscriptionData getSubscription(String feedUrl)
+    public Subscription getSubscription(String feedUrl)
     throws PlanetException {
-        Query q = strategy.getNamedQuery("PlanetSubscriptionData.getByFeedURL");
+        Query q = strategy.getNamedQuery("Subscription.getByFeedURL");
         q.setParameter(1, feedUrl);
         try {
-            return (PlanetSubscriptionData)q.getSingleResult();
+            return (Subscription)q.getSingleResult();
         } catch (NoResultException e) {
             return null;
         }
     }
     
-    public PlanetSubscriptionData getSubscriptionById(String id)
+    public Subscription getSubscriptionById(String id)
     throws PlanetException {
-        return (PlanetSubscriptionData) strategy.load(
-                PlanetSubscriptionData.class, id);
+        return (Subscription) strategy.load(
+                Subscription.class, id);
     }
     
     public Iterator getAllSubscriptions() {
         try {
             return ((List)strategy.getNamedQuery(
-                    "PlanetSubscriptionData.getAll").getResultList()).iterator();
+                    "Subscription.getAll").getResultList()).iterator();
         } catch (Throwable e) {
             throw new RuntimeException(
                     "ERROR fetching subscription collection", e);
@@ -123,7 +123,7 @@
     }
     
     public int getSubscriptionCount() throws PlanetException {
-        Query q = strategy.getNamedQuery("PlanetSubscriptionData.getAll");
+        Query q = strategy.getNamedQuery("Subscription.getAll");
         return q.getResultList().size();
     }
     
@@ -136,18 +136,18 @@
      * Get top X subscriptions, restricted by group.
      */
     public List getTopSubscriptions(
-            PlanetGroupData group, int offset, int len) throws PlanetException {
+            PlanetGroup group, int offset, int len) throws PlanetException {
         List result = null;
         if (group != null) {
             Query q = strategy.getNamedQuery(
-                    "PlanetSubscriptionData.getByGroupOrderByInboundBlogsDesc");
+                    "Subscription.getByGroupOrderByInboundBlogsDesc");
             q.setParameter(1, group);
             if (offset != 0) q.setFirstResult(offset);
             if (len != -1) q.setMaxResults(len);
             result = q.getResultList();
         } else {
             Query q = strategy.getNamedQuery(
-                    "PlanetSubscriptionData.getAllOrderByInboundBlogsDesc");
+                    "Subscription.getAllOrderByInboundBlogsDesc");
             if (offset != 0) q.setFirstResult(offset);
             if (len != -1) q.setMaxResults(len);
             result = q.getResultList();
@@ -155,77 +155,77 @@
         return result;
     }
     
-    public PlanetGroupData getGroup(String handle) throws PlanetException {
-        Query q = strategy.getNamedQuery("PlanetGroupData.getByHandle");
+    public PlanetGroup getGroup(String handle) throws PlanetException {
+        Query q = strategy.getNamedQuery("PlanetGroup.getByHandle");
         q.setParameter(1, handle);
         try {
-            return (PlanetGroupData)q.getSingleResult();
+            return (PlanetGroup)q.getSingleResult();
         } catch (NoResultException e) {
             return null;
         }
     }
     
-    public PlanetGroupData getGroupById(String id) throws PlanetException {
-        return (PlanetGroupData) strategy.load(PlanetGroupData.class, id);
+    public PlanetGroup getGroupById(String id) throws PlanetException {
+        return (PlanetGroup) strategy.load(PlanetGroup.class, id);
     }        
     
     public void release() {}
     
     
-    public void savePlanet(PlanetData planet) throws PlanetException {
+    public void savePlanet(Planet planet) throws PlanetException {
         strategy.store(planet);
     }
     
-    public PlanetData getPlanet(String handle) throws PlanetException {
-        Query q = strategy.getNamedQuery("PlanetData.getByHandle");
+    public Planet getPlanet(String handle) throws PlanetException {
+        Query q = strategy.getNamedQuery("Planet.getByHandle");
         q.setParameter(1, handle);
         try {
-            return (PlanetData)q.getSingleResult();
+            return (Planet)q.getSingleResult();
         } catch (NoResultException e) {
             return null;
         }
     }
     
-    public PlanetData getPlanetById(String id) throws PlanetException {
-        return (PlanetData)strategy.load(PlanetData.class, id);
+    public Planet getPlanetById(String id) throws PlanetException {
+        return (Planet)strategy.load(Planet.class, id);
     }
     
     public List getPlanets() throws PlanetException {
-        return (List)strategy.getNamedQuery("PlanetData.getAll").getResultList();
+        return (List)strategy.getNamedQuery("Planet.getAll").getResultList();
     }
     
-    public List getGroupHandles(PlanetData planet) throws PlanetException {
+    public List getGroupHandles(Planet planet) throws PlanetException {
         List handles = new ArrayList();
         Iterator list = getGroups(planet).iterator();
         while (list.hasNext()) {
-            PlanetGroupData group = (PlanetGroupData) list.next();
+            PlanetGroup group = (PlanetGroup) list.next();
             handles.add(group.getHandle());
         }
         return handles;
     }
     
-    public List getGroups(PlanetData planet) throws PlanetException {
-        Query q = strategy.getNamedQuery("PlanetGroupData.getByPlanet");
+    public List getGroups(Planet planet) throws PlanetException {
+        Query q = strategy.getNamedQuery("PlanetGroup.getByPlanet");
         q.setParameter(1, planet.getHandle());
         return q.getResultList();
     }
     
-    public PlanetGroupData getGroup(PlanetData planet, String handle) throws PlanetException {
-        Query q = strategy.getNamedQuery("PlanetGroupData.getByPlanetAndHandle");
+    public PlanetGroup getGroup(Planet planet, String handle) throws PlanetException {
+        Query q = strategy.getNamedQuery("PlanetGroup.getByPlanetAndHandle");
         q.setParameter(1, planet.getHandle());
         q.setParameter(2, handle);
         try {
-            return (PlanetGroupData)q.getSingleResult();
+            return (PlanetGroup)q.getSingleResult();
         } catch (NoResultException e) {
             return null;
         }
     }
     
-    public void deletePlanet(PlanetData planet) throws PlanetException {
+    public void deletePlanet(Planet planet) throws PlanetException {
         strategy.remove(planet);
     }
     
-    public void deleteEntries(PlanetSubscriptionData sub) 
+    public void deleteEntries(Subscription sub) 
         throws PlanetException {
         Iterator entries = sub.getEntries().iterator();
         while(entries.hasNext()) {
@@ -237,30 +237,30 @@
     }
     
     public List getSubscriptions() throws PlanetException {
-        Query q = strategy.getNamedQuery("PlanetSubscriptionData.getAllOrderByFeedURL");
+        Query q = strategy.getNamedQuery("Subscription.getAllOrderByFeedURL");
         return q.getResultList();
     }
 
-    public PlanetEntryData getEntryById(String id) throws PlanetException {
-        return (PlanetEntryData) strategy.load(PlanetEntryData.class, id);
+    public SubscriptionEntry getEntryById(String id) throws PlanetException {
+        return (SubscriptionEntry) strategy.load(SubscriptionEntry.class, id);
     }
 
-    public List getEntries(PlanetSubscriptionData sub, int offset, int len) throws PlanetException {            
+    public List getEntries(Subscription sub, int offset, int len) throws PlanetException {            
         if(sub == null) {
             throw new PlanetException("subscription cannot be null");
         }
-        Query q = strategy.getNamedQuery("PlanetEntryData.getBySubscription");
+        Query q = strategy.getNamedQuery("SubscriptionEntry.getBySubscription");
         q.setParameter(1, sub);
         if (offset != 0) q.setFirstResult(offset);
         if (len != -1) q.setMaxResults(len);
         return q.getResultList();
     }
 
-    public List getEntries(PlanetGroupData group, int offset, int len) throws PlanetException {
+    public List getEntries(PlanetGroup group, int offset, int len) throws PlanetException {
         return getEntries(group, null, null, offset, len);
     }
 
-    public List getEntries(PlanetGroupData group, Date startDate, Date endDate, int offset, int len) throws PlanetException {
+    public List getEntries(PlanetGroup group, Date startDate, Date endDate, int offset, int len) throws PlanetException {
         StringBuffer queryString = new StringBuffer();
                 
         if(group == null) {
@@ -274,7 +274,7 @@
             StringBuffer sb = new StringBuffer();
             List params = new ArrayList();
             int size = 0;
-            sb.append("SELECT e FROM PlanetEntryData e ");
+            sb.append("SELECT e FROM SubscriptionEntry e ");
             sb.append("JOIN e.subscription.groups g ");
                         
             params.add(size++, group.getHandle());

Modified: roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPropertiesManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPropertiesManagerImpl.java?view=diff&rev=552017&r1=552016&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPropertiesManagerImpl.java (original)
+++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPropertiesManagerImpl.java Fri Jun 29 13:05:57 2007
@@ -33,7 +33,7 @@
 import org.apache.roller.planet.config.runtime.DisplayGroup;
 import org.apache.roller.planet.config.runtime.PropertyDef;
 import org.apache.roller.planet.config.runtime.RuntimeConfigDefs;
-import org.apache.roller.planet.pojos.PropertyData;
+import org.apache.roller.planet.pojos.RuntimeConfigProperty;
 
 
 /**
@@ -62,33 +62,33 @@
     /**
      * Retrieve a single property by name.
      */
-    public PropertyData getProperty(String name) throws PlanetException {
-        return (PropertyData)strategy.load(PropertyData.class, name);
+    public RuntimeConfigProperty getProperty(String name) throws PlanetException {
+        return (RuntimeConfigProperty)strategy.load(RuntimeConfigProperty.class, name);
     }
     
     
     /**
      * Retrieve all properties.
-     *
+     * 
      * Properties are returned in a Map to make them easy to lookup.  The Map
-     * uses the property name as the key and the PropertyData object
+     * uses the property name as the key and the RuntimeConfigProperty object
      * as the value.
      */
     public Map getProperties() throws PlanetException {
         
         HashMap props = new HashMap();
-        List list = strategy.getNamedQuery("PropertyData.getAll").getResultList();
+        List list = strategy.getNamedQuery("RuntimeConfigProperty.getAll").getResultList();
         
         /*
          * for convenience sake we are going to put the list of props
          * into a map for users to access it.  The value element of the
-         * hash still needs to be the PropertyData object so that
+         * hash still needs to be the RuntimeConfigProperty object so that
          * we can save the elements again after they have been updated
          */
-        PropertyData prop = null;
+        RuntimeConfigProperty prop = null;
         Iterator it = list.iterator();
         while(it.hasNext()) {
-            prop = (PropertyData) it.next();
+            prop = (RuntimeConfigProperty) it.next();
             props.put(prop.getName(), prop);
         }
         
@@ -99,7 +99,7 @@
     /**
      * Save a single property.
      */
-    public void saveProperty(PropertyData property) throws PlanetException {
+    public void saveProperty(RuntimeConfigProperty property) throws PlanetException {
         
         strategy.store(property);
     }
@@ -113,7 +113,7 @@
         // just go through the list and saveProperties each property
         Iterator props = properties.values().iterator();
         while (props.hasNext()) {
-            strategy.store((PropertyData) props.next());
+            strategy.store((RuntimeConfigProperty) props.next());
         }
     }
     
@@ -180,8 +180,8 @@
                     
                     // do we already have this prop?  if not then add it
                     if(!props.containsKey(propDef.getName())) {
-                        PropertyData newprop =
-                                new PropertyData(propDef.getName(), propDef.getDefaultValue());
+                        RuntimeConfigProperty newprop =
+                                new RuntimeConfigProperty(propDef.getName(), propDef.getDefaultValue());
                         
                         props.put(propDef.getName(), newprop);
                         

Copied: roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/Planet.java (from r552006, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/Planet.java?view=diff&rev=552017&p1=roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java&r1=552006&p2=roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/Planet.java&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java (original)
+++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/Planet.java Fri Jun 29 13:05:57 2007
@@ -28,7 +28,7 @@
  * 
  * @hibernate.class lazy="true" table="rag_planet"
  */
-public class PlanetData implements Comparable {
+public class Planet implements Comparable {
     
     private String id = UUIDGenerator.generateUUID();
     private String handle = null;
@@ -37,11 +37,11 @@
     private Set groups = new TreeSet();
     
     
-    public PlanetData() {
+    public Planet() {
     }
     
     
-    public PlanetData(String handle, String title, String desc) {
+    public Planet(String handle, String title, String desc) {
         this.title = title;
         this.handle = handle;
         this.description = desc;
@@ -52,7 +52,7 @@
      * For comparing planets and sorting, ordered by Title.
      */
     public int compareTo(Object o) {
-        PlanetData other = (PlanetData) o;
+        Planet other = (Planet) o;
         return getTitle().compareTo(other.getTitle());
     }
     
@@ -107,7 +107,7 @@
     /** 
      * @hibernate.set lazy="true" inverse="true" cascade="all" sort="natural"
      * @hibernate.collection-key column="planet_id"
-     * @hibernate.collection-one-to-many class="org.apache.roller.planet.pojos.PlanetGroupData"
+     * @hibernate.collection-one-to-many class="org.apache.roller.planet.pojos.PlanetGroup"
      */
     public Set getGroups() {
         return groups;

Copied: roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/Planet.orm.xml (from r552006, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/Planet.orm.xml?view=diff&rev=552017&p1=roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml&r1=552006&p2=roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/Planet.orm.xml&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml (original)
+++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/Planet.orm.xml Fri Jun 29 13:05:57 2007
@@ -9,14 +9,14 @@
         </persistence-unit-defaults>
     </persistence-unit-metadata>
     <package>org.apache.roller.planet.pojos</package>
-    <entity metadata-complete="true" name="PlanetData"
-            class="org.apache.roller.planet.pojos.PlanetData">
+    <entity metadata-complete="true" name="Planet"
+            class="org.apache.roller.planet.pojos.Planet">
         <table name="rag_planet"/>
-        <named-query name="PlanetData.getAll">
-            <query>SELECT p FROM PlanetData p</query>
+        <named-query name="Planet.getAll">
+            <query>SELECT p FROM Planet p</query>
         </named-query>
-        <named-query name="PlanetData.getByHandle">
-            <query>SELECT p FROM PlanetData p WHERE p.handle = ?1</query>
+        <named-query name="Planet.getByHandle">
+            <query>SELECT p FROM Planet p WHERE p.handle = ?1</query>
         </named-query>
         <attributes>
             <id name="id">
@@ -31,7 +31,7 @@
             <basic name="handle">
                 <column name="handle" insertable="true" updatable="true" unique="true"/>
             </basic>
-            <one-to-many name="groups" mapped-by="planet" target-entity="org.apache.roller.planet.pojos.PlanetGroupData" fetch="LAZY">
+            <one-to-many name="groups" mapped-by="planet" target-entity="org.apache.roller.planet.pojos.PlanetGroup" fetch="LAZY">
                 <cascade>
                     <cascade-all/>
                 </cascade>

Copied: roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroup.java (from r552006, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.java)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroup.java?view=diff&rev=552017&p1=roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.java&r1=552006&p2=roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroup.java&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.java (original)
+++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroup.java Fri Jun 29 13:05:57 2007
@@ -32,7 +32,7 @@
  *
  * @hibernate.class lazy="true" table="rag_group"
  */
-public class PlanetGroupData implements Serializable, Comparable {
+public class PlanetGroup implements Serializable, Comparable {
     
     transient private String[] catArray = null;
     
@@ -48,13 +48,13 @@
     private String categoryRestriction = null;
     
     // associations
-    private PlanetData planet = null;
+    private Planet planet = null;
     private Set subscriptions = new TreeSet();
     
     
-    public PlanetGroupData() {}
+    public PlanetGroup() {}
     
-    public PlanetGroupData(PlanetData planet, String handle, String title, String desc) {
+    public PlanetGroup(Planet planet, String handle, String title, String desc) {
         this.planet = planet;
         this.handle = handle;
         this.title = title;
@@ -66,7 +66,7 @@
      * For comparing groups and sorting, ordered by Title.
      */
     public int compareTo(Object o) {
-        PlanetGroupData other = (PlanetGroupData) o;
+        PlanetGroup other = (PlanetGroup) o;
         return getTitle().compareTo(other.getTitle());
     }
     
@@ -86,7 +86,7 @@
     /**
      * @hibernate.set table="rag_group_subscription" lazy="true" invert="true" cascade="none" sort="natural"
      * @hibernate.collection-key column="group_id"
-     * @hibernate.collection-many-to-many column="subscription_id" class="org.apache.roller.planet.pojos.PlanetSubscriptionData"
+     * @hibernate.collection-many-to-many column="subscription_id" class="org.apache.roller.planet.pojos.Subscription"
      */
     public Set getSubscriptions() {
         return subscriptions;
@@ -173,11 +173,11 @@
     /**
      * @hibernate.many-to-one column="planet_id" cascade="none" non-null="false"
      */
-    public PlanetData getPlanet() {
+    public Planet getPlanet() {
         return planet;
     }
     
-    public void setPlanet(PlanetData planet) {
+    public void setPlanet(Planet planet) {
         this.planet = planet;
     }
     
@@ -198,7 +198,7 @@
     /**
      * Returns true if entry is qualified for inclusion in this group.
      */
-    public boolean qualified(PlanetEntryData entry) {
+    public boolean qualified(SubscriptionEntry entry) {
         String[] cats = getCategoryRestrictionAsArray();
         if (cats == null || cats.length == 0) return true;
         for (int i=0; i<cats.length; i++) {

Copied: roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroup.orm.xml (from r552006, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.orm.xml)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroup.orm.xml?view=diff&rev=552017&p1=roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.orm.xml&r1=552006&p2=roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroup.orm.xml&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.orm.xml (original)
+++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroup.orm.xml Fri Jun 29 13:05:57 2007
@@ -9,22 +9,22 @@
         </persistence-unit-defaults>
     </persistence-unit-metadata>
     <package>org.apache.roller.planet.pojos</package>
-    <entity metadata-complete="true" name="PlanetGroupData" class="org.apache.roller.planet.pojos.PlanetGroupData">
+    <entity metadata-complete="true" name="PlanetGroup" class="org.apache.roller.planet.pojos.PlanetGroup">
         <table name="rag_group"/>
-        <named-query name="PlanetGroupData.getByHandle">
-            <query>SELECT p FROM PlanetGroupData p WHERE p.handle = ?1</query>
+        <named-query name="PlanetGroup.getByHandle">
+            <query>SELECT p FROM PlanetGroup p WHERE p.handle = ?1</query>
         </named-query>
-        <named-query name="PlanetGroupData.getByPlanetAndHandle">
-            <query>SELECT p FROM PlanetGroupData p WHERE p.planet.handle = ?1 and p.handle = ?2</query>
+        <named-query name="PlanetGroup.getByPlanetAndHandle">
+            <query>SELECT p FROM PlanetGroup p WHERE p.planet.handle = ?1 and p.handle = ?2</query>
         </named-query>
-        <named-query name="PlanetGroupData.getByPlanet">
-            <query>SELECT p FROM PlanetGroupData p WHERE p.planet.handle = ?1</query>
+        <named-query name="PlanetGroup.getByPlanet">
+            <query>SELECT p FROM PlanetGroup p WHERE p.planet.handle = ?1</query>
         </named-query>
-        <named-query name="PlanetGroupData.getWithPlanetNull">
-            <query>SELECT p FROM PlanetGroupData p WHERE p.planet IS NULL</query>
+        <named-query name="PlanetGroup.getWithPlanetNull">
+            <query>SELECT p FROM PlanetGroup p WHERE p.planet IS NULL</query>
         </named-query>
-        <named-query name="PlanetGroupData.getAll">
-            <query>SELECT p FROM PlanetGroupData p</query>
+        <named-query name="PlanetGroup.getAll">
+            <query>SELECT p FROM PlanetGroup p</query>
         </named-query>
         <attributes>
             <id name="id">
@@ -48,11 +48,11 @@
             <basic name="title">
                 <column name="title" insertable="true" updatable="true" unique="false"/>
             </basic>
-            <many-to-one name="planet" target-entity="org.apache.roller.planet.pojos.PlanetData">
+            <many-to-one name="planet" target-entity="org.apache.roller.planet.pojos.Planet">
 				<join-column name="planet_id" insertable="true" updatable="true" nullable="true"/>
 			</many-to-one>
             <many-to-many name="subscriptions"
-                          target-entity="org.apache.roller.planet.pojos.PlanetSubscriptionData"
+                          target-entity="org.apache.roller.planet.pojos.Subscription"
                           mapped-by="groups"/>
             <transient name="categoryRestrictionAsArray"/>
         </attributes>

Copied: roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/RuntimeConfigProperty.java (from r552006, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PropertyData.java)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/RuntimeConfigProperty.java?view=diff&rev=552017&p1=roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PropertyData.java&r1=552006&p2=roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/RuntimeConfigProperty.java&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PropertyData.java (original)
+++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/RuntimeConfigProperty.java Fri Jun 29 13:05:57 2007
@@ -25,21 +25,20 @@
 
 /**
  * Represents a single runtime property of the system.
- *
- * @ejb:bean name="PropertyData"
- * @hibernate.class lazy="true" table="rag_properties"
+ * 
  * @hibernate.cache usage="read-write"
+ * @hibernate.class lazy="true" table="rag_properties"
  */
-public class PropertyData implements Serializable {
+public class RuntimeConfigProperty implements Serializable {
     
     private String name = null;
     private String value = null;
     
     
-    public PropertyData() {}
+    public RuntimeConfigProperty() {}
     
     
-    public PropertyData(String name, String value) {
+    public RuntimeConfigProperty(String name, String value) {
         this.name = name;
         this.value = value;
     }
@@ -97,8 +96,8 @@
     
     public boolean equals(Object other) {
         if (other == this) return true;
-        if (other instanceof PropertyData != true) return false;
-        PropertyData o = (PropertyData)other;
+        if (other instanceof RuntimeConfigProperty != true) return false;
+        RuntimeConfigProperty o = (RuntimeConfigProperty)other;
         return new EqualsBuilder()
         .append(getName(), o.getName())
         .isEquals();

Copied: roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml (from r552006, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PropertyData.orm.xml)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml?view=diff&rev=552017&p1=roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PropertyData.orm.xml&r1=552006&p2=roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PropertyData.orm.xml (original)
+++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml Fri Jun 29 13:05:57 2007
@@ -9,11 +9,11 @@
         </persistence-unit-defaults>
     </persistence-unit-metadata>
     <package>org.apache.roller.planet.pojos</package>
-    <entity metadata-complete="true" name="PropertyData"
-            class="org.apache.roller.planet.pojos.PropertyData">
+    <entity metadata-complete="true" name="RuntimeConfigProperty"
+            class="org.apache.roller.planet.pojos.RuntimeConfigProperty">
         <table name="rag_properties"/>
-        <named-query name="PropertyData.getAll">
-            <query>SELECT r FROM PropertyData r</query>
+        <named-query name="RuntimeConfigProperty.getAll">
+            <query>SELECT r FROM RuntimeConfigProperty r</query>
         </named-query>
         <attributes>
             <id name="name">

Copied: roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/Subscription.java (from r552006, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/Subscription.java?view=diff&rev=552017&p1=roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java&r1=552006&p2=roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/Subscription.java&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java (original)
+++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/Subscription.java Fri Jun 29 13:05:57 2007
@@ -32,7 +32,7 @@
  *
  * @hibernate.class lazy="true" table="rag_subscription"
  */
-public class PlanetSubscriptionData implements Serializable, Comparable
+public class Subscription implements Serializable, Comparable
 {
     /** Database ID */
     protected String id = UUIDGenerator.generateUUID();
@@ -52,16 +52,16 @@
     
     
     public int compareTo(Object o) {
-        PlanetSubscriptionData other = (PlanetSubscriptionData) o;
+        Subscription other = (Subscription) o;
         return getTitle().compareTo(other.getTitle());
     }
     
     public boolean equals(Object other) {
         
         if(this == other) return true;
-        if(!(other instanceof PlanetSubscriptionData)) return false;
+        if(!(other instanceof Subscription)) return false;
         
-        final PlanetSubscriptionData that = (PlanetSubscriptionData) other;
+        final Subscription that = (Subscription) other;
         return this.feedUrl.equals(that.getFeedURL());
     }
     
@@ -179,7 +179,7 @@
     /**
      * @hibernate.set table="rag_group_subscription" lazy="true" cascade="none"
      * @hibernate.collection-key column="subscription_id"
-     * @hibernate.collection-many-to-many column="group_id" class="org.apache.roller.planet.pojos.PlanetGroupData"
+     * @hibernate.collection-many-to-many column="group_id" class="org.apache.roller.planet.pojos.PlanetGroup"
      */
     public Set getGroups() {
         return groups;
@@ -191,9 +191,11 @@
     
     
     /**
+     * 
+     * 
      * @hibernate.bag lazy="true" inverse="true" cascade="all"
      * @hibernate.collection-key column="subscription_id"
-     * @hibernate.collection-one-to-many class="org.apache.roller.planet.pojos.PlanetEntryData"
+     * @hibernate.collection-one-to-many class="org.apache.roller.planet.pojos.SubscriptionEntry"
      */
     public List getEntries() {
         return entries;
@@ -204,7 +206,7 @@
     }
     
     
-    public void addEntry(PlanetEntryData entry) {
+    public void addEntry(SubscriptionEntry entry) {
         // bi-directional one-to-many
         entry.setSubscription(this);
         this.getEntries().add(entry);
@@ -213,7 +215,7 @@
     public void addEntries(Collection newEntries) {
         // bi-directional one-to-many
         for (Iterator it = newEntries.iterator(); it.hasNext();) {
-            PlanetEntryData entry = (PlanetEntryData) it.next();
+            SubscriptionEntry entry = (SubscriptionEntry) it.next();
             entry.setSubscription(this);
         }
         this.getEntries().addAll(newEntries);

Copied: roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/Subscription.orm.xml (from r552006, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/Subscription.orm.xml?view=diff&rev=552017&p1=roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml&r1=552006&p2=roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/Subscription.orm.xml&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml (original)
+++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/Subscription.orm.xml Fri Jun 29 13:05:57 2007
@@ -9,25 +9,25 @@
         </persistence-unit-defaults>
     </persistence-unit-metadata>
     <package>org.apache.roller.planet.pojos</package>
-    <entity metadata-complete="true" name="PlanetSubscriptionData"
-            class="org.apache.roller.planet.pojos.PlanetSubscriptionData">
+    <entity metadata-complete="true" name="Subscription"
+            class="org.apache.roller.planet.pojos.Subscription">
         <table name="rag_subscription"/>
-        <named-query name="PlanetSubscriptionData.getAll">
-            <query>SELECT p FROM PlanetSubscriptionData p</query>
+        <named-query name="Subscription.getAll">
+            <query>SELECT p FROM Subscription p</query>
         </named-query>
-        <named-query name="PlanetSubscriptionData.getAllOrderByFeedURL">
-            <query>SELECT p FROM PlanetSubscriptionData p ORDER BY p.feedURL DESC</query>
+        <named-query name="Subscription.getAllOrderByFeedURL">
+            <query>SELECT p FROM Subscription p ORDER BY p.feedURL DESC</query>
         </named-query>
-        <named-query name="PlanetSubscriptionData.getAllOrderByInboundBlogsDesc">
-            <query>SELECT p FROM PlanetSubscriptionData p ORDER BY p.inboundblogs DESC</query>
+        <named-query name="Subscription.getAllOrderByInboundBlogsDesc">
+            <query>SELECT p FROM Subscription p ORDER BY p.inboundblogs DESC</query>
         </named-query>
-        <named-query name="PlanetSubscriptionData.getByGroupOrderByInboundBlogsDesc">
-            <query>SELECT p FROM PlanetSubscriptionData p JOIN p.groups g WHERE g.handle = ?1 ORDER
+        <named-query name="Subscription.getByGroupOrderByInboundBlogsDesc">
+            <query>SELECT p FROM Subscription p JOIN p.groups g WHERE g.handle = ?1 ORDER
                 BY p.inboundblogs DESC
             </query>
         </named-query>
-        <named-query name="PlanetSubscriptionData.getByFeedURL">
-            <query>SELECT p FROM PlanetSubscriptionData p WHERE p.feedURL = ?1</query>
+        <named-query name="Subscription.getByFeedURL">
+            <query>SELECT p FROM Subscription p WHERE p.feedURL = ?1</query>
         </named-query>
         <attributes>
             <id name="id">
@@ -55,13 +55,13 @@
             <basic name="inboundblogs">
                 <column name="inbound_blogs" insertable="true" updatable="true" unique="false"/>
             </basic>
-            <one-to-many name="entries" mapped-by="subscription" target-entity="org.apache.roller.planet.pojos.PlanetEntryData" fetch="LAZY">
+            <one-to-many name="entries" mapped-by="subscription" target-entity="org.apache.roller.planet.pojos.SubscriptionEntry" fetch="LAZY">
                 <cascade>
                     <cascade-all />
                 </cascade>
             </one-to-many>
             <many-to-many name="groups"
-                          target-entity="org.apache.roller.planet.pojos.PlanetGroupData">
+                          target-entity="org.apache.roller.planet.pojos.PlanetGroup">
                 <join-table name="rag_group_subscription">
                     <join-column name="subscription_id"/>
                     <inverse-join-column name="group_id"/>

Copied: roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/SubscriptionEntry.java (from r552006, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.java)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/SubscriptionEntry.java?view=diff&rev=552017&p1=roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.java&r1=552006&p2=roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/SubscriptionEntry.java&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.java (original)
+++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/SubscriptionEntry.java Fri Jun 29 13:05:57 2007
@@ -44,7 +44,7 @@
  * 
  * @hibernate.class lazy="true" table="rag_entry"
  */
-public class PlanetEntryData implements Serializable, Comparable {
+public class SubscriptionEntry implements Serializable, Comparable {
     
     protected String    id = UUIDGenerator.generateUUID();
     protected String    handle;
@@ -57,19 +57,19 @@
     protected Timestamp updated;
     
     private String categoriesString;
-    protected PlanetSubscriptionData subscription = null;
+    protected Subscription subscription = null;
     
     /**
      * Construct empty entry.
      */
-    public PlanetEntryData() {
+    public SubscriptionEntry() {
     }
     
     /**
      * Create entry from Rome entry.
      */
-    public PlanetEntryData(
-            SyndFeed romeFeed, SyndEntry romeEntry, PlanetSubscriptionData sub) {
+    public SubscriptionEntry(
+            SyndFeed romeFeed, SyndEntry romeEntry, Subscription sub) {
         setSubscription(sub);
         initFromRomeEntry(romeFeed, romeEntry);
     }
@@ -78,9 +78,9 @@
      * Create entry from Rome entry.
      */
     /*
-    public PlanetEntryData(
+    public SubscriptionEntry(
             WeblogEntryData rollerEntry,
-            PlanetSubscriptionData sub,
+            Subscription sub,
             Map pagePlugins) throws PlanetException {
         setSubscription(sub);
         initFromRollerEntry(rollerEntry, pagePlugins);
@@ -202,10 +202,10 @@
     /**
      * @hibernate.many-to-one column="subscription_id" cascade="save-update" not-null="true"
      */
-    public PlanetSubscriptionData getSubscription() {
+    public Subscription getSubscription() {
         return subscription;
     }
-    public void setSubscription(PlanetSubscriptionData subscription) {
+    public void setSubscription(Subscription subscription) {
         this.subscription = subscription;
     }
     /**
@@ -376,7 +376,7 @@
      * Compare planet entries by comparing permalinks.
      */
     public int compareTo(Object o) {
-        PlanetEntryData other = (PlanetEntryData)o;
+        SubscriptionEntry other = (SubscriptionEntry)o;
         return getPermalink().compareTo(other.getPermalink());
     }
     
@@ -385,8 +385,8 @@
      */
     public boolean equals(Object other) {        
         if(this == other) return true;
-        if(!(other instanceof PlanetEntryData)) return false;        
-        final PlanetEntryData that = (PlanetEntryData) other;
+        if(!(other instanceof SubscriptionEntry)) return false;        
+        final SubscriptionEntry that = (SubscriptionEntry) other;
         return this.permalink.equals(that.getPermalink());
     }
     
@@ -401,7 +401,7 @@
      * Read-only synomym for getSubscription()
      * @roller.wrapPojoMethod type="pojo"
      */
-    public PlanetSubscriptionData getWebsite() {
+    public Subscription getWebsite() {
         return this.subscription;        
     }
     public void setWebsite() {

Copied: roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml (from r552006, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.orm.xml)
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml?view=diff&rev=552017&p1=roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.orm.xml&r1=552006&p2=roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.orm.xml (original)
+++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml Fri Jun 29 13:05:57 2007
@@ -9,26 +9,26 @@
         </persistence-unit-defaults>
     </persistence-unit-metadata>
     <package>org.apache.roller.planet.pojos</package>
-    <entity metadata-complete="true" name="PlanetEntryData" class="org.apache.roller.planet.pojos.PlanetEntryData">
+    <entity metadata-complete="true" name="SubscriptionEntry" class="org.apache.roller.planet.pojos.SubscriptionEntry">
         <table name="rag_entry"/>
-        <named-query name="PlanetEntryData.getByFeedURL">
-            <query>SELECT p FROM PlanetEntryData p WHERE p.subscription.feedURL = ?1</query>
+        <named-query name="SubscriptionEntry.getByFeedURL">
+            <query>SELECT p FROM SubscriptionEntry p WHERE p.subscription.feedURL = ?1</query>
         </named-query>
-        <named-query name="PlanetEntryData.getByGroup&amp;EndDateOrderByPubTimeDesc">
-            <query>SELECT p FROM PlanetEntryData p JOIN p.subscription s JOIN s.groups g
+        <named-query name="SubscriptionEntry.getByGroup&amp;EndDateOrderByPubTimeDesc">
+            <query>SELECT p FROM SubscriptionEntry p JOIN p.subscription s JOIN s.groups g
                 WHERE g =?1 AND p.pubTime &lt; ?2
                 ORDER BY p.pubTime DESC
             </query>
         </named-query>
-        <named-query name="PlanetEntryData.getByGroup&amp;EndDate&amp;StartDateOrderByPubTimeDesc">
-            <query>SELECT p FROM PlanetEntryData p JOIN p.subscription s JOIN s.groups g
+        <named-query name="SubscriptionEntry.getByGroup&amp;EndDate&amp;StartDateOrderByPubTimeDesc">
+            <query>SELECT p FROM SubscriptionEntry p JOIN p.subscription s JOIN s.groups g
                 WHERE g=?1 AND p.pubTime &lt; ?2 AND p.pubTime &gt; ?3
                 ORDER BY p.pubTime DESC
             </query>
         </named-query>
-        <named-query name="PlanetEntryData.getBySubscription">
+        <named-query name="SubscriptionEntry.getBySubscription">
             <query>
-                SELECT p FROM PlanetEntryData p WHERE p.subscription = ?1 ORDER BY p.pubTime DESC
+                SELECT p FROM SubscriptionEntry p WHERE p.subscription = ?1 ORDER BY p.pubTime DESC
             </query>
         </named-query>
         <attributes>
@@ -63,7 +63,7 @@
                 <column name="updated" insertable="true" updatable="true" unique="false"/>
             </basic>
             <many-to-one name="subscription"
-                         target-entity="org.apache.roller.planet.pojos.PlanetSubscriptionData">
+                         target-entity="org.apache.roller.planet.pojos.Subscription">
                 <join-column name="subscription_id" insertable="true" updatable="true"
                              nullable="false"/>
             </many-to-one>

Modified: roller/trunk/apps/planet/src/java/org/apache/roller/planet/tasks/StaticPlanetModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/tasks/StaticPlanetModel.java?view=diff&rev=552017&r1=552016&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/org/apache/roller/planet/tasks/StaticPlanetModel.java (original)
+++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/tasks/StaticPlanetModel.java Fri Jun 29 13:05:57 2007
@@ -26,8 +26,8 @@
 import org.apache.roller.planet.business.Planet;
 import org.apache.roller.planet.business.PlanetFactory;
 import org.apache.roller.planet.business.PlanetManager;
-import org.apache.roller.planet.pojos.PlanetGroupData;
-import org.apache.roller.planet.pojos.PlanetSubscriptionData;
+import org.apache.roller.planet.pojos.PlanetGroup;
+import org.apache.roller.planet.pojos.Subscription;
 
 /**
  * Simple planet model for use static planet generation, designed
@@ -49,14 +49,14 @@
 //    }
        
        
-    public PlanetSubscriptionData getSubscription(String feedUrl) throws Exception {
+    public Subscription getSubscription(String feedUrl) throws Exception {
         return planetManager.getSubscription(feedUrl); 
     }
     
     
     public List getFeedEntries(String feedUrl, int maxEntries) throws Exception {
         try {
-            PlanetSubscriptionData sub = planetManager.getSubscription(feedUrl);
+            Subscription sub = planetManager.getSubscription(feedUrl);
             if(sub != null) {
                 return planetManager.getEntries(sub, 0, maxEntries);
             } else {
@@ -74,13 +74,13 @@
 //    }
     
     // removed now that groups must be part of a planet, this method no longer makes sense
-//    public PlanetGroupData getGroup(String handle) throws PlanetException {
+//    public PlanetGroup getGroup(String handle) throws PlanetException {
 //        return planetManager.getGroup(handle);
 //    }
     
     
     public List getAggregation(
-            PlanetGroupData group, int maxEntries) throws PlanetException {
+            PlanetGroup group, int maxEntries) throws PlanetException {
         return planetManager.getEntries(group, 0, maxEntries);
     }
     

Modified: roller/trunk/apps/planet/src/java/org/apache/roller/planet/tasks/TechnoratiRankingsTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/tasks/TechnoratiRankingsTask.java?view=diff&rev=552017&r1=552016&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/org/apache/roller/planet/tasks/TechnoratiRankingsTask.java (original)
+++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/tasks/TechnoratiRankingsTask.java Fri Jun 29 13:05:57 2007
@@ -28,7 +28,7 @@
 import org.apache.roller.planet.business.PlanetManager;
 import org.apache.roller.planet.config.PlanetConfig;
 import org.apache.roller.planet.config.PlanetRuntimeConfig;
-import org.apache.roller.planet.pojos.PlanetSubscriptionData;
+import org.apache.roller.planet.pojos.Subscription;
 import org.apache.roller.planet.util.Technorati;
 
 
@@ -85,8 +85,8 @@
                 
                 Iterator subs = planet.getSubscriptions().iterator();
                 while (subs.hasNext()) {
-                    PlanetSubscriptionData sub =
-                            (PlanetSubscriptionData)subs.next();
+                    Subscription sub =
+                            (Subscription)subs.next();
                     if (count >= start && count < end) {
                         try {
                             Technorati.Result result =

Modified: roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/ConfigForm.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/ConfigForm.java?view=diff&rev=552017&r1=552016&r2=552017
==============================================================================
--- roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/ConfigForm.java (original)
+++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/ConfigForm.java Fri Jun 29 13:05:57 2007
@@ -27,7 +27,7 @@
 import org.apache.roller.planet.PlanetException;
 import org.apache.roller.planet.business.PlanetFactory;
 import org.apache.roller.planet.business.PropertiesManager;
-import org.apache.roller.planet.pojos.PropertyData;
+import org.apache.roller.planet.pojos.RuntimeConfigProperty;
 import org.apache.roller.planet.ui.core.struts2.PlanetActionSupport;
 import org.apache.struts2.interceptor.ParameterAware;
 
@@ -70,7 +70,7 @@
         try {
             // only set values for properties that are already defined
             String propName = null;
-            PropertyData updProp = null;
+            RuntimeConfigProperty updProp = null;
             String incomingProp = null;
             Iterator propsIT = this.properties.keySet().iterator();
             while(propsIT.hasNext()) {
@@ -78,7 +78,7 @@
                 
                 log.debug("Checking property ["+propName+"]");
                 
-                updProp = (PropertyData) this.properties.get(propName);
+                updProp = (RuntimeConfigProperty) this.properties.get(propName);
                 String[] propValues = (String[]) this.parameters.get(updProp.getName());
                 if(propValues != null && propValues.length > 0) {
                     // we don't deal with multi-valued props



Mime
View raw message