Author: snoopdave
Date: Mon Apr 9 20:19:05 2007
New Revision: 527005
URL: http://svn.apache.org/viewvc?view=rev&rev=527005
Log:
Merging latest from trunk
Added:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/tasks/RefreshRollerPlanetTask.java
- copied unchanged from r526991,
roller/trunk/src/org/apache/roller/planet/tasks/RefreshRollerPlanetTask.java
Removed:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/business/hibernate/HibernateRollerPlanetImpl.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/business/hibernate/HibernateRollerPlanetManagerImpl.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/business/hibernate/package.html
Modified:
roller/branches/roller_4.0_newbackend/apps/planet/build.xml
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/tasks/PlanetTask.java
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java
roller/branches/roller_4.0_newbackend/apps/planet/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
roller/branches/roller_4.0_newbackend/apps/planet/testdata/planet.properties
roller/branches/roller_4.0_newbackend/build.xml
roller/branches/roller_4.0_newbackend/metadata/database/tmpls/3xx-to-400-migration.vm
roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm
roller/branches/roller_4.0_newbackend/properties.xmlf
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/business/RollerRomeFeedFetcher.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetGroupsAction.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetSubscriptionsAction.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/PlanetModel.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java
roller/branches/roller_4.0_newbackend/tests/org/apache/roller/business/PlanetManagerLocalTest.java
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/ApplicationResources.properties
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet.properties
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/roller.properties
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/PlanetConfig.jsp
Modified: roller/branches/roller_4.0_newbackend/apps/planet/build.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/apps/planet/build.xml?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
--- roller/branches/roller_4.0_newbackend/apps/planet/build.xml (original)
+++ roller/branches/roller_4.0_newbackend/apps/planet/build.xml Mon Apr 9
20:19:05 2007
@@ -133,7 +133,6 @@
<fileset dir="${tools}/buildtime/mockrunner-0.35/lib">
<include name="*.jar"/>
</fileset>
- <pathelement location="${tools}/buildtime/ant-1.6.2/ant.jar"/>
<pathelement location="${tools}/buildtime/junit-3.8.1.jar"/>
<pathelement location="${tools}/buildtime/derby.jar"/>
<pathelement location="${tools}/buildtime/derbyclient.jar"/>
@@ -366,6 +365,7 @@
<classpath>
<path refid="test.path"/>
+ <pathelement location="${tools}/buildtime/ant-1.6.2/ant.jar"/>
</classpath>
</javac>
Modified:
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
---
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java
(original)
+++
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java
Mon Apr 9 20:19:05 2007
@@ -76,10 +76,27 @@
PlanetConfig.getProperty("hibernate.configResource"),
PlanetConfig.getProperty("hibernate.dialect"));
}
+
} catch(Throwable t) {
// if this happens then we are screwed
log.fatal("Error initializing Hibernate", t);
throw new RollerException(t);
+ }
+
+ 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/hibernate/HibernatePlanetManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
---
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
(original)
+++
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
Mon Apr 9 20:19:05 2007
@@ -340,10 +340,10 @@
sb.append("where (");
for (int i=0; i<groups.size(); i++) {
- if (i > 0) sb.append(" and ");
+ if (i > 0) sb.append(" or ");
sb.append(" g=:group" + i);
}
- sb.append(")");
+ sb.append(") ");
if (startDate != null) {
sb.append("and e.pubTime > :startDate ");
Modified:
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/tasks/PlanetTask.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/tasks/PlanetTask.java?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
---
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/tasks/PlanetTask.java
(original)
+++
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/tasks/PlanetTask.java
Mon Apr 9 20:19:05 2007
@@ -34,7 +34,6 @@
*/
public void initialize() throws Exception {
setupURLStrategy();
- setupFeedFetcher();
}
@@ -55,26 +54,5 @@
// plug it in
PlanetFactory.getPlanet().setURLStrategy(urlStrategy);
- }
-
-
- /**
- * Lookup configured FeedFetcher from config and plug it in.
- *
- * If no FeedFetcher can be configured then we bail and spew errors.
- */
- protected void setupFeedFetcher() throws Exception {
-
- String feedFetchClass =
PlanetConfig.getProperty("feedfetcher.classname");
- if(feedFetchClass == null || feedFetchClass.trim().length() < 1) {
- throw new Exception("No FeedFetcher configured!!!");
- }
-
- Class fetchClass = Class.forName(feedFetchClass);
- FeedFetcher feedFetcher = (FeedFetcher) fetchClass.newInstance();
-
- // plug it in
- PlanetFactory.getPlanet().setFeedFetcher(feedFetcher);
- }
-
+ }
}
Modified:
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
---
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java
(original)
+++
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java
Mon Apr 9 20:19:05 2007
@@ -84,7 +84,6 @@
setupRuntimeProperties();
setupURLStrategy();
- setupFeedFetcher();
planet.flush();
planet.release();
@@ -129,28 +128,7 @@
// plug it in
PlanetFactory.getPlanet().setURLStrategy(urlStrategy);
- }
-
-
- /**
- * Lookup configured FeedFetcher from config and plug it in.
- *
- * If no FeedFetcher can be configured then we bail and spew errors.
- */
- private void setupFeedFetcher() throws Exception {
-
- String feedFetchClass =
PlanetConfig.getProperty("feedfetcher.classname");
- if(feedFetchClass == null || feedFetchClass.trim().length() < 1) {
- throw new Exception("No FeedFetcher configured!!!");
- }
-
- Class fetchClass = Class.forName(feedFetchClass);
- FeedFetcher feedFetcher = (FeedFetcher) fetchClass.newInstance();
-
- // plug it in
- PlanetFactory.getPlanet().setFeedFetcher(feedFetcher);
- }
-
+ }
private void upgradeDatabaseIfNeeded() throws RollerException {
Modified:
roller/branches/roller_4.0_newbackend/apps/planet/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/apps/planet/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
---
roller/branches/roller_4.0_newbackend/apps/planet/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
(original)
+++
roller/branches/roller_4.0_newbackend/apps/planet/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
Mon Apr 9 20:19:05 2007
@@ -51,9 +51,6 @@
testSub.setFeedURL(feed_url);
mgr.saveSubscription(testSub);
PlanetFactory.getPlanet().flush();
-
- // use RomeFeedFetcher
- PlanetFactory.getPlanet().setFeedFetcher(new RomeFeedFetcher());
}
Modified:
roller/branches/roller_4.0_newbackend/apps/planet/testdata/planet.properties
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/apps/planet/testdata/planet.properties?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
---
roller/branches/roller_4.0_newbackend/apps/planet/testdata/planet.properties
(original)
+++
roller/branches/roller_4.0_newbackend/apps/planet/testdata/planet.properties
Mon Apr 9 20:19:05 2007
@@ -58,6 +58,9 @@
# Number of Technorati queries allowed per day
planet.aggregator.technorati.limit=500
+# choose a feed fetcher
+feedfetcher.classname=\
+org.apache.roller.planet.business.RomeFeedFetcher
# The set of default Roller renderer factories.
rendering.rollerRendererFactories=\
Modified: roller/branches/roller_4.0_newbackend/build.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/build.xml?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
--- roller/branches/roller_4.0_newbackend/build.xml (original)
+++ roller/branches/roller_4.0_newbackend/build.xml Mon Apr 9 20:19:05 2007
@@ -892,6 +892,7 @@
<classpath>
<path refid="tests.path"/>
+ <pathelement location="${ro.tools}/buildtime/ant-1.6.2/ant.jar"/>
&custom-jars;
</classpath>
</javac>
Modified:
roller/branches/roller_4.0_newbackend/metadata/database/tmpls/3xx-to-400-migration.vm
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/metadata/database/tmpls/3xx-to-400-migration.vm?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
---
roller/branches/roller_4.0_newbackend/metadata/database/tmpls/3xx-to-400-migration.vm
(original)
+++
roller/branches/roller_4.0_newbackend/metadata/database/tmpls/3xx-to-400-migration.vm
Mon Apr 9 20:19:05 2007
@@ -12,8 +12,8 @@
);
alter table rag_planet add constraint ragp_handle_uq unique ( handle );
-insert into rag_planet (id,title,handle) values
('default_planet','default_planet','default_planet');
-update rag_group set planet_id='default_planet';
+insert into rag_planet (id,title,handle) values
('zzz_default_planet_zzz','Default Planet','zzz_default_planet_zzz');
+update rag_group set planet_id='zzz_default_planet_zzz';
-- new column to support account activation by email
#addColumnNull("rolleruser" "activationcode" "varchar(48)")
Modified:
roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
--- roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm
(original)
+++ roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm
Mon Apr 9 20:19:05 2007
@@ -505,6 +505,17 @@
create index ragp_handle_idx on rag_planet(handle);
insert into rag_planet (id,name,handle) values
('default_planet','default_planet','default_planet');
+create table rag_planet (
+ id varchar(48) not null primary key,
+ handle varchar(32) not null,
+ title varchar(255) not null,
+ description varchar(255)
+);
+alter table rag_planet add constraint ragp_handle_uq unique ( handle );
+
+insert into rag_planet (id,title,handle) values
('zzz_default_planet_zzz','Default Planet','zzz_default_planet_zzz');
+update rag_group set planet_id='zzz_default_planet_zzz';
+
-- *****************************************************
-- Now add the foreign key relationships
Modified: roller/branches/roller_4.0_newbackend/properties.xmlf
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/properties.xmlf?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
--- roller/branches/roller_4.0_newbackend/properties.xmlf (original)
+++ roller/branches/roller_4.0_newbackend/properties.xmlf Mon Apr 9 20:19:05
2007
@@ -236,7 +236,6 @@
<include name="*.jar"/>
</fileset>
<fileset refid="commons-httpclient.jar"/>
- <pathelement location="${ro.tools}/buildtime/ant-1.6.2/ant.jar"/>
<pathelement location="${ro.tools}/buildtime/junit-3.8.1.jar"/>
<pathelement location="${ro.tools}/buildtime/derby.jar"/>
<pathelement location="${ro.tools}/buildtime/derbyclient.jar"/>
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/business/RollerRomeFeedFetcher.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/business/RollerRomeFeedFetcher.java?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/business/RollerRomeFeedFetcher.java
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/business/RollerRomeFeedFetcher.java
Mon Apr 9 20:19:05 2007
@@ -135,9 +135,7 @@
WeblogEntryData rollerEntry =
(WeblogEntryData)entryIter.next();
- PlanetEntryData entry = new PlanetEntryData();
- entry.setSubscription(sub);
-
+ PlanetEntryData entry = new PlanetEntryData();
String content = "";
if (!StringUtils.isEmpty(rollerEntry.getText())) {
content = rollerEntry.getText();
@@ -151,10 +149,8 @@
entry.setPubTime(rollerEntry.getPubTime());
entry.setText(content);
entry.setPermalink(rollerEntry.getPermalink());
-
entry.setCategoriesString(rollerEntry.getCategory().getPath());
-
- planetManager.saveEntry(entry);
- PlanetFactory.getPlanet().flush();
+
entry.setCategoriesString(rollerEntry.getCategory().getPath());
+
newEntries.add(entry);
} catch (Exception e) {
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java
Mon Apr 9 20:19:05 2007
@@ -140,10 +140,11 @@
UserManager userManager =
RollerFactory.getRoller().getUserManager();
// first, make sure there is an "all" planet group
- PlanetData planetObject = planet.getPlanet("all");
+ PlanetData planetObject =
planet.getPlanet("zzz_default_planet_zzz");
PlanetGroupData group = planet.getGroup(planetObject, "all");
if(group == null) {
group = new PlanetGroupData();
+ group.setPlanet(planetObject);
group.setHandle("all");
group.setTitle("all");
planet.saveGroup(group);
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetGroupsAction.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetGroupsAction.java?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetGroupsAction.java
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetGroupsAction.java
Mon Apr 9 20:19:05 2007
@@ -76,7 +76,7 @@
if (request.getParameter("groupHandle") != null)
{
String handle = request.getParameter("groupHandle");
- PlanetData defaultPlanet =
pmgr.getPlanet("default_planet");
+ PlanetData defaultPlanet =
pmgr.getPlanet("zzz_default_planet_zzz");
PlanetGroupData group = pmgr.getGroup(defaultPlanet,
handle);
form.copyFrom(group, request.getLocale());
}
@@ -144,7 +144,7 @@
PlanetGroupForm form = (PlanetGroupForm)actionForm;
if (form.getHandle() != null)
{
- PlanetData defaultPlanet =
pmgr.getPlanet("default_planet");
+ PlanetData defaultPlanet =
pmgr.getPlanet("zzz_default_planet_zzz");
PlanetGroupData group = pmgr.getGroup(defaultPlanet,
form.getHandle());
pmgr.deleteGroup(group);
PlanetFactory.getPlanet().flush();
@@ -189,7 +189,7 @@
{
PlanetGroupForm form = (PlanetGroupForm)actionForm;
PlanetManager pmgr =
PlanetFactory.getPlanet().getPlanetManager();
- PlanetData defaultPlanet = pmgr.getPlanet("default_planet");
+ PlanetData defaultPlanet =
pmgr.getPlanet("zzz_default_planet_zzz");
ActionErrors errors = validate(pmgr, form);
if (errors.isEmpty())
{
@@ -278,7 +278,7 @@
super("planetGroups.pagetitle", request, response, mapping);
RollerRequest rreq = RollerRequest.getRollerRequest(request);
PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
- PlanetData defaultPlanet = pmgr.getPlanet("default_planet");
+ PlanetData defaultPlanet =
pmgr.getPlanet("zzz_default_planet_zzz");
PlanetGroupData externalGroup = pmgr.getGroup(defaultPlanet,
"external");
Iterator allgroups = defaultPlanet.getGroups().iterator();
while (allgroups.hasNext())
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetSubscriptionsAction.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetSubscriptionsAction.java?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetSubscriptionsAction.java
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetSubscriptionsAction.java
Mon Apr 9 20:19:05 2007
@@ -87,7 +87,7 @@
groupHandle = (groupHandle == null) ? form.getGroupHandle() :
groupHandle;
groupHandle = (groupHandle == null) ? "external" : groupHandle;
- PlanetData defaultPlanet = pmgr.getPlanet("default_planet");
+ PlanetData defaultPlanet =
pmgr.getPlanet("zzz_default_planet_zzz");
PlanetGroupData targetGroup = pmgr.getGroup(defaultPlanet,
groupHandle);
form.setGroupHandle(groupHandle);
request.setAttribute("model",
@@ -119,7 +119,7 @@
groupHandle = (groupHandle == null) ? form.getGroupHandle() :
groupHandle;
groupHandle = (groupHandle == null) ? "external" : groupHandle;
- PlanetData defaultPlanet = pmgr.getPlanet("default_planet");
+ PlanetData defaultPlanet =
pmgr.getPlanet("zzz_default_planet_zzz");
PlanetGroupData targetGroup = pmgr.getGroup(defaultPlanet,
groupHandle);
form.setGroupHandle(groupHandle);
request.setAttribute("model",
@@ -153,7 +153,7 @@
groupHandle = (groupHandle == null) ?
form.getGroupHandle() : groupHandle;
groupHandle = (groupHandle == null) ? "external" :
groupHandle;
- PlanetData defaultPlanet =
pmgr.getPlanet("default_planet");
+ PlanetData defaultPlanet =
pmgr.getPlanet("zzz_default_planet_zzz");
PlanetGroupData targetGroup = pmgr.getGroup(defaultPlanet,
groupHandle);
targetGroup.getSubscriptions().remove(sub);
@@ -198,7 +198,7 @@
groupHandle = (groupHandle == null) ? form.getGroupHandle() :
groupHandle;
groupHandle = (groupHandle == null) ? "external" : groupHandle;
- PlanetData defaultPlanet = pmgr.getPlanet("default_planet");
+ PlanetData defaultPlanet =
pmgr.getPlanet("zzz_default_planet_zzz");
PlanetGroupData targetGroup = pmgr.getGroup(defaultPlanet,
groupHandle);
if (RollerSession.getRollerSession(request).isGlobalAdminUser()) {
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/PlanetModel.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/PlanetModel.java?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/PlanetModel.java
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/PlanetModel.java
Mon Apr 9 20:19:05 2007
@@ -166,7 +166,7 @@
List list = new ArrayList();
try {
PlanetManager planetManager =
PlanetFactory.getPlanet().getPlanetManager();
- PlanetData defaultPlanet = planetManager.getPlanet("default");
+ PlanetData defaultPlanet =
planetManager.getPlanet("zzz_default_planet_zzz");
PlanetGroupData planetGroup =
planetManager.getGroup(defaultPlanet, groupHandle);
List subs = planetManager.getTopSubscriptions(planetGroup, 0,
length);
for (Iterator it = subs.iterator(); it.hasNext();) {
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java
Mon Apr 9 20:19:05 2007
@@ -99,11 +99,11 @@
PlanetSubscriptionData sub =
planetManager.getSubscription(feedURL);
rawEntries = planetManager.getEntries(sub, offset,
length+1);
} else if (groupHandle != null) {
- PlanetData planet = planetManager.getPlanet("default");
+ PlanetData planet =
planetManager.getPlanet("zzz_default_planet_zzz");
PlanetGroupData group = planetManager.getGroup(planet,
groupHandle);
rawEntries =
planetManager.getEntries(Collections.singletonList(group), startDate, null,
offset, length+1);
} else {
- PlanetData planet = planetManager.getPlanet("default");
+ PlanetData planet =
planetManager.getPlanet("zzz_default_planet_zzz");
PlanetGroupData groupAll = planetManager.getGroup(planet,
"all");
PlanetGroupData groupDefault =
planetManager.getGroup(planet, "default");
List groups = new ArrayList();
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java
Mon Apr 9 20:19:05 2007
@@ -131,7 +131,7 @@
try {
// populate the rendering model
if (request.getParameter("group") != null) {
- PlanetData planetObject = planet.getPlanet("default");
+ PlanetData planetObject =
planet.getPlanet("zzz_default_planet_zzz");
model.put("group", planet.getGroup(planetObject,
request.getParameter("group")));
}
model.put("planet", planet);
Modified:
roller/branches/roller_4.0_newbackend/tests/org/apache/roller/business/PlanetManagerLocalTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/business/PlanetManagerLocalTest.java?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
---
roller/branches/roller_4.0_newbackend/tests/org/apache/roller/business/PlanetManagerLocalTest.java
(original)
+++
roller/branches/roller_4.0_newbackend/tests/org/apache/roller/business/PlanetManagerLocalTest.java
Mon Apr 9 20:19:05 2007
@@ -32,7 +32,7 @@
import org.apache.roller.pojos.UserData;
import org.apache.roller.pojos.WeblogEntryData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.planet.tasks.RefreshPlanetTask;
+import org.apache.roller.planet.tasks.RefreshRollerPlanetTask;
import org.apache.roller.planet.tasks.SyncWebsitesTask;
@@ -125,7 +125,7 @@
syncTask.init();
syncTask.run();
- RefreshPlanetTask refreshTask = new RefreshPlanetTask();
+ RefreshRollerPlanetTask refreshTask = new
RefreshRollerPlanetTask();
refreshTask.run();
PlanetData planetObject = planet.getPlanet("default");
Modified:
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/ApplicationResources.properties?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
---
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/ApplicationResources.properties
(original)
+++
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/ApplicationResources.properties
Mon Apr 9 20:19:05 2007
@@ -374,6 +374,7 @@
configForm.saved=Configuration settings saved
+
# ---------------------------------------------------------------- Create
weblog
createWebsite.title=Create Weblog
@@ -1055,17 +1056,39 @@
planet.title.unconfigured=Planet Aggregator (unconfigured)
planet.description.unconfigured=Planet aggregator is enabled but has not yet
been configured.
-planetConfig.title=Planet configuration
+planetConfig.title=Planet Configuration
planetConfig.subtitle=Configure Roller's built-in newsfeed aggregator.
+planetConfig.prompt=Set the title, description, email address and site URL \
+to be included in newsfeeds produced by the aggregator. You can also setup a \
+proxy if one is required required by your network.
+
+ConfigForm.siteSettings=Planet Settings
+ConfigForm.title=Planet title
+ConfigForm.description=Planet description
+ConfigForm.adminName=Name of Planet administrator
+ConfigForm.adminEmail=Email of Planet administrator
+ConfigForm.absoluteUrl=Absolute URL to Planet page
+ConfigForm.proxyHost=Proxy host for feed fetcher
+ConfigForm.proxyPort=Proxy port for feed fetcher
+
+planetConfig.title.control=Experimental Planet Control
+planetConfig.prompt.control=Launch background tasks (for testing purposes only)
+
+planetConfig.numWebsites=Number of Roller hosted weblogs
+planetConfig.numSubscrtions=Number of Roller hosted subscriptions
+
+planetConfig.button.post=Save
+planetConfig.button.refreshEntries=Refresh Entries
+planetConfig.button.syncWebsites=Synchronize Roller weblogs
+
+planetConfig.success.saved=Configuration saved
+planetConfig.success.refreshed=Refresh operation started
+planetConfig.success.synced=weblog synchronization started
+planetConfig.error.cacheDirNotFound=Cache directory not found
+planetConfig.error.cacheDirNotWritable=Cache directory not writable
+planetConfig.error.badProxyPort=Proxy port is invalid
+
-ConfigForm.siteSettings=Planet Configuration
-ConfigForm.title=Title of Planet site
-ConfigForm.description=Desrcription of Planet site
-ConfigForm.adminName=Name of Planet site administrator
-ConfigForm.adminEmail=Email address of Planet site adminsitrator
-ConfigForm.absoluteUrl=Absolute URL of Planet-site
-ConfigForm.proxyHost=Proxy Host URL
-ConfigForm.proxyPort=Proxy Host Port
# ----------------------------------------------------- PlanetSubscriptions.jsp
Modified:
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet.properties
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet.properties?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet.properties
(original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet.properties
Mon Apr 9 20:19:05 2007
@@ -43,14 +43,17 @@
persistence.planet.classname=org.apache.roller.planet.business.jpa.JPAPlanetImpl
#persistence.planet.classname=org.apache.roller.planet.business.hibernate.HibernatePlanetImpl
-# Absolute URL to site
-site.absoluteurl=http://localhost:8080/planet
+# You MUST override and set these three properties correctly:
+cache.dir=/var/planet/cache
+output.dir=/usr/local/planet/webapp
+template.dir=/usr/local/planet/webapp/WEB-INF/templates
-# Planet cache must exist and must be writable by Roller process
-planet.aggregator.cache.dir=/var/roller/planetcache
-
-# Number of queries allowed per day
+# Number of Technorati queries allowed per day
planet.aggregator.technorati.limit=500
+
+# choose a feed fetcher
+feedfetcher.classname=\
+org.apache.roller.planet.business.RollerRomeFeedFetcher
# How the hibernate config is built
hibernate.dialect=org.hibernate.dialect.MySQLDialect
Modified:
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/roller.properties
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/roller.properties?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/roller.properties
(original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/roller.properties
Mon Apr 9 20:19:05 2007
@@ -310,10 +310,10 @@
tasks.SyncWebsitesTask.leaseTime=30
# Refresh entries for planet feeds
-tasks.RefreshEntriesTask.class=org.apache.roller.planet.tasks.RefreshEntriesTask
-tasks.RefreshEntriesTask.startTime=startOfHour
-tasks.RefreshEntriesTask.interval=60
-tasks.RefreshEntriesTask.leaseTime=30
+tasks.RefreshRollerPlanetTask.class=org.apache.roller.planet.tasks.RefreshRollerPlanetTask
+tasks.RefreshRollerPlanetTask.startTime=startOfHour
+tasks.RefreshRollerPlanetTask.interval=60
+tasks.RefreshRollerPlanetTask.leaseTime=30
# Technorati rankings for planet feeds
tasks.TechnoratiRankingsTask.class=org.apache.roller.planet.tasks.TechnoratiRankingsTask
Modified:
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/PlanetConfig.jsp
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/PlanetConfig.jsp?view=diff&rev=527005&r1=527004&r2=527005
==============================================================================
---
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/PlanetConfig.jsp
(original)
+++
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/PlanetConfig.jsp
Mon Apr 9 20:19:05 2007
@@ -30,7 +30,7 @@
<roller:StatusMessage/>
<p class="subtitle"><fmt:message key="planetConfig.subtitle" /></a>
-<p><fmt:message key="configForm.prompt" /></a>
+<p><fmt:message key="planetConfig.prompt" /></a>
<form action="planetConfig.do" method="post">
