Return-Path: 
 <commits-return-8956-apmail-roller-commits-archive=roller.apache.org@roller.apache.org>
X-Original-To: apmail-roller-commits-archive@www.apache.org
Delivered-To: apmail-roller-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id DD1A811940
	for <apmail-roller-commits-archive@www.apache.org>;
 Sat, 19 Jul 2014 23:35:49 +0000 (UTC)
Received: (qmail 91997 invoked by uid 500); 19 Jul 2014 23:35:49 -0000
Delivered-To: apmail-roller-commits-archive@roller.apache.org
Received: (qmail 91966 invoked by uid 500); 19 Jul 2014 23:35:49 -0000
Mailing-List: contact commits-help@roller.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@roller.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@roller.apache.org>
List-Post: <mailto:commits@roller.apache.org>
List-Id: <commits.roller.apache.org>
Reply-To: dev@roller.apache.org
Delivered-To: mailing list commits@roller.apache.org
Received: (qmail 91957 invoked by uid 99); 19 Jul 2014 23:35:49 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Jul 2014 23:35:49 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Jul 2014 23:35:48 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id CFC9823889F1;
	Sat, 19 Jul 2014 23:35:27 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1611984 [2/2] - in /roller/trunk/app/src:
 main/java/org/apache/roller/weblogger/business/plugins/entry/
 main/java/org/apache/roller/weblogger/business/themes/
 main/java/org/apache/roller/weblogger/pojos/
 main/java/org/apache/roller/weblogg...
Date: Sat, 19 Jul 2014 23:35:26 -0000
To: commits@roller.apache.org
From: gmazza@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140719233527.CFC9823889F1@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: roller/trunk/app/src/main/webapp/themes/frontpage/theme.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/frontpage/theme.xml?rev=1611984&r1=1611983&r2=1611984&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/frontpage/theme.xml (original)
+++ roller/trunk/app/src/main/webapp/themes/frontpage/theme.xml Sat Jul 19 23:35:25 2014
@@ -16,9 +16,9 @@
     <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
+        <contentType>text/html</contentType>
         <templateCode>
            <templateLanguage>velocity</templateLanguage>
-           <contentType>text/html</contentType>
            <contentsFile>weblog.vm</contentsFile>
            <type>standard</type>
        </templateCode>
@@ -30,9 +30,9 @@
     <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
-         <templateCode>
+        <contentType>text/html</contentType>
+        <templateCode>
            <templateLanguage>velocity</templateLanguage>
-           <contentType>text/html</contentType>
            <contentsFile>_blogdirectory.vm</contentsFile>
            <type>standard</type>
        </templateCode>
@@ -44,9 +44,9 @@
     <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
+        <contentType>text/html</contentType>
         <templateCode>
            <templateLanguage>velocity</templateLanguage>
-           <contentType>text/html</contentType>
            <contentsFile>_blogprofile.vm</contentsFile>
            <type>standard</type>
        </templateCode>
@@ -58,9 +58,9 @@
     <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
+        <contentType>text/html</contentType>
         <templateCode>
            <templateLanguage>velocity</templateLanguage>
-           <contentType>text/html</contentType>
            <contentsFile>_blogs.vm</contentsFile>
            <type>standard</type>
        </templateCode>
@@ -72,9 +72,9 @@
     <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
+        <contentType>text/html</contentType>
         <templateCode>
            <templateLanguage>velocity</templateLanguage>
-           <contentType>text/html</contentType>
            <contentsFile>_css.vm</contentsFile>
            <type>standard</type>
        </templateCode>
@@ -86,9 +86,9 @@
     <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
+        <contentType>text/html</contentType>
         <templateCode>
            <templateLanguage>velocity</templateLanguage>
-           <contentType>text/html</contentType>
            <contentsFile>_day.vm</contentsFile>
            <type>standard</type>
        </templateCode>
@@ -100,9 +100,9 @@
     <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
+        <contentType>text/html</contentType>
         <templateCode>
            <templateLanguage>velocity</templateLanguage>
-           <contentType>text/html</contentType>
            <contentsFile>_decorator.vm</contentsFile>
            <type>standard</type>
        </templateCode>
@@ -114,9 +114,9 @@
     <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
