You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2007/06/27 01:33:12 UTC
svn commit: r550986 - in /roller/trunk/apps/weblogger:
src/java/org/apache/roller/weblogger/business/hibernate/
src/java/org/apache/roller/weblogger/planet/business/hibernate/
web/WEB-INF/classes/
Author: agilliland
Date: Tue Jun 26 16:33:11 2007
New Revision: 550986
URL: http://svn.apache.org/viewvc?view=rev&rev=550986
Log:
final cleanup on hibernate persistence strategy based on changes in planet code.
Removed:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetPersistenceStrategy.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/RollerPlanetModule.java
roller/trunk/apps/weblogger/web/WEB-INF/classes/planet.properties
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java?view=diff&rev=550986&r1=550985&r2=550986
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java Tue Jun 26 16:33:11 2007
@@ -42,6 +42,7 @@
import org.apache.roller.weblogger.business.themes.ThemeManager;
import org.apache.roller.weblogger.business.themes.ThemeManagerImpl;
+
/**
* Guice module for configuring Hibernate as Roller-backend.
*/
@@ -52,7 +53,6 @@
binder.bind(Roller.class).to(HibernateRollerImpl.class);
binder.bind(HibernatePersistenceStrategy.class);
- binder.bind(org.apache.roller.weblogger.planet.business.hibernate.HibernateRollerPlanetPersistenceStrategy.class);
binder.bind(AutoPingManager.class).to( HibernateAutoPingManagerImpl.class);
binder.bind(BookmarkManager.class).to( HibernateBookmarkManagerImpl.class);
@@ -70,5 +70,6 @@
binder.bind(PluginManager.class).to( PluginManagerImpl.class);
binder.bind(ThemeManager.class).to( ThemeManagerImpl.class);
}
+
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/RollerPlanetModule.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/RollerPlanetModule.java?view=diff&rev=550986&r1=550985&r2=550986
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/RollerPlanetModule.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/RollerPlanetModule.java Tue Jun 26 16:33:11 2007
@@ -25,12 +25,12 @@
import org.apache.roller.planet.business.Planet;
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.business.PropertiesManager;
-import org.apache.roller.planet.business.RomeFeedFetcher;
import org.apache.roller.planet.business.URLStrategy;
import org.apache.roller.planet.business.hibernate.HibernatePersistenceStrategy;
import org.apache.roller.planet.business.hibernate.HibernatePlanetImpl;
import org.apache.roller.planet.business.hibernate.HibernatePlanetManagerImpl;
import org.apache.roller.planet.business.hibernate.HibernatePropertiesManagerImpl;
+import org.apache.roller.weblogger.planet.business.RollerRomeFeedFetcher;
/**
@@ -39,16 +39,17 @@
public class RollerPlanetModule implements Module {
public void configure(Binder binder) {
-
- binder.bind(Planet.class).to(HibernatePlanetImpl.class);
- // Use special Planet persistence strategy that works against RollerConfig
- binder.bind(HibernatePersistenceStrategy.class).to(HibernateRollerPlanetPersistenceStrategy.class);
+ binder.bind(HibernatePersistenceStrategy.class);
binder.bind(PlanetManager.class).to( HibernatePlanetManagerImpl.class);
binder.bind(PropertiesManager.class).to( HibernatePropertiesManagerImpl.class);
binder.bind(URLStrategy.class).to( MultiPlanetURLStrategy.class);
- binder.bind(FeedFetcher.class).to( RomeFeedFetcher.class);
+
+ // use custom Weblogger feed fetcher
+ binder.bind(FeedFetcher.class).to( RollerRomeFeedFetcher.class);
+
+ binder.bind(Planet.class).to(HibernatePlanetImpl.class);
}
}
Modified: roller/trunk/apps/weblogger/web/WEB-INF/classes/planet.properties
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/classes/planet.properties?view=diff&rev=550986&r1=550985&r2=550986
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/classes/planet.properties (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/classes/planet.properties Tue Jun 26 16:33:11 2007
@@ -41,22 +41,81 @@
# PlanetConfig.getProperty("propname");
-# You MUST override and set these three properties correctly:
+#----------------------------------------------------
+# Manditory properties
+# You MUST ensure that these properies are set correctly.
+# If not, you MUST override them in your planet-custom.properties file.
+
cache.dir=/var/planet/cache
output.dir=/usr/local/planet/webapp
template.dir=/usr/local/planet/webapp/WEB-INF/templates
-# Number of Technorati queries allowed per day
-planet.aggregator.technorati.limit=500
+# Specify database configuration type of 'jndi' or 'jdbc'
+database.configurationType=jndi
+
+# For database configuration type 'jndi',this will be used
+database.jndi.name=jdbc/rollerdb
-# choose a feed fetcher
-feedfetcher.classname=\
-org.apache.roller.weblogger.planet.business.RollerRomeFeedFetcher
+# For database configuration type of 'jdbc', you MUST override these
+database.jdbc.driverClass=
+database.jdbc.connectionURL=
+database.jdbc.username=
+database.jdbc.password=
+
+# Hibernate settings
+hibernate.dialect=org.hibernate.dialect.MySQLDialect
+hibernate.connection.provider_class=\
+org.apache.roller.planet.business.hibernate.HibernateConnectionProvider
-#---------------------------------
+#----------------------------------------------------
+# Optional properties
# Pluggable backend
-guice.backend.module= org.apache.roller.weblogger.planet.business.jpa.RollerPlanetModule
+guice.backend.module=org.apache.roller.weblogger.planet.business.jpa.RollerPlanetModule
+
+# Number of Technorati queries allowed per day
+planet.aggregator.technorati.limit=500
+# The set of default Roller renderer factories.
+rendering.rollerRendererFactories=\
+org.apache.roller.planet.ui.rendering.velocity.VelocityRendererFactory
+
+# The set of user defined renderer factories. These are prepended to the list above.
+rendering.userRendererFactories=
+
+# The set of default Roller request mappers
+rendering.rollerRequestMappers=\
+org.apache.roller.planet.ui.rendering.MultiPlanetRequestMapper
+
+# The set of user defined request mappers. These are prepended to the list above.
+rendering.userRequestMappers=
+
+# Url path elements which can NEVER be considered a weblog url
+# each represents a url at the application root, i.e. /<elem>/*
+rendering.multiPlanetMapper.rollerProtectedUrls=\
+planet-ui,index.jsp,favicon.ico,robots.txt
+
+# Set of user defined protected urls. These are added to the set above.
+rendering.multiPlanetMapper.userProtectedUrls=
+
+rendering.homepageModels=\
+org.apache.roller.planet.ui.rendering.model.SiteModel,\
+org.apache.roller.planet.ui.rendering.model.SiteURLModel,\
+org.apache.roller.planet.ui.rendering.model.UtilitiesModel
+
+rendering.pageModels=\
+org.apache.roller.planet.ui.rendering.model.PageModel,\
+org.apache.roller.planet.ui.rendering.model.PlanetURLModel,\
+org.apache.roller.planet.ui.rendering.model.UtilitiesModel
+
+rendering.feedModels=\
+org.apache.roller.planet.ui.rendering.model.FeedModel,\
+org.apache.roller.planet.ui.rendering.model.PlanetURLModel,\
+org.apache.roller.planet.ui.rendering.model.UtilitiesModel
+
+rendering.opmlModels=\
+org.apache.roller.planet.ui.rendering.model.PlanetGroupModel,\
+org.apache.roller.planet.ui.rendering.model.PlanetURLModel,\
+org.apache.roller.planet.ui.rendering.model.UtilitiesModel