roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r1172075 [2/4] - in /roller/trunk: ./ planet-business/ planet-business/src/main/java/org/apache/roller/planet/ planet-business/src/main/java/org/apache/roller/planet/business/ planet-business/src/main/java/org/apache/roller/planet/config/ p...
Date Sat, 17 Sep 2011 22:00:40 GMT
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java Sat Sep 17 22:00:34 2011
@@ -18,10 +18,6 @@
 
 package org.apache.roller.weblogger.business.themes;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-import java.util.List;
 import org.apache.commons.lang.StringUtils;
 import org.apache.roller.weblogger.pojos.WeblogTemplate;
 import org.jdom.Document;
@@ -29,6 +25,11 @@ import org.jdom.Element;
 import org.jdom.JDOMException;
 import org.jdom.input.SAXBuilder;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+import java.util.List;
+
 
 /**
  * The parser for theme xml descriptors.
@@ -42,7 +43,7 @@ public class ThemeMetadataParser {
      * Unmarshall the given input stream into our defined
      * set of Java objects.
      **/
-    public ThemeMetadata unmarshall(InputStream instream) 
+    public ThemeMetadata unmarshall(InputStream instream)
         throws ThemeParsingException, IOException, JDOMException {
         
         if(instream == null)
@@ -58,6 +59,7 @@ public class ThemeMetadataParser {
         theme.setId(root.getChildText("id"));
         theme.setName(root.getChildText("name"));
         theme.setAuthor(root.getChildText("author"));
+        theme.setType(root.getChildText("type"));
         
         // if either id or name is null then throw a parsing exception
         if(StringUtils.isEmpty(theme.getId()) || StringUtils.isEmpty(theme.getName())) {
@@ -76,6 +78,7 @@ public class ThemeMetadataParser {
         Element stylesheet = root.getChild("stylesheet");
         if(stylesheet != null) {
             theme.setStylesheet(elementToStylesheet(stylesheet));
+
         }
         
         // now grab the static resources
@@ -93,6 +96,7 @@ public class ThemeMetadataParser {
         while (templatesIter.hasNext()) {
             Element template = (Element) templatesIter.next();
             ThemeMetadataTemplate tmpl = elementToTemplateMetadata(template);
+
             theme.addTemplate(tmpl);
             
             if(WeblogTemplate.ACTION_WEBLOG.equals(tmpl.getAction())) {
@@ -119,9 +123,33 @@ public class ThemeMetadataParser {
         template.setName(element.getChildText("name"));
         template.setDescription(element.getChildText("description"));
         template.setLink(element.getChildText("link"));
-        template.setTemplateLanguage(element.getChildText("templateLanguage"));
-        template.setContentType(element.getChildText("contentType"));
-        template.setContentsFile(element.getChildText("contentsFile"));
+
+        //parsing tempaltecode segment
+        List templateCodeList = element.getChildren("templateCode");
+        Iterator templCodeitr = templateCodeList.iterator();
+
+        while (templCodeitr.hasNext()){
+            Element templateCodeElement = (Element) templCodeitr.next();
+
+            ThemeMetadataTemplateCode templateCode = new ThemeMetadataTemplateCode();
+            templateCode.setTemplateLang(templateCodeElement.getChildText("templateLanguage"));
+            templateCode.setContentsFile(templateCodeElement.getChildText("contentsFile"));
+            templateCode.setContentType(templateCodeElement.getChildText("contentType"));
+            templateCode.setType(templateCodeElement.getChildText("type"));
+
+            // validating template code
+            if (StringUtils.isEmpty(templateCode.getContentsFile())) {
+                throw new ThemeParsingException("templateCode must contain a 'contentsFile' element");
+        }
+            if(StringUtils.isEmpty(templateCode.getTemplateLang())) {
+            throw new ThemeParsingException("templateCode must contain a 'templateLanguage' element");
+        }
+             if(StringUtils.isEmpty(templateCode.getType())) {
+            throw new ThemeParsingException("templateCode must contain a 'type' element");
+        }
+
+            template.addTemplateCode(templateCode.getType(),templateCode);
+        }
         
         String navbar = element.getChildText("navbar");
         if("true".equalsIgnoreCase(navbar)) {
@@ -140,12 +168,8 @@ public class ThemeMetadataParser {
         if(StringUtils.isEmpty(template.getName())) {
             throw new ThemeParsingException("templates must contain a 'name' element");
         }
-        if(StringUtils.isEmpty(template.getTemplateLanguage())) {
-            throw new ThemeParsingException("templates must contain a 'templateLanguage' element");
-        }
-        if(StringUtils.isEmpty(template.getContentsFile())) {
-            throw new ThemeParsingException("templates must contain a 'contentsFile' element");
-        }
+
+
         
         return template;
     }
@@ -159,8 +183,32 @@ public class ThemeMetadataParser {
         template.setName(element.getChildText("name"));
         template.setDescription(element.getChildText("description"));
         template.setLink(element.getChildText("link"));
-        template.setTemplateLanguage(element.getChildText("templateLanguage"));
-        template.setContentsFile(element.getChildText("contentsFile"));
+
+        // parsing templatecode segment
+         List templateCodeList = element.getChildren("templateCode");
+        Iterator templCodeitr = templateCodeList.iterator();
+
+        while (templCodeitr.hasNext()){
+            Element templateCodeElement = (Element) templCodeitr.next();
+
+            ThemeMetadataTemplateCode templateCode = new ThemeMetadataTemplateCode();
+            templateCode.setTemplateLang(templateCodeElement.getChildText("templateLanguage"));
+            templateCode.setContentsFile(templateCodeElement.getChildText("contentsFile"));
+            templateCode.setContentType(templateCodeElement.getChildText("contentType"));
+            templateCode.setType(templateCodeElement.getChildText("type"));
+
+            //validating stylesheet template code.
+            if (StringUtils.isEmpty(templateCode.getContentsFile())) {
+                throw new ThemeParsingException("stylesheet must contain a 'contentsFile' element");
+            }
+            if (StringUtils.isEmpty(templateCode.getTemplateLang())) {
+                throw new ThemeParsingException("stylesheet must contain a 'templateLanguage' element");
+            }
+            if (StringUtils.isEmpty(templateCode.getType())) {
+                throw new ThemeParsingException("templateCode must contain a 'type' element");
+            }
+            template.addTemplateCode(templateCode.getType(), templateCode);
+        }
         
         // validate template
         if(StringUtils.isEmpty(template.getName())) {
@@ -169,13 +217,7 @@ public class ThemeMetadataParser {
         if(StringUtils.isEmpty(template.getLink())) {
             throw new ThemeParsingException("stylesheet must contain a 'link' element");
         }
-        if(StringUtils.isEmpty(template.getTemplateLanguage())) {
-            throw new ThemeParsingException("stylesheet must contain a 'templateLanguage' element");
-        }
-        if(StringUtils.isEmpty(template.getContentsFile())) {
-            throw new ThemeParsingException("stylesheet must contain a 'contentsFile' element");
-        }
-        
+
         return template;
     }
     

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplate.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplate.java?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplate.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataTemplate.java Sat Sep 17 22:00:34 2011
@@ -19,6 +19,8 @@
 package org.apache.roller.weblogger.business.themes;
 
 
+import java.util.Hashtable;
+
 /**
  * A parsed 'template' element of a theme metadata descriptor.
  */
@@ -33,6 +35,10 @@ public class ThemeMetadataTemplate {
     private String templateLanguage = null;
     private String contentType = null;
     private String contentsFile = null;
+    private String type = null;
+    // Hash table to keep metadata about parsed template code files
+    private Hashtable<String, ThemeMetadataTemplateCode> templateCodeTable
+            = new Hashtable<String, ThemeMetadataTemplateCode>();
 
     public String getAction() {
         return action;
@@ -105,5 +111,25 @@ public class ThemeMetadataTemplate {
     public void setContentsFile(String contentsFile) {
         this.contentsFile = contentsFile;
     }
-    
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public void addTemplateCode(String type, ThemeMetadataTemplateCode templateCode) {
+        this.getTemplateCodeTable().put(type, templateCode);
+    }
+
+    public ThemeMetadataTemplateCode getTemplateCode(String type){
+        return this.getTemplateCodeTable().get(type);
+    }
+
+    public Hashtable<String, ThemeMetadataTemplateCode> getTemplateCodeTable() {
+        return templateCodeTable;
+    }
+
 }

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java Sat Sep 17 22:00:34 2011
@@ -18,16 +18,13 @@
 
 package org.apache.roller.weblogger.business.themes;
 
-import java.util.Date;
-import java.util.List;
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.MediaFileManager;
 import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.pojos.MediaFile;
-import org.apache.roller.weblogger.pojos.ThemeResource;
-import org.apache.roller.weblogger.pojos.ThemeTemplate;
-import org.apache.roller.weblogger.pojos.WeblogTheme;
-import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.*;
+
+import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -48,7 +45,11 @@ public class WeblogCustomTheme extends W
     public String getName() {
         return CUSTOM;
     }
-    
+
+    public String getType() {
+        return CUSTOM;
+    }
+
     public String getDescription() {
         return CUSTOM;
     }
@@ -79,7 +80,7 @@ public class WeblogCustomTheme extends W
      * Returns null if no stylesheet can be found.
      */
     public ThemeTemplate getStylesheet() throws WebloggerException {
-        return getTemplateByLink(this.weblog.getCustomStylesheetPath());
+       return getTemplateByLink(this.weblog.getCustomStylesheetPath());
     }
     
     
@@ -124,8 +125,8 @@ public class WeblogCustomTheme extends W
     public ThemeTemplate getTemplateByLink(String link) throws WebloggerException {
         if(link == null)
             return null;
-        
-        return WebloggerFactory.getWeblogger().getWeblogManager().getPageByLink(this.weblog, link);
+
+          return WebloggerFactory.getWeblogger().getWeblogManager().getPageByLink(this.weblog, link);
     }
     
     

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java Sat Sep 17 22:00:34 2011
@@ -18,22 +18,14 @@
 
 package org.apache.roller.weblogger.business.themes;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.MediaFileManager;
 import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.pojos.MediaFile;
-import org.apache.roller.weblogger.pojos.ThemeResource;
-import org.apache.roller.weblogger.pojos.ThemeTemplate;
-import org.apache.roller.weblogger.pojos.WeblogTheme;
-import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.*;
+
+import java.util.*;
 
 
 /**
@@ -59,7 +51,11 @@ public class WeblogSharedTheme extends W
     public String getName() {
         return this.theme.getName();
     }
-    
+
+    public String getType() {
+        return this.theme.getType();
+    }
+
     public String getDescription() {
         return this.theme.getDescription();
     }
@@ -119,11 +115,11 @@ public class WeblogSharedTheme extends W
      * Lookup the stylesheet template for this theme.
      * Returns null if no stylesheet can be found.
      */
-    public ThemeTemplate getStylesheet() throws WebloggerException {
+     public ThemeTemplate getStylesheet() throws WebloggerException {
         // stylesheet is handled differently than other templates because with
         // the stylesheet we want to return the weblog custom version if it
         // exists, otherwise we return the shared theme version
-        
+
         // load from theme first to see if we even support a stylesheet
         ThemeTemplate stylesheet = this.theme.getStylesheet();
         if(stylesheet != null) {
@@ -197,29 +193,29 @@ public class WeblogSharedTheme extends W
      * Lookup the specified template by link.
      * Returns null if the template cannot be found.
      */
-    public ThemeTemplate getTemplateByLink(String link) throws WebloggerException {
-        
+     public ThemeTemplate getTemplateByLink(String link) throws WebloggerException {
+
         if(link == null)
             return null;
-        
+
         ThemeTemplate template = null;
-        
+
         // if name refers to the stylesheet then return result of getStylesheet()
         ThemeTemplate stylesheet = getStylesheet();
         if(stylesheet != null && link.equals(stylesheet.getLink())) {
             return stylesheet;
         }
-        
+
         // first check if this user has selected a theme
         // if so then return the proper theme template
         template = this.theme.getTemplateByLink(link);
-        
+
         // if we didn't get the Template from a theme then look in the db
         if(template == null) {
             template = WebloggerFactory.getWeblogger()
                     .getWeblogManager().getPageByLink(this.weblog, link);
         }
-        
+
         return template;
     }
     

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/config/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1,3 +1,4 @@
 /roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/config:894711-895418
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/config:713070-782269
 /roller/branches/roller_mediablogging/weblogger-business/src/main/java/org/apache/roller/weblogger/config:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/config:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/business/jpa/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1,3 +1,4 @@
 /roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/business/jpa:894711-895418
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa:713070-782269
 /roller/branches/roller_mediablogging/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/business/jpa:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/business/jpa:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1,3 +1,4 @@
 /roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos:894711-895418
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos:713070-782269
 /roller/branches/roller_mediablogging/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/AutoPing.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/BookmarkComparator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/BookmarkComparator.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/BookmarkComparator.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/FileContent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/FileContent.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/FileContent.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/GlobalPermission.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFile.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileComparator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileComparator.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileComparator.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectoryComparator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileDirectoryComparator.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectoryComparator.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileFilter.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileFilter.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileTag.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileTag.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileTag.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileType.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFileType.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ObjectPermission.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/ObjectPermission.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ObjectPermission.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/PingTarget.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/PingTarget.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/PingTarget.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Resource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Resource.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Resource.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/RollerPermission.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/RollerPermission.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/RollerPermission.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StatCount.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/StatCount.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StatCount.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StatCountCountComparator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/StatCountCountComparator.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StatCountCountComparator.java:1139921-1160032

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java Sat Sep 17 22:00:34 2011
@@ -18,6 +18,9 @@
 
 package org.apache.roller.weblogger.pojos;
 
+import org.apache.roller.weblogger.WebloggerException;
+import org.apache.roller.weblogger.business.WebloggerFactory;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -37,6 +40,7 @@ public class StaticTemplate implements T
     private Date lastModified = new Date();
     private String templateLanguage = null;
     private String  outputContentType = null;
+    private String type = "standard";
     
     
     public StaticTemplate(String id, String lang) {
@@ -91,6 +95,18 @@ public class StaticTemplate implements T
         return outputContentType;
     }
 
+    public String getType() {
+        return type;
+    }
+
+    public WeblogTemplateCode getTemplateCode(String type) throws WebloggerException {
+        return WebloggerFactory.getWeblogger().getWeblogManager().getTemplateCodeByType(this.getId(),type);
+    }
+
+    public void setType(String type){
+         this.type = type;
+    }
+
     public void setOutputContentType(String outputContentType) {
         this.outputContentType = outputContentType;
     }

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/StaticTemplate.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java:1139921-1160032

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java Sat Sep 17 22:00:34 2011
@@ -18,6 +18,9 @@
 
 package org.apache.roller.weblogger.pojos;
 
+import org.apache.roller.weblogger.WebloggerException;
+import org.apache.roller.weblogger.business.WebloggerFactory;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -44,6 +47,7 @@ public class StaticThemeTemplate impleme
     private String outputContentType = null;
     private String decoratorName = null;
     private ThemeTemplate decorator = null;
+    private String type = "standard";
     
     
     public StaticThemeTemplate(String id, String lang) {
@@ -99,6 +103,18 @@ public class StaticThemeTemplate impleme
         return outputContentType;
     }
 
+    public String getType() {
+        return type;
+    }
+
+    public WeblogTemplateCode getTemplateCode(String type) throws WebloggerException {
+        return WebloggerFactory.getWeblogger().getWeblogManager().getTemplateCodeByType(this.id, type);
+    }
+
+    public void setType(String type){
+          this.type = type;
+    }
+
     public void setOutputContentType(String outputContentType) {
         this.outputContentType = outputContentType;
     }

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TagStat.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/TagStat.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TagStat.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TagStatComparator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/TagStatComparator.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TagStatComparator.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TagStatCountComparator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/TagStatCountComparator.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TagStatCountComparator.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TaskLock.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/TaskLock.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/TaskLock.java:1139921-1160032

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Template.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Template.java?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Template.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Template.java Sat Sep 17 22:00:34 2011
@@ -18,6 +18,8 @@
 
 package org.apache.roller.weblogger.pojos;
 
+import org.apache.roller.weblogger.WebloggerException;
+
 import java.util.Date;
 
 
@@ -56,12 +58,35 @@ public interface Template {
     /**
      * The templating language used by this template.
      */
+
     public String getTemplateLanguage();
+
+    /**
+     * Set the template language.This is used by template code object to assign
+     * correct template language for different template content types
+     */
+    public  void setTemplateLanguage(String templateLanguage);
     
     
     /**
      * Content-type of output or null if none defined.
      */
     public String getOutputContentType();
+
+    /**
+     *
+     * type of the template , eg: standard , mobile etc.
+     */
+    //TODO need to remove this type from weblog template as one template acts in different types
+
+    @Deprecated
+    //Moved to templateCode
+    public String getType();
+
+    /**
+     *
+     * get the Template code object for the given type.
+     */
+    public WeblogTemplateCode getTemplateCode(String type) throws WebloggerException;
     
 }

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Template.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Template.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Template.java:1139921-1160032

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Theme.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Theme.java?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Theme.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Theme.java Sat Sep 17 22:00:34 2011
@@ -18,9 +18,10 @@
 
 package org.apache.roller.weblogger.pojos;
 
+import org.apache.roller.weblogger.WebloggerException;
+
 import java.util.Date;
 import java.util.List;
-import org.apache.roller.weblogger.WebloggerException;
 
 
 /**
@@ -39,7 +40,11 @@ public interface Theme {
      * A common or display name for this Theme.
      */
     public String getName();
-    
+
+    /**
+     * Metadata to identify a theme Type  eg: standard , mobile  etc.
+     */
+     public String getType();
     
     /**
      * A description of the Theme.

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Theme.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Theme.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Theme.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ThemeResource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/ThemeResource.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ThemeResource.java:1139921-1160032

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java Sat Sep 17 22:00:34 2011
@@ -52,8 +52,12 @@ public interface ThemeTemplate extends T
      * The contents or body of the Template.
      */
     public String getContents();
-    
-    
+
+    /**
+     * set content. This will be used by template code objects to store different
+     * types of template contents
+     */
+     public void setContents(String contents);
     /**
      * The url link value for this Template.  If this template is not
      * private this is the url that it can be accessed at.
@@ -84,5 +88,5 @@ public interface ThemeTemplate extends T
      * should be applied.
      */
     public ThemeTemplate getDecorator();
-    
+
 }

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/User.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/User.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/UserAttribute.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/UserRole.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/UserRole.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/UserRole.java:1139921-1160032

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java Sat Sep 17 22:00:34 2011
@@ -94,6 +94,7 @@ public class Weblog implements Serializa
     private String  iconPath         = null;
     private String  about            = null;
     private String  creator          = null;
+
     
     // Associated objects
     private List           permissions = new ArrayList();
@@ -1252,4 +1253,25 @@ public class Weblog implements Serializa
 
     /** No-op method to please XDoclet */
     public void setEntryCount(int ignored) {}
+
+
+    /**
+     *
+     * @return  mobileTheme
+     */
+
+    public Theme getTheme(String type){
+        WeblogThemeAssoc themeAssoc;
+        Theme theme = null;
+        try {
+            //get Theme Associativity object so we can get the ThemeName for the type given
+            themeAssoc = WebloggerFactory.getWeblogger().getWeblogManager().getThemeAssoc(this ,type);
+            if(themeAssoc != null)
+                // get the Theme from theme manager
+              theme = WebloggerFactory.getWeblogger().getThemeManager().getTheme(themeAssoc.getName());
+        } catch (WebloggerException e) {
+            log.error("Error getting Weblog Theme type -"+type+"for weblog "+getHandle(),e);
+        }
+        return theme;
+    }
 }

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogCategory.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategory.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategoryPathComparator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogCategoryPathComparator.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategoryPathComparator.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogPermission.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogReferrer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogReferrer.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogReferrer.java:1139921-1160032

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java Sat Sep 17 22:00:34 2011
@@ -18,16 +18,18 @@
 
 package org.apache.roller.weblogger.pojos;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.util.UUIDGenerator;
+import org.apache.roller.weblogger.WebloggerException;
+import org.apache.roller.weblogger.business.WebloggerFactory;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
 
 
 /**
@@ -57,11 +59,11 @@ public class WeblogTemplate implements T
     private boolean navbar = false;
     private String  decoratorName = null;
     private String  outputContentType = null;
+    private String  type = null;
     
     // associations
     private Weblog weblog = null;
-    
-    
+
     static {
         requiredTemplates = new HashSet();
         requiredTemplates.add("Weblog");
@@ -102,7 +104,6 @@ public class WeblogTemplate implements T
         this.weblog = website;
     }
     
-    
     public String getAction() {
         return action;
     }
@@ -231,7 +232,19 @@ public class WeblogTemplate implements T
     public boolean isCustom() {
         return ACTION_CUSTOM.equals(getAction()) && !isRequired();
     }
-    
+
+    public WeblogTemplateCode getTemplateCode(String type) throws WebloggerException {
+        return WebloggerFactory.getWeblogger().getWeblogManager().getTemplateCodeByType(this.id, type);
+    }
+
+      public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     
     //------------------------------------------------------- Good citizenship
 
@@ -263,5 +276,5 @@ public class WeblogTemplate implements T
             .append(getWebsite())
             .toHashCode();
     }
-    
+
 }

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTheme.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogTheme.java:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/WeblogTheme.java:1139921-1160032

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java Sat Sep 17 22:00:34 2011
@@ -18,22 +18,13 @@
 
 package org.apache.roller.weblogger.pojos.wrapper;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-import java.util.TimeZone;
+import com.sun.org.apache.bcel.internal.generic.RETURN;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.URLStrategy;
-import org.apache.roller.weblogger.pojos.ThemeTemplate;
-import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.WeblogCategory;
-import org.apache.roller.weblogger.pojos.WeblogEntry;
-import org.apache.roller.weblogger.pojos.WeblogEntryComment;
-import org.apache.roller.weblogger.pojos.WeblogReferrer;
+import org.apache.roller.weblogger.pojos.*;
+
+import java.util.*;
 
 
 /**
@@ -46,39 +37,56 @@ public class WeblogWrapper {
     
     // url strategy to use for any url building
     private final URLStrategy urlStrategy;
+
+    // type of the request detected at  Page model
+    private String type = "standard";
     
     
     // this is private so that we can force the use of the .wrap(pojo) method
-    private WeblogWrapper(Weblog toWrap, URLStrategy strat) {
+    private WeblogWrapper(Weblog toWrap, URLStrategy strat, String type) {
         this.pojo = toWrap;
         this.urlStrategy = strat;
+        this.type = type;
     }
     
     
-    // wrap the given pojo if it is not null
-    public static WeblogWrapper wrap(Weblog toWrap, URLStrategy strat) {
+    // wrap the given pojo if it is not null with detected type
+    public static WeblogWrapper wrap(Weblog toWrap, URLStrategy strat, String type) {
         if(toWrap != null)
-            return new WeblogWrapper(toWrap, strat);
+            return new WeblogWrapper(toWrap, strat , type);
         
         return null;
     }
+      //wrap the given pojo if it is not null without changing type. (i.e using default)
+     public static WeblogWrapper wrap(Weblog toWrap, URLStrategy strat) {
+        if(toWrap != null)
+            return new WeblogWrapper(toWrap, strat , "standard");
+
+        return null;
+    }
     
     
     public ThemeTemplateWrapper getPageByAction(String action)
             throws WebloggerException {
-        return ThemeTemplateWrapper.wrap(this.pojo.getTheme().getTemplateByAction(action));
+        ThemeTemplate templateToWrap = this.pojo.getTheme().getTemplateByAction(action);
+        prepareTemplate(templateToWrap, type);
+        return ThemeTemplateWrapper.wrap(templateToWrap);
     }
     
     
     public ThemeTemplateWrapper getPageByName(String name)
             throws WebloggerException {
-        return ThemeTemplateWrapper.wrap(this.pojo.getTheme().getTemplateByName(name));
+       ThemeTemplate templateToWrap = this.pojo.getTheme().getTemplateByName(name);
+        prepareTemplate(templateToWrap, type);
+        return ThemeTemplateWrapper.wrap(templateToWrap);
     }
     
     
     public ThemeTemplateWrapper getPageByLink(String link)
             throws WebloggerException {
-        return ThemeTemplateWrapper.wrap(this.pojo.getTheme().getTemplateByLink(link));
+        ThemeTemplate templateToWrap = this.pojo.getTheme().getTemplateByLink(link);
+        prepareTemplate(templateToWrap, type);
+        return ThemeTemplateWrapper.wrap(templateToWrap);
     }
     
     
@@ -268,7 +276,7 @@ public class WeblogWrapper {
         }
         return null;
     }
-    
+
     
     /**
      * Get path to weblog icon image if defined.
@@ -464,5 +472,35 @@ public class WeblogWrapper {
     public Weblog getPojo() {
         return this.pojo;
     }
-    
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    /**
+     * @param page
+     * @param type
+     * @return
+     *
+     * Prepare template to add the correct template content
+     */
+    private ThemeTemplate prepareTemplate(ThemeTemplate page, String type) throws WebloggerException {
+
+        WeblogTemplateCode templateCode = page.getTemplateCode(type);
+
+        if (templateCode != null) {
+            page.setContents(templateCode.getTemplate());
+            page.setTemplateLanguage(templateCode.getTemplateLanguage());
+            return page;
+        } else {
+            // if there is no template code present we fall back to default template
+            return page;
+        }
+
+    }
+
 }

Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/util/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1,3 +1,4 @@
 /roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/util:894711-895418
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/util:713070-782269
 /roller/branches/roller_mediablogging/weblogger-business/src/main/java/org/apache/roller/weblogger/util:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/java/org/apache/roller/weblogger/util:1139921-1160032

Modified: roller/trunk/weblogger-business/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/META-INF/persistence.xml?rev=1172075&r1=1172074&r2=1172075&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/META-INF/persistence.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/META-INF/persistence.xml Sat Sep 17 22:00:34 2011
@@ -28,5 +28,7 @@
         <mapping-file>org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml            </mapping-file>	
         <mapping-file>org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml      </mapping-file>
         <class>org.apache.roller.weblogger.pojos.AutoPing</class>
+        <class>org.apache.roller.weblogger.pojos.WeblogThemeAssoc</class>
+        <class>org.apache.roller.weblogger.pojos.WeblogTemplateCode</class>
     </persistence-unit>  
 </persistence>

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/jpa/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/package.html:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/jpa/package.html:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/package.html:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/package.html:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/pings/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/pings/package.html:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/pings/package.html:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/plugins/comment/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/comment/package.html:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/plugins/comment/package.html:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/plugins/entry/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/entry/package.html:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/plugins/entry/package.html:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/plugins/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/plugins/package.html:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/plugins/package.html:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/referrers/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/referrers/package.html:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/referrers/package.html:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/runnable/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/package.html:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/runnable/package.html:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/search/operations/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/package.html:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/search/operations/package.html:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/search/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/package.html:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/search/package.html:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/startup/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/startup/package.html:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/startup/package.html:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/themes/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/package.html:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/business/themes/package.html:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/config/package.html:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/package.html:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/config/roller.properties:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/runtime/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/config/runtime/package.html:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/runtime/package.html:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/config/runtimeConfigDefs.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/planet/business/jpa/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa/package.html:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/planet/business/jpa/package.html:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/planet/business/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/package.html:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/planet/business/package.html:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/planet/tasks/package.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/planet/tasks/package.html:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/planet/tasks/package.html:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFile.orm.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/PingTarget.orm.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/TaskLock.orm.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/User.orm.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/UserRole.orm.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.orm.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml:1139921-1160032

Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 22:00:34 2011
@@ -1 +1,2 @@
 /roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml:713070-782269
+/roller/branches/roller_mobile/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml:1139921-1160032



Mime
View raw message