+        <contentType>text/html</contentType>
         <templateCode>
            <templateLanguage>velocity</templateLanguage>
-           <contentType>text/html</contentType>
            <contentsFile>_entry.vm</contentsFile>
            <type>standard</type>
        </templateCode>
@@ -128,9 +128,9 @@
     <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
+        <contentType>text/html</contentType>
         <templateCode>
            <templateLanguage>velocity</templateLanguage>
-           <contentType>text/html</contentType>
            <contentsFile>_footer.vm</contentsFile>
            <type>standard</type>
        </templateCode>
@@ -142,12 +142,12 @@
     <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
-         <templateCode>
+        <contentType>text/html</contentType>
+        <templateCode>
            <templateLanguage>velocity</templateLanguage>
-           <contentType>text/html</contentType>
            <contentsFile>_header.vm</contentsFile>
            <type>standard</type>
-       </templateCode>
+        </templateCode>
     </template>
     
     <template action="custom">
@@ -156,12 +156,12 @@
     <link>directory</link>
         <navbar>false</navbar>
         <hidden>false</hidden>
-         <templateCode>
+        <contentType>text/html</contentType>
+        <templateCode>
            <templateLanguage>velocity</templateLanguage>
-           <contentType>text/html</contentType>
            <contentsFile>directory.vm</contentsFile>
            <type>standard</type>
-       </templateCode>
+        </templateCode>
     </template>
     
     <!-- resources -->

Modified: roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml?rev=1611984&r1=1611983&r2=1611984&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml (original)
+++ roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml Sat Jul 19 23:35:25 2014
@@ -16,9 +16,9 @@
         <name>custom.css</name>
         <description>Custom style sheet</description>
 	    <link>custom.css</link>
+        <contentType>text/html</contentType>
         <templateCode>
            <templateLanguage>velocity</templateLanguage>
-           <contentType>text/html</contentType>
            <contentsFile>custom_css.vm</contentsFile>
            <type>standard</type>
        </templateCode>
@@ -31,9 +31,9 @@
 	    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
+        <contentType>text/html</contentType>
         <templateCode>
            <templateLanguage>velocity</templateLanguage>
-           <contentType>text/html</contentType>
            <contentsFile>weblog.vm</contentsFile>
            <type>standard</type>
        </templateCode>
@@ -45,9 +45,9 @@
 	    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
+        <contentType>text/html</contentType>
         <templateCode>
            <templateLanguage>velocity</templateLanguage>
-           <contentType>text/html</contentType>
            <contentsFile>entry.vm</contentsFile>
            <type>standard</type>
        </templateCode>
@@ -59,9 +59,9 @@
 	    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
+        <contentType>text/html</contentType>
         <templateCode>
            <templateLanguage>velocity</templateLanguage>
-           <contentType>text/html</contentType>
            <contentsFile>tags_index.vm</contentsFile>
            <type>standard</type>
        </templateCode>
@@ -73,9 +73,9 @@
 	    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
+        <contentType>text/html</contentType>
         <templateCode>
            <templateLanguage>velocity</templateLanguage>
-           <contentType>text/html</contentType>
            <contentsFile>search.vm</contentsFile>
            <type>standard</type>
        </templateCode>
@@ -87,9 +87,9 @@
 	    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
+        <contentType>text/html</contentType>
         <templateCode>
            <templateLanguage>velocity</templateLanguage>
-           <contentType>text/html</contentType>
            <contentsFile>day.vm</contentsFile>
            <type>standard</type>
        </templateCode>
@@ -101,9 +101,9 @@
 	    <link>archives</link>
         <navbar>true</navbar>
         <hidden>false</hidden>
-         <templateCode>
+        <contentType>text/html</contentType>
+        <templateCode>
            <templateLanguage>velocity</templateLanguage>
-           <contentType>text/html</contentType>
            <contentsFile>archives.vm</contentsFile>
            <type>standard</type>
        </templateCode>
@@ -115,9 +115,9 @@
 	    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
-         <templateCode>
+        <contentType>text/html</contentType>
+        <templateCode>
            <templateLanguage>velocity</templateLanguage>
