You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/04/08 00:09:52 UTC

svn commit: r526492 [3/4] - in /incubator/roller/branches/roller_4.0_newbackend: ./ apps/planet/ apps/planet/src/java/org/apache/roller/planet/business/ apps/planet/src/java/org/apache/roller/planet/business/datamapper/ apps/planet/src/java/org/apache/...

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.java Sat Apr  7 15:09:45 2007
@@ -30,7 +30,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
-import java.util.TreeMap;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
@@ -39,13 +38,11 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.business.themes.ThemeNotFoundException;
 import org.apache.roller.config.RollerRuntimeConfig;
 import org.apache.roller.business.BookmarkManager;
 import org.apache.roller.business.PluginManager;
 import org.apache.roller.business.Roller;
 import org.apache.roller.business.themes.ThemeManager;
-import org.apache.roller.business.UserManager;
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.util.UUIDGenerator;
 
@@ -188,48 +185,26 @@
     /**
      * Get the Theme object in use by this weblog, or null if no theme selected.
      */
-    public Theme getTheme() throws RollerException {
+    public WeblogTheme getTheme() throws RollerException {
         
-        // if theme is custom or null then just return null
-        if(getEditorTheme() == null || Theme.CUSTOM.equals(getEditorTheme())) {
-            return null;
-        } else {
-            try {
-                ThemeManager themeMgr = RollerFactory.getRoller().getThemeManager();
-                return themeMgr.getTheme(getEditorTheme());
-            } catch(ThemeNotFoundException tnfe) {
-                // i sure hope not!
-                log.error("Unable to find theme = "+getEditorTheme(), tnfe);
-                return null;
-            }
-        }
+        // let the ThemeManager handle it
+        ThemeManager themeMgr = RollerFactory.getRoller().getThemeManager();
+        return themeMgr.getTheme(this);
     }
     
     
     /**
      * Lookup the default page for this website.
      */
-    public Template getDefaultPage() throws RollerException {
+    public ThemeTemplate getDefaultPage() throws RollerException {
         
-        Template template = null;
-        
-        // first check if this user has selected a theme
-        // if so then return the themes Weblog template
+        // look for the page in our Theme
         Theme weblogTheme = getTheme();
         if(weblogTheme != null) {
-            template = weblogTheme.getTemplateByAction(Template.ACTION_WEBLOG);
+            return weblogTheme.getDefaultTemplate();
         }
         
-        // if we didn't get the Template from a theme then look in the db
-        if(template == null) {
-            UserManager userMgr = RollerFactory.getRoller().getUserManager();
-            template = userMgr.getPage(this.defaultPageId);
-        }
-        
-        if(template != null)
-            log.debug("returning default template id ["+template.getId()+"]");
-        
-        return template;
+        return null;
     }
     
     
@@ -238,33 +213,18 @@
      * 
      * @roller.wrapPojoMethod type="pojo"
      */
-    public Template getPageByAction(String action) throws RollerException {
+    public ThemeTemplate getPageByAction(String action) throws RollerException {
         
         if(action == null)
             return null;
         
-        log.debug("looking up template for action ["+action+"]");
-        
-        Template template = null;
-        
-        // first check if this user has selected a theme
-        // if so then return the proper theme template
+        // look for the page in our Theme
         Theme weblogTheme = getTheme();
         if(weblogTheme != null) {
-            template = weblogTheme.getTemplateByAction(action);
-        } else {
-        
-            // NOTE: we specifically do *NOT* return templates by action from the
-            // weblog's custom templates if the weblog is using a theme because we
-            // don't want old templates to take effect when using a specific theme
-            UserManager userMgr = RollerFactory.getRoller().getUserManager();
-            template = userMgr.getPageByAction(this, action);
+            return weblogTheme.getTemplateByAction(action);
         }
-
-        if(template != null)
-            log.debug("returning template ["+template.getId()+"]");
         
-        return template;
+        return null;
     }
     
     
@@ -272,32 +232,18 @@
      * Lookup a Template for this website by name.
      * @roller.wrapPojoMethod type="pojo"
      */
-    public Template getPageByName(String name) throws RollerException {
+    public ThemeTemplate getPageByName(String name) throws RollerException {
         
         if(name == null)
             return null;
         
-        log.debug("looking up template ["+name+"]");
-        
-        Template template = null;
-        
-        // first check if this user has selected a theme
-        // if so then return the proper theme template
+        // look for the page in our Theme
         Theme weblogTheme = getTheme();
         if(weblogTheme != null) {
-            template = weblogTheme.getTemplate(name);
-        }
-        
-        // if we didn't get the Template from a theme then look in the db
-        if(template == null) {
-            UserManager userMgr = RollerFactory.getRoller().getUserManager();
-            template = userMgr.getPageByName(this, name);
+            return weblogTheme.getTemplateByName(name);
         }
         
-        if(template != null)
-            log.debug("returning template ["+template.getId()+"]");
-        
-        return template;
+        return null;
     }
     
     
@@ -305,32 +251,18 @@
      * Lookup a template for this website by link.
      * @roller.wrapPojoMethod type="pojo"
      */
-    public Template getPageByLink(String link) throws RollerException {
+    public ThemeTemplate getPageByLink(String link) throws RollerException {
         
         if(link == null)
             return null;
         
-        log.debug("looking up template ["+link+"]");
-        
-        Template template = null;
-        
-        // first check if this user has selected a theme
-        // if so then return the proper theme template
+        // look for the page in our Theme
         Theme weblogTheme = getTheme();
         if(weblogTheme != null) {
-            template = weblogTheme.getTemplateByLink(link);
+            return weblogTheme.getTemplateByLink(link);
         }
         
-        // if we didn't get the Template from a theme then look in the db
-        if(template == null) {
-            UserManager userMgr = RollerFactory.getRoller().getUserManager();
-            template = userMgr.getPageByLink(this, link);
-        }
-        
-        if(template != null)
-            log.debug("returning template ["+template.getId()+"]");
-        
-        return template;
+        return null;
     }
     
     
@@ -338,45 +270,15 @@
      * Get a list of all pages that are part of this website.
      * @roller.wrapPojoMethod type="pojo-collection" class="org.apache.roller.pojos.Template"
      */
-    public List getPages() {
+    public List getPages() throws RollerException {
         
-        Map pages = new TreeMap();
-        
-        // first get the pages from the db
-        try {
-            Template template = null;
-            UserManager userMgr = RollerFactory.getRoller().getUserManager();
-            Iterator dbPages = userMgr.getPages(this).iterator();
-            while(dbPages.hasNext()) {
-                template = (Template) dbPages.next();
-                pages.put(template.getName(), template);
-            }
-        } catch(Exception e) {
-            // db error
-            log.error(e);
-        }
-        
-        
-        // now get theme pages if needed and put them in place of db pages
-        try {
-            Theme weblogTheme = getTheme();
-            if(weblogTheme != null) {
-                Template template = null;
-                Iterator themePages = weblogTheme.getTemplates().iterator();
-                while(themePages.hasNext()) {
-                    template = (Template) themePages.next();
-                    
-                    // note that this will put theme pages over custom
-                    // pages in the pages list, which is what we want
-                    pages.put(template.getName(), template);
-                }
-            }
-        } catch(Exception e) {
-            // how??
-            log.error(e);
+        // look for the pages in our Theme
+        Theme weblogTheme = getTheme();
+        if(weblogTheme != null) {
+            return weblogTheme.getTemplates();
         }
         
-        return new ArrayList(pages.values());
+        return Collections.EMPTY_LIST;
     }
     
     

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/TemplateWrapper.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/TemplateWrapper.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/TemplateWrapper.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/TemplateWrapper.java Sat Apr  7 15:09:45 2007
@@ -18,24 +18,24 @@
 
 package org.apache.roller.pojos.wrapper;
 
-import org.apache.roller.pojos.Template;
+import org.apache.roller.pojos.ThemeTemplate;
 
 
 /**
- * Generated wrapper for class: org.apache.roller.pojos.Template
+ * Generated wrapper for class: org.apache.roller.pojos.ThemeTemplate
  */
 public class TemplateWrapper {
 
     // keep a reference to the wrapped pojo
-    private Template pojo = null;
+    private ThemeTemplate pojo = null;
 
     // this is private so that we can force the use of the .wrap(pojo) method
-    private TemplateWrapper(Template toWrap) {
+    private TemplateWrapper(ThemeTemplate toWrap) {
         this.pojo = toWrap;
     }
 
     // wrap the given pojo if it is not null
-    public static TemplateWrapper wrap(Template toWrap) {
+    public static TemplateWrapper wrap(ThemeTemplate toWrap) {
         if(toWrap != null)
             return new TemplateWrapper(toWrap);
 
@@ -128,7 +128,7 @@
      * because some parts of the rendering process still need the
      * orginal pojo object
      */
-    public org.apache.roller.pojos.Template getPojo() {
+    public org.apache.roller.pojos.ThemeTemplate getPojo() {
         return this.pojo;
     }
 

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/WebsiteDataWrapper.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/WebsiteDataWrapper.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/WebsiteDataWrapper.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/WebsiteDataWrapper.java Sat Apr  7 15:09:45 2007
@@ -82,6 +82,7 @@
      * each pojo that is part of the collection.
      */
     public java.util.List getPages()
+        throws org.apache.roller.RollerException
     {
         java.util.List initialCollection = this.pojo.getPages();
 
@@ -92,7 +93,7 @@
         java.util.Iterator it = initialCollection.iterator();
         int i = 0;
         while(it.hasNext()) {
-            wrappedCollection.add(i, org.apache.roller.pojos.wrapper.TemplateWrapper.wrap((org.apache.roller.pojos.Template) it.next()));
+            wrappedCollection.add(i, org.apache.roller.pojos.wrapper.TemplateWrapper.wrap((org.apache.roller.pojos.ThemeTemplate) it.next()));
             i++;
         }
 

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java Sat Apr  7 15:09:45 2007
@@ -43,7 +43,7 @@
 import org.apache.roller.ui.authoring.struts.formbeans.ImportEntriesForm;
 import org.apache.commons.lang.StringUtils;
 import org.apache.roller.business.FileManager;
-import org.apache.roller.pojos.WeblogResource;
+import org.apache.roller.pojos.ThemeResource;
 
 /**
  * TODO: revisit this class once Atom 1.0 support comes to Rome
@@ -84,7 +84,7 @@
 
                     // load selected file
                     FileManager fMgr = RollerFactory.getRoller().getFileManager();
-                    WeblogResource f = fMgr.getFile(website, form.getImportFileName());
+                    ThemeResource f = fMgr.getFile(website, form.getImportFileName());
 
                     //ArchiveParser archiveParser =
                         //new ArchiveParser(RollerFactory.getRoller(), rreq.getWebsite(), f);

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java Sat Apr  7 15:09:45 2007
@@ -18,6 +18,7 @@
 package org.apache.roller.ui.authoring.struts.actions;
 
 import java.io.IOException;
+import java.util.Date;
 import java.util.List;
 
 import javax.servlet.ServletException;
@@ -39,7 +40,11 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.themes.ThemeManager;
 import org.apache.roller.business.UserManager;
+import org.apache.roller.business.themes.SharedTheme;
 import org.apache.roller.pojos.Theme;
+import org.apache.roller.pojos.ThemeResource;
+import org.apache.roller.pojos.ThemeTemplate;
+import org.apache.roller.pojos.WeblogTheme;
 import org.apache.roller.pojos.WebsiteData;
 import org.apache.roller.ui.core.BasePageModel;
 import org.apache.roller.ui.core.RollerRequest;
@@ -109,16 +114,7 @@
                 String username = rses.getAuthenticatedUser().getUserName();
                 List themes = themeMgr.getEnabledThemesList();
                 
-                // TODO: hack to make 'custom' an actual Theme object
-                // maybe there should be an actual Theme representing custom themes?
-                Theme currentTheme = null;
-                if(Theme.CUSTOM.equals(website.getEditorTheme())) {
-                    currentTheme = new Theme();
-                    currentTheme.setId(Theme.CUSTOM);
-                    currentTheme.setName(Theme.CUSTOM);
-                } else {
-                    currentTheme = website.getTheme();
-                }
+                Theme currentTheme = website.getTheme();
                 
                 // this checks if the website has a default page template
                 // if not then we don't allow for a custom theme
@@ -186,16 +182,7 @@
                 String username = rses.getAuthenticatedUser().getUserName();
                 List themes = themeMgr.getEnabledThemesList();
                 
-                // TODO: hack to make 'custom' an actual Theme object
-                // maybe there should be an actual Theme representing custom themes?
-                Theme currentTheme = null;
-                if(Theme.CUSTOM.equals(website.getEditorTheme())) {
-                    currentTheme = new Theme();
-                    currentTheme.setId(Theme.CUSTOM);
-                    currentTheme.setName(Theme.CUSTOM);
-                } else {
-                    currentTheme = website.getTheme();
-                }
+                Theme currentTheme = website.getTheme();
                 
                 // this checks if the website has a default page template
                 // if not then we don't allow for a custom theme
@@ -232,11 +219,9 @@
 
                 } catch(ThemeNotFoundException tnfe) {
                     // hmm ... maybe they chose "custom"?
-                    if(theme != null && theme.equals(Theme.CUSTOM)) {
+                    if(theme != null && theme.equals(WeblogTheme.CUSTOM)) {
                         // TODO: total hack, this needs fixing
-                        Theme customTheme = new Theme();
-                        customTheme.setId(Theme.CUSTOM);
-                        customTheme.setName(Theme.CUSTOM);
+                        Theme customTheme = new WorkaroundCustomTheme();
                         request.setAttribute("previewTheme", customTheme);
                     } else {
                         // we should never get here
@@ -303,8 +288,8 @@
                     
                 } catch(ThemeNotFoundException tnfe) {
                     // possibly selected "custom"
-                    if(theme != null && theme.equals(Theme.CUSTOM)) {
-                        newTheme = Theme.CUSTOM;
+                    if(theme != null && theme.equals(WeblogTheme.CUSTOM)) {
+                        newTheme = WeblogTheme.CUSTOM;
                     } else {
                         // hmm ... that's weird
                         mLogger.warn(tnfe);
@@ -388,7 +373,7 @@
                 String username = rses.getAuthenticatedUser().getUserName();
                 
                 try {
-                    Theme usersTheme = website.getTheme();
+                    SharedTheme usersTheme = themeMgr.getTheme(website.getEditorTheme());
                     
                     // only if custom themes are allowed
                     if(RollerRuntimeConfig.getBooleanProperty("themes.customtheme.allowed")) {
@@ -434,4 +419,47 @@
     }
     
     
+    class WorkaroundCustomTheme implements Theme {
+        
+        public String getId() {
+            return WeblogTheme.CUSTOM;
+        }
+        
+        public String getName() {
+            return WeblogTheme.CUSTOM;
+        }
+        
+        public String getDescription() {
+            return WeblogTheme.CUSTOM;
+        }
+        
+        public String getAuthor() {
+            return WeblogTheme.CUSTOM;
+        }
+        
+        public String getCustomStylesheet() {
+            return null;
+        }
+        
+        public Date getLastModified() {
+            return null;
+        }
+        
+        public boolean isEnabled() {
+            return true;
+        }
+        
+        public List getTemplates() throws RollerException { return null; }
+        
+        public ThemeTemplate getDefaultTemplate() throws RollerException { return null; }
+        
+        public ThemeTemplate getTemplateByAction(String action) throws RollerException { return null; }
+        
+        public ThemeTemplate getTemplateByName(String name) throws RollerException { return null; }
+        
+        public ThemeTemplate getTemplateByLink(String link) throws RollerException { return null; }
+        
+        public ThemeResource getResource(String path) { return null; }
+    }
+
 }

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java Sat Apr  7 15:09:45 2007
@@ -18,14 +18,12 @@
 
 package org.apache.roller.ui.authoring.struts.actions;
 
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
-import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
@@ -47,14 +45,13 @@
 import org.apache.roller.business.FileManager;
 import org.apache.roller.business.Roller;
 import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.WeblogResource;
+import org.apache.roller.pojos.ThemeResource;
 import org.apache.roller.pojos.WebsiteData;
 import org.apache.roller.ui.core.BasePageModel;
 import org.apache.roller.ui.core.RollerRequest;
 import org.apache.roller.ui.core.RollerSession;
 import org.apache.roller.ui.authoring.struts.formbeans.UploadFileForm;
 import org.apache.roller.ui.core.RequestConstants;
-import org.apache.roller.util.RollerMessages;
 import org.apache.roller.util.URLUtilities;
 
 
@@ -447,7 +444,7 @@
             uploadEnabled = RollerRuntimeConfig.getBooleanProperty("uploads.enabled");
             
             // get files, add them to the list
-            WeblogResource[] resources = fmgr.getFiles(weblog, uploadsPath);
+            ThemeResource[] resources = fmgr.getFiles(weblog, uploadsPath);
             for (int i=0; i<resources.length; i++) {
                 totalSize += resources[i].getLength();
             }
@@ -455,7 +452,7 @@
             
             // get directories, only if we are at the default/root view
             if(showingRoot) {
-                WeblogResource[] dirs = fmgr.getDirectories(weblog);
+                ThemeResource[] dirs = fmgr.getDirectories(weblog);
                 files.addAll(Arrays.asList(dirs));
             }
             
@@ -502,8 +499,8 @@
     
     public class WeblogResourceComparator implements Comparator {
         public int compare(Object o1, Object o2) {
-            WeblogResource r1 = (WeblogResource)o1;
-            WeblogResource r2 = (WeblogResource)o2;
+            ThemeResource r1 = (ThemeResource)o1;
+            ThemeResource r2 = (ThemeResource)o2;
             
             // consider directories so they go to the top of the list
             if(r1.isDirectory() && r2.isDirectory()) {
@@ -521,8 +518,8 @@
             }
         }
         public boolean equals(Object o1, Object o2) {
-            WeblogResource r1 = (WeblogResource)o1;
-            WeblogResource r2 = (WeblogResource)o2;
+            ThemeResource r1 = (ThemeResource)o1;
+            ThemeResource r2 = (ThemeResource)o2;
             
             // need to be same type to be equals, i.e both files or directories
             if((r1.isDirectory() && !r2.isDirectory()) ||

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java Sat Apr  7 15:09:45 2007
@@ -20,8 +20,6 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
@@ -39,9 +37,9 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.UserManager;
 import org.apache.roller.config.RollerConfig;
-import org.apache.roller.pojos.Theme;
 import org.apache.roller.pojos.UserData;
 import org.apache.roller.pojos.WeblogTemplate;
+import org.apache.roller.pojos.WeblogTheme;
 import org.apache.roller.pojos.WebsiteData;
 import org.apache.roller.ui.authoring.struts.formbeans.WeblogTemplateFormEx;
 import org.apache.roller.ui.core.BasePageModel;
@@ -235,7 +233,7 @@
             List availableActions = new ArrayList();
             availableActions.add(WeblogTemplate.ACTION_CUSTOM);
             
-            if(Theme.CUSTOM.equals(website.getEditorTheme())) {
+            if(WeblogTheme.CUSTOM.equals(website.getEditorTheme())) {
                 // if the weblog is using a custom theme then determine which
                 // action templates are still available to be created
                 availableActions.add(WeblogTemplate.ACTION_PERMALINK);

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/RollerRequest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/RollerRequest.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/RollerRequest.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/RollerRequest.java Sat Apr  7 15:09:45 2007
@@ -35,12 +35,11 @@
 import org.apache.roller.config.RollerRuntimeConfig;
 import org.apache.roller.business.Roller;
 import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.Template;
 import org.apache.roller.business.UserManager;
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.pojos.BookmarkData;
 import org.apache.roller.pojos.FolderData;
-import org.apache.roller.pojos.UserData;
+import org.apache.roller.pojos.ThemeTemplate;
 import org.apache.roller.pojos.WeblogCategoryData;
 import org.apache.roller.pojos.WeblogEntryData;
 import org.apache.roller.pojos.WebsiteData;
@@ -81,7 +80,7 @@
     private String             mDateString = null;
     private String             mPathInfo = null; 
     private String             mPageLink = null;
-    private Template           mPage;
+    private ThemeTemplate      mPage = null;
     private PageContext        mPageContext = null;
     private HttpServletRequest mRequest = null;
     private WebsiteData        mWebsite;
@@ -651,7 +650,7 @@
      * Gets the WeblogTemplate specified by the request, or null.
      * @return WeblogTemplate
      */
-    public Template getPage()
+    public ThemeTemplate getPage()
     {
         if (mPage == null)
         {
@@ -675,7 +674,7 @@
     /**
      * Allow comment servlet to inject page that it has chosen.
      */
-    public void setPage(org.apache.roller.pojos.Template page) 
+    public void setPage(org.apache.roller.pojos.ThemeTemplate page) 
     {
         mPage = page;
     }

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/PlanetModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/PlanetModel.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/PlanetModel.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/PlanetModel.java Sat Apr  7 15:09:45 2007
@@ -25,11 +25,12 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.planet.business.Planet;
 import org.apache.roller.planet.business.PlanetFactory;
 import org.apache.roller.planet.business.PlanetManager;
+import org.apache.roller.planet.pojos.PlanetData;
+import org.apache.roller.planet.pojos.PlanetGroupData;
 import org.apache.roller.planet.pojos.PlanetSubscriptionData;
-import org.apache.roller.pojos.Template;
+import org.apache.roller.pojos.ThemeTemplate;
 import org.apache.roller.pojos.WebsiteData;
 import org.apache.roller.ui.rendering.pagers.Pager;
 import org.apache.roller.ui.rendering.pagers.PlanetEntriesPager;
@@ -64,7 +65,7 @@
         }
         
         if (weblogRequest instanceof WeblogPageRequest) {
-            Template weblogPage = ((WeblogPageRequest)weblogRequest).getWeblogPage();
+            ThemeTemplate weblogPage = ((WeblogPageRequest)weblogRequest).getWeblogPage();
             pageLink = (weblogPage != null) ? weblogPage.getLink() : null;
             pageNum = ((WeblogPageRequest)weblogRequest).getPageNum();
         }  
@@ -165,7 +166,9 @@
         List list = new ArrayList();
         try {
             PlanetManager planetManager = PlanetFactory.getPlanet().getPlanetManager();
-            List subs = planetManager.getTopSubscriptions(groupHandle, 0, length);
+            PlanetData defaultPlanet = planetManager.getPlanet("default");
+            PlanetGroupData planetGroup = planetManager.getGroup(defaultPlanet, groupHandle);
+            List subs = planetManager.getTopSubscriptions(planetGroup, 0, length);
             for (Iterator it = subs.iterator(); it.hasNext();) {
                 PlanetSubscriptionData sub = (PlanetSubscriptionData) it.next();
                 // TODO needs pojo wrapping from planet

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/SiteModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/SiteModel.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/SiteModel.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/SiteModel.java Sat Apr  7 15:09:45 2007
@@ -36,7 +36,7 @@
 import org.apache.roller.pojos.HitCountData;
 import org.apache.roller.pojos.PermissionsData;
 import org.apache.roller.pojos.StatCount;
-import org.apache.roller.pojos.Template;
+import org.apache.roller.pojos.ThemeTemplate;
 import org.apache.roller.pojos.UserData;
 import org.apache.roller.pojos.WeblogEntryData;
 import org.apache.roller.pojos.WebsiteData;
@@ -82,7 +82,7 @@
         }
         
         if (weblogRequest instanceof WeblogPageRequest) {
-            Template weblogPage = ((WeblogPageRequest)weblogRequest).getWeblogPage();
+            ThemeTemplate weblogPage = ((WeblogPageRequest)weblogRequest).getWeblogPage();
             pageLink = (weblogPage != null) ? weblogPage.getLink() : null;
             pageNum = ((WeblogPageRequest)weblogRequest).getPageNum();
             tags = ((WeblogPageRequest)weblogRequest).getTags();

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java Sat Apr  7 15:09:45 2007
@@ -29,7 +29,6 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.pojos.CommentData;
-import org.apache.roller.pojos.Template;
 import org.apache.roller.pojos.WebsiteData;
 import org.apache.roller.pojos.wrapper.CommentDataWrapper;
 

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java Sat Apr  7 15:09:45 2007
@@ -20,16 +20,18 @@
 
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.planet.business.Planet;
 import org.apache.roller.planet.business.PlanetFactory;
 import org.apache.roller.planet.business.PlanetManager;
+import org.apache.roller.planet.pojos.PlanetData;
 import org.apache.roller.planet.pojos.PlanetEntryData;
 import org.apache.roller.planet.pojos.PlanetGroupData;
+import org.apache.roller.planet.pojos.PlanetSubscriptionData;
 
 
 /**
@@ -94,12 +96,20 @@
                 
                 List rawEntries = null;
                 if (feedURL != null) {
-                    rawEntries = planetManager.getFeedEntries(feedURL, offset, length+1);
+                    PlanetSubscriptionData sub = planetManager.getSubscription(feedURL);
+                    rawEntries = planetManager.getEntries(sub, offset, length+1);
                 } else if (groupHandle != null) {
-                    PlanetGroupData group = planetManager.getGroup(groupHandle);
-                    rawEntries = planetManager.getAggregation(group, startDate, null, offset, length+1);
+                    PlanetData planet = planetManager.getPlanet("default");
+                    PlanetGroupData group = planetManager.getGroup(planet, groupHandle);
+                    rawEntries = planetManager.getEntries(Collections.singletonList(group), startDate, null, offset, length+1);
                 } else {
-                    rawEntries = planetManager.getAggregation(startDate, null, offset, length+1);
+                    PlanetData planet = planetManager.getPlanet("default");
+                    PlanetGroupData groupAll = planetManager.getGroup(planet, "all");
+                    PlanetGroupData groupDefault = planetManager.getGroup(planet, "default");
+                    List groups = new ArrayList();
+                    groups.add(groupAll);
+                    groups.add(groupDefault);
+                    rawEntries = planetManager.getEntries(groups, startDate, null, offset, length+1);
                 }
                 
                 // check if there are more results for paging

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesListPager.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesListPager.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesListPager.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesListPager.java Sat Apr  7 15:09:45 2007
@@ -29,7 +29,6 @@
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.UserManager;
 import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.Template;
 import org.apache.roller.pojos.UserData;
 import org.apache.roller.pojos.WeblogEntryData;
 import org.apache.roller.pojos.WebsiteData;

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java Sat Apr  7 15:09:45 2007
@@ -84,7 +84,7 @@
             
             Pattern[] tempP = new Pattern[SmileysPlugin.smileyDefs.size()];
             String[] tempS = new String[SmileysPlugin.smileyDefs.size()];
-            //System.out.println("# smileys: " + smileyDefs.size());
+            System.out.println("# smileys: " + smileyDefs.size());
             int count = 0;
             Enumeration enum1 = SmileysPlugin.smileyDefs.propertyNames();
             while(enum1.hasMoreElements()) {
@@ -97,7 +97,7 @@
                         "\" class=\"smiley\"" +
                         " alt=\"" + smileyAlt + "\"" +
                         " title=\"" + smileyAlt +"\" />";
-                //System.out.println(smiley + "=" + tempS[count]);
+                System.out.println(smiley + "=" + tempS[count]);
                 count++;
             }
             SmileysPlugin.smileyPatterns = tempP;

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java Sat Apr  7 15:09:45 2007
@@ -254,7 +254,7 @@
         Renderer renderer = null;
         try {
             log.debug("Looking up renderer");
-            Template template = new StaticTemplate(pageId, null, "velocity");
+            Template template = new StaticTemplate(pageId, "velocity");
             renderer = RendererManager.getRenderer(template);
         } catch(Exception e) {
             // nobody wants to render my content :(

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PageServlet.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PageServlet.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PageServlet.java Sat Apr  7 15:09:45 2007
@@ -41,8 +41,8 @@
 import org.apache.roller.config.RollerRuntimeConfig;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.StaticTemplate;
-import org.apache.roller.pojos.Template;
+import org.apache.roller.pojos.StaticThemeTemplate;
+import org.apache.roller.pojos.ThemeTemplate;
 import org.apache.roller.pojos.WeblogEntryData;
 import org.apache.roller.pojos.WebsiteData;
 import org.apache.roller.ui.core.RollerContext;
@@ -224,7 +224,7 @@
         
         
         // figure out what template to use
-        Template page = null;
+        ThemeTemplate page = null;
         
         // If this is a popup request, then deal with it specially
         // TODO: do we really need to keep supporting this?
@@ -238,7 +238,7 @@
             
             // User doesn't have one so return the default
             if(page == null) {
-                page = new StaticTemplate("templates/weblog/popupcomments.vm", null, "velocity");
+                page = new StaticThemeTemplate("templates/weblog/popupcomments.vm", "velocity");
             }
             
         // If request specified the page, then go with that
@@ -249,7 +249,7 @@
         } else if("tags".equals(pageRequest.getContext()) &&
                 pageRequest.getTags() == null) {
             try {
-                page = weblog.getPageByAction(Template.ACTION_TAGSINDEX);
+                page = weblog.getPageByAction(ThemeTemplate.ACTION_TAGSINDEX);
             } catch(Exception e) {
                 log.error("Error getting weblog page for action 'tagsIndex'", e);
             }
@@ -265,7 +265,7 @@
         // If this is a permalink then look for a permalink template
         } else if(pageRequest.getWeblogAnchor() != null) {
             try {
-                page = weblog.getPageByAction(Template.ACTION_PERMALINK);
+                page = weblog.getPageByAction(ThemeTemplate.ACTION_PERMALINK);
             } catch(Exception e) {
                 log.error("Error getting weblog page for action 'permalink'", e);
             }

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java Sat Apr  7 15:09:45 2007
@@ -30,10 +30,10 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
 import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.planet.business.Planet;
 import org.apache.roller.planet.business.PlanetFactory;
 import org.apache.roller.planet.business.PlanetManager;
-import org.apache.roller.business.RollerFactory;
+import org.apache.roller.planet.pojos.PlanetData;
+import org.apache.roller.planet.pojos.PlanetGroupData;
 import org.apache.roller.pojos.StaticTemplate;
 import org.apache.roller.pojos.Template;
 import org.apache.roller.ui.rendering.Renderer;
@@ -131,7 +131,8 @@
         try {
             // populate the rendering model
             if (request.getParameter("group") != null) {
-                model.put("group", planet.getGroup(request.getParameter("group")));
+                PlanetData planetObject = planet.getPlanet("default");
+                model.put("group", planet.getGroup(planetObject, request.getParameter("group")));
             }
             model.put("planet", planet);
             model.put("date", new Date());
@@ -167,7 +168,7 @@
         Renderer renderer = null;
         try {
             log.debug("Looking up renderer");
-            Template template = new StaticTemplate("templates/planet/planetrss.vm", null, "velocity");
+            Template template = new StaticTemplate("templates/planet/planetrss.vm", "velocity");
             renderer = RendererManager.getRenderer(template);
         } catch(Exception e) {
             // nobody wants to render my content :(

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PreviewResourceServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PreviewResourceServlet.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PreviewResourceServlet.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PreviewResourceServlet.java Sat Apr  7 15:09:45 2007
@@ -18,8 +18,6 @@
 
 package org.apache.roller.ui.rendering.servlets;
 
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -34,9 +32,9 @@
 import org.apache.roller.RollerException;
 import org.apache.roller.business.FileManager;
 import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.themes.ThemeManager;
 import org.apache.roller.pojos.Theme;
-import org.apache.roller.pojos.WeblogResource;
+import org.apache.roller.pojos.ThemeResource;
+import org.apache.roller.pojos.WeblogTheme;
 import org.apache.roller.pojos.WebsiteData;
 import org.apache.roller.ui.rendering.util.ModDateHeaderUtil;
 import org.apache.roller.ui.rendering.util.WeblogPreviewResourceRequest;
@@ -105,22 +103,22 @@
         // first, see if we have a preview theme to operate from
         if(resourceRequest.getThemeName() != null) {
             Theme theme = resourceRequest.getTheme();
-            File resource = theme.getResource(resourceRequest.getResourcePath());
+            ThemeResource resource = theme.getResource(resourceRequest.getResourcePath());
             if(resource != null) {
-                resourceLastMod = resource.lastModified();
-                resourceStream = new FileInputStream(resource);
+                resourceLastMod = resource.getLastModified();
+                resourceStream = resource.getInputStream();
             }
         }
         
         // second, see if resource comes from weblog's configured shared theme
         if(resourceStream == null) {
             try {
-                Theme weblogTheme = weblog.getTheme();
+                WeblogTheme weblogTheme = weblog.getTheme();
                 if(weblogTheme != null) {
-                    File resource = weblogTheme.getResource(resourceRequest.getResourcePath());
+                    ThemeResource resource = weblogTheme.getResource(resourceRequest.getResourcePath());
                     if(resource != null) {
-                        resourceLastMod = resource.lastModified();
-                        resourceStream = new FileInputStream(resource);
+                        resourceLastMod = resource.getLastModified();
+                        resourceStream = resource.getInputStream();
                     }
                 }
             } catch (Exception ex) {
@@ -134,7 +132,7 @@
         if(resourceStream == null) {
             try {
                 FileManager fileMgr = RollerFactory.getRoller().getFileManager();
-                WeblogResource resource = fileMgr.getFile(weblog, 
+                ThemeResource resource = fileMgr.getFile(weblog, 
                         resourceRequest.getResourcePath());
                 resourceLastMod = resource.getLastModified();
                 resourceStream = resource.getInputStream();

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java Sat Apr  7 15:09:45 2007
@@ -35,6 +35,7 @@
 import org.apache.roller.config.RollerRuntimeConfig;
 import org.apache.roller.pojos.Template;
 import org.apache.roller.pojos.Theme;
+import org.apache.roller.pojos.WeblogTheme;
 import org.apache.roller.pojos.WebsiteData;
 import org.apache.roller.ui.core.RollerContext;
 import org.apache.roller.util.cache.CachedContent;
@@ -107,8 +108,8 @@
         tmpWebsite.setData(weblog);
         if(previewTheme != null && previewTheme.isEnabled()) {
             tmpWebsite.setEditorTheme(previewTheme.getId());
-        } else if(Theme.CUSTOM.equals(previewRequest.getThemeName())) {
-            tmpWebsite.setEditorTheme(Theme.CUSTOM);
+        } else if(WeblogTheme.CUSTOM.equals(previewRequest.getThemeName())) {
+            tmpWebsite.setEditorTheme(WeblogTheme.CUSTOM);
         }
         
         // we've got to set the weblog in our previewRequest because that's

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java Sat Apr  7 15:09:45 2007
@@ -119,7 +119,7 @@
         Renderer renderer = null;
         try {
             log.debug("Looking up renderer");
-            Template template = new StaticTemplate("templates/weblog/rsd.vm", null, "velocity");
+            Template template = new StaticTemplate("templates/weblog/rsd.vm", "velocity");
             renderer = RendererManager.getRenderer(template);
         } catch(Exception e) {
             // nobody wants to render my content :(

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java Sat Apr  7 15:09:45 2007
@@ -34,9 +34,8 @@
 import org.apache.roller.RollerException;
 import org.apache.roller.business.FileManager;
 import org.apache.roller.business.RollerFactory;
-import org.apache.roller.business.themes.ThemeManager;
-import org.apache.roller.pojos.Theme;
-import org.apache.roller.pojos.WeblogResource;
+import org.apache.roller.pojos.ThemeResource;
+import org.apache.roller.pojos.WeblogTheme;
 import org.apache.roller.pojos.WebsiteData;
 import org.apache.roller.ui.rendering.util.ModDateHeaderUtil;
 import org.apache.roller.ui.rendering.util.WeblogResourceRequest;
@@ -105,12 +104,12 @@
         
         // first see if resource comes from weblog's shared theme
         try {
-            Theme weblogTheme = weblog.getTheme();
+            WeblogTheme weblogTheme = weblog.getTheme();
             if(weblogTheme != null) {
-                File resource = weblogTheme.getResource(resourceRequest.getResourcePath());
+                ThemeResource resource = weblogTheme.getResource(resourceRequest.getResourcePath());
                 if(resource != null) {
-                    resourceLastMod = resource.lastModified();
-                    resourceStream = new FileInputStream(resource);
+                    resourceLastMod = resource.getLastModified();
+                    resourceStream = resource.getInputStream();
                 }
             }
         } catch (Exception ex) {
@@ -123,7 +122,7 @@
         if(resourceStream == null) {
             try {
                 FileManager fileMgr = RollerFactory.getRoller().getFileManager();
-                WeblogResource resource = fileMgr.getFile(weblog, 
+                ThemeResource resource = fileMgr.getFile(weblog, 
                         resourceRequest.getResourcePath());
                 resourceLastMod = resource.getLastModified();
                 resourceStream = resource.getInputStream();

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/SearchServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/SearchServlet.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/SearchServlet.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/SearchServlet.java Sat Apr  7 15:09:45 2007
@@ -35,7 +35,7 @@
 import org.apache.roller.config.RollerRuntimeConfig;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.UserManager;
-import org.apache.roller.pojos.Template;
+import org.apache.roller.pojos.ThemeTemplate;
 import org.apache.roller.pojos.WebsiteData;
 import org.apache.roller.ui.rendering.Renderer;
 import org.apache.roller.ui.rendering.RendererManager;
@@ -96,10 +96,10 @@
         }
         
         // lookup template to use for rendering
-        Template page = null;
+        ThemeTemplate page = null;
         try {
             // first try looking for a specific search page
-            page = weblog.getPageByAction(Template.ACTION_SEARCH);
+            page = weblog.getPageByAction(ThemeTemplate.ACTION_SEARCH);
             
             // if not found then fall back on default page
             if(page == null) {

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/util/WeblogPageRequest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/util/WeblogPageRequest.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/util/WeblogPageRequest.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/util/WeblogPageRequest.java Sat Apr  7 15:09:45 2007
@@ -18,8 +18,6 @@
 
 package org.apache.roller.ui.rendering.util;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -29,12 +27,10 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
 import org.apache.roller.config.RollerConfig;
-import org.apache.roller.business.PropertiesManager;
-import org.apache.roller.business.Roller;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.UserManager;
 import org.apache.roller.business.WeblogManager;
-import org.apache.roller.pojos.Template;
+import org.apache.roller.pojos.ThemeTemplate;
 import org.apache.roller.pojos.WeblogCategoryData;
 import org.apache.roller.pojos.WeblogEntryData;
 import org.apache.roller.pojos.WeblogTemplate;
@@ -68,7 +64,7 @@
     
     // heavyweight attributes
     private WeblogEntryData weblogEntry = null;
-    private Template weblogPage = null;
+    private ThemeTemplate weblogPage = null;
     private WeblogCategoryData weblogCategory = null;
     
     
@@ -349,7 +345,7 @@
         this.weblogEntry = weblogEntry;
     }
 
-    public Template getWeblogPage() {
+    public ThemeTemplate getWeblogPage() {
         
         if(weblogPage == null && weblogPageName != null) {
             try {

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/util/cache/PlanetCache.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/util/cache/PlanetCache.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/util/cache/PlanetCache.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/util/cache/PlanetCache.java Sat Apr  7 15:09:45 2007
@@ -161,7 +161,8 @@
         // still null, we need to get a fresh value
         if(lastModified == null) {
             
-            lastModified = PlanetFactory.getPlanet().getPlanetManager().getLastUpdated();
+            // TODO: ROLLER40 last updated for planet
+            lastModified = null; // PlanetFactory.getPlanet().getPlanetManager().getLastUpdated();
             
             if (lastModified == null) {
                 lastModified = new Date();

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/util/cache/WeblogCacheWarmupJob.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/util/cache/WeblogCacheWarmupJob.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/util/cache/WeblogCacheWarmupJob.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/util/cache/WeblogCacheWarmupJob.java Sat Apr  7 15:09:45 2007
@@ -138,7 +138,7 @@
                 
                 // lookup Renderer we are going to use
                 Renderer renderer = null;
-                Template template = new StaticTemplate("templates/feeds/weblog-"+type+"-"+format+".vm", null, "velocity");
+                Template template = new StaticTemplate("templates/feeds/weblog-"+type+"-"+format+".vm", "velocity");
                 renderer = RendererManager.getRenderer(template);
                 
                 

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/velocity/ThemeResourceLoader.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/velocity/ThemeResourceLoader.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/velocity/ThemeResourceLoader.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/velocity/ThemeResourceLoader.java Sat Apr  7 15:09:45 2007
@@ -75,7 +75,7 @@
             // lookup the template from the proper theme
             ThemeManager themeMgr = RollerFactory.getRoller().getThemeManager();
             Theme theme = themeMgr.getTheme(split[0]);
-            ThemeTemplate template = theme.getTemplate(split[1]);
+            ThemeTemplate template = theme.getTemplateByName(split[1]);
             
             if(template == null)
                 throw new ResourceNotFoundException("Template ["+split[1]+
@@ -128,7 +128,7 @@
             // lookup the template from the proper theme
             ThemeManager themeMgr = RollerFactory.getRoller().getThemeManager();
             Theme theme = themeMgr.getTheme(split[0]);
-            ThemeTemplate template = theme.getTemplate(split[1]);
+            ThemeTemplate template = theme.getTemplateByName(split[1]);
             
             if(template == null)
                 return last_mod;

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/velocity/VelocityRenderer.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/velocity/VelocityRenderer.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/velocity/VelocityRenderer.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/velocity/VelocityRenderer.java Sat Apr  7 15:09:45 2007
@@ -24,12 +24,12 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.pojos.Template;
+import org.apache.roller.pojos.ThemeTemplate;
 import org.apache.roller.ui.rendering.Renderer;
 import org.apache.roller.ui.rendering.RenderingException;
 import org.apache.roller.ui.rendering.model.UtilitiesModel;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.context.Context;
-import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.exception.ParseErrorException;
 import org.apache.velocity.exception.ResourceNotFoundException;
 
@@ -62,12 +62,16 @@
             // if we can't then this will throw an exception
             velocityTemplate = RollerVelocity.getTemplate(template.getId(), "UTF-8");
             
-            // if there is a decorator then look that up too
-            Template decorator = renderTemplate.getDecorator();
-            if(decorator != null) {
-                velocityDecorator = RollerVelocity.getTemplate(decorator.getId());
+            // if this is a ThemeTemplate than look for a decorator too
+            if(template instanceof ThemeTemplate) {
+                ThemeTemplate templ = (ThemeTemplate) template;
+                
+                Template decorator = templ.getDecorator();
+                if(decorator != null) {
+                    velocityDecorator = RollerVelocity.getTemplate(decorator.getId(), "UTF-8");
+                }
             }
-            
+
         } catch(ResourceNotFoundException ex) {
             // velocity couldn't find the resource so lets log a warning
             log.warn("Error creating renderer for "+template.getId()+

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java Sat Apr  7 15:09:45 2007
@@ -25,7 +25,6 @@
 import java.util.Date;
 import java.util.Locale;
 import java.util.Map;
-import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -33,31 +32,25 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.RollerException;
-import org.apache.roller.config.RollerConfig;
 import org.apache.roller.config.RollerRuntimeConfig;
 import org.apache.roller.business.Roller;
 import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.CommentData;
 import org.apache.roller.pojos.FolderData;
 import org.apache.roller.pojos.RollerPropertyData;
-import org.apache.roller.pojos.Template;
+import org.apache.roller.pojos.ThemeTemplate;
 import org.apache.roller.pojos.WeblogCategoryData;
 import org.apache.roller.pojos.WeblogEntryData;
 import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.pojos.wrapper.CommentDataWrapper;
 import org.apache.roller.pojos.wrapper.TemplateWrapper;
 import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
 import org.apache.roller.pojos.wrapper.WebsiteDataWrapper;
 import org.apache.roller.ui.core.RollerSession;
-import org.apache.roller.ui.rendering.velocity.deprecated.NewsfeedCache;
 import org.apache.roller.ui.rendering.util.WeblogEntryCommentForm;
 import org.apache.roller.ui.rendering.util.WeblogPageRequest;
 import org.apache.roller.util.DateUtil;
 import org.apache.roller.util.RegexUtil;
 import org.apache.roller.util.URLUtilities;
 import org.apache.struts.util.RequestUtils;
-import org.apache.velocity.VelocityContext;
-
 
 /**
  * Load Velocity Context with Roller objects, values, and custom plugins.
@@ -114,7 +107,7 @@
         WebsiteData weblog = null;
         WeblogEntryData entry = null;
         WeblogCategoryData category = null;
-        Template page = null;
+        ThemeTemplate page = null;
         FolderData folder = null;  // don't even know how this is involved :/
         Date date = null;
         boolean isDay = false;
@@ -249,7 +242,7 @@
         mLogger.debug("context viewLocale = "+ctx.get( "viewLocale"));
         
         // alternative display pages - customization
-        Template entryPage = weblog.getPageByName("_entry");
+        ThemeTemplate entryPage = weblog.getPageByName("_entry");
         if (entryPage != null) {
             ctx.put("entryPage", TemplateWrapper.wrap(entryPage));
         }
@@ -366,7 +359,7 @@
             Map ctx,
             HttpServletRequest request,
             WebsiteData website,
-            Template page) throws RollerException {
+            ThemeTemplate page) throws RollerException {
         
         mLogger.debug("Loading utility objects");
         

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java Sat Apr  7 15:09:45 2007
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -37,7 +38,6 @@
 import org.apache.roller.business.BookmarkManager;
 import org.apache.roller.business.referrers.RefererManager;
 import org.apache.roller.business.RollerFactory;
-import org.apache.roller.pojos.Template;
 import org.apache.roller.business.UserManager;
 import org.apache.roller.business.WeblogManager;
 import org.apache.roller.pojos.CommentData;
@@ -57,6 +57,7 @@
 import org.apache.roller.util.DateUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.roller.pojos.HitCountData;
+import org.apache.roller.pojos.ThemeTemplate;
 
 
 /**
@@ -131,11 +132,16 @@
         // Get the pages, put into context & load map
         if (mWebsite != null) {
             
-            // Get the pages, put into context & load map
-            List pages = mWebsite.getPages();
+            List pages = Collections.EMPTY_LIST;
+            try {
+                pages = mWebsite.getPages();
+            } catch (RollerException ex) {
+                mLogger.error("error getting weblog pages", ex);
+            }
+            
             Iterator pageIter = pages.iterator();
             while (pageIter.hasNext()) {
-                Template page = (Template) pageIter.next();
+                ThemeTemplate page = (ThemeTemplate) pageIter.next();
                 mPageMap.put(page.getName(), TemplateWrapper.wrap(page));
             }
         }
@@ -286,7 +292,7 @@
         String template_id = null;
         
         try {
-            Template pd = mWebsite.getPageByName(pageName);
+            ThemeTemplate pd = mWebsite.getPageByName(pageName);
             if(pd != null) {
                 template_id = pd.getId();
             }

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/util/URLUtilities.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/util/URLUtilities.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/util/URLUtilities.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/util/URLUtilities.java Sat Apr  7 15:09:45 2007
@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Map;
 import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.pojos.Theme;
+import org.apache.roller.pojos.WeblogTheme;
 import org.apache.roller.pojos.WebsiteData;
 
 
@@ -485,7 +485,7 @@
         }
         
         Map params = new HashMap();
-        if(previewTheme != null && !Theme.CUSTOM.equals(previewTheme)) {
+        if(previewTheme != null && !WeblogTheme.CUSTOM.equals(previewTheme)) {
             params.put("theme", encode(previewTheme));
         }
         

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/AtomHandler.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/AtomHandler.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/AtomHandler.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/AtomHandler.java Sat Apr  7 15:09:45 2007
@@ -18,8 +18,6 @@
 package org.apache.roller.webservices.atomprotocol;
 
 import java.io.InputStream;
-import java.util.Date;
-
 import com.sun.syndication.feed.atom.Entry;
 import com.sun.syndication.feed.atom.Feed;
 
@@ -27,7 +25,7 @@
  * Interface to be supported by an Atom server, expected lifetime: one request.
  * AtomServlet calls this generic interface instead of Roller specific APIs. 
  * <p />
- * Based on: draft-ietf-atompub-protocol-08.txt + PaceMediaEntries5
+ * Based on: draft-ietf-atompub-protocol-14.txt
  * <p />
  * Designed to be Roller independent.
  */

Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/AtomService.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/AtomService.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/AtomService.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/AtomService.java Sat Apr  7 15:09:45 2007
@@ -14,21 +14,20 @@
 * limitations under the License.  For additional information regarding
 * copyright in this work, please see the NOTICE file in the top level
 * directory of this distribution.
-*/
+*/ 
 package org.apache.roller.webservices.atomprotocol;
 
+
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Set;
 
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.Namespace;
 
 /**
- * This class models an Atom Ublishing Protocol Service Document.
+ * This class models an Atom Publishing Protocol AtomService Document.
  * <p />
  * Based on: draft-ietf-atompub-protocol-10.txt
  * <p />
@@ -83,17 +82,21 @@
 	</service>
  */
 public class AtomService {
-    public static final Namespace ns =
-            Namespace.getNamespace("app","http://purl.org/atom/app#");
-    public static final Namespace atomns =
-            Namespace.getNamespace("atom","http://www.w3.org/2005/Atom");
 
     private List workspaces = new ArrayList();
     
+    /** Namespace for Atom Syndication Format */
+    public static Namespace ATOM_FORMAT = 
+        Namespace.getNamespace("atom","http://www.w3.org/2005/Atom");
+    
+    /** Namespace for Atom Publishing Protocol */
+    public static Namespace ATOM_PROTOCOL = 
+        Namespace.getNamespace("app","http://purl.org/atom/app#");  
+        
     public AtomService() {
     }
     
-    public void addWorkspace(AtomService.Workspace workspace) {
+    public void addWorkspace(Workspace workspace) {
         workspaces.add(workspace);
     }
     
@@ -105,362 +108,43 @@
         this.workspaces = workspaces;
     }
     
-    /**
-     * This class models an Atom workspace.
-     * @author Dave Johnson
-     *//*
-	appWorkspace =
-	   element app:workspace {
-	      appCommonAttributes,
-	      ( appCollection*
-	        & extensionElement* )
-	   }
-	atomTitle = element atom:title { atomTextConstruct }
-     */
-    public static class Workspace {
-        private String title       = null;
-        private String titleType   = null; // may be TEXT, HTML, XHTML
-        private Set    collections = new LinkedHashSet();
-        
-        public Workspace() {
-        }
-        
-        /** Iterate over collections in workspace */
-        public Iterator getCollections() {
-            return collections.iterator();
-        }
-        
-        /** Add new collection to workspace */
-        public void addCollection(AtomService.Collection col) {
-            collections.add(col);
-        }
-        
-        /** Workspace must have a human readable title */
-        public String getTitle() {
-            return title;
-        }
-        
-        public void setTitle(String title) {
-            this.title = title;
-        }
-
-        public String getTitleType() {
-            return titleType;
-        }
-
-        public void setTitleType(String titleType) {
-            this.titleType = titleType;
-        }
-    }
-    
-    /**
-     * This class models an Atom workspace collection.    
-     *//* 
-	appCollection =
-	   element app:collection {
-	      appCommonAttributes,
-	      attribute href { atomURI  },
-	      ( appAccept?	
-	        & appCategories*
-	        & extensionElement* )
-	   }
-     */
-    public static class Collection {
-        private String title = null;
-        private String titleType =null; // may be TEXT, HTML, XHTML
-        private String accept = "entry";
-        private String listTemplate = null;
-        private String href = null;
-        private Set categories = new LinkedHashSet(); // of Categories objects
-        
-        public Collection() {
-        }
-        
-        /**
-         * Comma separated list of media-ranges accepted by collection
-         * or "entry" to indicate Atom entries only. Leaving null will 
-         * default to entries only.
-         */
-        public String getAccept() {
-            return accept;
-        }
-        
-        public void setAccept(String accept) {
-            this.accept = accept;
-        }
-        
-        /** The URI of the collection */
-        public String getHref() {
-            return href;
-        }
-        
-        public void setHref(String href) {
-            this.href = href;
-        }
-        
-        /** Must have human readable title */
-        public String getTitle() {
-            return title;
-        }
-        
-        public void setTitle(String title) {
-            this.title = title;
-        }
-
-        public String getTitleType() {
-            return titleType;
-        }
-
-        public void setTitleType(String titleType) {
-            this.titleType = titleType;
-        }
-
-        /** Workspace can have multiple Categories objects */
-        public void addCategories(Categories cats) {
-            categories.add(cats);
-        }
-        
-        /** Iterate over Categories objects in Collection */
-        public Iterator getCategories() {
-            return categories.iterator();
-        }
-    }
-    
-    /** 
-     * Categories object contains Category objects 
-     *//*
-	 appInlineCategories =
-	    element app:categories {
-	        attribute fixed { "yes" | "no" }?,
-	        attribute scheme { atomURI }?,
-	        (atomCategory*)
-	    }
-     */
-    public static class Categories {
-        private Set categories = new LinkedHashSet(); // of Category objects
-        private String scheme = null;
-        private boolean fixed = false;
-        
-        /** Add category list of those specified*/
-        public void addCategory(Category cat) {
-            categories.add(cat);
-        }
-        
-        /** Iterate over Category objects */
-        public Iterator getCategories() {
-            return categories.iterator();
-        }
-
-        /** True if clients MUST use one of the categories specified */
-        public boolean isFixed() {
-            return fixed;
-        }
-
-        /** True if clients MUST use one of the categories specified */
-        public void setFixed(boolean fixed) {
-            this.fixed = fixed;
-        }
-
-        /** Category URI scheme to use for Categories without a scheme */
-        public String getScheme() {
-            return scheme;
+    public Workspace findWorkspace(String title) {
+        for (Iterator it = workspaces.iterator(); it.hasNext();) {
+            Workspace ws = (Workspace) it.next();
+            if (title.equals(ws.getTitle())) {
+                return ws;
+            }
         }
-
-        /** Category URI scheme to use for Categories without a scheme */
-        public void setScheme(String scheme) {
-            this.scheme = scheme;
-        }        
+        return null;
     }
-    
-      
-    /** 
-     * Represents an &lt;atom:category&gt; object 
-     *//*
-	    atomCategory =
-	    element atom:category {
-	       atomCommonAttributes,
-	       attribute term { text },
-	       attribute scheme { atomURI }?,
-	       attribute label { text }?,
-	       undefinedContent
-	    }
-     */
-    public static class Category {
-        private String term;
-        private String scheme;
-        private String label;                
 
-        public String getTerm() {
-            return term;
-        }
-
-        public void setTerm(String term) {
-            this.term = term;
-        }
-
-        public String getScheme() {
-            return scheme;
-        }
-
-        public void setScheme(String scheme) {
-            this.scheme = scheme;
-        }
-
-        public String getLabel() {
-            return label;
-        }
-
-        public void setLabel(String label) {
-            this.label = label;
-        }
-    }
-    
     /** Deserialize an Atom service XML document into an object */
     public static AtomService documentToService(Document document) {
         AtomService service = new AtomService();
         Element root = document.getRootElement();
-        List spaces = root.getChildren("workspace", ns);
+        List spaces = root.getChildren("workspace", ATOM_PROTOCOL);
         Iterator iter = spaces.iterator();
         while (iter.hasNext()) {
             Element e = (Element) iter.next();
-            service.addWorkspace(AtomService.elementToWorkspace(e));
+            service.addWorkspace(Workspace.elementToWorkspace(e));
         }
         return service;
     }
     
-    /** Serialize an AtomService object into an XML document */
+    /**
+     * Serialize an AtomService object into an XML document
+     */
     public static Document serviceToDocument(AtomService service) {
         Document doc = new Document();
-        Element root = new Element("service", ns);
+        Element root = new Element("service", ATOM_PROTOCOL);
         doc.setRootElement(root);
         Iterator iter = service.getWorkspaces().iterator();
         while (iter.hasNext()) {
-            AtomService.Workspace space = (AtomService.Workspace) iter.next();
-            root.addContent(AtomService.workspaceToElement(space));
+            Workspace space = (Workspace) iter.next();
+            root.addContent(Workspace.workspaceToElement(space));
         }
         return doc;
     }
-    
-    /** Deserialize a Atom workspace XML element into an object */
-    public static AtomService.Workspace elementToWorkspace(Element element) {
-        AtomService.Workspace space = new AtomService.Workspace();
-        
-        Element titleElem = element.getChild("title", atomns);
-        space.setTitle(titleElem.getText());
-        if (titleElem.getAttribute("type", atomns) != null) {
-            space.setTitleType(titleElem.getAttribute("type", atomns).getValue());
-        }
-        
-        List collections = element.getChildren("collection", ns);
-        Iterator iter = collections.iterator();
-        while (iter.hasNext()) {
-            Element e = (Element) iter.next();
-            space.addCollection(AtomService.elementToCollection(e));
-        }
-        return space;
-    }
-    
-    /** Serialize an AtomService.Workspace object into an XML element */
-    public static Element workspaceToElement(Workspace space) {
-        Element element = new Element("workspace", ns);
-        
-        Element title = new Element("title", atomns);
-        title.setText(space.getTitle());
-        element.addContent(title);
-        if (space.getTitleType() != null && !space.getTitleType().equals("TEXT")) {
-            element.setAttribute("type", space.getTitleType(), atomns);
-        }
-        
-        Iterator iter = space.getCollections();
-        while (iter.hasNext()) {
-            AtomService.Collection col = (AtomService.Collection) iter.next();
-            element.addContent(collectionToElement(col));
-        }
-        return element;
-    }
-    
-    /** Deserialize an Atom service collection XML element into an object */
-    public static AtomService.Collection elementToCollection(Element element) {
-        AtomService.Collection collection = new AtomService.Collection();
-        collection.setHref(element.getAttribute("href").getValue());
-        
-        Element titleElem = element.getChild("title", atomns);
-        if (titleElem != null) {
-            collection.setTitle(titleElem.getText());
-            if (titleElem.getAttribute("type", atomns) != null) {
-                collection.setTitleType(titleElem.getAttribute("type", atomns).getValue());
-            }
-        }
-                
-        Element memberType = element.getChild("accept",  ns);
-        if (memberType != null) {
-            collection.setAccept(memberType.getText());
-        }
-        
-        // Loop to parse <app:categories> element to Categories objects
-        List catsElems = element.getChildren("categories", ns);
-        for (Iterator catsIter = catsElems.iterator(); catsIter.hasNext();) {
-            Element catsElem = (Element) catsIter.next();  
-            Categories cats = new Categories();
-            if ("yes".equals(catsElem.getAttribute("fixed", ns))) {
-                cats.setFixed(true);
-            }
-            // Loop to parse <atom:category> elemenents to Category objects
-            List catElems = catsElem.getChildren("category", atomns);
-            for (Iterator catIter = catElems.iterator(); catIter.hasNext();) {                
-                Element catElem = (Element) catIter.next();
-                Category cat = new Category();
-                cat.setTerm(catElem.getAttributeValue("term", atomns));                
-                cat.setLabel(catElem.getAttributeValue("label", atomns)); 
-                cat.setScheme(catElem.getAttributeValue("scheme", atomns));
-                cats.addCategory(cat);
-            }
-            collection.addCategories(cats);
-        }
-        return collection;
-    }
-    
-    /** Serialize an AtomService.Collection object into an XML element */
-    public static Element collectionToElement(AtomService.Collection collection) {
-        Element element = new Element("collection", ns);
-        element.setAttribute("href", collection.getHref());
-                       
-        Element title = new Element("title", atomns);
-        title.setText(collection.getTitle());
-        element.addContent(title);
-        if (collection.getTitleType() != null && !collection.getTitleType().equals("TEXT")) {
-            element.setAttribute("type", collection.getTitleType(), atomns);
-        }
-                    
-        // Loop to create <app:categories> elements            
-        for (Iterator it = collection.getCategories(); it.hasNext();) {
-            Categories cats = (Categories)it.next();
-            Element catsElem = new Element("categories", ns);
-            catsElem.setAttribute("fixed", cats.isFixed() ? "yes" : "no", ns);
-            if (cats.getScheme() != null) {
-                catsElem.setAttribute("scheme", cats.getScheme(), ns);
-            }
-            // Loop to create <atom:category> elements
-            for (Iterator catIter = cats.getCategories(); catIter.hasNext();) {
-                Category cat = (Category) catIter.next();
-                Element catElem = new Element("category", atomns);
-                catElem.setAttribute("term", cat.getTerm(), atomns);
-                if (cat.getScheme() != null) { // optional
-                    catElem.setAttribute("scheme", cat.getScheme(), atomns);
-                }
-                if (cat.getLabel() != null) { // optional
-                    catElem.setAttribute("label", cat.getLabel(), atomns);
-                }
-                catsElem.addContent(catElem);
-            }
-            element.addContent(catsElem);
-        }
-        
-        Element memberType = new Element("accept", ns);
-        memberType.setText(collection.getAccept());
-        element.addContent(memberType);
-        
-        return element;
-    }
+
 }