svn commit: r550799 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java
Author: snoopdave
Date: Tue Jun 26 06:08:24 2007
New Revision: 550799
URL: http://svn.apache.org/viewvc?view=revrev=550799
Log:
Fixing broken bootstrap filter, using redirect without context name only works
if roller is installed at root
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java?view=diffrev=550799r1=550798r2=550799
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/BootstrapFilter.java
Tue Jun 26 06:08:24 2007
@@ -23,6 +23,7 @@
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@@ -39,7 +40,7 @@
* type is auto, otherwise does nothing.
*/
public class BootstrapFilter implements Filter {
-
+private ServletContext context = null;
private static Log log = LogFactory.getLog(BootstrapFilter.class);
@@ -55,8 +56,10 @@
auto.equals(RollerConfig.getProperty(installation.type))
!isInstallUrl(request.getServletPath())) {
-// just redirect to install action
-response.sendRedirect(/roller-ui/install/install.rol);
+// we doing an install, so forward to installer
+RequestDispatcher rd = context.getRequestDispatcher(
+/roller-ui/install/install.rol);
+rd.forward(req, res);
} else {
chain.doFilter(request, response);
@@ -72,8 +75,9 @@
}
-public void init(FilterConfig filterConfig) throws ServletException {}
-
-public void destroy() {}
+public void init(FilterConfig filterConfig) throws ServletException {
+context = filterConfig.getServletContext();
+}
+public void destroy() {}
}
svn commit: r550853 - in /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business: ./ hibernate/ jpa/ referrers/ search/ themes/
Author: agilliland
Date: Tue Jun 26 09:50:30 2007
New Revision: 550853
URL: http://svn.apache.org/viewvc?view=revrev=550853
Log:
lets be anal about the immutability of our business tier classes.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateAutoPingManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateBookmarkManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePingQueueManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePingTargetManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePropertiesManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRefererManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRollerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateThreadManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateUserManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateWeblogManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAAutoPingManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPingQueueManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAPropertiesManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAThreadManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/ReferrerQueueManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java?view=diffrev=550853r1=550852r2=550853
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerFactory.java
Tue Jun 26 09:50:30 2007
@@ -24,20 +24,16 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.business.startup.WebloggerStartup;
-import org.apache.roller.weblogger.config.PingConfig;
import org.apache.roller.weblogger.config.RollerConfig;
/**
- * Provides access to the Roller instance.
+ * Provides access to the Roller instance and bootstraps the business tier.
*/
public final class RollerFactory {
private static final Log log = LogFactory.getLog(RollerFactory.class);
-// have we been bootstrapped yet?
-private static boolean bootstrapped = false;
-
// a reference to the bootstrapped Roller instance
private static Roller rollerInstance = null;
@@ -64,10 +60,10 @@
/**
- * True if bootstrap process was completed, False otherwise.
+ * True if bootstrap process has been completed, False otherwise.
*/
public static boolean isBootstrapped() {
-return bootstrapped;
+return (rollerInstance != null);
}
@@ -115,9 +111,7 @@
rollerInstance = injector.getInstance(Roller.class);
-// note that we've now been bootstrapped
-
svn commit: r550872 - in /roller/trunk/apps/planet: src/java/org/apache/roller/planet/business/ src/java/org/apache/roller/planet/business/hibernate/ src/java/org/apache/roller/planet/business/jpa/ te
Author: agilliland
Date: Tue Jun 26 10:30:15 2007
New Revision: 550872
URL: http://svn.apache.org/viewvc?view=revrev=550872
Log:
lets be anal about the immutability of our business tier objects. we also
needed to tie in the initialization process to our managers which use it.
Modified:
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/AbstractManagerImpl.java
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/Manager.java
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/PlanetFactory.java
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePersistenceStrategy.java
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePropertiesManagerImpl.java
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPersistenceStrategy.java
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetImpl.java
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPropertiesManagerImpl.java
roller/trunk/apps/planet/test/java/org/apache/roller/planet/TestUtils.java
Modified:
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/AbstractManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/AbstractManagerImpl.java?view=diffrev=550872r1=550871r2=550872
==
---
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/AbstractManagerImpl.java
(original)
+++
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/AbstractManagerImpl.java
Tue Jun 26 10:30:15 2007
@@ -25,6 +25,11 @@
*/
public abstract class AbstractManagerImpl implements Manager {
+public void initialize() throws InitializationException {
+// no-op
+}
+
+
public void release() {
// no-op
}
Modified:
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/Manager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/Manager.java?view=diffrev=550872r1=550871r2=550872
==
---
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/Manager.java
(original)
+++
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/Manager.java
Tue Jun 26 10:30:15 2007
@@ -27,6 +27,12 @@
public interface Manager {
/**
+ * Initialize the Manager. Called once after instantiation.
+ */
+public void initialize() throws InitializationException;
+
+
+/**
* Release all resources associated with session.
*/
public void release();
Modified:
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/PlanetFactory.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/PlanetFactory.java?view=diffrev=550872r1=550871r2=550872
==
---
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/PlanetFactory.java
(original)
+++
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/PlanetFactory.java
Tue Jun 26 10:30:15 2007
@@ -26,22 +26,17 @@
import org.apache.roller.planet.business.startup.PlanetStartup;
import org.apache.roller.planet.config.PlanetConfig;
+
/**
* Provides access to the Planet instance.
*/
-public abstract class PlanetFactory {
-private static Log log = LogFactory.getLog(PlanetFactory.class);
-private static Planet planetInstance = null;
-private static Injector injector = null;
+public abstract class PlanetFactory {
-// have we been bootstrapped yet?
-private static boolean bootstrapped = false;
+private static Log log = LogFactory.getLog(PlanetFactory.class);
+private static Planet planetInstance = null;
+private static Injector injector = null;
-/**
- * Let's just be doubling certain this class cannot be instantiated.
- */
-private PlanetFactory() {} // hello planetary citizens
static {
@@ -55,7 +50,15 @@
throw new RuntimeException(Error instantiating backend module +
moduleClassname, e);
}
}
-
+
+
+// non-instantiable
+private PlanetFactory() {
+// hello planetary citizens
+}
+
+
+
/**
* Static accessor for the instance of
svn commit: r550885 - /roller/trunk/tools/roller-planet/roller-planet-business.jar
Author: agilliland Date: Tue Jun 26 10:57:10 2007 New Revision: 550885 URL: http://svn.apache.org/viewvc?view=revrev=550885 Log: updating planet integration jar with some updates to the initialization process. Modified: roller/trunk/tools/roller-planet/roller-planet-business.jar Modified: roller/trunk/tools/roller-planet/roller-planet-business.jar URL: http://svn.apache.org/viewvc/roller/trunk/tools/roller-planet/roller-planet-business.jar?view=diffrev=550885r1=550884r2=550885 == Binary files - no diff available.
svn commit: r550897 - in /roller/trunk: apps/planet/src/java/org/apache/roller/planet/business/hibernate/ apps/planet/src/java/org/apache/roller/planet/business/jpa/ tools/roller-planet/
Author: agilliland Date: Tue Jun 26 11:21:38 2007 New Revision: 550897 URL: http://svn.apache.org/viewvc?view=revrev=550897 Log: session factory and emf need to be protected level access so that subclasses can instantiate and assign them on their own. updating planet integration jar with this change. Modified: roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePersistenceStrategy.java roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPersistenceStrategy.java roller/trunk/tools/roller-planet/roller-planet-business.jar Modified: roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePersistenceStrategy.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePersistenceStrategy.java?view=diffrev=550897r1=550896r2=550897 == --- roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePersistenceStrategy.java (original) +++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePersistenceStrategy.java Tue Jun 26 11:21:38 2007 @@ -43,7 +43,7 @@ private static final Log log = LogFactory.getLog(HibernatePersistenceStrategy.class); -private final SessionFactory sessionFactory; +protected SessionFactory sessionFactory; /** Modified: roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPersistenceStrategy.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPersistenceStrategy.java?view=diffrev=550897r1=550896r2=550897 == --- roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPersistenceStrategy.java (original) +++ roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPersistenceStrategy.java Tue Jun 26 11:21:38 2007 @@ -59,7 +59,7 @@ /** * The EntityManagerFactory for this Roller instance. */ -private final EntityManagerFactory emf; +protected EntityManagerFactory emf; /** Modified: roller/trunk/tools/roller-planet/roller-planet-business.jar URL: http://svn.apache.org/viewvc/roller/trunk/tools/roller-planet/roller-planet-business.jar?view=diffrev=550897r1=550896r2=550897 == Binary files - no diff available.
svn commit: r550899 - in /roller/trunk/apps/weblogger: ./ src/java/org/apache/roller/weblogger/planet/business/hibernate/ src/java/org/apache/roller/weblogger/planet/business/jpa/
Author: agilliland
Date: Tue Jun 26 11:22:22 2007
New Revision: 550899
URL: http://svn.apache.org/viewvc?view=revrev=550899
Log:
tidy up Weblogger planet integration.
Modified:
roller/trunk/apps/weblogger/properties.xmlf
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetPersistenceStrategy.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetPersistenceStrategy.java
Modified: roller/trunk/apps/weblogger/properties.xmlf
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/properties.xmlf?view=diffrev=550899r1=550898r2=550899
==
--- roller/trunk/apps/weblogger/properties.xmlf (original)
+++ roller/trunk/apps/weblogger/properties.xmlf Tue Jun 26 11:22:22 2007
@@ -191,12 +191,12 @@
fileset refid=roller-planet.jars /
!-- JPA bytecode enhancement apparently wants JPA classes everywhere --
fileset refid=jpa.jars /
+fileset refid=hibernate.jar /
+fileset refid=hibernate.jars /
/path
path id=business.path
path refid=base.path/
-fileset refid=hibernate.jar /
-fileset refid=hibernate.jars /
/path
path id=presentation.path
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetPersistenceStrategy.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetPersistenceStrategy.java?view=diffrev=550899r1=550898r2=550899
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetPersistenceStrategy.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetPersistenceStrategy.java
Tue Jun 26 11:22:22 2007
@@ -18,19 +18,22 @@
package org.apache.roller.weblogger.planet.business.hibernate;
+import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.planet.PlanetException;
import
org.apache.roller.planet.business.hibernate.HibernatePersistenceStrategy;
import org.apache.roller.weblogger.config.RollerConfig;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.Environment;
+
/**
* Hibernate strategy for Planet, uses RollerConfig to get Hibernate
configuration.
*/
@com.google.inject.Singleton
public class HibernateRollerPlanetPersistenceStrategy extends
HibernatePersistenceStrategy {
-private static Log logger =
-
LogFactory.getFactory().getInstance(HibernateRollerPlanetPersistenceStrategy.class);
+
/**
* Persistence strategy configures itself by using
'planet-hibernate.cfg.xml'
@@ -44,6 +47,17 @@
String connectionProvider =
RollerConfig.getProperty(hibernate.connectionProvider);
String configuration = planet-hibernate.cfg.xml;
-init(dialect, connectionProvider, configuration);
-}
+
+Configuration config = new Configuration();
+config.configure(configuration);
+
+// Add dialect specified by Roller config and our connection provider
+Properties props = new Properties();
+props.put(Environment.DIALECT, dialect);
+props.put(Environment.CONNECTION_PROVIDER, connectionProvider);
+config.mergeProperties(props);
+
+sessionFactory = config.buildSessionFactory();
+}
+
}
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetPersistenceStrategy.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetPersistenceStrategy.java?view=diffrev=550899r1=550898r2=550899
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetPersistenceStrategy.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/JPARollerPlanetPersistenceStrategy.java
Tue Jun 26 11:22:22 2007
@@ -30,14 +30,17 @@
import org.apache.roller.weblogger.business.startup.WebloggerStartup;
import org.apache.roller.weblogger.config.RollerConfig;
+
/**
* JPA strategy for Planet, uses RollerConfig to get JPA configuration.
*/
@com.google.inject.Singleton
public class JPARollerPlanetPersistenceStrategy extends JPAPersistenceStrategy
{
+
private static Log logger =
LogFactory.getFactory().getInstance(JPARollerPlanetPersistenceStrategy.class);
+
/**
* Construct by finding using DatabaseProvider and
[Roller-JIRA] Created: (ROL-1463) Oracle createdb.sql errors
Oracle createdb.sql errors -- Key: ROL-1463 URL: http://opensource.atlassian.com/projects/roller/browse/ROL-1463 Project: Roller Issue Type: Bug Components: Database Access Data Model Affects Versions: 3.2 Environment: This is against the 3.2 branch. Reporter: Henri Yandell Assignee: Roller Unassigned One line amongst the createdb.sql errors: Query 83 of 120 elapsed time (seconds) - Total: 0.011, SQL query: 0.011, Building output: 0 Error: java.sql.SQLException: ORA-01408: such column list already indexed , SQL State: 72000, Error Code: 1408 Error occured in: create index rtl_taskname_idx on roller_tasklock( name ) If you delete that line, everything runs happily. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://opensource.atlassian.com/projects/roller/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira
svn commit: r550971 - in /roller/trunk/apps/weblogger: src/java/org/apache/roller/weblogger/business/hibernate/ src/java/org/apache/roller/weblogger/planet/business/hibernate/ src/java/org/apache/roll
Author: agilliland
Date: Tue Jun 26 15:16:20 2007
New Revision: 550971
URL: http://svn.apache.org/viewvc?view=revrev=550971
Log:
a couple tweaks to stay inline with changes made to Planet backend and removing
old planet hibernate config since we no longer need it now that the planet
business jar includes it.
Removed:
roller/trunk/apps/weblogger/web/WEB-INF/classes/planet-hibernate.cfg.xml
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePersistenceStrategy.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetPersistenceStrategy.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/RollerPlanetModule.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/RollerPlanetModule.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePersistenceStrategy.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePersistenceStrategy.java?view=diffrev=550971r1=550970r2=550971
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePersistenceStrategy.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePersistenceStrategy.java
Tue Jun 26 15:16:20 2007
@@ -18,7 +18,6 @@
package org.apache.roller.weblogger.business.hibernate;
-import java.io.StringBufferInputStream;
import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -30,8 +29,6 @@
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.RollerConfig;
import org.hibernate.cfg.Environment;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
/**
@@ -43,16 +40,11 @@
*/
@com.google.inject.Singleton
public class HibernatePersistenceStrategy {
+
private static Log log =
LogFactory.getLog(HibernatePersistenceStrategy.class);
-protected static SessionFactory sessionFactory = null;
+private final SessionFactory sessionFactory;
-/** No-op so XML parser doesn't hit the network looking for Hibernate DTDs
*/
-private EntityResolver noOpEntityResolver = new EntityResolver() {
-public InputSource resolveEntity(String publicId, String systemId) {
-return new InputSource(new StringBufferInputStream());
-}
-};
/**
* Persistence strategy configures itself by using Roller properties:
@@ -60,16 +52,14 @@
* 'hibernate.dialect' - the classname of the Hibernate dialect to be used,
* 'hibernate.connectionProvider - the classname of Roller's connnection
provider impl.
*/
-protected HibernatePersistenceStrategy() throws WebloggerException {
+protected HibernatePersistenceStrategy() throws WebloggerException {
+
String dialect =
RollerConfig.getProperty(hibernate.dialect);
String connectionProvider =
RollerConfig.getProperty(hibernate.connectionProvider);
String configuration = hibernate.cfg.xml;
-init(dialect, connectionProvider, configuration);
-}
-
-protected void init(String dialect, String connectionProvider, String
configuration) {
+
Configuration config = new Configuration();
config.configure(configuration);
@@ -79,7 +69,7 @@
props.put(Environment.CONNECTION_PROVIDER, connectionProvider);
config.mergeProperties(props);
-this.sessionFactory = config.buildSessionFactory();
+sessionFactory = config.buildSessionFactory();
}
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetPersistenceStrategy.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetPersistenceStrategy.java?view=diffrev=550971r1=550970r2=550971
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetPersistenceStrategy.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/hibernate/HibernateRollerPlanetPersistenceStrategy.java
Tue Jun 26 15:16:20 2007
@@ -41,15 +41,15 @@
* dialect to be used, 'hibernate.connectionProvider - the classname of
* Roller's connnection provider impl.
*/
-protected HibernateRollerPlanetPersistenceStrategy() throws
PlanetException {
+protected
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=revrev=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=diffrev=550986r1=550985r2=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=diffrev=550986r1=550985r2=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=diffrev=550986r1=550985r2=550986
==
--- roller/trunk/apps/weblogger/web/WEB-INF/classes/planet.properties (original)
+++
svn commit: r551034 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogCategory.java
Author: agilliland
Date: Tue Jun 26 21:29:30 2007
New Revision: 551034
URL: http://svn.apache.org/viewvc?view=revrev=551034
Log:
implementing comparable and defining a natural sort order for categories, by
name. also cleaning up unused code and comments.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogCategory.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogCategory.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogCategory.java?view=diffrev=551034r1=551033r2=551034
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogCategory.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogCategory.java
Tue Jun 26 21:29:30 2007
@@ -27,7 +27,6 @@
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
@@ -37,18 +36,15 @@
/**
* Weblog Category.
*
- * @ejb:bean name=WeblogCategory
* @hibernate.cache usage=read-write
* @hibernate.class lazy=true table=weblogcategory
- * @struts.form include-all=true
*/
-public class WeblogCategory implements Serializable {
+public class WeblogCategory implements Serializable, Comparable {
public static final long serialVersionUID = 1435782148712018954L;
private static Log log = LogFactory.getLog(WeblogCategory.class);
-
// attributes
private String id = UUIDGenerator.generateUUID();
private String name = null;
@@ -68,9 +64,9 @@
public WeblogCategory(
Weblog website,
WeblogCategory parent,
-java.lang.String name,
-java.lang.String description,
-java.lang.String image) {
+String name,
+String description,
+String image) {
this.name = name;
this.description = description;
@@ -90,26 +86,6 @@
}
-public WeblogCategory(WeblogCategory otherData) {
-this.setData(otherData);
-}
-
-
-public void setData(WeblogCategory otherData) {
-WeblogCategory other = (WeblogCategory) otherData;
-
-this.id = other.getId();
-this.website = other.getWebsite();
-this.name = other.getName();
-this.description = other.getDescription();
-this.image = other.getImage();
-this.path = other.getPath();
-
-this.parentCategory = other.getParent();
-this.childCategories = other.getWeblogCategories();
-}
-
-
//--- Good citizenship
public String toString() {
@@ -142,22 +118,25 @@
.toHashCode();
}
+/**
+ * @see java.lang.Comparable#compareTo(java.lang.Object)
+ */
+public int compareTo(Object o) {
+WeblogCategory other = (WeblogCategory)o;
+return getName().compareTo(other.getName());
+}
+
/**
* Database surrogate key.
*
- * @roller.wrapPojoMethod type=simple
- *
- * @hibernate.id column=id
- * generator-class=assigned
+ * @hibernate.id column=id generator-class=assigned
*/
-public java.lang.String getId() {
+public String getId() {
return this.id;
}
-public void setId(java.lang.String id) {
-// Form bean workaround: empty string is never a valid id
-if (id != null id.trim().length() == 0) return;
+public void setId(String id) {
this.id = id;
}
@@ -165,15 +144,13 @@
/**
* The display name for this category.
*
- * @roller.wrapPojoMethod type=simple
- *
* @hibernate.property column=name non-null=true unique=false
*/
-public java.lang.String getName() {
+public String getName() {
return this.name;
}
-public void setName(java.lang.String name) {
+public void setName(String name) {
this.name = name;
}
@@ -181,15 +158,13 @@
/**
* A full description for this category.
*
- * @roller.wrapPojoMethod type=simple
- *
* @hibernate.property column=description non-null=true unique=false
*/
-public java.lang.String getDescription() {
+public String getDescription() {
return this.description;
}
-public void setDescription(java.lang.String description) {
+public void setDescription(String description) {
this.description = description;
}
@@ -197,15 +172,13 @@
/**
* An image icon to represent this
svn commit: r551035 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
Author: agilliland
Date: Tue Jun 26 21:30:51 2007
New Revision: 551035
URL: http://svn.apache.org/viewvc?view=revrev=551035
Log:
category list should include all categories, not just children of root cat.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java?view=diffrev=551035r1=551034r2=551035
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
Tue Jun 26 21:30:51 2007
@@ -19,6 +19,7 @@
package org.apache.roller.weblogger.ui.struts2.editor;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -158,6 +159,9 @@
}
+/**
+ * Get the list of all categories for the action weblog, not including
root.
+ */
public ListWeblogCategory getCategories() {
// make list of categories with first option being being a transient
// category just meant to represent the default option of any category
@@ -168,7 +172,15 @@
tmpCat.setPath();
cats.add(tmpCat);
-cats.addAll(getActionWeblog().getWeblogCategories());
+ListWeblogCategory weblogCats = Collections.EMPTY_LIST;
+try {
+WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+weblogCats = wmgr.getWeblogCategories(getActionWeblog(), false);
+} catch (WebloggerException ex) {
+log.error(Error getting category list for weblog - +getWeblog(),
ex);
+}
+
+cats.addAll(weblogCats);
return cats;
}
svn commit: r551036 - in /roller/trunk/apps/weblogger: src/java/org/apache/roller/weblogger/ui/struts2/editor/ web/WEB-INF/jsps/editor/
Author: agilliland
Date: Tue Jun 26 21:32:58 2007
New Revision: 551036
URL: http://svn.apache.org/viewvc?view=revrev=551036
Log:
category drop down on entry editor should include all categories, not just
children of root category. we are also going to display the category name
rather than path, since that is nicer for users.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java?view=diffrev=551036r1=551035r2=551036
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
Tue Jun 26 21:32:58 2007
@@ -19,9 +19,12 @@
package org.apache.roller.weblogger.ui.struts2.editor;
import java.sql.Timestamp;
+import java.util.Collections;
import java.util.Date;
+import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogPermission;
@@ -30,6 +33,7 @@
import org.apache.roller.weblogger.util.cache.CacheManager;
import org.apache.roller.weblogger.util.MailUtil;
import org.apache.commons.lang.StringUtils;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
import org.apache.roller.weblogger.util.MediacastResource;
import org.apache.roller.weblogger.util.MediacastUtil;
import org.apache.struts2.interceptor.validation.SkipValidation;
@@ -188,6 +192,20 @@
return INPUT;
+}
+
+
+/**
+ * Get the list of all categories for the action weblog, not including
root.
+ */
+public ListWeblogCategory getCategories() {
+try {
+WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+return wmgr.getWeblogCategories(getActionWeblog(), false);
+} catch (WebloggerException ex) {
+log.error(Error getting category list for weblog - +getWeblog(),
ex);
+return Collections.EMPTY_LIST;
+}
}
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java?view=diffrev=551036r1=551035r2=551036
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
Tue Jun 26 21:32:58 2007
@@ -20,14 +20,17 @@
import java.sql.Timestamp;
import java.util.Arrays;
+import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
+import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.util.cache.CacheManager;
@@ -254,6 +257,19 @@
return INPUT;
}
+
+/**
+ * Get the list of all categories for the action weblog, not including
root.
+ */
+public ListWeblogCategory getCategories() {
+try {
+WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+return wmgr.getWeblogCategories(getActionWeblog(), false);
+} catch (WebloggerException ex) {
+log.error(Error getting category list for weblog - +getWeblog(),
ex);
+return Collections.EMPTY_LIST;
+}
+}
public String getPreviewURL() {
return URLUtilities.getPreviewWeblogEntryURL(getEntry().getAnchor(),
getActionWeblog(), null, true);
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp
URL:
svn commit: r551040 - in /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc: BloggerAPIHandler.java MetaWeblogAPIHandler.java
Author: agilliland Date: Tue Jun 26 21:55:27 2007 New Revision: 551040 URL: http://svn.apache.org/viewvc?view=revrev=551040 Log: new entries created by xmlrpc need to have the locale properly set. Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java?view=diffrev=551040r1=551039r2=551040 == --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java Tue Jun 26 21:55:27 2007 @@ -403,6 +403,7 @@ WeblogEntry entry = new WeblogEntry(); entry.setTitle(title); entry.setText(content); +entry.setLocale(website.getLocale()); entry.setPubTime(current); entry.setUpdateTime(current); User user = roller.getUserManager().getUserByUserName(userid); Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java?view=diffrev=551040r1=551039r2=551040 == --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java Tue Jun 26 21:55:27 2007 @@ -244,6 +244,7 @@ WeblogEntry entry = new WeblogEntry(); entry.setTitle(title); entry.setText(description); +entry.setLocale(website.getLocale()); entry.setPubTime(new Timestamp(dateCreated.getTime())); entry.setUpdateTime(current); entry.setWebsite(website);
svn commit: r551046 [2/2] - in /roller/trunk/apps/weblogger: src/java/org/apache/roller/weblogger/business/ src/java/org/apache/roller/weblogger/business/hibernate/ src/java/org/apache/roller/weblogge
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java?view=diffrev=551046r1=551045r2=551046
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java
Tue Jun 26 22:33:26 2007
@@ -25,7 +25,7 @@
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
@@ -89,7 +89,7 @@
}
try {
-Roller roller = RollerFactory.getRoller();
+Weblogger roller = RollerFactory.getRoller();
WeblogManager wmgr = roller.getWeblogManager();
List entries = wmgr.getComments(
weblog, null, null, startDate, null,
WeblogEntryComment.APPROVED, true, offset, length + 1);
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java?view=diffrev=551046r1=551045r2=551046
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/UsersPager.java
Tue Jun 26 22:33:26 2007
@@ -25,7 +25,7 @@
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.pojos.User;
@@ -131,7 +131,7 @@
List results = new ArrayList();
try {
-Roller roller = RollerFactory.getRoller();
+Weblogger roller = RollerFactory.getRoller();
UserManager umgr = roller.getUserManager();
List rawUsers = null;
if (letter == null) {
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java?view=diffrev=551046r1=551045r2=551046
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java
Tue Jun 26 22:33:26 2007
@@ -29,7 +29,7 @@
import org.apache.commons.collections.comparators.ReverseComparator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.business.Roller;
+import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.RollerFactory;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -114,7 +114,7 @@
if (entries == null) {
entries = new TreeMap(new ReverseComparator());
try {
-Roller roller = RollerFactory.getRoller();
+Weblogger roller = RollerFactory.getRoller();
WeblogManager wmgr = roller.getWeblogManager();
Map mmap =
RollerFactory.getRoller().getWeblogManager().getWeblogEntryObjectMap(
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java?view=diffrev=551046r1=551045r2=551046
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java
(original)
+++
svn commit: r551048 - in /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business: Roller.java Weblogger.java
Author: agilliland
Date: Tue Jun 26 22:35:48 2007
New Revision: 551048
URL: http://svn.apache.org/viewvc?view=revrev=551048
Log:
renaming Roller interface to Weblogger.
Added:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Weblogger.java
- copied, changed from r550835,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Roller.java
Removed:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Roller.java
Copied:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Weblogger.java
(from r550835,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Roller.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Weblogger.java?view=diffrev=551048p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Roller.javar1=550835p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Weblogger.javar2=551048
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Roller.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Weblogger.java
Tue Jun 26 22:35:48 2007
@@ -30,32 +30,37 @@
import org.apache.roller.weblogger.business.themes.ThemeManager;
-/**
- * The main entry point interface of the Roller business tier.
+/**
+ *
+ * The main entry point interface of the Weblogger business tier.
*/
-public interface Roller {
+public interface Weblogger {
-/**
- * Get UserManager associated with this Roller instance.
+/**
+ *
+ * Get UserManager associated with this Weblogger instance.
*/
public UserManager getUserManager();
-/**
- * Get BookmarkManager associated with this Roller instance.
+/**
+ *
+ * Get BookmarkManager associated with this Weblogger instance.
*/
public BookmarkManager getBookmarkManager();
-/**
- * Get WeblogManager associated with this Roller instance.
+/**
+ *
+ * Get WeblogManager associated with this Weblogger instance.
*/
public WeblogManager getWeblogManager();
-/**
- * Get RefererManager associated with this Roller instance.
+/**
+ *
+ * Get RefererManager associated with this Weblogger instance.
*/
public RefererManager getRefererManager();
@@ -67,55 +72,57 @@
/**
- * Get the AutoPingManager associated with this Roller instance.
+ * Get the AutoPingManager associated with this Weblogger instance.
*/
public AutoPingManager getAutopingManager();
/**
- * Get the PingTargetManager associated with this Roller instance.
+ * Get the PingTargetManager associated with this Weblogger instance.
*/
public PingTargetManager getPingTargetManager();
/**
- * Get the PingQueueManager associated with this Roller instance.
+ * Get the PingQueueManager associated with this Weblogger instance.
*/
public PingQueueManager getPingQueueManager();
-/**
- * Get PropertiesManager associated with this Roller instance.
+/**
+ *
+ * Get PropertiesManager associated with this Weblogger instance.
*/
public PropertiesManager getPropertiesManager();
-/**
- * Get FileManager associated with this Roller instance.
+/**
+ *
+ * Get FileManager associated with this Weblogger instance.
*/
public FileManager getFileManager();
/**
- * Get ThreadManager associated with this Roller instance.
+ * Get ThreadManager associated with this Weblogger instance.
*/
public ThreadManager getThreadManager();
/**
- * Get IndexManager associated with this Roller instance.
+ * Get IndexManager associated with this Weblogger instance.
*/
public IndexManager getIndexManager();
/**
- * Get ThemeManager associated with this Roller instance.
+ * Get ThemeManager associated with this Weblogger instance.
*/
public ThemeManager getThemeManager();
/**
- * Get PluginManager associated with this Roller instance.
+ * Get PluginManager associated with this Weblogger instance.
*/
public PluginManager getPagePluginManager();
@@ -127,30 +134,36 @@
/**
- * Release all resources associated with Roller session.
+ * Release all resources associated with Weblogger session.
*/
public void release();
/**
- * Initialize any resources necessary for this instance of Roller.
+ * Initialize any resources necessary for this instance of Weblogger.
*/
public void initialize() throws InitializationException;
svn commit: r551059 [5/5] - in /roller/trunk/apps/weblogger: src/java/org/apache/roller/weblogger/business/ src/java/org/apache/roller/weblogger/business/pings/ src/java/org/apache/roller/weblogger/bu
Modified:
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java?view=diffrev=551059r1=551058r2=551059
==
---
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java
(original)
+++
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java
Tue Jun 26 22:52:00 2007
@@ -82,7 +82,7 @@
log.info(BEGIN);
-WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
+WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager();
// root category is always available
WeblogCategory root =
mgr.getRootWeblogCategory(TestUtils.getManagedWebsite(testWeblog));
@@ -99,7 +99,7 @@
// now delete the weblog owning these categories
Exception ex = null;
try {
-UserManager umgr = RollerFactory.getRoller().getUserManager();
+UserManager umgr = WebloggerFactory.getRoller().getUserManager();
umgr.removeWebsite(TestUtils.getManagedWebsite(testWeblog));
TestUtils.endSession(true);
} catch (WebloggerException e) {
Modified:
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java?view=diffrev=551059r1=551058r2=551059
==
---
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java
(original)
+++
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java
Tue Jun 26 22:52:00 2007
@@ -100,7 +100,7 @@
*/
public void testWeblogEntryCRUD() throws Exception {
-WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
+WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager();
WeblogEntry entry = null;
WeblogEntry testEntry = new WeblogEntry();
@@ -153,7 +153,7 @@
*/
public void testWeblogEntryLookups() throws Exception {
-WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
+WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager();
WeblogEntry entry = null;
List entries = null;
Map entryMap = null;
@@ -310,7 +310,7 @@
*/
public void testCreateAnchor() throws Exception {
-WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
+WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager();
WeblogEntry entry = null;
List entries = null;
@@ -341,7 +341,7 @@
public void testCreateAnEntryWithTagsShortcut() throws Exception {
try {
-WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
+WeblogManager mgr =
WebloggerFactory.getRoller().getWeblogManager();
WeblogEntry entry = null;
testWeblog = TestUtils.getManagedWebsite(testWeblog);
testUser = TestUtils.getManagedUser(testUser);
@@ -391,7 +391,7 @@
public void testAddMultipleTags() throws Exception {
-WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
+WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager();
// setup some test entries to use
testWeblog = TestUtils.getManagedWebsite(testWeblog);
@@ -419,7 +419,7 @@
public void testAddMultipleIdenticalTags() throws Exception {
-WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
+WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager();
// setup some test entries to use
testWeblog = TestUtils.getManagedWebsite(testWeblog);
@@ -446,7 +446,7 @@
public void testRemoveTagsViaShortcut() throws Exception {
try {
-WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
+WeblogManager mgr =
WebloggerFactory.getRoller().getWeblogManager();
// setup some test entries to use
testWeblog = TestUtils.getManagedWebsite(testWeblog);
@@ -487,7 +487,7 @@
public void testTagsExist() throws Exception {
-WeblogManager mgr = RollerFactory.getRoller().getWeblogManager();
+WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager();
testWeblog = TestUtils.getManagedWebsite(testWeblog);
testUser = TestUtils.getManagedUser(testUser);
@@ -539,7 +539,7 @@
svn commit: r551061 - in /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business: RollerImpl.java WebloggerImpl.java hibernate/HibernateRollerImpl.java jpa/JPARollerImpl.java
Author: agilliland
Date: Tue Jun 26 22:57:35 2007
New Revision: 551061
URL: http://svn.apache.org/viewvc?view=revrev=551061
Log:
renaming RollerImpl to WebloggerImpl.
Added:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerImpl.java
- copied, changed from r551059,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java
Removed:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRollerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java
Copied:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerImpl.java
(from r551059,
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerImpl.java?view=diffrev=551061p1=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.javar1=551059p2=roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerImpl.javar2=551061
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerImpl.java
Tue Jun 26 22:57:35 2007
@@ -44,9 +44,9 @@
* interface, regardless of their persistence strategy.
*/
@com.google.inject.Singleton
-public abstract class RollerImpl implements Weblogger {
+public abstract class WebloggerImpl implements Weblogger {
-private static Log log = LogFactory.getLog(RollerImpl.class);
+private static Log log = LogFactory.getLog(WebloggerImpl.class);
// managers
private final AutoPingManager autoPingManager;
@@ -70,7 +70,7 @@
private final String buildUser;
-protected RollerImpl(
+protected WebloggerImpl(
AutoPingManager autoPingManager,
BookmarkManager bookmarkManager,
FileManager fileManager,
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRollerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRollerImpl.java?view=diffrev=551061r1=551060r2=551061
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRollerImpl.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRollerImpl.java
Tue Jun 26 22:57:35 2007
@@ -19,7 +19,7 @@
package org.apache.roller.weblogger.business.hibernate;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.RollerImpl;
+import org.apache.roller.weblogger.business.WebloggerImpl;
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.FileManager;
import org.apache.roller.weblogger.business.pings.AutoPingManager;
@@ -40,7 +40,7 @@
* A Hibernate specific implementation of the Roller business layer.
*/
@com.google.inject.Singleton
-public class HibernateRollerImpl extends RollerImpl {
+public class HibernateRollerImpl extends WebloggerImpl {
// a persistence utility class
private final HibernatePersistenceStrategy strategy;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java?view=diffrev=551061r1=551060r2=551061
==
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java
Tue Jun 26 22:57:35 2007
@@ -24,7 +24,7 @@
import org.apache.roller.weblogger.business.FileManager;
import org.apache.roller.weblogger.business.PropertiesManager;
import org.apache.roller.weblogger.business.Weblogger;
-import org.apache.roller.weblogger.business.RollerImpl;
+import org.apache.roller.weblogger.business.WebloggerImpl;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.business.runnable.ThreadManager;
@@ -41,7 +41,7 @@
* A JPA specific implementation of the Weblogger business layer.
*/
@com.google.inject.Singleton
-public class JPARollerImpl extends
