Author: snoopdave
Date: Mon Apr 9 21:17:53 2007
New Revision: 527013
URL: http://svn.apache.org/viewvc?view=rev&rev=527013
Log:
Bringing JPA impls back in line with trunk
Modified:
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/DatamapperPlanetImpl.java
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/jpa/JPAPlanetManagerImpl.java
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetImpl.java
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
roller/branches/roller_4.0_newbackend/merges.txt
roller/branches/roller_4.0_newbackend/nbproject/project.xml
roller/branches/roller_4.0_newbackend/tools/roller-planet/roller-planet-business.jar
Modified:
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/DatamapperPlanetImpl.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/DatamapperPlanetImpl.java?view=diff&rev=527013&r1=527012&r2=527013
==============================================================================
---
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/DatamapperPlanetImpl.java
(original)
+++
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/DatamapperPlanetImpl.java
Mon Apr 9 21:17:53 2007
@@ -24,8 +24,10 @@
import org.apache.roller.planet.business.Planet;
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.business.datamapper.DatamapperPersistenceStrategy;
+import org.apache.roller.planet.business.FeedFetcher;
import org.apache.roller.planet.business.PropertiesManager;
import org.apache.roller.planet.business.datamapper.jpa.JPAPlanetManagerImpl;
+import org.apache.roller.planet.config.PlanetConfig;
/**
* A Datamapper specific implementation of the Roller business layer.
@@ -46,6 +48,21 @@
protected DatamapperPlanetImpl() throws RollerException {
+ try {
+ String feedFetchClass =
PlanetConfig.getProperty("feedfetcher.classname");
+ if(feedFetchClass == null || feedFetchClass.trim().length() < 1) {
+ throw new RollerException("No FeedFetcher configured!!!");
+ }
+
+ Class fetchClass = Class.forName(feedFetchClass);
+ FeedFetcher feedFetcher = (FeedFetcher) fetchClass.newInstance();
+
+ // plug it in
+ setFeedFetcher(feedFetcher);
+
+ } catch (Exception e) {
+ throw new RollerException("Error initializing feed fetcher", e);
+ }
}
Modified:
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/jpa/JPAPlanetManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/jpa/JPAPlanetManagerImpl.java?view=diff&rev=527013&r1=527012&r2=527013
==============================================================================
---
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/jpa/JPAPlanetManagerImpl.java
(original)
+++
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/jpa/JPAPlanetManagerImpl.java
Mon Apr 9 21:17:53 2007
@@ -61,12 +61,12 @@
sb.append("WHERE (");
for (int i=0; i<groups.size(); i++) {
- if (i > 0) sb.append(" AND ");
+ if (i > 0) sb.append(" OR ");
PlanetGroupData group = (PlanetGroupData)groups.get(i);
params.add(size++, group);
sb.append(" g = ?").append(size);
}
- sb.append(")");
+ sb.append(") ");
if (startDate != null) {
params.add(size++, startDate);
Modified:
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetImpl.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetImpl.java?view=diff&rev=527013&r1=527012&r2=527013
==============================================================================
---
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetImpl.java
(original)
+++
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetImpl.java
Mon Apr 9 21:17:53 2007
@@ -111,6 +111,23 @@
}
strategy = new JPAPersistenceStrategy("PlanetPU", emfProps);
+
+ try {
+ String feedFetchClass =
PlanetConfig.getProperty("feedfetcher.classname");
+ if(feedFetchClass == null || feedFetchClass.trim().length() < 1) {
+ throw new RollerException("No FeedFetcher configured!!!");
+ }
+
+ Class fetchClass = Class.forName(feedFetchClass);
+ FeedFetcher feedFetcher = (FeedFetcher) fetchClass.newInstance();
+
+ // plug it in
+ setFeedFetcher(feedFetcher);
+
+ } catch (Exception e) {
+ throw new RollerException("Error initializing feed fetcher", e);
+ }
+
}
Modified:
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java?view=diff&rev=527013&r1=527012&r2=527013
==============================================================================
---
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
(original)
+++
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
Mon Apr 9 21:17:53 2007
@@ -293,12 +293,12 @@
sb.append("WHERE (");
for (int i=0; i<groups.size(); i++) {
- if (i > 0) sb.append(" AND ");
+ if (i > 0) sb.append(" OR ");
PlanetGroupData group = (PlanetGroupData)groups.get(i);
params.add(size++, group.getHandle());
sb.append(" g.handle = ?").append(size);
}
- sb.append(")");
+ sb.append(") ");
if (startDate != null) {
params.add(size++, startDate);
Modified: roller/branches/roller_4.0_newbackend/merges.txt
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/merges.txt?view=diff&rev=527013&r1=527012&r2=527013
==============================================================================
--- roller/branches/roller_4.0_newbackend/merges.txt (original)
+++ roller/branches/roller_4.0_newbackend/merges.txt Mon Apr 9 21:17:53 2007
@@ -3,6 +3,9 @@
Temporary file to track merges from trunk into the roller_4.0_newbackend
branch.
+April 9, 2007: merging latest from trunk
+svn merge -r 526746:526991 https://svn.apache.org/repos/asf/roller/trunk
+
April 7, 2007: merging latest from trunk
svn merge -r 525301:526464
https://svn.apache.org/repos/asf/incubator/roller/trunk
Modified: roller/branches/roller_4.0_newbackend/nbproject/project.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/nbproject/project.xml?view=diff&rev=527013&r1=527012&r2=527013
==============================================================================
--- roller/branches/roller_4.0_newbackend/nbproject/project.xml (original)
+++ roller/branches/roller_4.0_newbackend/nbproject/project.xml Mon Apr 9
21:17:53 2007
@@ -165,7 +165,7 @@
<package-root>sandbox/jdobackend/src</package-root>
<package-root>sandbox/scripting/bsf/src</package-root>
<package-root>sandbox/scripting/groovy/src</package-root>
- <classpath
mode="compile">tools/buildtime/junit-3.8.1.jar:tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/ekitapplet.jar:tools/lib/jazzy-core.jar:tools/lib/log4j-1.2.4.jar:tools/lib/lucene-1.4.3.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-1.4.jar:tools/lib/velocity-dep-1.4.jar:tools/lib/velocity-tools-1.1.jar:tools/lib/xmlrpc-1.2-b1.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-beanutils.jar:tools/struts-1.2.4/lib/commons-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/lib/struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:tools/standar
d-1.0.3/lib/jaxen-full.jar:tools/standard-1.0.3/lib/jstl.jar:tools/standard-1.0.3/lib/standard.jar:tools/buildtime/tomcat-5.0.28/servlet-api.jar:tools/buildtime/tomcat-5.0.28/jsp-api.jar:tools/lib/jdom.jar:tools/spring-1.2/acegi-security-0.9.0.jar:tools/spring-1.2/spring.jar:tools/lib/rome-0.8.jar:tools/lib/rome-fetcher-0.8.jar:tools/lib/commons-codec-1.3.jar:tools/hibernate-3.1/hibernate3.jar:contrib/lib/textile4j-1.20.jar:tools/buildtime/derby.jar:tools/buildtime/ant-1.6.2/ant.jar:tools/buildtime/derbynet.jar:tools/lib/rome-0.9.jar:tools/lib/rome-fetcher-0.9.jar:tools/buildtime/activation.jar:tools/buildtime/mail.jar:tools/spring-1.2/acegi-security-1.0.1.jar:tools/spring-1.2/spring.jar:sandbox/scripting/bsf/lib/bsf.jar:tools/openjpa-0.9.6/geronimo-j2ee-connector_1.5_spec.jar:tools/openjpa-0.9.6/geronimo-jta_1.0.1B_spec-1.0.1.jar:tools/openjpa-0.9.6/openjpa-all-0.9.6-incubating.jar:tools/openjpa-0.9.6/persistence-api-1.0.jar:tools/openjpa-0.9.6/serp-1.11.0.jar:tools/lib/com
mons-collections-3.2.jar:tools/lib/commons-lang-2.1.jar:tools/lib/commons-logging-1.0.4.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar</classpath>
+ <classpath
mode="compile">tools/buildtime/junit-3.8.1.jar:tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/ekitapplet.jar:tools/lib/jazzy-core.jar:tools/lib/log4j-1.2.4.jar:tools/lib/lucene-1.4.3.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-tools-1.1.jar:tools/lib/xmlrpc-1.2-b1.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/lib/struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:tools/standard-1.0.3/lib/jaxen-full.jar:tools/standard-1.0.3/lib/jstl.jar:tools/standard-1.0.3/lib/standard.jar:tools/buildtime/tomcat-5.0.28/servlet-api.jar:tools/buildtime/tomcat-5.0.28/jsp-api.jar:tools/lib/jdom.jar:tools/spring-1.2/acegi-se
curity-0.9.0.jar:tools/spring-1.2/spring.jar:tools/lib/commons-codec-1.3.jar:tools/hibernate-3.1/hibernate3.jar:contrib/lib/textile4j-1.20.jar:tools/buildtime/derby.jar:tools/buildtime/ant-1.6.2/ant.jar:tools/buildtime/derbynet.jar:tools/lib/rome-0.9.jar:tools/lib/rome-fetcher-0.9.jar:tools/buildtime/activation.jar:tools/buildtime/mail.jar:tools/spring-1.2/acegi-security-1.0.1.jar:tools/spring-1.2/spring.jar:sandbox/scripting/bsf/lib/bsf.jar:tools/openjpa-0.9.6/geronimo-j2ee-connector_1.5_spec.jar:tools/openjpa-0.9.6/geronimo-jta_1.0.1B_spec-1.0.1.jar:tools/openjpa-0.9.6/openjpa-all-0.9.6-incubating.jar:tools/openjpa-0.9.6/persistence-api-1.0.jar:tools/openjpa-0.9.6/serp-1.11.0.jar:tools/lib/commons-collections-3.2.jar:tools/lib/commons-lang-2.1.jar:tools/lib/commons-logging-1.0.4.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar</classpath>
<source-level>1.5</source-level>
</compilation-unit>
</java-data>
Modified:
roller/branches/roller_4.0_newbackend/tools/roller-planet/roller-planet-business.jar
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/tools/roller-planet/roller-planet-business.jar?view=diff&rev=527013&r1=527012&r2=527013
==============================================================================
Binary files - no diff available.
