roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r525922 [2/2] - in /incubator/roller/trunk: src/org/apache/roller/business/ src/org/apache/roller/business/themes/ src/org/apache/roller/business/utils/ src/org/apache/roller/pojos/ src/org/apache/roller/pojos/wrapper/ src/org/apache/roller...
Date Thu, 05 Apr 2007 18:15:38 GMT
Modified: incubator/roller/trunk/src/org/apache/roller/pojos/ThemeTemplate.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/pojos/ThemeTemplate.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/pojos/ThemeTemplate.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/pojos/ThemeTemplate.java Thu Apr  5 11:15:32 2007
@@ -18,162 +18,71 @@
 
 package org.apache.roller.pojos;
 
-import java.io.Serializable;
-import java.util.Date;
-import org.apache.roller.pojos.Template;
-
 
 /**
- * A Theme based implementation of a Template.  A ThemeTemplate represents a
- * template which is part of a shared Theme.
+ * A Theme specific implementation of a Template.
+ * 
+ * A ThemeTemplate represents a template which is part of a Theme.
  */
-public class ThemeTemplate implements Template, Serializable {
+public interface ThemeTemplate extends Template {
     
-    private String id = null;
-    private String action = null;
-    private String name = null;
-    private String description = null;
-    private String contents = null;
-    private String link = null;
-    private Date lastModified = null;
-    private String templateLanguage = null;
-    private boolean hidden = false;
-    private boolean navbar = false;
-    private String decoratorName = null;
-    private String  outputContentType = null;
-    
-    private Theme myTheme = null;
-    
-    
-    public ThemeTemplate() {}
-    
-    public ThemeTemplate(Theme theme, String id, String action, String name, 
-            String desc, String contents, String link, Date date, 
-            String tempLang, boolean hid, boolean navbar, String decor) {
-        
-        this.myTheme = theme;
-        this.id = id;
-        this.action = action;
-        this.name = name;
-        this.description = desc;
-        this.contents = contents;
-        this.link = link;
-        this.lastModified = date;
-        this.templateLanguage = tempLang;
-        this.hidden = hid;
-        this.navbar = navbar;
-        this.decoratorName = decor;
-    }
-    
-    
-    public Template getDecorator() {
-        if(decoratorName != null && !id.equals(decoratorName)) {
-            return myTheme.getTemplate(decoratorName);
-        }
-        return null;
-    }
-    
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        // Form bean workaround: empty string is never a valid id
-        if (id != null && id.trim().length() == 0) return; 
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getContents() {
-        return contents;
-    }
-
-    public void setContents(String contents) {
-        this.contents = contents;
-    }
-
-    public Date getLastModified() {
-        return lastModified;
-    }
-
-    public void setLastModified(Date lastModified) {
-        this.lastModified = lastModified;
-    }
-
-    public String getLink() {
-        return link;
-    }
-
-    public void setLink(String link) {
-        this.link = link;
-    }
-
-    public String getTemplateLanguage() {
-        return templateLanguage;
-    }
-
-    public void setTemplateLanguage(String templateLanguage) {
-        this.templateLanguage = templateLanguage;
-    }
-
-    public boolean isHidden() {
-        return hidden;
-    }
-
-    public void setHidden(boolean isHidden) {
-        this.hidden = isHidden;
-    }
-
-    public boolean isNavbar() {
-        return navbar;
-    }
-
-    public void setNavbar(boolean navbar) {
-        this.navbar = navbar;
-    }
-
-    public String getDecoratorName() {
-        return decoratorName;
-    }
-
-    public void setDecoratorName(String decorator) {
-        this.decoratorName = decorator;
-    }
-
-    public String getOutputContentType() {
-        return outputContentType;
-    }
-
-    public void setOutputContentType(String outputContentType) {
-        this.outputContentType = outputContentType;
-    }
-    
-    public String toString() {
-        return (id + "," + name + "," + description + "," + link + "," + 
-                lastModified + "\n\n" + contents + "\n");
-    }
-
-    public String getAction() {
-        return action;
-    }
-
-    public void setAction(String action) {
-        this.action = action;
-    }
+    public static final String ACTION_WEBLOG = "weblog";
+    public static final String ACTION_PERMALINK = "permalink";
+    public static final String ACTION_SEARCH = "search";
+    public static final String ACTION_TAGSINDEX = "tagsIndex";
+    public static final String ACTION_CUSTOM = "custom";
+    
+    // the full list of supported special actions, which purposely does not
+    // contain an entry for the 'custom' action
+    public static final String[] ACTIONS = {
+        ACTION_WEBLOG, 
+        ACTION_PERMALINK, 
+        ACTION_SEARCH, 
+        ACTION_TAGSINDEX
+    };
+    
+    
+    /**
+     * The action this template is defined for.
+     */
+    public String getAction();
+    
+    
+    /**
+     * The contents or body of the Template.
+     */
+    public String getContents();
+    
+    
+    /**
+     * The url link value for this Template.  If this template is not
+     * private this is the url that it can be accessed at.
+     */
+    public String getLink();
+    
+    
+    /**
+     * Is the Template hidden?  A hidden template cannot be accessed directly.
+     */
+    public boolean isHidden();
+    
+    
+    /**
+     * Is the Template to be included in the navbar?
+     */
+    public boolean isNavbar();
+    
+    
+    /**
+     * The name of the decorator template to apply.
+     */
+    public String getDecoratorName();
+    
+    
+    /**
+     * The decorator Template to apply.  This returns null if no decorator
+     * should be applied.
+     */
+    public ThemeTemplate getDecorator();
     
 }

Modified: incubator/roller/trunk/src/org/apache/roller/pojos/WeblogTemplate.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/pojos/WeblogTemplate.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/pojos/WeblogTemplate.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/pojos/WeblogTemplate.java Thu Apr  5 11:15:32 2007
@@ -40,7 +40,7 @@
  * @hibernate.class lazy="true" table="webpage"
  * @hibernate.cache usage="read-write"
  */
-public class WeblogTemplate implements Serializable, Template {
+public class WeblogTemplate implements ThemeTemplate, Serializable {
     
     public static final long serialVersionUID = -613737191638263428L;
     public static final String DEFAULT_PAGE = "Weblog";
@@ -81,7 +81,7 @@
     }
     
     
-    public Template getDecorator() {
+    public ThemeTemplate getDecorator() {
         if(decoratorName != null && !id.equals(decoratorName)) {
             try {
                 return weblog.getPageByName(decoratorName);

Added: incubator/roller/trunk/src/org/apache/roller/pojos/WeblogTheme.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/pojos/WeblogTheme.java?view=auto&rev=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/pojos/WeblogTheme.java (added)
+++ incubator/roller/trunk/src/org/apache/roller/pojos/WeblogTheme.java Thu Apr  5 11:15:32 2007
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * 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.pojos;
+
+import java.io.Serializable;
+
+
+/**
+ * A Theme which is specifically tied to a given weblog.
+ *
+ * A WeblogTheme is what is used throughout the rendering process to do the
+ * rendering for a given weblog design.
+ */
+public abstract class WeblogTheme implements Theme, Serializable {
+    
+    // this is the name that will be used to identify a user customized theme
+    public static final String CUSTOM = "custom";
+    
+    protected WebsiteData weblog = null;
+    
+    
+    public WeblogTheme(WebsiteData weblog) {
+        this.weblog = weblog;
+    }
+    
+    
+    public WebsiteData getWeblog() {
+        return this.weblog;
+    }
+    
+}

Modified: incubator/roller/trunk/src/org/apache/roller/pojos/WebsiteData.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/pojos/WebsiteData.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/pojos/WebsiteData.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/pojos/WebsiteData.java Thu Apr  5 11:15:32 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;
 
 /**
@@ -187,48 +184,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;
     }
     
     
@@ -237,33 +212,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;
     }
     
     
@@ -271,32 +231,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;
     }
     
     
@@ -304,32 +250,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;
     }
     
     
@@ -337,45 +269,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/trunk/src/org/apache/roller/pojos/wrapper/TemplateWrapper.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/pojos/wrapper/TemplateWrapper.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/pojos/wrapper/TemplateWrapper.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/pojos/wrapper/TemplateWrapper.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/pojos/wrapper/WebsiteDataWrapper.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/pojos/wrapper/WebsiteDataWrapper.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/pojos/wrapper/WebsiteDataWrapper.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/pojos/wrapper/WebsiteDataWrapper.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/UploadFileFormAction.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/ui/core/RollerRequest.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/core/RollerRequest.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/core/RollerRequest.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/RollerRequest.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/ui/rendering/model/PlanetModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/PlanetModel.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/PlanetModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/PlanetModel.java Thu Apr  5 11:15:32 2007
@@ -25,11 +25,10 @@
 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.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 +63,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();
         }  

Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/SiteModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/SiteModel.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/SiteModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/SiteModel.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesListPager.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesListPager.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesListPager.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesListPager.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PageServlet.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PageServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PageServlet.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java Thu Apr  5 11:15:32 2007
@@ -167,7 +167,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/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewResourceServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewResourceServlet.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewResourceServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewResourceServlet.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/RSDServlet.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/ui/rendering/servlets/SearchServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/SearchServlet.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/SearchServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/SearchServlet.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/ui/rendering/util/WeblogPageRequest.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/WeblogPageRequest.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/WeblogPageRequest.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/WeblogPageRequest.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/ui/rendering/util/cache/WeblogCacheWarmupJob.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/cache/WeblogCacheWarmupJob.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/cache/WeblogCacheWarmupJob.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/cache/WeblogCacheWarmupJob.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/ui/rendering/velocity/ThemeResourceLoader.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/ThemeResourceLoader.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/ThemeResourceLoader.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/ThemeResourceLoader.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/ui/rendering/velocity/VelocityRenderer.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/VelocityRenderer.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/VelocityRenderer.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/VelocityRenderer.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/velocity/deprecated/OldWeblogPageModel.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/util/URLUtilities.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/util/URLUtilities.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/util/URLUtilities.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/util/URLUtilities.java Thu Apr  5 11:15:32 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/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java Thu Apr  5 11:15:32 2007
@@ -69,7 +69,7 @@
 import org.apache.roller.business.search.IndexManager;
 import org.apache.roller.pojos.RollerPropertyData;
 import org.apache.roller.pojos.WeblogEntryTagData;
-import org.apache.roller.pojos.WeblogResource;
+import org.apache.roller.pojos.ThemeResource;
 import org.apache.roller.util.URLUtilities;
 import org.apache.roller.util.cache.CacheManager;
 
@@ -228,7 +228,7 @@
                 workspace.addCollection(uploadCol);
 
                 // And add one media collection for each of weblog's upload sub-directories
-                WeblogResource[] dirs;
+                ThemeResource[] dirs;
                 try {
                     dirs = mRoller.getFileManager().getDirectories(perm.getWebsite());
                     for (int i=0; i<dirs.length; i++) {
@@ -413,7 +413,7 @@
                     "ERROR: cannot find specified weblog");
             }
             FileManager fmgr = mRoller.getFileManager();
-            WeblogResource[] files = fmgr.getFiles(website, path);
+            ThemeResource[] files = fmgr.getFiles(website, path);
                         
             if (canView(website)) {
                 Feed feed = new Feed();
@@ -429,8 +429,8 @@
                 
                 SortedSet sortedSet = new TreeSet(new Comparator() {
                     public int compare(Object o1, Object o2) {
-                        WeblogResource f1 = (WeblogResource)o1;
-                        WeblogResource f2 = (WeblogResource)o2;
+                        ThemeResource f1 = (ThemeResource)o1;
+                        ThemeResource f2 = (ThemeResource)o2;
                         if (f1.getLastModified() < f2.getLastModified()) return 1;
                         else if (f1.getLastModified() == f2.getLastModified()) return 0;
                         else return -1;
@@ -446,7 +446,7 @@
                     }
                 }
                 int count = 0;
-                WeblogResource[] sortedArray = (WeblogResource[])sortedSet.toArray(new WeblogResource[sortedSet.size()]);
+                ThemeResource[] sortedArray = (ThemeResource[])sortedSet.toArray(new ThemeResource[sortedSet.size()]);
                 for (int i=start; i<(start + max) && i<(sortedArray.length); i++) {
                     Entry entry = createAtomResourceEntry(website, sortedArray[i]);
                     atomEntries.add(entry);
@@ -552,7 +552,7 @@
                     String handle = pathInfo[0];
                     WebsiteData website = 
                         mRoller.getUserManager().getWebsiteByHandle(handle);                    
-                    WeblogResource resource = 
+                    ThemeResource resource = 
                         mRoller.getFileManager().getFile(website, fileName);
                     if (resource != null) return createAtomResourceEntry(website, resource);
                 }
@@ -681,7 +681,7 @@
                     fmgr.saveFile(website, path + fileName, contentType, tempFile.length(), fis);
                     fis.close();
                     
-                    WeblogResource resource = fmgr.getFile(website, path + fileName);
+                    ThemeResource resource = fmgr.getFile(website, path + fileName);
                     
                     // Throttle one entry per second
                     try { Thread.sleep(1000); } catch (Exception ignored) {}
@@ -1031,7 +1031,7 @@
         return atomEntry;
     }
     
-    private Entry createAtomResourceEntry(WebsiteData website, WeblogResource file) {
+    private Entry createAtomResourceEntry(WebsiteData website, ThemeResource file) {
         String absUrl = RollerRuntimeConfig.getAbsoluteContextURL();
         String editURI = 
                 URLUtilities.getAtomProtocolURL(true)+"/"+website.getHandle()

Modified: incubator/roller/trunk/tests/org/apache/roller/business/FileManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/tests/org/apache/roller/business/FileManagerTest.java?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/tests/org/apache/roller/business/FileManagerTest.java (original)
+++ incubator/roller/trunk/tests/org/apache/roller/business/FileManagerTest.java Thu Apr  5 11:15:32 2007
@@ -26,12 +26,9 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.TestUtils;
-import org.apache.roller.business.FileManager;
-import org.apache.roller.business.PropertiesManager;
-import org.apache.roller.business.RollerFactory;
 import org.apache.roller.pojos.RollerPropertyData;
+import org.apache.roller.pojos.ThemeResource;
 import org.apache.roller.pojos.UserData;
-import org.apache.roller.pojos.WeblogResource;
 import org.apache.roller.pojos.WebsiteData;
 
 /**
@@ -138,7 +135,7 @@
         fmgr.createDirectory(testWeblog, "bucket0");
         
         // make sure directory was created
-        WeblogResource[] dirs = fmgr.getDirectories(testWeblog);
+        ThemeResource[] dirs = fmgr.getDirectories(testWeblog);
         assertNotNull(dirs);
         assertEquals(1, dirs.length);
         assertEquals("bucket0", dirs[0].getName());
@@ -175,7 +172,7 @@
         fmgr.createDirectory(testWeblog, "bucket1");
         
         // make sure directory was created
-        WeblogResource[] dirs = fmgr.getDirectories(testWeblog);
+        ThemeResource[] dirs = fmgr.getDirectories(testWeblog);
         assertNotNull(dirs);
         assertEquals(1, dirs.length);
         assertEquals("bucket1", dirs[0].getName());

Modified: incubator/roller/trunk/web/WEB-INF/jsps/authoring/edit-pages.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/authoring/edit-pages.jsp?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/authoring/edit-pages.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/authoring/edit-pages.jsp Thu Apr  5 11:15:32 2007
@@ -16,7 +16,7 @@
   directory of this distribution.
 -->
 <%@ include file="/WEB-INF/jsps/taglibs.jsp" %><%
-request.setAttribute("customTheme", org.apache.roller.pojos.Theme.CUSTOM); %>
+request.setAttribute("customTheme", org.apache.roller.pojos.WeblogTheme.CUSTOM); %>
 
 <roller:StatusMessage/>
 

Modified: incubator/roller/trunk/web/WEB-INF/jsps/authoring/theme-editor.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/authoring/theme-editor.jsp?view=diff&rev=525922&r1=525921&r2=525922
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/authoring/theme-editor.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/authoring/theme-editor.jsp Thu Apr  5 11:15:32 2007
@@ -18,7 +18,7 @@
 <%@ include file="/WEB-INF/jsps/taglibs.jsp" %>
 <%
 // this just makes the name for a custom theme available to our jstl EL
-String customTheme = org.apache.roller.pojos.Theme.CUSTOM;
+String customTheme = org.apache.roller.pojos.WeblogTheme.CUSTOM;
 request.setAttribute("customTheme", customTheme);
 
 boolean allowCustom = org.apache.roller.config.RollerRuntimeConfig.getBooleanProperty("themes.customtheme.allowed");



Mime
View raw message