-           <contentType>text/html</contentType>
            <contentsFile>std_head.vm</contentsFile>
            <type>standard</type>
        </templateCode>
@@ -129,9 +129,9 @@
 	    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
+        <contentType>text/html</contentType>
         <templateCode>
            <templateLanguage>velocity</templateLanguage>
-           <contentType>text/html</contentType>
            <contentsFile>std_header.vm</contentsFile>
            <type>standard</type>
        </templateCode>
@@ -143,9 +143,9 @@
 	    <link></link>
         <navbar>false</navbar>
         <hidden>true</hidden>
-         <templateCode>
+        <contentType>text/html</contentType>
+        <templateCode>
            <templateLanguage>velocity</templateLanguage>
-           <contentType>text/html</contentType>
            <contentsFile>std_footer.vm</contentsFile>
            <type>standard</type>
        </templateCode>

Modified: roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/CustomTemplateRenditionTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/CustomTemplateRenditionTest.java?rev=1611984&r1=1611983&r2=1611984&view=diff
==============================================================================
--- roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/CustomTemplateRenditionTest.java (original)
+++ roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/CustomTemplateRenditionTest.java Sat Jul 19 23:35:25 2014
@@ -72,11 +72,8 @@ public class CustomTemplateRenditionTest
            testPage.setName("testTemplate");
            testPage.setDescription("Test Weblog Template");
            testPage.setLink("testTemp");
-           testPage.setContents("a test weblog template.");
            testPage.setLastModified(new java.util.Date());
            testPage.setWebsite(TestUtils.getManagedWebsite(testWeblog));
-           testPage.setTemplateLanguage("velocity");
-           testPage.setType("standard");
        }
 
        public void tearDown() throws Exception {

Modified: roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java?rev=1611984&r1=1611983&r2=1611984&view=diff
==============================================================================
--- roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java (original)
+++ roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java Sat Jul 19 23:35:25 2014
@@ -74,11 +74,8 @@ public class WeblogPageTest extends Test
         testPage.setName("testTemplate");
         testPage.setDescription("Test Weblog Template");
         testPage.setLink("testTemp");
-        testPage.setContents("a test weblog template.");
         testPage.setLastModified(new java.util.Date());
         testPage.setWebsite(TestUtils.getManagedWebsite(testWeblog));
-        testPage.setTemplateLanguage("velocity");
-        testPage.setType("standard");
     }
     
     public void tearDown() throws Exception {
@@ -113,8 +110,7 @@ public class WeblogPageTest extends Test
         template = null;
         template = mgr.getPageByName(testWeblog, testPage.getName());
         assertNotNull(template);
-        assertEquals(testPage.getContents(), template.getContents());
-        
+
         // update template
         template.setName("testtesttest");
         mgr.savePage(template);
@@ -125,8 +121,7 @@ public class WeblogPageTest extends Test
         testWeblog = TestUtils.getManagedWebsite(testWeblog);
         template = mgr.getPageByName(testWeblog, "testtesttest");
         assertNotNull(template);
-        assertEquals(testPage.getContents(), template.getContents());
-        
+
         // delete template
         mgr.removePage(template);
         TestUtils.endSession(true);
@@ -155,27 +150,23 @@ public class WeblogPageTest extends Test
         // lookup by id
         page = mgr.getPage(id);
         assertNotNull(page);
-        assertEquals(testPage.getContents(), page.getContents());
-        
+
         // lookup by action
         page = null;
         testWeblog = TestUtils.getManagedWebsite(testWeblog);
         page = mgr.getPageByAction(testWeblog, testPage.getAction());
         assertNotNull(page);
-        assertEquals(testPage.getContents(), page.getContents());
-        
+
         // lookup by name
         page = null;
         page = mgr.getPageByName(testWeblog, testPage.getName());
         assertNotNull(page);
-        assertEquals(testPage.getContents(), page.getContents());
-        
+
         // lookup by link
         page = null;
         page = mgr.getPageByLink(testWeblog, testPage.getLink());
         assertNotNull(page);
-        assertEquals(testPage.getContents(), page.getContents());
-        
+
         // lookup all pages for weblog
         List pages = mgr.getPages(testWeblog);
         assertNotNull(pages);