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 2006/09/06 01:08:06 UTC
svn commit: r440523 - in
/incubator/roller/branches/roller_3.0/sandbox/jdobackend/src/org/apache/roller/business:
datamapper/DatamapperRollerImpl.java jdo/JDORollerImpl.java
Author: agilliland
Date: Tue Sep 5 16:08:06 2006
New Revision: 440523
URL: http://svn.apache.org/viewvc?view=rev&rev=440523
Log:
cleaning up Roller impl for datamapper and JDO.
Modified:
incubator/roller/branches/roller_3.0/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperRollerImpl.java
incubator/roller/branches/roller_3.0/sandbox/jdobackend/src/org/apache/roller/business/jdo/JDORollerImpl.java
Modified: incubator/roller/branches/roller_3.0/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperRollerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperRollerImpl.java?view=diff&rev=440523&r1=440522&r2=440523
==============================================================================
--- incubator/roller/branches/roller_3.0/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperRollerImpl.java (original)
+++ incubator/roller/branches/roller_3.0/sandbox/jdobackend/src/org/apache/roller/business/datamapper/DatamapperRollerImpl.java Tue Sep 5 16:08:06 2006
@@ -15,13 +15,6 @@
*/
package org.apache.roller.business.datamapper;
-
-/*
- * DatamapperRollerImpl.java
- *
- * Created on May 27, 2006, 2:50 PM
- *
- */
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -29,15 +22,16 @@
import org.apache.roller.business.RollerImpl;
import org.apache.roller.model.BookmarkManager;
import org.apache.roller.model.AutoPingManager;
+import org.apache.roller.model.ConfigManager;
import org.apache.roller.model.PingQueueManager;
import org.apache.roller.model.PingTargetManager;
import org.apache.roller.model.PlanetManager;
import org.apache.roller.model.PropertiesManager;
import org.apache.roller.model.RefererManager;
-import org.apache.roller.model.Roller;
import org.apache.roller.model.UserManager;
import org.apache.roller.model.WeblogManager;
+
/**
* A Datamapper specific implementation of the Roller business layer.
*/
@@ -45,8 +39,7 @@
static final long serialVersionUID = 5256135928578074652L;
- protected static Log logger =
- LogFactory.getLog(DatamapperRollerImpl.class);
+ protected static Log logger = LogFactory.getLog(DatamapperRollerImpl.class);
// our singleton instance
private static DatamapperRollerImpl me = null;
@@ -65,13 +58,16 @@
private AutoPingManager autoPingManager = null;
private PingTargetManager pingTargetManager = null;
+
protected DatamapperRollerImpl() throws RollerException {
}
+
public void flush() throws RollerException {
this.strategy.flush();
}
+
public void release() {
// release our own stuff first
@@ -90,6 +86,7 @@
super.release();
}
+
public void shutdown() {
// do our own shutdown first
@@ -99,139 +96,115 @@
super.shutdown();
}
+
/**
* @see org.apache.roller.model.Roller#getAutoPingManager()
*/
public AutoPingManager getAutopingManager() throws RollerException {
if (autoPingManager == null) {
- autoPingManager = createAutoPingManagerImpl(strategy);
+ autoPingManager = new DatamapperAutoPingManagerImpl(strategy);
}
return autoPingManager;
}
+
/**
* @see org.apache.roller.model.Roller#getBookmarkManager()
*/
public BookmarkManager getBookmarkManager() throws RollerException {
if ( bookmarkManager == null ) {
- bookmarkManager = createBookmarkManagerImpl(strategy);
+ bookmarkManager = new DatamapperBookmarkManagerImpl(strategy);
}
return bookmarkManager;
}
+
/**
* @see org.apache.roller.model.Roller#getPingTargetManager()
*/
public PingQueueManager getPingQueueManager() throws RollerException {
if (pingQueueManager == null) {
- pingQueueManager = createPingQueueManagerImpl(strategy);
+ pingQueueManager = new DatamapperPingQueueManagerImpl(strategy);
}
return pingQueueManager;
}
+
/**
* @see org.apache.roller.model.Roller#getPingTargetManager()
*/
public PingTargetManager getPingTargetManager() throws RollerException {
if (pingTargetManager == null) {
- pingTargetManager = createPingTargetManagerImpl(strategy);
+ pingTargetManager = new DatamapperPingTargetManagerImpl(strategy);
}
return pingTargetManager;
}
+
/**
* @see org.apache.roller.model.Roller#getPlanetManager()
*/
public PlanetManager getPlanetManager() throws RollerException {
if ( planetManager == null ) {
- planetManager = createPlanetManagerImpl(strategy);
+ planetManager = new DatamapperPlanetManagerImpl(strategy);
}
return planetManager;
}
+
/**
* @see org.apache.roller.model.Roller#getPropertiesManager()
*/
public PropertiesManager getPropertiesManager() throws RollerException {
if (propertiesManager == null) {
- propertiesManager = createPropertiesManagerImpl(strategy);
+ propertiesManager = new DatamapperPropertiesManagerImpl(strategy);
}
return propertiesManager;
}
+
/**
* @see org.apache.roller.model.Roller#getRefererManager()
*/
public RefererManager getRefererManager() throws RollerException {
if ( referrerManager == null ) {
- referrerManager = createReferrerManagerImpl(strategy);
+ referrerManager = new DatamapperReferrerManagerImpl(strategy);
}
return referrerManager;
}
+
/**
* @see org.apache.roller.model.Roller#getUserManager()
*/
public UserManager getUserManager() throws RollerException {
if ( userManager == null ) {
- userManager = createUserManagerImpl(strategy);
+ userManager = new DatamapperUserManagerImpl(strategy);
}
return userManager;
}
+
/**
* @see org.apache.roller.model.Roller#getWeblogManager()
*/
public WeblogManager getWeblogManager() throws RollerException {
if ( weblogManager == null ) {
- weblogManager = createWeblogManagerImpl(strategy);
+ weblogManager = new DatamapperWeblogManagerImpl(strategy);
}
return weblogManager;
}
-
- protected AutoPingManager createAutoPingManagerImpl
- (DatamapperPersistenceStrategy strategy) {
- return new DatamapperAutoPingManagerImpl(strategy);
- }
-
- protected BookmarkManager createBookmarkManagerImpl
- (DatamapperPersistenceStrategy strategy) {
- return new DatamapperBookmarkManagerImpl(strategy);
- }
-
- protected PingTargetManager createPingTargetManagerImpl
- (DatamapperPersistenceStrategy strategy) {
- return new DatamapperPingTargetManagerImpl(strategy);
- }
-
- protected PingQueueManager createPingQueueManagerImpl
- (DatamapperPersistenceStrategy strategy) {
- return new DatamapperPingQueueManagerImpl(strategy);
- }
-
- protected PlanetManager createPlanetManagerImpl
- (DatamapperPersistenceStrategy strategy) {
- return new DatamapperPlanetManagerImpl(strategy);
- }
-
- protected PropertiesManager createPropertiesManagerImpl
- (DatamapperPersistenceStrategy strategy) {
- return new DatamapperPropertiesManagerImpl(strategy);
- }
-
- protected RefererManager createReferrerManagerImpl
- (DatamapperPersistenceStrategy strategy) {
- return new DatamapperReferrerManagerImpl(strategy);
- }
-
- protected UserManager createUserManagerImpl
- (DatamapperPersistenceStrategy strategy) {
- return new DatamapperUserManagerImpl(strategy);
- }
-
- protected WeblogManager createWeblogManagerImpl
- (DatamapperPersistenceStrategy strategy) {
- return new DatamapperWeblogManagerImpl(strategy);
+
+
+ /**
+ * This method is deprecated.
+ * @return null
+ * @see org.apache.roller.model.Roller#getConfigManager()
+ * @deprecated see JIRA issue ROL-1151
+ * @throws org.apache.roller.RollerException on any error
+ */
+ public ConfigManager getConfigManager() throws RollerException {
+ throw new RollerException("Deprecated method getConfigManager.");
}
-
+
}
Modified: incubator/roller/branches/roller_3.0/sandbox/jdobackend/src/org/apache/roller/business/jdo/JDORollerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/sandbox/jdobackend/src/org/apache/roller/business/jdo/JDORollerImpl.java?view=diff&rev=440523&r1=440522&r2=440523
==============================================================================
--- incubator/roller/branches/roller_3.0/sandbox/jdobackend/src/org/apache/roller/business/jdo/JDORollerImpl.java (original)
+++ incubator/roller/branches/roller_3.0/sandbox/jdobackend/src/org/apache/roller/business/jdo/JDORollerImpl.java Tue Sep 5 16:08:06 2006
@@ -13,182 +13,46 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.roller.business.jdo;
-
-import java.sql.Connection;
-import javax.jdo.JDOHelper;
-import javax.jdo.PersistenceManagerFactory;
+package org.apache.roller.business.jdo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
-import org.apache.roller.business.datamapper.DatamapperPersistenceStrategy;
-import org.apache.roller.business.utils.UpgradeDatabase;
import org.apache.roller.business.datamapper.DatamapperRollerImpl;
-import org.apache.roller.model.AutoPingManager;
-import org.apache.roller.model.BookmarkManager;
-import org.apache.roller.model.ConfigManager;
-import org.apache.roller.model.PingQueueManager;
-import org.apache.roller.model.PingTargetManager;
-import org.apache.roller.model.PlanetManager;
-import org.apache.roller.model.PropertiesManager;
-import org.apache.roller.model.RefererManager;
import org.apache.roller.model.Roller;
-import org.apache.roller.model.UserManager;
-import org.apache.roller.model.WeblogManager;
-import org.apache.roller.pojos.UserData;
-import org.apache.roller.business.datamapper.DatamapperPlanetManagerImpl;
+
/**
* Implements Roller, the entry point interface for the Roller business tier
* APIs. JDO specific implementation.
- *
- * @author Dave Johnson
*/
public class JDORollerImpl extends DatamapperRollerImpl {
+
/**
* The logger associated with this class.
*/
- private static Log logger = LogFactory.getFactory()
- .getInstance(JDORollerImpl.class);
-
- /**
- * The singleton instance of the class.
- */
- protected static JDORollerImpl me;
-
+ private static Log logger = LogFactory.getLog(JDORollerImpl.class);
+
+
/**
* Single constructor.
* @throws org.apache.roller.RollerException on any error
*/
protected JDORollerImpl() throws RollerException {
+ // set strategy used by Datamapper
strategy = new JDOPersistenceStrategy();
}
+
/**
* Construct and return the singleton instance of the class.
* @throws org.apache.roller.RollerException on any error
* @return the singleton
*/
public static Roller instantiate() throws RollerException {
- if (me == null) {
- logger.debug("Instantiating DatamapperRollerImpl");
- me = new JDORollerImpl();
- }
-
- return me;
- }
-
- /**
- * This method is deprecated.
- * @return null
- * @see org.apache.roller.model.Roller#getConfigManager()
- * @deprecated see JIRA issue ROL-1151
- * @throws org.apache.roller.RollerException on any error
- */
- public ConfigManager getConfigManager() throws RollerException {
- throw new RollerException("Deprecated method getConfigManager.");
- }
-
- /**
- * Create an instance of UserManager.
- */
- protected UserManager createUserManagerImpl
- (DatamapperPersistenceStrategy strategy) {
- return null;
- }
-
- /**
- * Create an instance of BookmarkManager.
- */
- protected BookmarkManager createBookmarkManagerImpl
- (DatamapperPersistenceStrategy strategy) {
- return null;
- }
-
- /**
- * Create an instance of
- */
- protected static DatamapperRollerImpl createDatamapperRollerImpl() {
- return null;
- }
-
- /**
- * Create an instance of PingTargetManager.
- */
- protected PingTargetManager createPingTargetManagerImpl
- (DatamapperPersistenceStrategy strategy) {
- return null;
- }
-
- /**
- * Create an instance of WeblogManager.
- */
- protected WeblogManager createWeblogManagerImpl
- (DatamapperPersistenceStrategy strategy) {
- return null;
- }
-
- /**
- * Create an instance of AutoPingManager.
- */
- protected AutoPingManager createAutoPingManagerImpl
- (DatamapperPersistenceStrategy strategy) {
- return null;
- }
-
- /**
- * Create an instance of RollerPlanetManager.
- */
- protected PlanetManager createRollerPlanetManagerImpl
- (DatamapperPersistenceStrategy strategy) {
- return null;
- }
-
- /**
- * Create an instance of PingQueueManager.
- */
- protected PingQueueManager createPingQueueManagerImpl
- (DatamapperPersistenceStrategy strategy) {
- return null;
- }
-
- /**
- * Create an instance of PropertiesManager.
- */
- protected PropertiesManager createPropertiesManagerImpl
- (DatamapperPersistenceStrategy strategy) {
- return null;
- }
-
- /**
- * Create an instance of ReferrerManager.
- */
- protected RefererManager createReferrerManagerImpl
- (DatamapperPersistenceStrategy strategy) {
- return null;
- }
-
- /**
- * Release resources associated with this Roller instance.
- */
- public void release() {
- super.release();
- }
-
- /**
- * Shutdown.
- */
- public void shutdown() {
- super.shutdown();
- }
-
- /**
- * Create an instance of PlanetManager.
- * @param strategy the PersistenceStrategy
- * @return the PlanetManager
- */
- protected PlanetManager createPlanetManagerImpl(DatamapperPersistenceStrategy strategy) {
+ logger.debug("Instantiating DatamapperRollerImpl");
+ return new JDORollerImpl();
}
+
}