Author: snoopdave Date: Sun Jun 10 21:54:59 2007 New Revision: 546003 URL: http://svn.apache.org/viewvc?view=rev&rev=546003 Log: Fixes to get tests running; Planet now at 100%, but one Roller test is still failing.
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRollerImpl.java roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/RollerModule.java roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java roller/branches/roller_guice/apps/weblogger/testdata/roller-custom.properties Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRollerImpl.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRollerImpl.java?view=diff&rev=546003&r1=546002&r2=546003 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRollerImpl.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRollerImpl.java Sun Jun 10 21:54:59 2007 @@ -24,7 +24,6 @@ import org.apache.roller.weblogger.business.RollerImpl; import org.apache.roller.weblogger.business.BookmarkManager; import org.apache.roller.weblogger.business.FileManager; -import org.apache.roller.weblogger.business.PluginManager; import org.apache.roller.weblogger.business.pings.AutoPingManager; import org.apache.roller.weblogger.business.pings.PingQueueManager; import org.apache.roller.weblogger.business.pings.PingTargetManager; @@ -33,6 +32,7 @@ import org.apache.roller.weblogger.business.referrers.ReferrerQueueManager; import org.apache.roller.weblogger.business.UserManager; import org.apache.roller.weblogger.business.WeblogManager; +import org.apache.roller.weblogger.business.plugins.PluginManager; import org.apache.roller.weblogger.business.runnable.ThreadManager; import org.apache.roller.weblogger.business.search.IndexManager; import org.apache.roller.weblogger.business.themes.ThemeManager; Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java?view=diff&rev=546003&r1=546002&r2=546003 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/RollerModule.java Sun Jun 10 21:54:59 2007 @@ -24,8 +24,6 @@ import org.apache.roller.weblogger.business.BookmarkManager; import org.apache.roller.weblogger.business.FileManager; import org.apache.roller.weblogger.business.FileManagerImpl; -import org.apache.roller.weblogger.business.PluginManager; -import org.apache.roller.weblogger.business.PluginManagerImpl; import org.apache.roller.weblogger.business.PropertiesManager; import org.apache.roller.weblogger.business.Roller; import org.apache.roller.weblogger.business.RollerDatabaseProvider; @@ -34,6 +32,8 @@ import org.apache.roller.weblogger.business.pings.AutoPingManager; import org.apache.roller.weblogger.business.pings.PingQueueManager; import org.apache.roller.weblogger.business.pings.PingTargetManager; +import org.apache.roller.weblogger.business.plugins.PluginManager; +import org.apache.roller.weblogger.business.plugins.PluginManagerImpl; import org.apache.roller.weblogger.business.referrers.RefererManager; import org.apache.roller.weblogger.business.referrers.ReferrerQueueManager; import org.apache.roller.weblogger.business.referrers.ReferrerQueueManagerImpl; @@ -48,32 +48,32 @@ * Guice module for configuring Hibernate as Roller-backend. */ public class RollerModule implements Module { - + public void configure(Binder binder) { binder.bind(DatabaseProvider.class).to(RollerDatabaseProvider.class); - + binder.bind(Roller.class).to(HibernateRollerImpl.class); - binder.bind(HibernatePersistenceStrategy.class); - binder.bind(org.apache.roller.weblogger.planet.business.hibernate.HibernateRollerPlanetPersistenceStrategy.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); - binder.bind(PingQueueManager.class).to( HibernatePingQueueManagerImpl.class); - binder.bind(PingTargetManager.class).to( HibernatePingTargetManagerImpl.class); - binder.bind(PropertiesManager.class).to( HibernatePropertiesManagerImpl.class); + binder.bind(AutoPingManager.class).to( HibernateAutoPingManagerImpl.class); + binder.bind(BookmarkManager.class).to( HibernateBookmarkManagerImpl.class); + binder.bind(PingQueueManager.class).to( HibernatePingQueueManagerImpl.class); + binder.bind(PingTargetManager.class).to( HibernatePingTargetManagerImpl.class); + binder.bind(PropertiesManager.class).to( HibernatePropertiesManagerImpl.class); binder.bind(RefererManager.class).to( HibernateRefererManagerImpl.class); - binder.bind(UserManager.class).to( HibernateUserManagerImpl.class); - binder.bind(WeblogManager.class).to( HibernateWeblogManagerImpl.class); + binder.bind(UserManager.class).to( HibernateUserManagerImpl.class); + binder.bind(WeblogManager.class).to( HibernateWeblogManagerImpl.class); - binder.bind(ReferrerQueueManager.class).to(ReferrerQueueManagerImpl.class); - binder.bind(FileManager.class).to( FileManagerImpl.class); + binder.bind(ReferrerQueueManager.class).to(ReferrerQueueManagerImpl.class); + binder.bind(FileManager.class).to( FileManagerImpl.class); binder.bind(IndexManager.class).to( IndexManagerImpl.class); - binder.bind(PluginManager.class).to( PluginManagerImpl.class); - binder.bind(ThemeManager.class).to( ThemeManagerImpl.class); - binder.bind(ThreadManager.class).to( ThreadManagerImpl.class); - } + binder.bind(PluginManager.class).to( PluginManagerImpl.class); + binder.bind(ThemeManager.class).to( ThemeManagerImpl.class); + binder.bind(ThreadManager.class).to( ThreadManagerImpl.class); + } } Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java?view=diff&rev=546003&r1=546002&r2=546003 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java Sun Jun 10 21:54:59 2007 @@ -22,7 +22,6 @@ import org.apache.roller.weblogger.WebloggerException; import org.apache.roller.weblogger.business.BookmarkManager; import org.apache.roller.weblogger.business.FileManager; -import org.apache.roller.weblogger.business.PluginManager; import org.apache.roller.weblogger.business.PropertiesManager; import org.apache.roller.weblogger.business.Roller; import org.apache.roller.weblogger.business.RollerImpl; @@ -32,6 +31,7 @@ import org.apache.roller.weblogger.business.pings.AutoPingManager; import org.apache.roller.weblogger.business.pings.PingQueueManager; import org.apache.roller.weblogger.business.pings.PingTargetManager; +import org.apache.roller.weblogger.business.plugins.PluginManager; import org.apache.roller.weblogger.business.referrers.RefererManager; import org.apache.roller.weblogger.business.referrers.ReferrerQueueManager; import org.apache.roller.weblogger.business.search.IndexManager; @@ -40,6 +40,7 @@ /** * A JPA specific implementation of the Roller business layer. */ [EMAIL PROTECTED] public class JPARollerImpl extends RollerImpl { static final long serialVersionUID = 5256135928578074652L; Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/RollerModule.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/RollerModule.java?view=diff&rev=546003&r1=546002&r2=546003 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/RollerModule.java (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/RollerModule.java Sun Jun 10 21:54:59 2007 @@ -24,8 +24,6 @@ import org.apache.roller.weblogger.business.BookmarkManager; import org.apache.roller.weblogger.business.FileManager; import org.apache.roller.weblogger.business.FileManagerImpl; -import org.apache.roller.weblogger.business.PluginManager; -import org.apache.roller.weblogger.business.PluginManagerImpl; import org.apache.roller.weblogger.business.PropertiesManager; import org.apache.roller.weblogger.business.Roller; import org.apache.roller.weblogger.business.RollerDatabaseProvider; @@ -34,6 +32,8 @@ import org.apache.roller.weblogger.business.pings.AutoPingManager; import org.apache.roller.weblogger.business.pings.PingQueueManager; import org.apache.roller.weblogger.business.pings.PingTargetManager; +import org.apache.roller.weblogger.business.plugins.PluginManager; +import org.apache.roller.weblogger.business.plugins.PluginManagerImpl; import org.apache.roller.weblogger.business.referrers.RefererManager; import org.apache.roller.weblogger.business.referrers.ReferrerQueueManager; import org.apache.roller.weblogger.business.referrers.ReferrerQueueManagerImpl; @@ -56,7 +56,7 @@ binder.bind(Roller.class).to(JPARollerImpl.class); binder.bind(JPAPersistenceStrategy.class); - binder.bind(org.apache.roller.planet.business.jpa.JPAPersistenceStrategy.class); + binder.bind(org.apache.roller.weblogger.planet.business.jpa.JPARollerPlanetPersistenceStrategy.class); binder.bind(AutoPingManager.class).to( JPAAutoPingManagerImpl.class); binder.bind(BookmarkManager.class).to( JPABookmarkManagerImpl.class); Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties?view=diff&rev=546003&r1=546002&r2=546003 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties (original) +++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties Sun Jun 10 21:54:59 2007 @@ -73,7 +73,11 @@ # Hibernate dialect: You MUST override this to use a database other than MySQL4 hibernate.dialect=org.hibernate.dialect.MySQLDialect +#--------------------------------- +# Pluggable backend + # No need to touch these two settings unless you are customizing Roller +guice.backend.module=org.apache.roller.weblogger.business.jpa.RollerModule hibernate.connectionProvider=org.apache.roller.weblogger.business.hibernate.HibernateConnectionProvider #--------------------------------- Modified: roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java?view=diff&rev=546003&r1=546002&r2=546003 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java (original) +++ roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java Sun Jun 10 21:54:59 2007 @@ -67,7 +67,7 @@ +"U.S.S. Defiant which vanished 3 weeks ago, the warp engines " +"begin to lose power, and Spock reports strange sensor readings."); imgr.executeIndexOperationNow( - new AddEntryOperation((IndexManagerImpl) imgr, wd1)); + new AddEntryOperation(RollerFactory.getRoller(), (IndexManagerImpl)imgr, wd1)); WeblogEntry wd2 = new WeblogEntry(); wd2.setId("dummy2"); @@ -82,7 +82,7 @@ +"the inhabitants of planet Sigma Iotia II, and Uhura puts Kirk " +"in communication with Boss Oxmyx."); imgr.executeIndexOperationNow( - new AddEntryOperation((IndexManagerImpl) imgr, wd2)); + new AddEntryOperation(RollerFactory.getRoller(), (IndexManagerImpl)imgr, wd2)); Thread.sleep(1000); Modified: roller/branches/roller_guice/apps/weblogger/testdata/roller-custom.properties URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/testdata/roller-custom.properties?view=diff&rev=546003&r1=546002&r2=546003 ============================================================================== --- roller/branches/roller_guice/apps/weblogger/testdata/roller-custom.properties (original) +++ roller/branches/roller_guice/apps/weblogger/testdata/roller-custom.properties Sun Jun 10 21:54:59 2007 @@ -1,7 +1,17 @@ -#persistence.roller.classname=org.apache.roller.weblogger.business.jpa.JPARollerImpl -#persistence.roller.classname=org.apache.roller.weblogger.business.datamapper.jpa.JPARollerImpl -persistence.roller.classname=org.apache.roller.weblogger.business.hibernate.HibernateRollerImpl +# Pluggable backend +#guice.backend.module=org.apache.roller.weblogger.business.jpa.PlanetModule + +database.configurationType=jdbc + +database.jdbc.driverClass=org.apache.derby.jdbc.ClientDriver +database.jdbc.connectionURL=jdbc:derby://localhost:3219/roller +database.jdbc.username=app +database.jdbc.password=app + +hibernate.dialect=org.hibernate.dialect.DerbyDialect + +themes.dir=themes # we don't want to start with any folders/bookmarks for testing newuser.blogroll= @@ -11,13 +21,6 @@ search.index.dir=search-index -database.configurationType=jdbc - -database.jdbc.driverClass=org.apache.derby.jdbc.ClientDriver -database.jdbc.connectionURL=jdbc:derby://localhost:3219/roller -database.jdbc.username=APP -database.jdbc.password=APP -hibernate.dialect=org.hibernate.dialect.DerbyDialect #jdbc.driverClass=com.mysql.jdbc.Driver #jdbc.connectionURL=jdbc:mysql://localhost:3306/rollertest