You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/05/02 00:10:56 UTC
svn commit: r398709 [1/2] - in /incubator/roller/trunk:
contrib/plugins/src/org/roller/ metadata/database/hibernate/
metadata/xdoclet/ src/org/roller/ web/ web/WEB-INF/ web/WEB-INF/classes/
web/WEB-INF/jsps/ web/bookmarks/ web/planet/ web/tags/ web/the...
Author: snoopdave
Date: Mon May 1 15:10:52 2006
New Revision: 398709
URL: http://svn.apache.org/viewcvs?rev=398709&view=rev
Log:
Moving to org.apache.roller packaging
Removed:
incubator/roller/trunk/contrib/plugins/src/org/roller/
incubator/roller/trunk/src/org/roller/
Modified:
incubator/roller/trunk/metadata/database/hibernate/hibernate.cfg.xml
incubator/roller/trunk/metadata/xdoclet/dataobject-custom.j
incubator/roller/trunk/metadata/xdoclet/struts_form.xdt
incubator/roller/trunk/metadata/xdoclet/taglib-tag.xml
incubator/roller/trunk/web/WEB-INF/classes/ehcache.xml
incubator/roller/trunk/web/WEB-INF/classes/log4j.properties
incubator/roller/trunk/web/WEB-INF/classes/roller.properties
incubator/roller/trunk/web/WEB-INF/classes/rome.properties
incubator/roller/trunk/web/WEB-INF/jsps/denied.jsp
incubator/roller/trunk/web/WEB-INF/jsps/errorBody.jsp
incubator/roller/trunk/web/WEB-INF/jspwiki.properties
incubator/roller/trunk/web/WEB-INF/velocity.properties
incubator/roller/trunk/web/bookmarks/import.jsp
incubator/roller/trunk/web/keepalive.jsp
incubator/roller/trunk/web/login-redirect.jsp
incubator/roller/trunk/web/logout-redirect.jsp
incubator/roller/trunk/web/main.jsp
incubator/roller/trunk/web/planet/planet.jsp
incubator/roller/trunk/web/taglibs.jsp
incubator/roller/trunk/web/tags/date.jsp
incubator/roller/trunk/web/theme/searchResults.jsp
incubator/roller/trunk/web/weblog/CommentManagement.jsp
incubator/roller/trunk/web/weblog/CommentManagementSidebar.jsp
incubator/roller/trunk/web/weblog/CustomPingTargets.jsp
incubator/roller/trunk/web/weblog/PingResult.jsp
incubator/roller/trunk/web/weblog/Pings.jsp
incubator/roller/trunk/web/weblog/WeblogEdit.jsp
incubator/roller/trunk/web/weblog/WeblogEditSidebar.jsp
incubator/roller/trunk/web/weblog/WeblogEntryManagement.jsp
incubator/roller/trunk/web/weblog/WeblogEntryManagementSidebar.jsp
incubator/roller/trunk/web/weblog/WeblogEntryRemove.jsp
incubator/roller/trunk/web/weblog/editor-ekit.jsp
incubator/roller/trunk/web/weblog/export-entries.jsp
incubator/roller/trunk/web/weblog/spellcheck-entry.jsp
incubator/roller/trunk/web/website/CommonPingTargets.jsp
incubator/roller/trunk/web/website/edit-pages.jsp
incubator/roller/trunk/web/website/edit-website.jsp
incubator/roller/trunk/web/website/rollerProperties.jsp
incubator/roller/trunk/web/website/theme-editor.jsp
Modified: incubator/roller/trunk/metadata/database/hibernate/hibernate.cfg.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/database/hibernate/hibernate.cfg.xml?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/database/hibernate/hibernate.cfg.xml (original)
+++ incubator/roller/trunk/metadata/database/hibernate/hibernate.cfg.xml Mon May 1 15:10:52 2006
@@ -72,31 +72,31 @@
<!-- Map Roller pojo classes -->
- <mapping resource="org/roller/pojos/BookmarkData.hbm.xml" />
- <mapping resource="org/roller/pojos/CommentData.hbm.xml" />
- <mapping resource="org/roller/pojos/EntryAttributeData.hbm.xml" />
- <mapping resource="org/roller/pojos/FolderAssoc.hbm.xml" />
- <mapping resource="org/roller/pojos/FolderData.hbm.xml" />
- <mapping resource="org/roller/pojos/WeblogTemplate.hbm.xml" />
- <mapping resource="org/roller/pojos/PingCategoryRestrictionData.hbm.xml" />
- <mapping resource="org/roller/pojos/AutoPingData.hbm.xml" />
- <mapping resource="org/roller/pojos/PingQueueEntryData.hbm.xml" />
- <mapping resource="org/roller/pojos/PingTargetData.hbm.xml" />
- <mapping resource="org/roller/pojos/RefererData.hbm.xml" />
- <mapping resource="org/roller/pojos/RoleData.hbm.xml" />
- <mapping resource="org/roller/pojos/RollerConfigData.hbm.xml" />
- <mapping resource="org/roller/pojos/UserData.hbm.xml" />
- <mapping resource="org/roller/pojos/WeblogCategoryData.hbm.xml" />
- <mapping resource="org/roller/pojos/WeblogCategoryAssoc.hbm.xml" />
- <mapping resource="org/roller/pojos/WeblogEntryData.hbm.xml" />
- <mapping resource="org/roller/pojos/WebsiteData.hbm.xml" />
- <mapping resource="org/roller/pojos/RollerPropertyData.hbm.xml" />
- <mapping resource="org/roller/pojos/PermissionsData.hbm.xml" />
- <mapping resource="org/roller/pojos/PlanetConfigData.hbm.xml" />
- <mapping resource="org/roller/pojos/PlanetGroupData.hbm.xml" />
- <mapping resource="org/roller/pojos/PlanetEntryData.hbm.xml" />
- <mapping resource="org/roller/pojos/PlanetSubscriptionData.hbm.xml" />
- <mapping resource="org/roller/pojos/PlanetGroupSubscriptionAssoc.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/BookmarkData.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/CommentData.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/EntryAttributeData.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/FolderAssoc.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/FolderData.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/WeblogTemplate.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/PingCategoryRestrictionData.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/AutoPingData.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/PingQueueEntryData.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/PingTargetData.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/RefererData.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/RoleData.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/RollerConfigData.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/UserData.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/WeblogCategoryData.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/WeblogCategoryAssoc.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/WeblogEntryData.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/WebsiteData.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/RollerPropertyData.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/PermissionsData.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/PlanetConfigData.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/PlanetGroupData.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/PlanetEntryData.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/PlanetSubscriptionData.hbm.xml" />
+ <mapping resource="org/apache/roller/pojos/PlanetGroupSubscriptionAssoc.hbm.xml" />
</session-factory>
</hibernate-configuration>
Modified: incubator/roller/trunk/metadata/xdoclet/dataobject-custom.j
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/xdoclet/dataobject-custom.j?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/xdoclet/dataobject-custom.j (original)
+++ incubator/roller/trunk/metadata/xdoclet/dataobject-custom.j Mon May 1 15:10:52 2006
@@ -2,7 +2,7 @@
/**
* Setter is needed in RollerImpl.storeValueObject()
*/
- public void setData( org.roller.model.ValueObject otherData )
+ public void setData( org.apache.roller.model.ValueObject otherData )
{
<XDtEjbPersistent:forAllPersistentFields>
<XDtEjbDataObj:ifIsAggregate>
Modified: incubator/roller/trunk/metadata/xdoclet/struts_form.xdt
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/xdoclet/struts_form.xdt?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/xdoclet/struts_form.xdt (original)
+++ incubator/roller/trunk/metadata/xdoclet/struts_form.xdt Mon May 1 15:10:52 2006
@@ -1,6 +1,6 @@
package <XDtPackage:packageOf><XDtStrutsForm:strutsFormClass/></XDtPackage:packageOf>;
-import org.roller.RollerException;
+import org.apache.roller.RollerException;
import java.util.Locale;
/**
Modified: incubator/roller/trunk/metadata/xdoclet/taglib-tag.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/xdoclet/taglib-tag.xml?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/xdoclet/taglib-tag.xml (original)
+++ incubator/roller/trunk/metadata/xdoclet/taglib-tag.xml Mon May 1 15:10:52 2006
@@ -3,7 +3,7 @@
<tag>
<name>link</name>
- <tag-class>org.roller.presentation.tags.LinkTag</tag-class>
+ <tag-class>org.apache.roller.presentation.tags.LinkTag</tag-class>
<body-content>JSP</body-content>
@@ -259,7 +259,7 @@
<tag>
<name>linkparam</name>
- <tag-class>org.roller.presentation.tags.LinkParamTag</tag-class>
+ <tag-class>org.apache.roller.presentation.tags.LinkParamTag</tag-class>
<body-content>JSP</body-content>
Modified: incubator/roller/trunk/web/WEB-INF/classes/ehcache.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/ehcache.xml?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/ehcache.xml (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/ehcache.xml Mon May 1 15:10:52 2006
@@ -10,17 +10,17 @@
timeToLiveSeconds="1200"
overflowToDisk="false" />
- <cache name="org.roller.pojos.RollerPropertyData"
+ <cache name="org.apache.roller.pojos.RollerPropertyData"
maxElementsInMemory="100"
eternal="false"
overflowToDisk="false" />
- <cache name="org.roller.pojos.UserData"
+ <cache name="org.apache.roller.pojos.UserData"
maxElementsInMemory="1000"
eternal="false"
overflowToDisk="false" />
- <cache name="org.roller.pojos.WebsiteData"
+ <cache name="org.apache.roller.pojos.WebsiteData"
maxElementsInMemory="1000"
eternal="false"
overflowToDisk="false" />
Modified: incubator/roller/trunk/web/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/log4j.properties?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/log4j.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/log4j.properties Mon May 1 15:10:52 2006
@@ -24,8 +24,8 @@
log4j.appender.roller.layout.ConversionPattern=%-5p %d{yyyy-MM-dd HH:mm:ss,SSS} %C{1}:%M - %m%n
# Options are: DEBUG, INFO, WARN, ERROR, FATAL
-log4j.category.org.roller=INFO
-log4j.category.org.roller.presentation.webservices.atomprotocol=DEBUG
+log4j.category.org.apache.roller=INFO
+log4j.category.org.apache.roller.presentation.webservices.atomprotocol=DEBUG
log4j.category.com.ecyrd.jspwiki=ERROR
log4j.category.com.opensymphony.oscache=ERROR
log4j.category.org.hibernate=INFO
Modified: incubator/roller/trunk/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/roller.properties?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/roller.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/roller.properties Mon May 1 15:10:52 2006
@@ -89,7 +89,7 @@
#-----------------------------------
# The default cache implementation we want to use
-cache.defaultFactory=org.roller.presentation.cache.ExpiringLRUCacheFactoryImpl
+cache.defaultFactory=org.apache.roller.presentation.cache.ExpiringLRUCacheFactoryImpl
cache.customHandlers=
# This sets how many minutes into the future we look to prepare
@@ -151,34 +151,34 @@
# Weblog entry editor plugins
plugins.page=\
-org.roller.presentation.velocity.plugins.convertbreaks.ConvertLineBreaksPlugin \
-,org.roller.presentation.velocity.plugins.topictag.TopicTagPlugin \
-,org.roller.presentation.velocity.plugins.search.WikipediaLinkPlugin \
-,org.roller.presentation.velocity.plugins.search.GoogleLinkPlugin \
-,org.roller.presentation.velocity.plugins.textile.TextilePlugin \
-,org.roller.presentation.velocity.plugins.acronyms.AcronymsPlugin \
-,org.roller.presentation.velocity.plugins.bookmarks.BookmarkPlugin \
-,org.roller.presentation.velocity.plugins.email.ObfuscateEmailPlugin \
-,org.roller.presentation.velocity.plugins.smileys.SmileysPlugin \
-,org.roller.presentation.velocity.plugins.readmore.ReadMorePlugin
+org.apache.roller.presentation.velocity.plugins.convertbreaks.ConvertLineBreaksPlugin \
+,org.apache.roller.presentation.velocity.plugins.topictag.TopicTagPlugin \
+,org.apache.roller.presentation.velocity.plugins.search.WikipediaLinkPlugin \
+,org.apache.roller.presentation.velocity.plugins.search.GoogleLinkPlugin \
+,org.apache.roller.presentation.velocity.plugins.textile.TextilePlugin \
+,org.apache.roller.presentation.velocity.plugins.acronyms.AcronymsPlugin \
+,org.apache.roller.presentation.velocity.plugins.bookmarks.BookmarkPlugin \
+,org.apache.roller.presentation.velocity.plugins.email.ObfuscateEmailPlugin \
+,org.apache.roller.presentation.velocity.plugins.smileys.SmileysPlugin \
+,org.apache.roller.presentation.velocity.plugins.readmore.ReadMorePlugin
#----------------------------------
# scheduled tasks, each is comma separated list of classes
# Comma separated list of task classnames to be executed once per day
-tasks.daily=org.roller.presentation.TurnoverReferersTask\
+tasks.daily=org.apache.roller.presentation.TurnoverReferersTask\
# Needed to enable nightly fetching of blacklist
-#,org.roller.presentation.BlacklistUpdateTask\
+#,org.apache.roller.presentation.BlacklistUpdateTask\
# Daily Planet task: syncs weblog list with Roller, refreshes Technorati stats
-#,org.roller.presentation.planet.SyncWebsitesTask
+#,org.apache.roller.presentation.planet.SyncWebsitesTask
# Comma separated list of task classnames to be executed hourly
tasks.hourly=\
# Hourly Planet task: refresh latest entry list from all weblogs in list
-#org.roller.presentation.planet.RefreshEntriesTask
+#org.apache.roller.presentation.planet.RefreshEntriesTask
#----------------------------------
# Velocity settings
@@ -187,23 +187,23 @@
velocity.toolbox.file=/WEB-INF/toolbox.xml
# Page model implementation
-velocity.pagemodel.classname=org.roller.presentation.velocity.PageModel
+velocity.pagemodel.classname=org.apache.roller.presentation.velocity.PageModel
# Experimental page model that allows user's access to Planet aggregations
-#velocity.pagemodel.classname=org.roller.presentation.velocity.planet.PlanetPageModel
+#velocity.pagemodel.classname=org.apache.roller.presentation.velocity.planet.PlanetPageModel
#----------------------------------
# Persistence settings
-persistence.roller.classname=org.roller.business.hibernate.HibernateRollerImpl
-persistence.filemanager.classname=org.roller.business.FileManagerImpl
+persistence.roller.classname=org.apache.roller.business.hibernate.HibernateRollerImpl
+persistence.filemanager.classname=org.apache.roller.business.FileManagerImpl
# authenticator settings (experimental)
-authenticator.classname=org.roller.presentation.DefaultAuthenticator
+authenticator.classname=org.apache.roller.presentation.DefaultAuthenticator
#----------------------------------
# comment, referrer and trackback settings
-comment.authenticator.classname=org.roller.presentation.velocity.MathCommentAuthenticator
+comment.authenticator.classname=org.apache.roller.presentation.velocity.MathCommentAuthenticator
comment.notification.separateOwnerMessage=false
comment.notification.hideCommenterAddresses=false
@@ -353,14 +353,14 @@
# Optional site-wide customization settings for the TopicTag plugin.
# n.b. these default settings match the coded default values that would be
# applied if these were omitted.
-org.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.defaultTopicBookmarkName=Default Topic Site
-org.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.defaultTopicSite=http://www.technorati.com/tag
-org.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.tagRegexWithBookmark=topic:\\{(.*?)\\}\\[(.*?)\\]
-org.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.tagRegexWithoutBookmark=topic:\\[(.*?)\\]
-org.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.linkFormatString=<a rel=\"tag\" href=\"{0}{1}\">{2}</a>
+org.apache.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.defaultTopicBookmarkName=Default Topic Site
+org.apache.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.defaultTopicSite=http://www.technorati.com/tag
+org.apache.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.tagRegexWithBookmark=topic:\\{(.*?)\\}\\[(.*?)\\]
+org.apache.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.tagRegexWithoutBookmark=topic:\\[(.*?)\\]
+org.apache.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.linkFormatString=<a rel=\"tag\" href=\"{0}{1}\">{2}</a>
# Set to true to allow only default topic tag site (and avoid costly bookmark queries)
-org.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.ignoreBookmarks=true
+org.apache.roller.presentation.velocity.plugins.topictag.TopicTagPlugin.ignoreBookmarks=true
#---------------------------------
# Experimental settings
Modified: incubator/roller/trunk/web/WEB-INF/classes/rome.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/rome.properties?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/rome.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/rome.properties Mon May 1 15:10:52 2006
@@ -17,46 +17,46 @@
# Some RSS 0.91 feeds have pubDates in items
-WireFeedParser.classes=org.roller.util.rome.PlanetRSS091UParser \
- org.roller.util.rome.PlanetRSS091NParser
+WireFeedParser.classes=org.apache.roller.util.rome.PlanetRSS091UParser \
+ org.apache.roller.util.rome.PlanetRSS091NParser
-Converter.classes =org.roller.util.rome.PlanetConverterForRSS091U \
- org.roller.util.rome.PlanetConverterForRSS091N \
- org.roller.util.rome.PlanetConverterForRSS20
+Converter.classes =org.apache.roller.util.rome.PlanetConverterForRSS091U \
+ org.apache.roller.util.rome.PlanetConverterForRSS091N \
+ org.apache.roller.util.rome.PlanetConverterForRSS20
# Handle funky RSS (RSS 2.0 with <dc:date> and/or <content:encoded>)
rss_2.0.feed.ModuleGenerator.classes =com.sun.syndication.io.impl.DCModuleGenerator \
- org.roller.util.rome.ContentModuleGenerator
+ org.apache.roller.util.rome.ContentModuleGenerator
rss_2.0.item.ModuleGenerator.classes =com.sun.syndication.io.impl.DCModuleGenerator \
- org.roller.util.rome.ContentModuleGenerator
+ org.apache.roller.util.rome.ContentModuleGenerator
rss_2.0.feed.ModuleParser.classes =com.sun.syndication.io.impl.DCModuleParser \
- org.roller.util.rome.ContentModuleParser
+ org.apache.roller.util.rome.ContentModuleParser
rss_2.0.item.ModuleParser.classes =com.sun.syndication.io.impl.DCModuleParser \
- org.roller.util.rome.ContentModuleParser
+ org.apache.roller.util.rome.ContentModuleParser
# Handle <content:encoded> in RSS 1.0
rss_1.0.feed.ModuleParser.classes =com.sun.syndication.io.impl.DCModuleParser \
- org.roller.util.rome.ContentModuleParser
+ org.apache.roller.util.rome.ContentModuleParser
rss_1.0.item.ModuleParser.classes =com.sun.syndication.io.impl.DCModuleParser \
- org.roller.util.rome.ContentModuleParser
+ org.apache.roller.util.rome.ContentModuleParser
rss_1.0.feed.ModuleGenerator.classes =com.sun.syndication.io.impl.DCModuleGenerator \
- org.roller.util.rome.ContentModuleGenerator
+ org.apache.roller.util.rome.ContentModuleGenerator
rss_1.0.item.ModuleGenerator.classes =com.sun.syndication.io.impl.DCModuleGenerator \
- org.roller.util.rome.ContentModuleGenerator
+ org.apache.roller.util.rome.ContentModuleGenerator
# Handle Atom Pub Protocol pubcontrol extension
-atom_1.0.item.ModuleParser.classes =org.roller.presentation.webservices.atomprotocol.PubControlModuleParser
+atom_1.0.item.ModuleParser.classes =org.apache.roller.presentation.webservices.atomprotocol.PubControlModuleParser
-atom_1.0.item.ModuleGenerator.classes =org.roller.presentation.webservices.atomprotocol.PubControlModuleGenerator
+atom_1.0.item.ModuleGenerator.classes =org.apache.roller.presentation.webservices.atomprotocol.PubControlModuleGenerator
Modified: incubator/roller/trunk/web/WEB-INF/jsps/denied.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/jsps/denied.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/denied.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/denied.jsp Mon May 1 15:10:52 2006
@@ -15,18 +15,18 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-
-<%@ include file="/taglibs.jsp" %>
-
-<%@ page import="java.io.*,org.roller.util.Utilities" isErrorPage="true" %>
-
-<h2><fmt:message key="error.permissionDenied.title" /></h2>
-<fmt:message key="error.permissionDenied.prompt" />
-<ul>
-<li><fmt:message key="error.permissionDenied.reason0" /></li>
-<li><fmt:message key="error.permissionDenied.reason1" /></li>
-<li><fmt:message key="error.permissionDenied.reason2" /></li>
-<li><fmt:message key="error.permissionDenied.reason3" /></li>
-</ul>
-
-
+
+<%@ include file="/taglibs.jsp" %>
+
+<%@ page import="java.io.*,org.apache.roller.util.Utilities" isErrorPage="true" %>
+
+<h2><fmt:message key="error.permissionDenied.title" /></h2>
+<fmt:message key="error.permissionDenied.prompt" />
+<ul>
+<li><fmt:message key="error.permissionDenied.reason0" /></li>
+<li><fmt:message key="error.permissionDenied.reason1" /></li>
+<li><fmt:message key="error.permissionDenied.reason2" /></li>
+<li><fmt:message key="error.permissionDenied.reason3" /></li>
+</ul>
+
+
Modified: incubator/roller/trunk/web/WEB-INF/jsps/errorBody.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/jsps/errorBody.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/errorBody.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/errorBody.jsp Mon May 1 15:10:52 2006
@@ -15,72 +15,72 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/taglibs.jsp" %>
-
-<%
-boolean debug = org.roller.config.RollerRuntimeConfig.getBooleanProperty("site.debugMode");
-request.setAttribute("debug", new Boolean(debug));
-%>
-
-<h2 class="error"><fmt:message key="errorPage.title" /></h2>
-
-<c:choose>
-<c:when test="${debug}">
-
-<c:set var="status_code" value="${requestScope['javax.servlet.error.status_code']}" />
-<c:set var="message" value="${requestScope['javax.servlet.error.message']}" />
-<c:set var="type" value="${requestScope['javax.servlet.error.type']}" />
-<c:set var="exception" value="${requestScope['javax.servlet.error.exception']}" />
-
-<table width="80%" border="1px" style="border-collapse: collapse;">
-<tr>
- <td width="20%">Status Code</td>
- <td><c:out value="${status_code}" /></td>
-</tr>
-<tr>
- <td width="20%">Message</td>
- <td><c:out value="${message}" /></td>
-</tr>
-<tr>
- <td width="20%">Type</td>
- <td><c:out value="${type}" /></td>
-</tr>
-<tr>
- <td width="20%">Exception</td>
- <td><c:out value="${exception}" /></td>
-</tr>
-</table>
-
-<c:if test="${!empty exception}">
- <%
- java.io.StringWriter sw = new java.io.StringWriter();
- Throwable t = (Throwable)pageContext.getAttribute("exception");
- if (t != null) {
- t.printStackTrace(new java.io.PrintWriter(sw));
- String stackTrace = sw.toString();
- if (stackTrace.trim().length() > 0) {
- %>
- <p>Stack Trace:</p>
- <form>
- <textarea rows="30" style="font-size:8pt;width:80%">
- <%= stackTrace %>
- </textarea>
- </form>
- <% }
- } %>
-</c:if>
-
-<br />
-<br />
-
-</c:when>
-
-<c:otherwise>
- <p><fmt:message key="errorPage.message" /></p>
-</c:otherwise>
-
-</c:choose>
-
-
-
-
+<%@ include file="/taglibs.jsp" %>
+
+<%
+boolean debug = org.apache.roller.config.RollerRuntimeConfig.getBooleanProperty("site.debugMode");
+request.setAttribute("debug", new Boolean(debug));
+%>
+
+<h2 class="error"><fmt:message key="errorPage.title" /></h2>
+
+<c:choose>
+<c:when test="${debug}">
+
+<c:set var="status_code" value="${requestScope['javax.servlet.error.status_code']}" />
+<c:set var="message" value="${requestScope['javax.servlet.error.message']}" />
+<c:set var="type" value="${requestScope['javax.servlet.error.type']}" />
+<c:set var="exception" value="${requestScope['javax.servlet.error.exception']}" />
+
+<table width="80%" border="1px" style="border-collapse: collapse;">
+<tr>
+ <td width="20%">Status Code</td>
+ <td><c:out value="${status_code}" /></td>
+</tr>
+<tr>
+ <td width="20%">Message</td>
+ <td><c:out value="${message}" /></td>
+</tr>
+<tr>
+ <td width="20%">Type</td>
+ <td><c:out value="${type}" /></td>
+</tr>
+<tr>
+ <td width="20%">Exception</td>
+ <td><c:out value="${exception}" /></td>
+</tr>
+</table>
+
+<c:if test="${!empty exception}">
+ <%
+ java.io.StringWriter sw = new java.io.StringWriter();
+ Throwable t = (Throwable)pageContext.getAttribute("exception");
+ if (t != null) {
+ t.printStackTrace(new java.io.PrintWriter(sw));
+ String stackTrace = sw.toString();
+ if (stackTrace.trim().length() > 0) {
+ %>
+ <p>Stack Trace:</p>
+ <form>
+ <textarea rows="30" style="font-size:8pt;width:80%">
+ <%= stackTrace %>
+ </textarea>
+ </form>
+ <% }
+ } %>
+</c:if>
+
+<br />
+<br />
+
+</c:when>
+
+<c:otherwise>
+ <p><fmt:message key="errorPage.message" /></p>
+</c:otherwise>
+
+</c:choose>
+
+
+
+
Modified: incubator/roller/trunk/web/WEB-INF/jspwiki.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/jspwiki.properties?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jspwiki.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/jspwiki.properties Mon May 1 15:10:52 2006
@@ -19,7 +19,7 @@
jspwiki.baseURL=http://www.rollerweblogger.org/wiki/
# these are needed to run JSPWiki embedded inside Roller, no need to change them!
-jspwiki.pageProvider =org.roller.presentation.velocity.plugins.jspwiki.RollerPageProvider
+jspwiki.pageProvider =org.apache.roller.presentation.velocity.plugins.jspwiki.RollerPageProvider
jspwiki.basicAttachmentProvider.storageDir = .
jspwiki.fileSystemProvider.pageDir = .
jspwiki.referenceStyle=absolute
Modified: incubator/roller/trunk/web/WEB-INF/velocity.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/velocity.properties?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/velocity.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/velocity.properties Mon May 1 15:10:52 2006
@@ -14,58 +14,58 @@
# copyright in this work, please see the NOTICE file in the top level
# directory of this distribution.
-# specify resource loaders to use
-resource.loader = webapp, theme, roller, class
-
-# theme resource loader
-theme.resource.loader.public.name=theme
-theme.resource.loader.description=Roller Theme Resource Loader
-theme.resource.loader.class=org.roller.presentation.velocity.ThemeResourceLoader
-theme.resource.loader.cache=false
-theme.resource.loader.modificationCheckInterval=2
-
-# for the loader we call 'roller', use the RollerResourceLoader
-roller.resource.loader.public.name=roller
-roller.resource.loader.description=Roller Main Resource Loader
-roller.resource.loader.class=org.roller.presentation.velocity.RollerResourceLoader
-roller.resource.loader.cache=false
-roller.resource.loader.modificationCheckInterval=2
-
-# for the loader we call 'class', use the ClasspathResourceLoader
-class.resource.loader.description = Velocity Classpath Resource Loader
-class.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
-class.resource.loader.cache=true
-class.resource.loader.modificationCheckInterval=60
-
-# for the loader we call 'webapp', use the WebappResourceLoader
-webapp.resource.loader.description = Roller Webapp Resource Loader
-webapp.resource.loader.class = org.roller.presentation.velocity.WebappResourceLoader
-webapp.resource.loader.cache=true
-webapp.resource.loader.modificationCheckInterval=60
-
-# log invalid template references?
-# set this to false to have a quieter velocity.log
-runtime.log.invalid.reference=false
-
-# tell Velocity to use Log4J
-runtime.log.logsystem.class=org.apache.velocity.runtime.log.SimpleLog4JLogSystem
-runtime.log.logsystem.log4j.category=org.apache.velocity
-
-# Override the default global library, set to blank to load no default
-velocimacro.library = roller.vm,bookmark.vm,comments.vm,navbar.vm,newsfeed.vm,referer.vm,atommacros.vm,rssmacros.vm,user.vm,weblog.vm,website.vm
-
-# Change to false for deployment environments.
-# Caching for the 'class' & 'webapp' ResourceLoaders must be false for this to work
-velocimacro.library.autoreload=true
-
-# Allow Velocimacros to be defined in regular templates
-velocimacro.permissions.allow.inline=true
-
-# I *think* this will allow users to override macros
-# for themselves, but not everyone...
-velocimacro.permissions.allow.inline.local.scope=true
-
-# set encoding/charset to UTF-8
-input.encoding=UTF-8
-output.encoding=UTF-8
-default.contentType=text/html; charset=utf-8
+# specify resource loaders to use
+resource.loader = webapp, theme, roller, class
+
+# theme resource loader
+theme.resource.loader.public.name=theme
+theme.resource.loader.description=Roller Theme Resource Loader
+theme.resource.loader.class=org.apache.roller.presentation.velocity.ThemeResourceLoader
+theme.resource.loader.cache=false
+theme.resource.loader.modificationCheckInterval=2
+
+# for the loader we call 'roller', use the RollerResourceLoader
+roller.resource.loader.public.name=roller
+roller.resource.loader.description=Roller Main Resource Loader
+roller.resource.loader.class=org.apache.roller.presentation.velocity.RollerResourceLoader
+roller.resource.loader.cache=false
+roller.resource.loader.modificationCheckInterval=2
+
+# for the loader we call 'class', use the ClasspathResourceLoader
+class.resource.loader.description = Velocity Classpath Resource Loader
+class.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+class.resource.loader.cache=true
+class.resource.loader.modificationCheckInterval=60
+
+# for the loader we call 'webapp', use the WebappResourceLoader
+webapp.resource.loader.description = Roller Webapp Resource Loader
+webapp.resource.loader.class = org.apache.roller.presentation.velocity.WebappResourceLoader
+webapp.resource.loader.cache=true
+webapp.resource.loader.modificationCheckInterval=60
+
+# log invalid template references?
+# set this to false to have a quieter velocity.log
+runtime.log.invalid.reference=false
+
+# tell Velocity to use Log4J
+runtime.log.logsystem.class=org.apache.velocity.runtime.log.SimpleLog4JLogSystem
+runtime.log.logsystem.log4j.category=org.apache.velocity
+
+# Override the default global library, set to blank to load no default
+velocimacro.library = roller.vm,bookmark.vm,comments.vm,navbar.vm,newsfeed.vm,referer.vm,atommacros.vm,rssmacros.vm,user.vm,weblog.vm,website.vm
+
+# Change to false for deployment environments.
+# Caching for the 'class' & 'webapp' ResourceLoaders must be false for this to work
+velocimacro.library.autoreload=true
+
+# Allow Velocimacros to be defined in regular templates
+velocimacro.permissions.allow.inline=true
+
+# I *think* this will allow users to override macros
+# for themselves, but not everyone...
+velocimacro.permissions.allow.inline.local.scope=true
+
+# set encoding/charset to UTF-8
+input.encoding=UTF-8
+output.encoding=UTF-8
+default.contentType=text/html; charset=utf-8
Modified: incubator/roller/trunk/web/bookmarks/import.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/bookmarks/import.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/bookmarks/import.jsp (original)
+++ incubator/roller/trunk/web/bookmarks/import.jsp Mon May 1 15:10:52 2006
@@ -15,35 +15,35 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/taglibs.jsp" %>
-<%@ page import="org.roller.presentation.BasePageModel" %>
-<% BasePageModel model = (BasePageModel)request.getAttribute("model"); %>
-
-<p class="subtitle">
- <fmt:message key="bookmarksImport.subtitle" >
- <fmt:param value="${model.website.handle}" />
- </fmt:message>
-</p>
-<p class="pagetip">
- <fmt:message key="bookmarksImport.prompt" />
-</p>
-
-<html:form action="/editor/importBookmarks" method="post" enctype="multipart/form-data">
- <input name="weblog" type="hidden" value='<c:out value="${model.website.handle}" />' />
- <html:file property="bookmarksFile" />
- <br />
- <br />
- <html:submit/></input>
-</html:form>
-
-<%--
-Added by Matt Raible since the focus javascript generated by Struts uses
-a name reference and IE seems to only focus on file inputs via elements[0]?
---%>
-<script type="text/javascript">
-<!--
- document.forms[0].elements[0].focus();
-// -->
-</script>
-
-
+<%@ include file="/taglibs.jsp" %>
+<%@ page import="org.apache.roller.presentation.BasePageModel" %>
+<% BasePageModel model = (BasePageModel)request.getAttribute("model"); %>
+
+<p class="subtitle">
+ <fmt:message key="bookmarksImport.subtitle" >
+ <fmt:param value="${model.website.handle}" />
+ </fmt:message>
+</p>
+<p class="pagetip">
+ <fmt:message key="bookmarksImport.prompt" />
+</p>
+
+<html:form action="/editor/importBookmarks" method="post" enctype="multipart/form-data">
+ <input name="weblog" type="hidden" value='<c:out value="${model.website.handle}" />' />
+ <html:file property="bookmarksFile" />
+ <br />
+ <br />
+ <html:submit/></input>
+</html:form>
+
+<%--
+Added by Matt Raible since the focus javascript generated by Struts uses
+a name reference and IE seems to only focus on file inputs via elements[0]?
+--%>
+<script type="text/javascript">
+<!--
+ document.forms[0].elements[0].focus();
+// -->
+</script>
+
+
Modified: incubator/roller/trunk/web/keepalive.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/keepalive.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/keepalive.jsp (original)
+++ incubator/roller/trunk/web/keepalive.jsp Mon May 1 15:10:52 2006
@@ -15,54 +15,54 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ page session="false"
- import="org.roller.pojos.WebsiteData,
- org.roller.presentation.RollerRequest,
- org.roller.util.DateUtil,
- java.text.DateFormat,
- java.util.Date,
- java.util.Locale,
- java.util.TimeZone"
-%><style>
-.details {
- font-size: 12px;
- color: grey;
- text-align: right;
-}
-</style><%
-String msg = "You are not logged in.";
-HttpSession session = request.getSession(false);
-if (session != null)
-{
- RollerRequest rreq = RollerRequest.getRollerRequest(request);
- if (rreq != null)
- {
- try
- {
- WebsiteData website = rreq.getWebsite();
- if (website != null)
- {
- Date creationTime = new Date( session.getCreationTime() );
- Date accessedTime = new Date( session.getLastAccessedTime() );
- DateFormat sdf = DateFormat.getDateTimeInstance(
- DateFormat.MEDIUM, DateFormat.FULL, website.getLocaleInstance() );
- String creationStr = sdf.format( creationTime );
- String accessedStr = sdf.format( accessedTime );
- msg = "You have been logged in since " + creationStr + ". ";
- msg += "Last access was at " + accessedStr + ".";
- }
- }
- catch (Exception e)
- {
- msg = "You are currently logged in.";
- }
- }
-}
-%><span class="details"><%= msg %></span>
-<script>
- setTimeout("reload()",900000); // 15 minutes
- function reload()
- {
- self.location = "keepalive.jsp";
- }
+<%@ page session="false"
+ import="org.apache.roller.pojos.WebsiteData,
+ org.apache.roller.presentation.RollerRequest,
+ org.apache.roller.util.DateUtil,
+ java.text.DateFormat,
+ java.util.Date,
+ java.util.Locale,
+ java.util.TimeZone"
+%><style>
+.details {
+ font-size: 12px;
+ color: grey;
+ text-align: right;
+}
+</style><%
+String msg = "You are not logged in.";
+HttpSession session = request.getSession(false);
+if (session != null)
+{
+ RollerRequest rreq = RollerRequest.getRollerRequest(request);
+ if (rreq != null)
+ {
+ try
+ {
+ WebsiteData website = rreq.getWebsite();
+ if (website != null)
+ {
+ Date creationTime = new Date( session.getCreationTime() );
+ Date accessedTime = new Date( session.getLastAccessedTime() );
+ DateFormat sdf = DateFormat.getDateTimeInstance(
+ DateFormat.MEDIUM, DateFormat.FULL, website.getLocaleInstance() );
+ String creationStr = sdf.format( creationTime );
+ String accessedStr = sdf.format( accessedTime );
+ msg = "You have been logged in since " + creationStr + ". ";
+ msg += "Last access was at " + accessedStr + ".";
+ }
+ }
+ catch (Exception e)
+ {
+ msg = "You are currently logged in.";
+ }
+ }
+}
+%><span class="details"><%= msg %></span>
+<script>
+ setTimeout("reload()",900000); // 15 minutes
+ function reload()
+ {
+ self.location = "keepalive.jsp";
+ }
</script>
Modified: incubator/roller/trunk/web/login-redirect.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/login-redirect.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/login-redirect.jsp (original)
+++ incubator/roller/trunk/web/login-redirect.jsp Mon May 1 15:10:52 2006
@@ -15,27 +15,27 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ page language="java" errorPage="/error.jsp" contentType="text/html; charset=UTF-8" %><%@
-taglib uri="http://java.sun.com/jstl/core" prefix="c" %><%@
-taglib uri="http://www.rollerweblogger.org/tags" prefix="roller" %><%@
-page import="org.roller.model.*" %><%@
-page import="org.roller.pojos.*" %><%@
-page import="org.roller.config.RollerConfig" %><%@
-page import="org.roller.presentation.RollerSession" %><%@
-page import="java.util.List" %>
-<%
-Roller roller = RollerFactory.getRoller();
-RollerSession rollerSession = RollerSession.getRollerSession(request);
-UserData user = rollerSession.getAuthenticatedUser();
-List websites = roller.getUserManager().getWebsites(user, Boolean.TRUE, null);
-if (websites.size() == 1) {
- WebsiteData website = (WebsiteData)websites.get(0);
- website.hasUserPermissions(user, PermissionsData.LIMITED);
- response.sendRedirect(
- "editor/weblog.do?method=create&rmk=tabbedmenu.weblog&rmik=tabbedmenu.weblog.newEntry&weblog="+website.getHandle());
-} else {
- response.sendRedirect(
- "editor/yourWebsites.do?method=edit&rmik=tabbedmenu.user.websites");
-}
-%>
-
+<%@ page language="java" errorPage="/error.jsp" contentType="text/html; charset=UTF-8" %><%@
+taglib uri="http://java.sun.com/jstl/core" prefix="c" %><%@
+taglib uri="http://www.rollerweblogger.org/tags" prefix="roller" %><%@
+page import="org.apache.roller.model.*" %><%@
+page import="org.apache.roller.pojos.*" %><%@
+page import="org.apache.roller.config.RollerConfig" %><%@
+page import="org.apache.roller.presentation.RollerSession" %><%@
+page import="java.util.List" %>
+<%
+Roller roller = RollerFactory.getRoller();
+RollerSession rollerSession = RollerSession.getRollerSession(request);
+UserData user = rollerSession.getAuthenticatedUser();
+List websites = roller.getUserManager().getWebsites(user, Boolean.TRUE, null);
+if (websites.size() == 1) {
+ WebsiteData website = (WebsiteData)websites.get(0);
+ website.hasUserPermissions(user, PermissionsData.LIMITED);
+ response.sendRedirect(
+ "editor/weblog.do?method=create&rmk=tabbedmenu.weblog&rmik=tabbedmenu.weblog.newEntry&weblog="+website.getHandle());
+} else {
+ response.sendRedirect(
+ "editor/yourWebsites.do?method=edit&rmik=tabbedmenu.user.websites");
+}
+%>
+
Modified: incubator/roller/trunk/web/logout-redirect.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/logout-redirect.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/logout-redirect.jsp (original)
+++ incubator/roller/trunk/web/logout-redirect.jsp Mon May 1 15:10:52 2006
@@ -16,7 +16,7 @@
directory of this distribution.
-->
<%@ page language="java" contentType="text/html; charset=UTF-8" %>
-<%@ page import="org.roller.presentation.RollerSession" %>
+<%@ page import="org.apache.roller.presentation.RollerSession" %>
<%@ page import="javax.servlet.http.Cookie" %>
<%@ page import="org.acegisecurity.ui.rememberme.TokenBasedRememberMeServices" %>
Modified: incubator/roller/trunk/web/main.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/main.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/main.jsp (original)
+++ incubator/roller/trunk/web/main.jsp Mon May 1 15:10:52 2006
@@ -15,7 +15,7 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ page import="org.roller.presentation.MainPageAction" %>
+<%@ page import="org.apache.roller.presentation.MainPageAction" %>
<%@ page import="java.util.Locale" %>
<%@ include file="/taglibs.jsp" %>
<%
Modified: incubator/roller/trunk/web/planet/planet.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/planet/planet.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/planet/planet.jsp (original)
+++ incubator/roller/trunk/web/planet/planet.jsp Mon May 1 15:10:52 2006
@@ -15,75 +15,75 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/taglibs.jsp" %>
-<%@ page import="org.roller.presentation.planet.PlanetAction" %>
-<%@ page import="java.util.Locale" %>
-
-<%
-request.setAttribute("aggregation", ((PlanetAction.PlanetPageData)
- request.getAttribute("data")).getAggregation(50));
-request.setAttribute("topBlogs", ((PlanetAction.PlanetPageData)
- request.getAttribute("data")).getTopSubscriptions(50));
-request.setAttribute("popularWebsites",((PlanetAction.PlanetPageData)
- request.getAttribute("data")).getPopularWebsites(65));
-
-// custom groups, only shown if they exist
-request.setAttribute("featuredGroup1",((PlanetAction.PlanetPageData)
- request.getAttribute("data")).getGroup("featuredGroup1"));
-request.setAttribute("featuredGroup1_entries",((PlanetAction.PlanetPageData)
- request.getAttribute("data")).getAggregation("featuredGroup1",20));
-
-request.setAttribute("featuredGroup2",((PlanetAction.PlanetPageData)
- request.getAttribute("data")).getGroup("featuredGroup2"));
-request.setAttribute("featuredGroup2_entries",((PlanetAction.PlanetPageData)
- request.getAttribute("data")).getAggregation("featuredGroup2",20));
-%>
-
-<div class="entriesBox">
-<div class="entriesBoxInner">
-
-<c:forEach var="post" items="${aggregation}">
-
- <div class="entryBox">
-
- <a href='<c:out value="${post.permalink}" />' class="entryTitle">
- <str:truncateNicely upper="90" >
- <str:removeXml>
- <c:out value="${post.title}" />
- </str:removeXml>
- </str:truncateNicely></a>
- </a><br />
-
- <span class="entryDetails">
- <a href='<c:out value="${post.subscription.siteUrl}" />'
- class="entryDetails">
- <str:removeXml>
- <c:out value="${post.subscription.title}" />
- </str:removeXml>
- </a>
- <fmt:formatDate value="${post.published}" type="both"
- dateStyle="medium" timeStyle="medium" />
- <br />
- </span>
-
- <str:truncateNicely upper="250" >
- <str:removeXml>
- <c:out value="${post.content}" escapeXml="false" />
- </str:removeXml>
- </str:truncateNicely>
-
- </div>
-
-</c:forEach>
-</div> <!-- entriesBoxInner -->
-</div> <!-- entriesBox -->
-
-<br />
-
-<a href='<c:url value="/planetrss"/>' title='<fmt:message key="mainPage.rss.tip" />'>
- <img src='<c:url value="/images/rssbadge.gif"/>' border="0"
- alt='<fmt:message key="mainPage.rss.tip" />' />
-</a>
-<fmt:message key="mainPage.rss.instructions" />
-
-
+<%@ include file="/taglibs.jsp" %>
+<%@ page import="org.apache.roller.presentation.planet.PlanetAction" %>
+<%@ page import="java.util.Locale" %>
+
+<%
+request.setAttribute("aggregation", ((PlanetAction.PlanetPageData)
+ request.getAttribute("data")).getAggregation(50));
+request.setAttribute("topBlogs", ((PlanetAction.PlanetPageData)
+ request.getAttribute("data")).getTopSubscriptions(50));
+request.setAttribute("popularWebsites",((PlanetAction.PlanetPageData)
+ request.getAttribute("data")).getPopularWebsites(65));
+
+// custom groups, only shown if they exist
+request.setAttribute("featuredGroup1",((PlanetAction.PlanetPageData)
+ request.getAttribute("data")).getGroup("featuredGroup1"));
+request.setAttribute("featuredGroup1_entries",((PlanetAction.PlanetPageData)
+ request.getAttribute("data")).getAggregation("featuredGroup1",20));
+
+request.setAttribute("featuredGroup2",((PlanetAction.PlanetPageData)
+ request.getAttribute("data")).getGroup("featuredGroup2"));
+request.setAttribute("featuredGroup2_entries",((PlanetAction.PlanetPageData)
+ request.getAttribute("data")).getAggregation("featuredGroup2",20));
+%>
+
+<div class="entriesBox">
+<div class="entriesBoxInner">
+
+<c:forEach var="post" items="${aggregation}">
+
+ <div class="entryBox">
+
+ <a href='<c:out value="${post.permalink}" />' class="entryTitle">
+ <str:truncateNicely upper="90" >
+ <str:removeXml>
+ <c:out value="${post.title}" />
+ </str:removeXml>
+ </str:truncateNicely></a>
+ </a><br />
+
+ <span class="entryDetails">
+ <a href='<c:out value="${post.subscription.siteUrl}" />'
+ class="entryDetails">
+ <str:removeXml>
+ <c:out value="${post.subscription.title}" />
+ </str:removeXml>
+ </a>
+ <fmt:formatDate value="${post.published}" type="both"
+ dateStyle="medium" timeStyle="medium" />
+ <br />
+ </span>
+
+ <str:truncateNicely upper="250" >
+ <str:removeXml>
+ <c:out value="${post.content}" escapeXml="false" />
+ </str:removeXml>
+ </str:truncateNicely>
+
+ </div>
+
+</c:forEach>
+</div> <!-- entriesBoxInner -->
+</div> <!-- entriesBox -->
+
+<br />
+
+<a href='<c:url value="/planetrss"/>' title='<fmt:message key="mainPage.rss.tip" />'>
+ <img src='<c:url value="/images/rssbadge.gif"/>' border="0"
+ alt='<fmt:message key="mainPage.rss.tip" />' />
+</a>
+<fmt:message key="mainPage.rss.instructions" />
+
+
Modified: incubator/roller/trunk/web/taglibs.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/taglibs.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/taglibs.jsp (original)
+++ incubator/roller/trunk/web/taglibs.jsp Mon May 1 15:10:52 2006
@@ -28,22 +28,22 @@
<%@ page import="javax.servlet.jsp.jstl.core.Config" %>
-<%@ page import="org.roller.model.Roller" %>
-<%@ page import="org.roller.model.RollerFactory" %>
+<%@ page import="org.apache.roller.model.Roller" %>
+<%@ page import="org.apache.roller.model.RollerFactory" %>
-<%@ page import="org.roller.pojos.UserData" %>
-<%@ page import="org.roller.pojos.WebsiteData" %>
-<%@ page import="org.roller.pojos.RollerConfigData" %>
+<%@ page import="org.apache.roller.pojos.UserData" %>
+<%@ page import="org.apache.roller.pojos.WebsiteData" %>
+<%@ page import="org.apache.roller.pojos.RollerConfigData" %>
-<%@ page import="org.roller.config.RollerConfig" %>
-<%@ page import="org.roller.config.RollerRuntimeConfig" %>
-<%@ page import="org.roller.config.RollerConfig" %>
+<%@ page import="org.apache.roller.config.RollerConfig" %>
+<%@ page import="org.apache.roller.config.RollerRuntimeConfig" %>
+<%@ page import="org.apache.roller.config.RollerConfig" %>
-<%@ page import="org.roller.presentation.RollerRequest" %>
-<%@ page import="org.roller.presentation.BasePageModel" %>
-<%@ page import="org.roller.presentation.RollerContext" %>
-<%@ page import="org.roller.presentation.RollerSession" %>
-<%@ page import="org.roller.presentation.LanguageUtil" %>
+<%@ page import="org.apache.roller.presentation.RollerRequest" %>
+<%@ page import="org.apache.roller.presentation.BasePageModel" %>
+<%@ page import="org.apache.roller.presentation.RollerContext" %>
+<%@ page import="org.apache.roller.presentation.RollerSession" %>
+<%@ page import="org.apache.roller.presentation.LanguageUtil" %>
<%
// see if we have an authenticated user so we can set the display locale
Modified: incubator/roller/trunk/web/tags/date.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/tags/date.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/tags/date.jsp (original)
+++ incubator/roller/trunk/web/tags/date.jsp Mon May 1 15:10:52 2006
@@ -16,7 +16,7 @@
directory of this distribution.
-->
<%@ include file="/taglibs.jsp" %><% {
-String prefix = org.roller.presentation.tags.DateTag.KEY_PREFIX;
+String prefix = org.apache.roller.presentation.tags.DateTag.KEY_PREFIX;
String formName = request.getAttribute(prefix+"_formName").toString();
String dateField = request.getAttribute(prefix+"_property").toString();
String dateFormat = request.getAttribute(prefix+"_dateFormat").toString();
Modified: incubator/roller/trunk/web/theme/searchResults.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/theme/searchResults.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/theme/searchResults.jsp (original)
+++ incubator/roller/trunk/web/theme/searchResults.jsp Mon May 1 15:10:52 2006
@@ -18,10 +18,10 @@
<%@ include file="/taglibs.jsp" %>
<%
-org.roller.presentation.search.SearchAction.PageModel model =
- (org.roller.presentation.search.SearchAction.PageModel)
+org.apache.roller.presentation.search.SearchAction.PageModel model =
+ (org.apache.roller.presentation.search.SearchAction.PageModel)
request.getAttribute("model");
-org.roller.presentation.search.SearchResultsPageModel searchResults =
+org.apache.roller.presentation.search.SearchResultsPageModel searchResults =
model.getSearchModel();
request.setAttribute("searchResults", searchResults);
%>
Modified: incubator/roller/trunk/web/weblog/CommentManagement.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/CommentManagement.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/CommentManagement.jsp (original)
+++ incubator/roller/trunk/web/weblog/CommentManagement.jsp Mon May 1 15:10:52 2006
@@ -16,8 +16,8 @@
directory of this distribution.
-->
<%@ include file="/taglibs.jsp" %>
-<%@ page import="org.roller.presentation.weblog.actions.CommentManagementAction" %>
-<%@ page import="org.roller.presentation.RollerRequest" %>
+<%@ page import="org.apache.roller.presentation.weblog.actions.CommentManagementAction" %>
+<%@ page import="org.apache.roller.presentation.RollerRequest" %>
<%
CommentManagementAction.CommentManagementPageModel model =
(CommentManagementAction.CommentManagementPageModel)request.getAttribute("model");
Modified: incubator/roller/trunk/web/weblog/CommentManagementSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/CommentManagementSidebar.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/CommentManagementSidebar.jsp (original)
+++ incubator/roller/trunk/web/weblog/CommentManagementSidebar.jsp Mon May 1 15:10:52 2006
@@ -16,7 +16,7 @@
directory of this distribution.
-->
<%@ include file="/taglibs.jsp" %>
-<%@ page import="org.roller.presentation.weblog.actions.CommentManagementAction" %>
+<%@ page import="org.apache.roller.presentation.weblog.actions.CommentManagementAction" %>
<%
CommentManagementAction.CommentManagementPageModel model =
(CommentManagementAction.CommentManagementPageModel)request.getAttribute("model");
Modified: incubator/roller/trunk/web/weblog/CustomPingTargets.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/CustomPingTargets.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/CustomPingTargets.jsp (original)
+++ incubator/roller/trunk/web/weblog/CustomPingTargets.jsp Mon May 1 15:10:52 2006
@@ -15,7 +15,7 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ page import="org.roller.presentation.RollerRequest"%>
+<%@ page import="org.apache.roller.presentation.RollerRequest"%>
<%@ include file="/taglibs.jsp" %>
<%
BasePageModel pageModel = (BasePageModel)request.getAttribute("model");
Modified: incubator/roller/trunk/web/weblog/PingResult.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/PingResult.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/PingResult.jsp (original)
+++ incubator/roller/trunk/web/weblog/PingResult.jsp Mon May 1 15:10:52 2006
@@ -15,7 +15,7 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ page import="org.roller.presentation.RollerRequest"%>
+<%@ page import="org.apache.roller.presentation.RollerRequest"%>
<%@ include file="/taglibs.jsp" %>
<!-- This page consists only of result messages from the ping -->
Modified: incubator/roller/trunk/web/weblog/Pings.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/Pings.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/Pings.jsp (original)
+++ incubator/roller/trunk/web/weblog/Pings.jsp Mon May 1 15:10:52 2006
@@ -15,7 +15,7 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ page import="org.roller.presentation.RollerRequest"%>
+<%@ page import="org.apache.roller.presentation.RollerRequest"%>
<%@ include file="/taglibs.jsp" %>
<%
BasePageModel pageModel = (BasePageModel)request.getAttribute("model");
Modified: incubator/roller/trunk/web/weblog/WeblogEdit.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/WeblogEdit.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/WeblogEdit.jsp (original)
+++ incubator/roller/trunk/web/weblog/WeblogEdit.jsp Mon May 1 15:10:52 2006
@@ -16,10 +16,10 @@
directory of this distribution.
-->
<%@ include file="/taglibs.jsp" %>
-<%@ page import="org.roller.pojos.*" %>
-<%@ page import="org.roller.presentation.weblog.formbeans.WeblogEntryFormEx" %>
-<%@ page import="org.roller.presentation.weblog.actions.WeblogEntryPageModel" %>
-<%@ page import="org.roller.presentation.RollerRequest" %>
+<%@ page import="org.apache.roller.pojos.*" %>
+<%@ page import="org.apache.roller.presentation.weblog.formbeans.WeblogEntryFormEx" %>
+<%@ page import="org.apache.roller.presentation.weblog.actions.WeblogEntryPageModel" %>
+<%@ page import="org.apache.roller.presentation.RollerRequest" %>
<%
WeblogEntryPageModel model = (WeblogEntryPageModel)request.getAttribute("model");
try {
@@ -332,7 +332,7 @@
<fmt:message key="weblogEdit.pluginsToApply" /></a>
</div>
<div id="pluginControl" class="miscControl" style="display:none">
- <logic:iterate id="plugin" type="org.roller.model.PagePlugin"
+ <logic:iterate id="plugin" type="org.apache.roller.model.PagePlugin"
collection="<%= model.getPagePlugins() %>">
<html:multibox property="pluginsArray"
title="<%= plugin.getName() %>" value="<%= plugin.getName() %>"
Modified: incubator/roller/trunk/web/weblog/WeblogEditSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/WeblogEditSidebar.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/WeblogEditSidebar.jsp (original)
+++ incubator/roller/trunk/web/weblog/WeblogEditSidebar.jsp Mon May 1 15:10:52 2006
@@ -16,8 +16,8 @@
directory of this distribution.
-->
<%@ include file="/taglibs.jsp" %>
-<%@ page import="org.roller.presentation.weblog.actions.WeblogEntryPageModel" %>
-<%@ page import="org.roller.presentation.RollerRequest" %>
+<%@ page import="org.apache.roller.presentation.weblog.actions.WeblogEntryPageModel" %>
+<%@ page import="org.apache.roller.presentation.RollerRequest" %>
<%
WeblogEntryPageModel model = (WeblogEntryPageModel)request.getAttribute("model");
%>
Modified: incubator/roller/trunk/web/weblog/WeblogEntryManagement.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/WeblogEntryManagement.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/WeblogEntryManagement.jsp (original)
+++ incubator/roller/trunk/web/weblog/WeblogEntryManagement.jsp Mon May 1 15:10:52 2006
@@ -16,7 +16,7 @@
directory of this distribution.
-->
<%@ include file="/taglibs.jsp" %>
-<%@ page import="org.roller.presentation.weblog.actions.WeblogEntryManagementAction" %>
+<%@ page import="org.apache.roller.presentation.weblog.actions.WeblogEntryManagementAction" %>
<%
WeblogEntryManagementAction.PageModel model =
(WeblogEntryManagementAction.PageModel)request.getAttribute("model");
Modified: incubator/roller/trunk/web/weblog/WeblogEntryManagementSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/WeblogEntryManagementSidebar.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/WeblogEntryManagementSidebar.jsp (original)
+++ incubator/roller/trunk/web/weblog/WeblogEntryManagementSidebar.jsp Mon May 1 15:10:52 2006
@@ -17,7 +17,7 @@
-->
<%@ include file="/taglibs.jsp" %>
-<%@ page import="org.roller.presentation.weblog.actions.WeblogEntryManagementAction" %>
+<%@ page import="org.apache.roller.presentation.weblog.actions.WeblogEntryManagementAction" %>
<%
WeblogEntryManagementAction.PageModel model =
(WeblogEntryManagementAction.PageModel)request.getAttribute("model");
Modified: incubator/roller/trunk/web/weblog/WeblogEntryRemove.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/WeblogEntryRemove.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/WeblogEntryRemove.jsp (original)
+++ incubator/roller/trunk/web/weblog/WeblogEntryRemove.jsp Mon May 1 15:10:52 2006
@@ -19,7 +19,7 @@
<h2>
<jsp:useBean id="weblogEntryFormEx" scope="session"
- class="org.roller.presentation.weblog.formbeans.WeblogEntryFormEx"/>
+ class="org.apache.roller.presentation.weblog.formbeans.WeblogEntryFormEx"/>
<fmt:message key="weblogEntryRemove.removeWeblogEntry" /> [<jsp:getProperty name="weblogEntryFormEx" property="title"/>]
</h2>
Modified: incubator/roller/trunk/web/weblog/editor-ekit.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/editor-ekit.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/editor-ekit.jsp (original)
+++ incubator/roller/trunk/web/weblog/editor-ekit.jsp Mon May 1 15:10:52 2006
@@ -15,66 +15,66 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%-- This page is designed to be included in edit-weblog.jsp --%>
-<%@ page import="org.roller.presentation.weblog.formbeans.WeblogEntryFormEx" %>
-<%@ include file="/taglibs.jsp" %>
-<html:hidden property="summary" />
-
-<script type="text/javascript">
-<!--
-function postWeblogEntry(publish)
-{
- document.weblogEntryFormEx.text.value = document.Ekit.getDocumentText();
- if (publish)
- document.weblogEntryFormEx.publishEntry.value = "true";
- document.weblogEntryFormEx.submit();
-}
--->
-</script>
-
-<html:hidden property="text" />
-
-<%-- Use the Ekit applet --%>
-<APPLET CODEBASE="../editor/" CODE="com.hexidec.ekit.EkitApplet.class"
- ARCHIVE="ekitappletspell.jar" NAME="Ekit" WIDTH="95%" HEIGHT="550">
-<PARAM NAME="codebase" VALUE="../editor/">
-<PARAM NAME="code" VALUE="com.hexidec.ekit.EkitApplet.class">
-<PARAM NAME="archive" VALUE="ekitappletspell.jar">
-<PARAM NAME="type" VALUE="application/x-java-applet;version=1.3">
-<PARAM NAME="scriptable" VALUE="true">
-
-<!-- Load text into Ekit applet by using the form bean -->
-<PARAM NAME="DOCUMENT"
- VALUE="<HTML><HEAD></HEAD><BODY><bean:write
- name="weblogEntryFormEx" property="text" /></BODY></HTML>">
-
-<PARAM NAME="BASE64" VALUE="false">
-<PARAM NAME="STYLESHEET" VALUE="ekit.css">
-<PARAM NAME="LANGCODE" VALUE="en">
-<PARAM NAME="LANGCOUNTRY" VALUE="US">
-<PARAM NAME="TOOLBAR" VALUE="true">
-<PARAM NAME="TOOLBARMULTI" VALUE="true">
-<PARAM NAME="SOURCEVIEW" VALUE="false">
-<PARAM NAME="EXCLUSIVE" VALUE="true">
-<PARAM NAME="SPELLCHECK" VALUE="true">
-<PARAM NAME="MENUICONS" VALUE="true">
-<PARAM NAME="MENU_EDIT" VALUE="true">
-<PARAM NAME="MENU_VIEW" VALUE="true">
-<PARAM NAME="MENU_FONT" VALUE="true">
-<PARAM NAME="MENU_FORMAT" VALUE="true">
-<PARAM NAME="MENU_INSERT" VALUE="true">
-<PARAM NAME="MENU_TABLE" VALUE="true">
-<PARAM NAME="MENU_FORMS" VALUE="true">
-<PARAM NAME="MENU_SEARCH" VALUE="true">
-<PARAM NAME="MENU_TOOLS" VALUE="true">
-<PARAM NAME="MENU_HELP" VALUE="true">
-</APPLET>
-
-
-<br /><a href="http://www.hexidec.com">Ekit</a>
-editor by Howard Kistler of
-<a href="http://www.hexidec.com">hexidec codex</a>
-<br />
-<br />
-
-
+<%-- This page is designed to be included in edit-weblog.jsp --%>
+<%@ page import="org.apache.roller.presentation.weblog.formbeans.WeblogEntryFormEx" %>
+<%@ include file="/taglibs.jsp" %>
+<html:hidden property="summary" />
+
+<script type="text/javascript">
+<!--
+function postWeblogEntry(publish)
+{
+ document.weblogEntryFormEx.text.value = document.Ekit.getDocumentText();
+ if (publish)
+ document.weblogEntryFormEx.publishEntry.value = "true";
+ document.weblogEntryFormEx.submit();
+}
+-->
+</script>
+
+<html:hidden property="text" />
+
+<%-- Use the Ekit applet --%>
+<APPLET CODEBASE="../editor/" CODE="com.hexidec.ekit.EkitApplet.class"
+ ARCHIVE="ekitappletspell.jar" NAME="Ekit" WIDTH="95%" HEIGHT="550">
+<PARAM NAME="codebase" VALUE="../editor/">
+<PARAM NAME="code" VALUE="com.hexidec.ekit.EkitApplet.class">
+<PARAM NAME="archive" VALUE="ekitappletspell.jar">
+<PARAM NAME="type" VALUE="application/x-java-applet;version=1.3">
+<PARAM NAME="scriptable" VALUE="true">
+
+<!-- Load text into Ekit applet by using the form bean -->
+<PARAM NAME="DOCUMENT"
+ VALUE="<HTML><HEAD></HEAD><BODY><bean:write
+ name="weblogEntryFormEx" property="text" /></BODY></HTML>">
+
+<PARAM NAME="BASE64" VALUE="false">
+<PARAM NAME="STYLESHEET" VALUE="ekit.css">
+<PARAM NAME="LANGCODE" VALUE="en">
+<PARAM NAME="LANGCOUNTRY" VALUE="US">
+<PARAM NAME="TOOLBAR" VALUE="true">
+<PARAM NAME="TOOLBARMULTI" VALUE="true">
+<PARAM NAME="SOURCEVIEW" VALUE="false">
+<PARAM NAME="EXCLUSIVE" VALUE="true">
+<PARAM NAME="SPELLCHECK" VALUE="true">
+<PARAM NAME="MENUICONS" VALUE="true">
+<PARAM NAME="MENU_EDIT" VALUE="true">
+<PARAM NAME="MENU_VIEW" VALUE="true">
+<PARAM NAME="MENU_FONT" VALUE="true">
+<PARAM NAME="MENU_FORMAT" VALUE="true">
+<PARAM NAME="MENU_INSERT" VALUE="true">
+<PARAM NAME="MENU_TABLE" VALUE="true">
+<PARAM NAME="MENU_FORMS" VALUE="true">
+<PARAM NAME="MENU_SEARCH" VALUE="true">
+<PARAM NAME="MENU_TOOLS" VALUE="true">
+<PARAM NAME="MENU_HELP" VALUE="true">
+</APPLET>
+
+
+<br /><a href="http://www.hexidec.com">Ekit</a>
+editor by Howard Kistler of
+<a href="http://www.hexidec.com">hexidec codex</a>
+<br />
+<br />
+
+
Modified: incubator/roller/trunk/web/weblog/export-entries.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/export-entries.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/export-entries.jsp (original)
+++ incubator/roller/trunk/web/weblog/export-entries.jsp Mon May 1 15:10:52 2006
@@ -16,7 +16,7 @@
directory of this distribution.
-->
<%@ include file="/taglibs.jsp" %>
-<%@ page import="org.roller.presentation.BasePageModel" %>
+<%@ page import="org.apache.roller.presentation.BasePageModel" %>
<%
BasePageModel model = (BasePageModel)request.getAttribute("model");
%>
Modified: incubator/roller/trunk/web/weblog/spellcheck-entry.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/weblog/spellcheck-entry.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/weblog/spellcheck-entry.jsp (original)
+++ incubator/roller/trunk/web/weblog/spellcheck-entry.jsp Mon May 1 15:10:52 2006
@@ -15,88 +15,88 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<!-- spellcheck-entry.jsp -->
-<%@ include file="/taglibs.jsp" %>
-<%@ page import="org.roller.model.RollerSpellCheck,com.swabunga.spell.event.SpellCheckEvent" %>
-<%@ page import="org.apache.commons.lang.StringUtils,java.util.*" %>
-
-<script type="text/javascript">
-<!--
- function postWeblogEntry(activeForm,publish)
- {
- if (publish)
- activeForm.publishEntry.value = "true";
- activeForm.submit();
- }
-
- function spellcheck(activeForm)
- {
- activeForm.method.value = "spellCheck";
- postWeblogEntry(activeForm);
- }
-// -->
-</script>
-
-<roller:StatusMessage/>
-
-<html:form action="/editor/weblog" method="post">
- <bean:define id="text" name="weblogEntryFormEx"
- property="text" type="java.lang.String" />
- <input type="hidden" name="method" value="spellCheck"/>
- <input type="hidden" name="publishEntry" value="false" />
- <html:hidden property="title" />
- <html:hidden property="categoryId" />
- <html:hidden property="dateString" />
- <html:hidden property="hours" />
- <html:hidden property="minutes" />
- <html:hidden property="seconds" />
- <html:hidden property="day"/>
- <html:hidden property="id"/>
- <html:hidden property="anchor"/>
-<h3>Use Spell Check Results</h3>
-
- <table class="rTable" width="90%" border="1">
- <tr class="rEvenTr">
- <td class="rTd"><font style='font-size: 14px; vertical-align: middle; line-height= 18px; font-family: verdana, sans-serif;'><%= escapeText %></font></td>
- </tr>
- </table>
- <br />
- <input type="button" name="post" value="Post to Weblog"
- onClick="javascript:postWeblogEntry(this.form,true)" />
-
- <input type="button" name="draft" value="Save as Draft"
- onClick="javascript:postWeblogEntry(this.form)" />
-
-</html:form>
-
-<h2>Or</h2>
-
-<html:form action="/weblog" method="post" focus="title">
-
-<h3>Edit Manually</h3>
- <input type="hidden" name="method" value="update"/>
- <input type="hidden" name="publishEntry" value="false" />
- <html:hidden property="title" />
- <html:hidden property="categoryId" />
- <html:hidden property="dateString" />
- <html:hidden property="hours" />
- <html:hidden property="minutes" />
- <html:hidden property="seconds" />
- <html:hidden property="day"/>
- <html:hidden property="id"/>
- <html:hidden property="anchor"/>
- <html:textarea property="text" cols="75" rows="20" style="width: 90%"/>
- <br />
- <br />
- <input type="button" name="post" value="Post to Weblog"
- onClick="javascript:postWeblogEntry(this.form, true)" />
-
- <input type="button" name="draft" value="Save as Draft"
- onClick="javascript:postWeblogEntry(this.form)" />
-
- <input type="button" name="spelling" value="Recheck"
- onClick="javascript:spellcheck(this.form)" />
-
-</html:form>
-
+<!-- spellcheck-entry.jsp -->
+<%@ include file="/taglibs.jsp" %>
+<%@ page import="org.apache.roller.model.RollerSpellCheck,com.swabunga.spell.event.SpellCheckEvent" %>
+<%@ page import="org.apache.commons.lang.StringUtils,java.util.*" %>
+
+<script type="text/javascript">
+<!--
+ function postWeblogEntry(activeForm,publish)
+ {
+ if (publish)
+ activeForm.publishEntry.value = "true";
+ activeForm.submit();
+ }
+
+ function spellcheck(activeForm)
+ {
+ activeForm.method.value = "spellCheck";
+ postWeblogEntry(activeForm);
+ }
+// -->
+</script>
+
+<roller:StatusMessage/>
+
+<html:form action="/editor/weblog" method="post">
+ <bean:define id="text" name="weblogEntryFormEx"
+ property="text" type="java.lang.String" />
+ <input type="hidden" name="method" value="spellCheck"/>
+ <input type="hidden" name="publishEntry" value="false" />
+ <html:hidden property="title" />
+ <html:hidden property="categoryId" />
+ <html:hidden property="dateString" />
+ <html:hidden property="hours" />
+ <html:hidden property="minutes" />
+ <html:hidden property="seconds" />
+ <html:hidden property="day"/>
+ <html:hidden property="id"/>
+ <html:hidden property="anchor"/>
+<h3>Use Spell Check Results</h3>
+
+ <table class="rTable" width="90%" border="1">
+ <tr class="rEvenTr">
+ <td class="rTd"><font style='font-size: 14px; vertical-align: middle; line-height= 18px; font-family: verdana, sans-serif;'><%= escapeText %></font></td>
+ </tr>
+ </table>
+ <br />
+ <input type="button" name="post" value="Post to Weblog"
+ onClick="javascript:postWeblogEntry(this.form,true)" />
+
+ <input type="button" name="draft" value="Save as Draft"
+ onClick="javascript:postWeblogEntry(this.form)" />
+
+</html:form>
+
+<h2>Or</h2>
+
+<html:form action="/weblog" method="post" focus="title">
+
+<h3>Edit Manually</h3>
+ <input type="hidden" name="method" value="update"/>
+ <input type="hidden" name="publishEntry" value="false" />
+ <html:hidden property="title" />
+ <html:hidden property="categoryId" />
+ <html:hidden property="dateString" />
+ <html:hidden property="hours" />
+ <html:hidden property="minutes" />
+ <html:hidden property="seconds" />
+ <html:hidden property="day"/>
+ <html:hidden property="id"/>
+ <html:hidden property="anchor"/>
+ <html:textarea property="text" cols="75" rows="20" style="width: 90%"/>
+ <br />
+ <br />
+ <input type="button" name="post" value="Post to Weblog"
+ onClick="javascript:postWeblogEntry(this.form, true)" />
+
+ <input type="button" name="draft" value="Save as Draft"
+ onClick="javascript:postWeblogEntry(this.form)" />
+
+ <input type="button" name="spelling" value="Recheck"
+ onClick="javascript:spellcheck(this.form)" />
+
+</html:form>
+
Modified: incubator/roller/trunk/web/website/CommonPingTargets.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/website/CommonPingTargets.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/website/CommonPingTargets.jsp (original)
+++ incubator/roller/trunk/web/website/CommonPingTargets.jsp Mon May 1 15:10:52 2006
@@ -15,7 +15,7 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ page import="org.roller.presentation.RollerRequest"%>
+<%@ page import="org.apache.roller.presentation.RollerRequest"%>
<%@ include file="/taglibs.jsp" %>
<p class="subtitle">
Modified: incubator/roller/trunk/web/website/edit-pages.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/web/website/edit-pages.jsp?rev=398709&r1=398708&r2=398709&view=diff
==============================================================================
--- incubator/roller/trunk/web/website/edit-pages.jsp (original)
+++ incubator/roller/trunk/web/website/edit-pages.jsp Mon May 1 15:10:52 2006
@@ -15,69 +15,69 @@
copyright in this work, please see the NOTICE file in the top level
directory of this distribution.
-->
-<%@ include file="/taglibs.jsp" %><%
-request.setAttribute("customTheme", org.roller.pojos.Theme.CUSTOM); %>
-
-<roller:StatusMessage/>
-
-<p class="subtitle">
- <fmt:message key="pagesForm.subtitle" >
- <fmt:param value="${model.website.handle}" />
- </fmt:message>
-</p>
-<p class="pagetip">
- <fmt:message key="pagesForm.tip" />
-</p>
-
-<c:if test="${website.editorTheme ne customTheme}">
-<p><fmt:message key="pagesForm.themesReminder"><fmt:param value="${website.editorTheme}"/></fmt:message></p>
-</c:if>
-
-<%-- table of pages --%>
-<table class="rollertable">
- <tr>
- <th width="10%"><fmt:message key="pagesForm.name" /></th>
- <th width="10%"><fmt:message key="pagesForm.link" /></th>
- <th width="70%"><fmt:message key="pagesForm.description" /></th>
- <th width="5%"><fmt:message key="pagesForm.edit" /></th>
- <th width="5%"><fmt:message key="pagesForm.remove" /></th>
- </tr>
- <logic:iterate id="p" name="pages" >
- <roller:row oddStyleClass="rollertable_odd" evenStyleClass="rollertable_even">
-
- <td><bean:write name="p" property="name" /></td>
- <td><bean:write name="p" property="link" /></td>
- <td><bean:write name="p" property="description" /></td>
-
- <%-- links to edit and remove page actions --%>
- <td class="center">
- <roller:link forward="editPage">
- <roller:linkparam id="username" name="user" property="userName" />
- <roller:linkparam id="pageId" name="p" property="id" />
- <img src='<c:url value="/images/page_edit.png"/>' border="0" alt="icon" />
- </roller:link>
- </td>
-
- <td class="center">
- <c:choose>
- <c:when test="${!p.required}">
- <roller:link forward="removePage.ok">
- <roller:linkparam id="username" name="user" property="userName" />
- <roller:linkparam id="pageId" name="p" property="id" />
- <img src='<c:url value="/images/delete.png"/>' border="0" alt="icon" />
- </roller:link>
- </c:when>
- <c:otherwise>
- <fmt:message key="pagesForm.required"/>
- </c:otherwise>
- </c:choose>
- </td>
-
- </roller:row>
- </logic:iterate>
-</table>
-
-<p><fmt:message key="pagesForm.hiddenNote" /></p>
-
-
-
+<%@ include file="/taglibs.jsp" %><%
+request.setAttribute("customTheme", org.apache.roller.pojos.Theme.CUSTOM); %>
+
+<roller:StatusMessage/>
+
+<p class="subtitle">
+ <fmt:message key="pagesForm.subtitle" >
+ <fmt:param value="${model.website.handle}" />
+ </fmt:message>
+</p>
+<p class="pagetip">
+ <fmt:message key="pagesForm.tip" />
+</p>
+
+<c:if test="${website.editorTheme ne customTheme}">
+<p><fmt:message key="pagesForm.themesReminder"><fmt:param value="${website.editorTheme}"/></fmt:message></p>
+</c:if>
+
+<%-- table of pages --%>
+<table class="rollertable">
+ <tr>
+ <th width="10%"><fmt:message key="pagesForm.name" /></th>
+ <th width="10%"><fmt:message key="pagesForm.link" /></th>
+ <th width="70%"><fmt:message key="pagesForm.description" /></th>
+ <th width="5%"><fmt:message key="pagesForm.edit" /></th>
+ <th width="5%"><fmt:message key="pagesForm.remove" /></th>
+ </tr>
+ <logic:iterate id="p" name="pages" >
+ <roller:row oddStyleClass="rollertable_odd" evenStyleClass="rollertable_even">
+
+ <td><bean:write name="p" property="name" /></td>
+ <td><bean:write name="p" property="link" /></td>
+ <td><bean:write name="p" property="description" /></td>
+
+ <%-- links to edit and remove page actions --%>
+ <td class="center">
+ <roller:link forward="editPage">
+ <roller:linkparam id="username" name="user" property="userName" />
+ <roller:linkparam id="pageId" name="p" property="id" />
+ <img src='<c:url value="/images/page_edit.png"/>' border="0" alt="icon" />
+ </roller:link>
+ </td>
+
+ <td class="center">
+ <c:choose>
+ <c:when test="${!p.required}">
+ <roller:link forward="removePage.ok">
+ <roller:linkparam id="username" name="user" property="userName" />
+ <roller:linkparam id="pageId" name="p" property="id" />
+ <img src='<c:url value="/images/delete.png"/>' border="0" alt="icon" />
+ </roller:link>
+ </c:when>
+ <c:otherwise>
+ <fmt:message key="pagesForm.required"/>
+ </c:otherwise>
+ </c:choose>
+ </td>
+
+ </roller:row>
+ </logic:iterate>
+</table>
+
+<p><fmt:message key="pagesForm.hiddenNote" /></p>
+
+
+