You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/02/28 00:12:18 UTC
svn commit: r512478 - in
/incubator/roller/branches/roller_4.0/apps/planet/src:
java/org/apache/roller/planet/business/datamapper/
java/org/apache/roller/planet/business/jpa/
java/org/apache/roller/planet/pojos/ sql/
Author: snoopdave
Date: Tue Feb 27 15:12:16 2007
New Revision: 512478
URL: http://svn.apache.org/viewvc?view=rev&rev=512478
Log:
Fixes to get tests running with Toplink/JPA and MySQL
Modified:
incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/datamapper/DatamapperPlanetManagerImpl.java
incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml
incubator/roller/branches/roller_4.0/apps/planet/src/sql/droptables.sql
Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/datamapper/DatamapperPlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/datamapper/DatamapperPlanetManagerImpl.java?view=diff&rev=512478&r1=512477&r2=512478
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/datamapper/DatamapperPlanetManagerImpl.java (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/datamapper/DatamapperPlanetManagerImpl.java Tue Feb 27 15:12:16 2007
@@ -23,7 +23,6 @@
import com.sun.syndication.fetcher.impl.FeedFetcherCache;
import com.sun.syndication.fetcher.impl.HttpURLFeedFetcher;
import com.sun.syndication.fetcher.impl.SyndFeedInfo;
-
import java.io.File;
import java.net.URL;
import java.sql.Timestamp;
@@ -37,12 +36,9 @@
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.roller.RollerException;
-
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.pojos.PlanetData;
import org.apache.roller.planet.pojos.PlanetEntryData;
@@ -50,7 +46,6 @@
import org.apache.roller.planet.pojos.PlanetSubscriptionData;
import org.apache.roller.planet.util.rome.DiskFeedInfoCache;
import org.apache.roller.business.datamapper.DatamapperQuery;
-
import org.apache.roller.business.datamapper.DatamapperPersistenceStrategy;
import org.apache.roller.planet.business.AbstractManagerImpl;
@@ -368,7 +363,7 @@
log.debug(" Entry count: " + count);
if (count > 0) {
- sub.purgeEntries();
+ this.deleteEntries(sub);
sub.addEntries(newEntries);
this.saveSubscription(sub);
this.strategy.flush();
@@ -525,6 +520,17 @@
public void deletePlanet(PlanetData planet) throws RollerException {
strategy.remove(planet);
+ }
+
+ public void deleteEntries(PlanetSubscriptionData sub)
+ throws RollerException {
+ Iterator entries = sub.getEntries().iterator();
+ while(entries.hasNext()) {
+ strategy.remove(entries.next());
+ }
+
+ // make sure and clear the other side of the assocation
+ sub.getEntries().clear();
}
}
Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java?view=diff&rev=512478&r1=512477&r2=512478
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java Tue Feb 27 15:12:16 2007
@@ -374,7 +374,7 @@
log.debug(" Entry count: " + count);
if (count > 0) {
- sub.purgeEntries();
+ this.deleteEntries(sub);
sub.addEntries(newEntries);
this.saveSubscription(sub);
this.strategy.flush();
@@ -534,6 +534,17 @@
public void deletePlanet(PlanetData planet) throws RollerException {
strategy.remove(planet);
+ }
+
+ public void deleteEntries(PlanetSubscriptionData sub)
+ throws RollerException {
+ Iterator entries = sub.getEntries().iterator();
+ while(entries.hasNext()) {
+ strategy.remove(entries.next());
+ }
+
+ // make sure and clear the other side of the assocation
+ sub.getEntries().clear();
}
}
Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml?view=diff&rev=512478&r1=512477&r2=512478
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml Tue Feb 27 15:12:16 2007
@@ -24,8 +24,8 @@
<column name="id"/>
<generated-value strategy="TABLE" generator="PLANET-TABLE-GENERATOR"/>
</id>
- <basic name="name">
- <column name="name" insertable="true" updatable="true" unique="false"/>
+ <basic name="title">
+ <column name="title" insertable="true" updatable="true" unique="false"/>
</basic>
<basic name="handle">
<column name="handle" insertable="true" updatable="true" unique="true"/>
Modified: incubator/roller/branches/roller_4.0/apps/planet/src/sql/droptables.sql
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/sql/droptables.sql?view=diff&rev=512478&r1=512477&r2=512478
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/sql/droptables.sql (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/sql/droptables.sql Tue Feb 27 15:12:16 2007
@@ -14,6 +14,7 @@
-- copyright in this work, please see the NOTICE file in the top level
-- directory of this distribution.
+drop table planet_id_table;
drop table rag_entry;
drop table rag_group_subscription;
drop table rag_subscription;