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=diff&rev=551059&r1=551058&r2=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=diff&rev=551059&r1=551058&r2=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 @@ public void testGetEntriesByTag() throws Exception { try { - WeblogManager mgr = RollerFactory.getRoller().getWeblogManager(); + WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager(); // setup some test entries to use testWeblog = TestUtils.getManagedWebsite(testWeblog); @@ -574,7 +574,7 @@ public void testRemoveEntryTagCascading() throws Exception { - WeblogManager mgr = RollerFactory.getRoller().getWeblogManager(); + WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager(); // setup some test entries to use testWeblog = TestUtils.getManagedWebsite(testWeblog); @@ -608,7 +608,7 @@ public void testUpdateTags() throws Exception { - WeblogManager mgr = RollerFactory.getRoller().getWeblogManager(); + WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager(); // setup some test entries to use testWeblog = TestUtils.getManagedWebsite(testWeblog); @@ -658,7 +658,7 @@ */ public void testUpdateTagTime() throws Exception { - WeblogManager mgr = RollerFactory.getRoller().getWeblogManager(); + WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager(); // setup some test entries to use testWeblog = TestUtils.getManagedWebsite(testWeblog); @@ -714,7 +714,7 @@ public void testTagAggregates() throws Exception { log.info("BEGIN"); - WeblogManager mgr = RollerFactory.getRoller().getWeblogManager(); + WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager(); testWeblog = TestUtils.getManagedWebsite(testWeblog); testUser = TestUtils.getManagedUser(testUser); @@ -873,7 +873,7 @@ testWeblog = TestUtils.getManagedWebsite(testWeblog); testUser = TestUtils.getManagedUser(testUser); - WeblogManager mgr = RollerFactory.getRoller().getWeblogManager(); + WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager(); // let's make sure we are starting from scratch @@ -962,8 +962,8 @@ public void testWeblogStats() throws Exception { - WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager(); - UserManager umgr = RollerFactory.getRoller().getUserManager(); + WeblogManager wmgr = WebloggerFactory.getRoller().getWeblogManager(); + UserManager umgr = WebloggerFactory.getRoller().getUserManager(); User user1 = TestUtils.setupUser("statuser1"); Weblog blog1 = TestUtils.setupWeblog("statblog1", user1); Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java?view=diff&rev=551059&r1=551058&r2=551059 ============================================================================== --- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java (original) +++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java Tue Jun 26 22:52:00 2007 @@ -25,7 +25,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.roller.weblogger.TestUtils; -import org.apache.roller.weblogger.business.RollerFactory; +import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.UserManager; import org.apache.roller.weblogger.pojos.User; import org.apache.roller.weblogger.pojos.WeblogTemplate; @@ -102,7 +102,7 @@ */ public void testTemplateCRUD() throws Exception { - UserManager mgr = RollerFactory.getRoller().getUserManager(); + UserManager mgr = WebloggerFactory.getRoller().getUserManager(); WeblogTemplate template = null; // create template @@ -145,7 +145,7 @@ */ public void testPermissionsLookups() throws Exception { - UserManager mgr = RollerFactory.getRoller().getUserManager(); + UserManager mgr = WebloggerFactory.getRoller().getUserManager(); WeblogTemplate page = null; // create page Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java?view=diff&rev=551059&r1=551058&r2=551059 ============================================================================== --- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java (original) +++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java Tue Jun 26 22:52:00 2007 @@ -4,7 +4,7 @@ import java.util.Map; import junit.framework.TestCase; import org.apache.roller.weblogger.TestUtils; -import org.apache.roller.weblogger.business.RollerFactory; +import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.UserManager; import org.apache.roller.weblogger.business.WeblogManager; import org.apache.roller.weblogger.pojos.WeblogEntryComment; @@ -54,7 +54,7 @@ TestUtils.endSession(true); } public void testGetMostCommentedWeblogs() throws Exception { - UserManager mgr = RollerFactory.getRoller().getUserManager(); + UserManager mgr = WebloggerFactory.getRoller().getUserManager(); List list = mgr.getMostCommentedWebsites(null, null, 0, -1); assertNotNull(list); @@ -72,7 +72,7 @@ } public void testGetMostCommentedWeblogEntries() throws Exception { - WeblogManager mgr = RollerFactory.getRoller().getWeblogManager(); + WeblogManager mgr = WebloggerFactory.getRoller().getWeblogManager(); List list = mgr.getMostCommentedWeblogEntries(null, null, null, 0, -1); assertNotNull(list); @@ -88,14 +88,14 @@ assertEquals(1L, s2.getCount()); } public void testGetUserNameLetterMap() throws Exception { - UserManager mgr = RollerFactory.getRoller().getUserManager(); + UserManager mgr = WebloggerFactory.getRoller().getUserManager(); Map map = mgr.getUserNameLetterMap(); assertNotNull(map.get("a")); assertNotNull(map.get("b")); assertNull(map.get("c")); } public void testGetWeblogLetterMap() throws Exception { - UserManager mgr = RollerFactory.getRoller().getUserManager(); + UserManager mgr = WebloggerFactory.getRoller().getUserManager(); Map map = mgr.getWeblogHandleLetterMap(); assertNotNull(map.get("a")); assertNotNull(map.get("b")); Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogTest.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogTest.java?view=diff&rev=551059&r1=551058&r2=551059 ============================================================================== --- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogTest.java (original) +++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogTest.java Tue Jun 26 22:52:00 2007 @@ -24,7 +24,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.roller.weblogger.TestUtils; -import org.apache.roller.weblogger.business.RollerFactory; +import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.business.UserManager; import org.apache.roller.weblogger.pojos.StatCount; import org.apache.roller.weblogger.pojos.User; @@ -97,7 +97,7 @@ try { - UserManager mgr = RollerFactory.getRoller().getUserManager(); + UserManager mgr = WebloggerFactory.getRoller().getUserManager(); Weblog weblog = null; Weblog testWeblog = new Weblog(); @@ -167,7 +167,7 @@ Weblog testWeblog1 = null; Weblog testWeblog2 = null; try { - UserManager mgr = RollerFactory.getRoller().getUserManager(); + UserManager mgr = WebloggerFactory.getRoller().getUserManager(); Weblog weblog = null; // add test weblogs Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java?view=diff&rev=551059&r1=551058&r2=551059 ============================================================================== --- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java (original) +++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java Tue Jun 26 22:52:00 2007 @@ -41,7 +41,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.roller.weblogger.TestUtils; -import org.apache.roller.weblogger.business.RollerFactory; +import org.apache.roller.weblogger.business.WebloggerFactory; import org.apache.roller.weblogger.pojos.User; import org.apache.roller.weblogger.pojos.WeblogEntry; import org.apache.roller.weblogger.pojos.Weblog; @@ -174,7 +174,7 @@ testEntry1.setWebsite(testWeblog); testEntry1.setCreator(testUser); testEntry1.setCategory(testWeblog.getDefaultCategory()); - RollerFactory.getRoller().getWeblogManager().saveWeblogEntry(testEntry1); + WebloggerFactory.getRoller().getWeblogManager().saveWeblogEntry(testEntry1); WeblogEntry testEntry2 = new WeblogEntry(); testEntry2.setTitle("entryTestEntry2"); @@ -186,7 +186,7 @@ testEntry2.setWebsite(testWeblog); testEntry2.setCreator(testUser); testEntry2.setCategory(testWeblog.getDefaultCategory()); - RollerFactory.getRoller().getWeblogManager().saveWeblogEntry(testEntry1); + WebloggerFactory.getRoller().getWeblogManager().saveWeblogEntry(testEntry1); WeblogEntry testEntry3 = new WeblogEntry(); testEntry3.setTitle("entryTestEntry3"); @@ -198,7 +198,7 @@ testEntry3.setWebsite(testWeblog); testEntry3.setCreator(testUser); testEntry3.setCategory(testWeblog.getDefaultCategory()); - RollerFactory.getRoller().getWeblogManager().saveWeblogEntry(testEntry1); + WebloggerFactory.getRoller().getWeblogManager().saveWeblogEntry(testEntry1); TestUtils.endSession(true); Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/footer.jsp URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/footer.jsp?view=diff&rev=551059&r1=551058&r2=551059 ============================================================================== --- roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/footer.jsp (original) +++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/footer.jsp Tue Jun 26 22:52:00 2007 @@ -18,7 +18,7 @@ <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> Powered by <a href="http://www.rollerweblogger.org";>Apache Roller</a> -<%= org.apache.roller.weblogger.business.RollerFactory.getRoller().getVersion() %> | +<%= org.apache.roller.weblogger.business.WebloggerFactory.getRoller().getVersion() %> | <a href="http://opensource2.atlassian.com/projects/roller/";> <s:text name="footer.reportIssue" /></a> | Modified: roller/trunk/apps/weblogger/web/roller-ui/login-redirect.jsp URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/roller-ui/login-redirect.jsp?view=diff&rev=551059&r1=551058&r2=551059 ============================================================================== --- roller/trunk/apps/weblogger/web/roller-ui/login-redirect.jsp (original) +++ roller/trunk/apps/weblogger/web/roller-ui/login-redirect.jsp Tue Jun 26 22:52:00 2007 @@ -22,7 +22,7 @@ <%@ page import="java.util.List" %> <% User user = RollerSession.getRollerSession(request).getAuthenticatedUser(); -List websites = RollerFactory.getRoller().getUserManager().getWebsites(user, Boolean.TRUE, null, null, null, 0, Integer.MAX_VALUE); +List websites = WebloggerFactory.getRoller().getUserManager().getWebsites(user, Boolean.TRUE, null, null, null, 0, Integer.MAX_VALUE); if (websites.size() == 1) { Weblog website = (Weblog) websites.get(0);
