roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r230810 [1/6] - in /incubator/roller/branches/roller_2.0: ./ contrib/plugins/src/org/roller/presentation/velocity/plugins/acronyms/ contrib/plugins/src/org/roller/presentation/velocity/plugins/convertbreaks/ contrib/plugins/src/org/roller/p...
Date Mon, 08 Aug 2005 14:43:03 GMT
Author: snoopdave
Date: Mon Aug  8 07:41:04 2005
New Revision: 230810

URL: http://svn.apache.org/viewcvs?rev=230810&view=rev
Log:
Merging from trunk to roller_2.0 branch, revs 190010:225818

Added:
    incubator/roller/branches/roller_2.0/STATUS.txt   (props changed)
      - copied unchanged from r225818, incubator/roller/trunk/STATUS.txt
    incubator/roller/branches/roller_2.0/contrib/plugins/src/org/roller/presentation/velocity/plugins/convertbreaks/
      - copied from r225818, incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/convertbreaks/
    incubator/roller/branches/roller_2.0/contrib/plugins/src/org/roller/presentation/velocity/plugins/convertbreaks/ConvertLineBreaksPlugin.java
      - copied unchanged from r225818, incubator/roller/trunk/contrib/plugins/src/org/roller/presentation/velocity/plugins/convertbreaks/ConvertLineBreaksPlugin.java
    incubator/roller/branches/roller_2.0/metadata/xdoclet/pojo_wrapper.xdt
      - copied unchanged from r225818, incubator/roller/trunk/metadata/xdoclet/pojo_wrapper.xdt
    incubator/roller/branches/roller_2.0/src/org/roller/ThemeNotFoundException.java
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/ThemeNotFoundException.java
    incubator/roller/branches/roller_2.0/src/org/roller/business/ThemeManagerImpl.java
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/business/ThemeManagerImpl.java
    incubator/roller/branches/roller_2.0/src/org/roller/business/roller-persistence.png   (props changed)
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/business/roller-persistence.png
    incubator/roller/branches/roller_2.0/src/org/roller/business/roller-services-impl.png   (props changed)
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/business/roller-services-impl.png
    incubator/roller/branches/roller_2.0/src/org/roller/business/utils/package.html
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/business/utils/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/config/package.html
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/config/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/config/runtime/package.html
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/config/runtime/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/model/ThemeManager.java
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/model/ThemeManager.java
    incubator/roller/branches/roller_2.0/src/org/roller/model/roller-services.png   (props changed)
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/model/roller-services.png
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/Template.java
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/pojos/Template.java
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/Theme.java
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/pojos/Theme.java
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/ThemeTemplate.java
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/pojos/ThemeTemplate.java
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/WeblogTemplate.java
      - copied, changed from r225818, incubator/roller/trunk/src/org/roller/pojos/WeblogTemplate.java
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/roller-datamodel.png   (props changed)
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/pojos/roller-datamodel.png
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/atomapi/package.html
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/presentation/atomapi/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/filters/CharEncodingFilter.java   (props changed)
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/presentation/filters/CharEncodingFilter.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/pagecache/roller-caching.png   (props changed)
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/presentation/pagecache/roller-caching.png
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/pagecache/rollercache/package.html
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/presentation/pagecache/rollercache/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/pings/package.html
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/presentation/pings/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/package.html
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/presentation/planet/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/roller-ui.png   (props changed)
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/presentation/roller-ui.png
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/util/package.html
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/presentation/util/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/ThemeResourceLoader.java
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/presentation/velocity/ThemeResourceLoader.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/roller-velocity.png   (props changed)
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/presentation/velocity/roller-velocity.png
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/wrappers/
      - copied from r225818, incubator/roller/trunk/src/org/roller/presentation/velocity/wrappers/
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java
      - copied, changed from r225818, incubator/roller/trunk/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/util/rome/package.html
      - copied unchanged from r225818, incubator/roller/trunk/src/org/roller/util/rome/package.html
    incubator/roller/branches/roller_2.0/tools/buildtime/velocidoc-templates/
      - copied from r225818, incubator/roller/trunk/tools/buildtime/velocidoc-templates/
    incubator/roller/branches/roller_2.0/tools/buildtime/velocidoc-templates/allmacros.vm
      - copied unchanged from r225818, incubator/roller/trunk/tools/buildtime/velocidoc-templates/allmacros.vm
    incubator/roller/branches/roller_2.0/tools/buildtime/velocidoc-templates/alltemplates.vm
      - copied unchanged from r225818, incubator/roller/trunk/tools/buildtime/velocidoc-templates/alltemplates.vm
    incubator/roller/branches/roller_2.0/tools/buildtime/velocidoc-templates/control.vm
      - copied unchanged from r225818, incubator/roller/trunk/tools/buildtime/velocidoc-templates/control.vm
    incubator/roller/branches/roller_2.0/tools/buildtime/velocidoc-templates/index.vm
      - copied unchanged from r225818, incubator/roller/trunk/tools/buildtime/velocidoc-templates/index.vm
    incubator/roller/branches/roller_2.0/tools/buildtime/velocidoc-templates/macro.vm
      - copied unchanged from r225818, incubator/roller/trunk/tools/buildtime/velocidoc-templates/macro.vm
    incubator/roller/branches/roller_2.0/tools/buildtime/velocidoc-templates/overview-frame.vm
      - copied unchanged from r225818, incubator/roller/trunk/tools/buildtime/velocidoc-templates/overview-frame.vm
    incubator/roller/branches/roller_2.0/tools/buildtime/velocidoc-templates/package-overview.vm
      - copied unchanged from r225818, incubator/roller/trunk/tools/buildtime/velocidoc-templates/package-overview.vm
    incubator/roller/branches/roller_2.0/tools/buildtime/velocidoc-templates/package-templatelist.vm
      - copied unchanged from r225818, incubator/roller/trunk/tools/buildtime/velocidoc-templates/package-templatelist.vm
    incubator/roller/branches/roller_2.0/tools/buildtime/velocidoc-templates/roller-overview.vm
      - copied unchanged from r225818, incubator/roller/trunk/tools/buildtime/velocidoc-templates/roller-overview.vm
    incubator/roller/branches/roller_2.0/tools/buildtime/velocidoc-templates/stylesheet.vm
      - copied unchanged from r225818, incubator/roller/trunk/tools/buildtime/velocidoc-templates/stylesheet.vm
    incubator/roller/branches/roller_2.0/tools/buildtime/velocidoc-templates/template.vm
      - copied unchanged from r225818, incubator/roller/trunk/tools/buildtime/velocidoc-templates/template.vm
    incubator/roller/branches/roller_2.0/tools/lib/xmlrpc-1.2-b1.jar   (props changed)
      - copied unchanged from r225818, incubator/roller/trunk/tools/lib/xmlrpc-1.2-b1.jar
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/searchdisabled.vm
    incubator/roller/branches/roller_2.0/web/editor/ekitappletspell.jar   (props changed)
      - copied unchanged from r225818, incubator/roller/trunk/web/editor/ekitappletspell.jar
    incubator/roller/branches/roller_2.0/web/local-banner-planet.jspf
      - copied unchanged from r225818, incubator/roller/trunk/web/local-banner-planet.jspf
Removed:
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/PageData.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PreviewResourceLoader.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/ThemeCache.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/PageFormAction.java
Modified:
    incubator/roller/branches/roller_2.0/CHANGES.txt
    incubator/roller/branches/roller_2.0/LICENSE.txt
    incubator/roller/branches/roller_2.0/ant.properties
    incubator/roller/branches/roller_2.0/build.xml
    incubator/roller/branches/roller_2.0/contrib/plugins/src/org/roller/presentation/velocity/plugins/acronyms/AcronymsPlugin.java
    incubator/roller/branches/roller_2.0/contrib/plugins/src/org/roller/presentation/velocity/plugins/readmore/ReadMorePlugin.java
    incubator/roller/branches/roller_2.0/metadata/database/hibernate/hibernate.cfg.xml
    incubator/roller/branches/roller_2.0/metadata/xdoclet/filter-mappings.xml
    incubator/roller/branches/roller_2.0/nbproject/project.xml
    incubator/roller/branches/roller_2.0/personal/testing/hibernate.cfg.xml
    incubator/roller/branches/roller_2.0/sandbox/planetroller/src/org/roller/tools/planet/PlanetTool.java
    incubator/roller/branches/roller_2.0/sandbox/standalone/build.xml
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/hibernate.cfg.xml
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/setenv.bat
    incubator/roller/branches/roller_2.0/src/org/roller/RollerException.java
    incubator/roller/branches/roller_2.0/src/org/roller/RollerPermissionsException.java
    incubator/roller/branches/roller_2.0/src/org/roller/business/AutoPingManagerImpl.java
    incubator/roller/branches/roller_2.0/src/org/roller/business/FileManagerImpl.java
    incubator/roller/branches/roller_2.0/src/org/roller/business/IndexManagerImpl.java
    incubator/roller/branches/roller_2.0/src/org/roller/business/PingQueueManagerImpl.java
    incubator/roller/branches/roller_2.0/src/org/roller/business/PingTargetManagerImpl.java
    incubator/roller/branches/roller_2.0/src/org/roller/business/PlanetManagerImpl.java
    incubator/roller/branches/roller_2.0/src/org/roller/business/RollerImpl.java
    incubator/roller/branches/roller_2.0/src/org/roller/business/UserManagerImpl.java
    incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernatePlanetManagerImpl.java
    incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateRefererManagerImpl.java
    incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateUserManagerImpl.java
    incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/business/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/business/search/operations/AddEntryOperation.java
    incubator/roller/branches/roller_2.0/src/org/roller/business/search/operations/ReIndexEntryOperation.java
    incubator/roller/branches/roller_2.0/src/org/roller/business/search/operations/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/business/search/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/business/utils/UpgradeDatabase.java
    incubator/roller/branches/roller_2.0/src/org/roller/config/RollerConfig.java
    incubator/roller/branches/roller_2.0/src/org/roller/model/AutoPingManager.java
    incubator/roller/branches/roller_2.0/src/org/roller/model/BookmarkManager.java
    incubator/roller/branches/roller_2.0/src/org/roller/model/ConfigManager.java
    incubator/roller/branches/roller_2.0/src/org/roller/model/FileManager.java
    incubator/roller/branches/roller_2.0/src/org/roller/model/IndexManager.java
    incubator/roller/branches/roller_2.0/src/org/roller/model/PingQueueManager.java
    incubator/roller/branches/roller_2.0/src/org/roller/model/PingTargetManager.java
    incubator/roller/branches/roller_2.0/src/org/roller/model/PropertiesManager.java
    incubator/roller/branches/roller_2.0/src/org/roller/model/RefererManager.java
    incubator/roller/branches/roller_2.0/src/org/roller/model/Roller.java
    incubator/roller/branches/roller_2.0/src/org/roller/model/RollerFactory.java
    incubator/roller/branches/roller_2.0/src/org/roller/model/ScheduledTask.java
    incubator/roller/branches/roller_2.0/src/org/roller/model/ThreadManager.java
    incubator/roller/branches/roller_2.0/src/org/roller/model/UserManager.java
    incubator/roller/branches/roller_2.0/src/org/roller/model/WeblogManager.java
    incubator/roller/branches/roller_2.0/src/org/roller/model/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/BookmarkData.java
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/CommentData.java
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/EntryAttributeData.java
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/FolderData.java
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/PersistentObject.java
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/RefererData.java
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/UserData.java
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/WeblogCategoryData.java
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/WeblogEntryData.java
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/WebsiteData.java
    incubator/roller/branches/roller_2.0/src/org/roller/pojos/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/ResourceServlet.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerContext.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerRequest.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/formbeans/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/filters/RequestFilter.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/filters/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/forms/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/newsfeeds/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/pagecache/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/SyncWebsitesTask.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/calendar/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/BaseRollerMenu.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/MenuImpl.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/MenuItem.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/RollerMenuModel.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/menu/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/tags/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/BasePageServlet.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/CommentServlet.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/ContextLoader.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/ExportRss.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/FlavorServlet.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/FoafServlet.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageHelper.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageModel.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PageServlet.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PlanetFeedServlet.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/PreviewServlet.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/RollerResourceLoader.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/SearchServlet.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/VelocityPageInsert.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/TrackbackServlet.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryPageModel.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/formbeans/WeblogEntryFormEx.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/formbeans/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/tags/ApplyPluginsTag.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/tags/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/ThemeEditorAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserBaseAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/formbeans/RollerConfigFormEx.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/formbeans/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/tags/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/xmlrpc/BloggerAPIHandler.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/xmlrpc/MetaWeblogAPIHandler.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/xmlrpc/package.html
    incubator/roller/branches/roller_2.0/src/org/roller/util/package.html
    incubator/roller/branches/roller_2.0/tests/org/roller/RollerTestBase.java
    incubator/roller/branches/roller_2.0/tests/org/roller/business/IndexManagerTest.java
    incubator/roller/branches/roller_2.0/tests/org/roller/business/PermissionsTest.java
    incubator/roller/branches/roller_2.0/tests/org/roller/business/UserManagerTest.java
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/bookmark.vm
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/comments.vm
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/flavors/atom.vm
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/navbar.vm
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/newsfeed.vm
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/planetrss.vm
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/referer.vm
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.properties
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.vm
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rollerRuntimeConfigDefs.xml
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/rssmacros.vm
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/searchresults_day.vm
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/user.vm
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/weblog.vm
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/website.vm
    incubator/roller/branches/roller_2.0/web/WEB-INF/velocity.properties
    incubator/roller/branches/roller_2.0/web/planet.jsp
    incubator/roller/branches/roller_2.0/web/planet/PlanetConfig.jsp
    incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp
    incubator/roller/branches/roller_2.0/web/weblog/editor-ekit.jsp
    incubator/roller/branches/roller_2.0/web/website/edit-page.jsp
    incubator/roller/branches/roller_2.0/web/website/edit-pages.jsp
    incubator/roller/branches/roller_2.0/web/website/remove-page.jsp
    incubator/roller/branches/roller_2.0/web/website/theme-editor.jsp

Modified: incubator/roller/branches/roller_2.0/CHANGES.txt
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/CHANGES.txt?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/CHANGES.txt (original)
+++ incubator/roller/branches/roller_2.0/CHANGES.txt Mon Aug  8 07:41:04 2005
@@ -1,6 +1,44 @@
 
 ROLLER CHANGE LOG
 -----------------
+
+Roller 1.2 - New feature release
+
+Also, changed license to Apache License v2.0
+
+    New Feature
+    * [ROL-305] - Configurable Weblogs.com pings
+
+    Improvement
+    * [ROL-708] - Metadata driven configuration
+    * [ROL-730] - Upgraded to Ekit-editor version 1.0
+
+    Bugs fixes
+    * [ROL-684] - ekit jar in wrong place
+    * [ROL-699] - Weblog Editor shows wrong timezone
+    * [ROL-725] - RSS dates are invalid in non-English locales
+    * [ROL-729] - Deleting Pinned to Main Entry
+    * [ROL-734] - Bookmark OPML fails if folder named 'unfiled' already exists
+    * [ROL-742] - Saving Website:Settings clears hit count
+    * [ROL-743] - #showOpmlLink() macro broken
+
+------------------------------------------------------------------------------
+Roller 1.1.2 - Bug fix release
+
+No new features, just one bug fix.
+
+   * [ROL-724] - Deleted and modified entris not removed from Search Index
+
+------------------------------------------------------------------------------
+Roller 1.1.1 - Bug fix release
+
+No new features, just one bug fix.
+
+   * [ROL-716] Search is broken
+   
+------------------------------------------------------------------------------
+Roller 1.1 - New feature release
+
 This release includes basic support for Podcasting, bug fixes and minor improvements.
 A new aggregator front page (known as Planet Roller) has been added to Roller, but
 it is an unsupported feature available only via Roller's custom build mechanism.

Modified: incubator/roller/branches/roller_2.0/LICENSE.txt
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/LICENSE.txt?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/LICENSE.txt (original)
+++ incubator/roller/branches/roller_2.0/LICENSE.txt Mon Aug  8 07:41:04 2005
@@ -1,46 +1,201 @@
-
-Roller Software License
-
-Version 1.0
-
-Copyright (c) 2000 David M Johnson. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this 
-list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, 
-this list of conditions and the following disclaimer in the documentation and/or 
-other materials provided with the distribution.
-
-3. The end-user documentation included with the redistribution, if any, must 
-include the following acknowledgment:
-
-"This product includes software developed by David M Johnson"
-
-Alternately, this acknowledgment may appear in the software itself, if and 
-wherever such third-party acknowledgments normally appear.
-
-4. The names "Roller" and "David M Johnson" must not be used to endorse or 
-promote products derived from this software without prior written permission. 
-For written permission, please contact snoopdave@users.sourceforce.net.
-
-5. Products derived from this software may not be called "Roller", nor may 
-"Roller" appear in their name, without prior written permission of David M Johnson.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, 
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ROLLER
-PROJECT OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-POSSIBILITY OF SUCH DAMAGE.
-
-This software consists of voluntary contributions made by many individuals on 
-behalf of the David M Johnson. 
-
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Propchange: incubator/roller/branches/roller_2.0/STATUS.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/roller/branches/roller_2.0/ant.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/ant.properties?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/ant.properties (original)
+++ incubator/roller/branches/roller_2.0/ant.properties Mon Aug  8 07:41:04 2005
@@ -1,6 +1,6 @@
 build.debug=true
 build.deprecation=false
-ro.version=2.0-dev
+ro.version=2.0 (Incubating - Early Access Edition)
 ro.build=./build
 ro.tools=./tools
 basedir=.

Modified: incubator/roller/branches/roller_2.0/build.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/build.xml?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/build.xml (original)
+++ incubator/roller/branches/roller_2.0/build.xml Mon Aug  8 07:41:04 2005
@@ -57,7 +57,7 @@
 <!-- XDoclet code generation -->
 <!-- ********************************************************************* -->
 	
-<target name="generate" depends="gen-forms,gen-hibernate,gen-web" >
+<target name="generate" depends="gen-forms,gen-hibernate,gen-web,gen-wrappers" >
 </target>
 
 <!-- ============================================== -->
@@ -74,6 +74,7 @@
 
     <!-- Use EJBDoclet to generate Struts forms -->
     <ejbdoclet destdir="${build.generated}/src" excludedtags="@version,@author">
+	<fileset dir="./src" includes="org/roller/pojos/WeblogTemplate.java" />
         <fileset dir="./src" includes="org/roller/pojos/*Data.java" />
         <fileset dir="./src" includes="org/roller/business/*Data.java" /> 
         &custom-gen-web;
@@ -129,6 +130,7 @@
         excludedtags="@version,@author"
         addedtags="@xdoclet-generated at ${TODAY}"
         force="true">
+	<fileset dir="./src" includes="org/roller/pojos/WeblogTemplate.java" />
         <fileset dir="./src" includes="org/roller/pojos/*Data.java" />
         <fileset dir="./src" includes="org/roller/pojos/*Assoc.java" />
         <fileset dir="./src" includes="org/roller/business/*Data.java" />
@@ -193,6 +195,46 @@
 
 </target>
 
+<!-- ============================================== -->
+<!-- Generate pojo wrappers -->
+<target name="gen-wrappers" description="XDoclet generate pojo wrappers">
+
+    <!-- Define the XDoclet task -->
+    <taskdef  name="xdoclet" classname="xdoclet.DocletTask"
+        classpathref="xdoclet.path" />
+    
+    <xdoclet destdir="${build.generated}/src.business">
+        
+        <packageSubstitution packages="pojos" substituteWith="pojos.wrapper"/>
+        
+        <fileset dir="./src">
+            <!-- 
+                it may be easier to glob using *Data.java at some point, but
+                for now that will generate a lot of unneeded classes.
+                
+                maybe we can extend the process to only wrap classes that have
+                methods tagged with @roller.wrapPojoMethod ??
+            -->
+            <include name="org/roller/pojos/BookmarkData.java"/>
+            <include name="org/roller/pojos/CommentData.java"/>
+            <include name="org/roller/pojos/EntryAttributeData.java"/>
+            <include name="org/roller/pojos/FolderData.java"/>
+            <include name="org/roller/pojos/RefererData.java"/>
+            <include name="org/roller/pojos/Template.java"/>
+            <include name="org/roller/pojos/UserData.java"/>
+            <include name="org/roller/pojos/WeblogEntryData.java"/>
+            <include name="org/roller/pojos/WeblogCategoryData.java"/>
+            <include name="org/roller/pojos/WebsiteData.java"/>
+        </fileset>
+
+        <template 
+            destinationFile="{0}Wrapper.java"
+            templateFile="metadata/xdoclet/pojo_wrapper.xdt"
+            subTaskName="Pojo Wrappers" />
+    </xdoclet>
+        
+</target>
+        
 <!-- ********************************************************************* -->
 <!-- Compile and jar Business Tier classes -->
 <!-- ********************************************************************* -->
@@ -214,12 +256,14 @@
     <javac debug="${build.debug}" destdir="${build.compile_beans}"
         excludes="org/roller/presentation/**" >
         <src path="${basedir}/src" />
+        <src path="${build.generated}/src.business"/>
         &custom-src-beans;
         <classpath>
             <path refid="business.path"/>
             &custom-jars;
         </classpath>
     </javac>
+    
     <!-- Copy class resources -->
     <copy todir="${build.compile_beans}/org/roller/model">
         <fileset dir="${build.generated}/src.business" includes="*.hbm.xml"/>
@@ -386,12 +430,6 @@
     <copy todir="${build.stage_web}/WEB-INF/tlds">
         <fileset dir="${ro.tools}/lib" includes="*.tld"/>
     </copy>
-    <!-- Copy applet jars to root of servlet context -->
-    <copy todir="${build.stage_web}">
-        <fileset dir="${ro.tools}/lib">
-            <include name="ekitapplet.jar"/>
-        </fileset>
-    </copy>
     <!-- copy database related files -->
     <antcall target="stage-dbscripts" />
 
@@ -464,9 +502,17 @@
 </target>
 
 <!-- ********************************************************************* -->
-<!-- Generate Javadocs -->
+<!-- Generate Javadocs and Velocidocs -->
 <!-- ********************************************************************* -->
 	
+<target name="docs" depends="javadoc,velocidoc" >
+    <copy todir="${build.javadoc}">
+        <fileset dir="${build.velocidoc}/docs">
+            <include name="*.css"/>
+        </fileset>
+    </copy>
+</target>
+
 <target name="javadoc">
     <mkdir dir="${build.javadoc}"/>
     <javadoc
@@ -491,31 +537,36 @@
         <link href="http://jakarta.apache.org/struts/doc-1.0.2/api"/>
         <link href="http://hibernate.bluemars.net/hib_docs/api/"/>
     </javadoc>
-
-    <antcall target="velocidoc" />
+    <copy todir="${build.javadoc}">
+        <fileset dir="${basedir}/src">
+            <include name="**/roller*.png"/>
+        </fileset>
+    </copy>
 </target>
 	
 <target name="velocidoc">
     <mkdir dir="${build.velocidoc}/temp"/>
     <copy todir="${build.velocidoc}/temp">
         <fileset dir="./web/WEB-INF/classes/">
-            <include name="bookmarks.vm" />
+            <include name="bookmark.vm" />
             <include name="comments.vm" />
             <include name="navbar.vm" />
-            <include name="navbar-css.vm" />
             <include name="referer.vm" />
             <include name="roller.vm" />
             <include name="rssmacros.vm" />
             <include name="user.vm" />
             <include name="weblog.vm" />
             <include name="website.vm" />
+            <!--
+            -->
         </fileset>
     </copy>
     <mkdir dir="${build.velocidoc}/docs"/>
     <java fork="true" jar="${ro.tools}/buildtime/velocidoc-app.jar">
-        <arg line="-s ${build.velocidocs}/temp -d ${build.velocidoc}/docs"/>
-        <arg line="-ctl ${ro.tools}/buildtime/velocidoc-templates/control.vm"/>
-        <arg line="-src ${ro.tools}/buildtime/velocidoc-templates/"/>
+        <arg line="-s ${build.velocidoc}/temp \
+           -d ${build.velocidoc}/docs \
+           -t ${ro.tools}/buildtime/velocidoc-templates/ \
+           -c ${ro.tools}/buildtime/velocidoc-templates/control.vm "/>
     </java>
 </target>
 

Modified: incubator/roller/branches/roller_2.0/contrib/plugins/src/org/roller/presentation/velocity/plugins/acronyms/AcronymsPlugin.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/contrib/plugins/src/org/roller/presentation/velocity/plugins/acronyms/AcronymsPlugin.java?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/contrib/plugins/src/org/roller/presentation/velocity/plugins/acronyms/AcronymsPlugin.java (original)
+++ incubator/roller/branches/roller_2.0/contrib/plugins/src/org/roller/presentation/velocity/plugins/acronyms/AcronymsPlugin.java Mon Aug  8 07:41:04 2005
@@ -12,7 +12,7 @@
 import org.roller.RollerException;
 import org.roller.model.RollerFactory;
 import org.roller.model.UserManager;
-import org.roller.pojos.PageData;
+import org.roller.pojos.WeblogTemplate;
 import org.roller.pojos.WeblogEntryData;
 import org.roller.pojos.WebsiteData;
 import org.roller.presentation.RollerRequest;
@@ -80,7 +80,7 @@
         try
         {
             UserManager userMgr = RollerFactory.getRoller().getUserManager();
-            PageData acronymsPage = userMgr.getPageByName(
+            WeblogTemplate acronymsPage = userMgr.getPageByName(
                                         website, "_acronyms");
             if (acronymsPage != null) 
             {
@@ -193,15 +193,15 @@
 	}
 
 	/**
-	 * Parse the Template of the provided PageData and turns it
+	 * Parse the Template of the provided WeblogTemplate and turns it
 	 * into a <code>Properties</code> collection.
 	 * 
 	 * @param acronymPage
 	 * @return acronym properties (key = acronym, value= full text), empty if Template is empty
 	 */
-	private Properties parseAcronymPage(PageData acronymPage, Properties acronyms)
+	private Properties parseAcronymPage(WeblogTemplate acronymPage, Properties acronyms)
 	{
-		String rawAcronyms = acronymPage.getTemplate();
+		String rawAcronyms = acronymPage.getContents();
 		
 		if (mLogger.isDebugEnabled()) 
 		{

Modified: incubator/roller/branches/roller_2.0/contrib/plugins/src/org/roller/presentation/velocity/plugins/readmore/ReadMorePlugin.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/contrib/plugins/src/org/roller/presentation/velocity/plugins/readmore/ReadMorePlugin.java?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/contrib/plugins/src/org/roller/presentation/velocity/plugins/readmore/ReadMorePlugin.java (original)
+++ incubator/roller/branches/roller_2.0/contrib/plugins/src/org/roller/presentation/velocity/plugins/readmore/ReadMorePlugin.java Mon Aug  8 07:41:04 2005
@@ -55,7 +55,7 @@
      */
     private String getPageLink(UserManager mgr, WebsiteData website) throws RollerException
     {
-        return mgr.retrievePage(website.getDefaultPageId()).getLink();
+        return website.getDefaultPage().getLink();
     }
 
     /* 
@@ -82,11 +82,15 @@
             pageLink = getPageLink(
                 RollerFactory.getRoller().getUserManager(), entry.getWebsite());
         }
-        catch (RollerException e) 
        {
+        catch (RollerException e) 
+        {
             mLogger.warn("Unable to get pageLink", e);
         }
         
-        String result = Utilities.removeHTML(entry.getText(), true);
        result = Utilities.truncateText(result, 240, 260, "...");
        //String result = Utilities.truncateNicely(entry.getText(), 240, 260, "... ");
        
+        String result = Utilities.removeHTML(entry.getText(), true);
+        result = Utilities.truncateText(result, 240, 260, "...");
+        //String result = Utilities.truncateNicely(entry.getText(), 240, 260, "... ");
+        
         // if the result is shorter, we need to add "Read More" link
         if (result.length() < entry.getText().length())
         {            

Modified: incubator/roller/branches/roller_2.0/metadata/database/hibernate/hibernate.cfg.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/metadata/database/hibernate/hibernate.cfg.xml?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/metadata/database/hibernate/hibernate.cfg.xml (original)
+++ incubator/roller/branches/roller_2.0/metadata/database/hibernate/hibernate.cfg.xml Mon Aug  8 07:41:04 2005
@@ -43,7 +43,7 @@
         <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/PageData.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" />

Modified: incubator/roller/branches/roller_2.0/metadata/xdoclet/filter-mappings.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/metadata/xdoclet/filter-mappings.xml?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/metadata/xdoclet/filter-mappings.xml (original)
+++ incubator/roller/branches/roller_2.0/metadata/xdoclet/filter-mappings.xml Mon Aug  8 07:41:04 2005
@@ -5,18 +5,32 @@
     ******************************************************* -->
 
 <!--
+     NOTE: Wherever "dispatcher" elements are specified in the filter mappings, they are
+     required for Servlet API 2.4 containers, such as Tomcat 5+ and Resin 3+, but should be
+     commented out for Servlet API 2.3 containers, like Tomcat 4.x and Resin 2.x.
+-->
+
+<!--
 <filter-mapping>
     <filter-name>UrlRewriteFilter</filter-name>
     <url-pattern>/*</url-pattern>
 </filter-mapping>
 -->
 
-<!-- Map everything to the PersistenceSessionFilter -->
+<!-- Ensures character encoding set to UTF-8 and JSTL and Struts locales are in sync.
+     Note: Any filters preceding this one MUST not cause request parsing. -->
+<filter-mapping>
+    <filter-name>CharEncodingFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+    <dispatcher>REQUEST</dispatcher>
+    <dispatcher>FORWARD</dispatcher>
+</filter-mapping>
+
+<!-- Map everything to the PersistenceSessionFilter.
+     NOTE: Any filters preceding this one MUST NOT use persistence sessions.-->
 <filter-mapping>
     <filter-name>PersistenceSessionFilter</filter-name>
     <url-pattern>/*</url-pattern>
-    <!-- You must uncomment these two dispatcher lines on Tomcat 5+ and any Servlet API 2.4+ container
-         in order to avoid database connection leaks on the FORWARD dispatch paths. -->
     <dispatcher>REQUEST</dispatcher>
     <dispatcher>FORWARD</dispatcher>
 </filter-mapping>
@@ -64,8 +78,6 @@
 <filter-mapping>
     <filter-name>loginFilter</filter-name>
     <url-pattern>/login.jsp</url-pattern>
-    <!-- You must uncomment these two dispatcher lines on Tomcat 5+ and any Servlet API 2.4+ container
-         in order for RememberMe to work in these environments, because we can reach login.jsp via FORWARD. -->
     <dispatcher>REQUEST</dispatcher>
     <dispatcher>FORWARD</dispatcher>
 </filter-mapping>

Modified: incubator/roller/branches/roller_2.0/nbproject/project.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/nbproject/project.xml?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/nbproject/project.xml (original)
+++ incubator/roller/branches/roller_2.0/nbproject/project.xml Mon Aug  8 07:41:04 2005
@@ -143,7 +143,7 @@
             <web-module>
                 <doc-root>web</doc-root>
                 <classpath>web</classpath>
-                <context-path>/</context-path>
+                <context-path>/roller</context-path>
                 <j2ee-spec-level>1.4</j2ee-spec-level>
             </web-module>
         </web-data>

Modified: incubator/roller/branches/roller_2.0/personal/testing/hibernate.cfg.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/personal/testing/hibernate.cfg.xml?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/personal/testing/hibernate.cfg.xml (original)
+++ incubator/roller/branches/roller_2.0/personal/testing/hibernate.cfg.xml Mon Aug  8 07:41:04 2005
@@ -32,7 +32,7 @@
         <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/PageData.hbm.xml" />
+        <mapping resource="org/roller/pojos/WeblogTemplate.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" />

Modified: incubator/roller/branches/roller_2.0/sandbox/planetroller/src/org/roller/tools/planet/PlanetTool.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/planetroller/src/org/roller/tools/planet/PlanetTool.java?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/planetroller/src/org/roller/tools/planet/PlanetTool.java (original)
+++ incubator/roller/branches/roller_2.0/sandbox/planetroller/src/org/roller/tools/planet/PlanetTool.java Mon Aug  8 07:41:04 2005
@@ -238,6 +238,11 @@
     {
         throw new RuntimeException("Not implemented");
     }
+    
+    public List getTopSubscriptions(PlanetGroupData group, int max) throws RollerException
+    {
+        throw new RuntimeException("Not implemented");
+    }
 
     public List getTopSubscriptions(PlanetGroupData group, int max) throws RollerException
     {

Modified: incubator/roller/branches/roller_2.0/sandbox/standalone/build.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/build.xml?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/build.xml (original)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/build.xml Mon Aug  8 07:41:04 2005
@@ -83,22 +83,33 @@
         todir="./build/roller-demo/conf/Catalina/localhost" />
         
    <!-- And hibernate.cfg.xml configured for HSQLDB -->
+   <mkdir dir="./build/roller-demo/common/classes" />
+   <copy file="./tomcat/roller-custom.properties" overwrite="true"
+        todir="./build/roller-demo/common/classes" />
+   
+   <!-- And hibernate.cfg.xml configured for HSQLDB -->
    <copy file="./tomcat/hibernate.cfg.xml" overwrite="true"
         todir="./build/roller-demo/webapps/roller/WEB-INF/classes" />
-   
+	   
    <!-- Roller HSQLDB starter goes into Tomcat -->
    <copy file="./build/roller-hsqldb.jar" 
         todir="./build/roller-demo/server/lib" />
    <copy file="${roller.srcdir}/tools/buildtime/hsqldb.jar" 
         todir="./build/roller-demo/common/lib" />
+	
+   <!-- Custom local-banner -->
+   <copy file="./tomcat/localbanner.jspf" 
+        todir="./build/roller-demo/webapps/roller" />
 
    <!-- Our own server.xml: adds HSQLDB startup -->         
    <copy file="./tomcat/server.xml"
         todir="./build/roller-demo/conf" />
         
    <!-- Define VM properties needed by HSQLDB and JSPWiki plugins -->
-   <copy file="./tomcat/setenv.sh"
-        todir="./build/roller-demo/bin" />
+	   <copy file="./tomcat/setenv.sh"
+	        todir="./build/roller-demo/bin" />
+	   <copy file="./tomcat/setenv.bat"
+	        todir="./build/roller-demo/bin" />
         
    <chmod perm="+x">
        <fileset dir="./build/roller-demo/bin" includes="*.sh" />
@@ -121,13 +132,6 @@
         url="jdbc:hsqldb:hsql://localhost:3219"
         userid="sa" password=""
         src="./build/roller-demo/webapps/roller/WEB-INF/dbscripts/hsql/createdb.sql"
-        classpath="./build/roller-demo/common/lib/hsqldb.jar" />
-        
-    <!-- Create Roller Planet database tables -->
-    <sql driver="org.hsqldb.jdbcDriver"
-        url="jdbc:hsqldb:hsql://localhost:3219"
-        userid="sa" password=""
-        src="./build/roller-demo/webapps/roller/WEB-INF/dbscripts/hsql/createdb-planet.sql"
         classpath="./build/roller-demo/common/lib/hsqldb.jar" />
         
     <!-- Shutdown HSQLDB -->

Modified: incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/hibernate.cfg.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/hibernate.cfg.xml?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/hibernate.cfg.xml (original)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/hibernate.cfg.xml Mon Aug  8 07:41:04 2005
@@ -19,6 +19,10 @@
         <mapping resource="org/roller/pojos/FolderAssoc.hbm.xml" />
         <mapping resource="org/roller/pojos/FolderData.hbm.xml" />
         <mapping resource="org/roller/pojos/PageData.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" />
@@ -28,7 +32,7 @@
         <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/PlanetConfigData.hbm.xml" />
         <mapping resource="org/roller/pojos/PlanetGroupData.hbm.xml" />
         <mapping resource="org/roller/pojos/PlanetEntryData.hbm.xml" />

Modified: incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/setenv.bat
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/setenv.bat?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/setenv.bat (original)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/setenv.bat Mon Aug  8 07:41:04 2005
@@ -1 +1,2 @@
 set JAVA_OPTS=-Dhsqldb_database=%CATALINA_HOME%\blogdata\rollerdb -Dhsqldb_port=7475 -DrollerPageDir=%CATALINA_HOME%\wikidata -DrollerStorageDir=%CATALINA_HOME%\wikiattachments
+set CATALINA_TMPDIR=\temp
\ No newline at end of file

Modified: incubator/roller/branches/roller_2.0/src/org/roller/RollerException.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/RollerException.java?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/RollerException.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/RollerException.java Mon Aug  8 07:41:04 2005
@@ -4,36 +4,57 @@
 import java.io.PrintStream;
 import java.io.PrintWriter;
 
-/** 
- * Generic RollerException
+/**
+ * Roller services interfaces throw this exception.
  */ 
 public class RollerException extends Exception
 {
     private Throwable mRootCause = null;
     
+	/**
+	 * Construct RollerException, wrapping existing throwable.
+	 * @param s Error message
+	 * @param t Existing connection to wrap.
+	 */
 	public RollerException(String s,Throwable t)
 	{
 		super(s);
         mRootCause = t;
 	}
+	/**
+	 * Construct RollerException, wrapping existing throwable.
+	 * @param t Existing exception to be wrapped.
+	 */
 	public RollerException(Throwable t)
 	{
         mRootCause = t;
 	}
+	/**
+	 * Construct RollerException with message string.
+	 * @param s Error message string.
+	 */
 	public RollerException(String s)
 	{
 		super(s);
 	}
+	/**
+	 * Construct emtpy exception object.
+	 */
 	public RollerException()
 	{
 		super();
 	}
+    /**
+     * Get root cause object, or null if none.
+     * @return Root cause or null if none.
+     */
     public Throwable getRootCause()
     {
         return mRootCause;
     }
    
-    /** 
+    /**
+     * Print stack trace for exception and for root cause exception if htere is one.
      * @see java.lang.Throwable#printStackTrace()
      */
     public void printStackTrace()
@@ -46,8 +67,9 @@
         }
     }
 
-    /** 
-     * @see java.lang.Throwable#printStackTrace(java.io.PrintStream)
+    /**
+     * Print stack trace for exception and for root cause exception if htere is one.
+     * @param s Stream to print to.
      */
     public void printStackTrace(PrintStream s)
     {
@@ -59,8 +81,9 @@
         }
     }
 
-    /** 
-     * @see java.lang.Throwable#printStackTrace(java.io.PrintWriter)
+    /**
+     * Print stack trace for exception and for root cause exception if htere is one.
+     * @param s Writer to write to.
      */
     public void printStackTrace(PrintWriter s)
     {
@@ -72,6 +95,10 @@
        }
     }
 
+    /**
+     * Get root cause message.
+     * @return Root cause message.
+     */
     public String getRootCauseMessage() 
     {
         String rcmessage = null;

Modified: incubator/roller/branches/roller_2.0/src/org/roller/RollerPermissionsException.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/RollerPermissionsException.java?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/RollerPermissionsException.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/RollerPermissionsException.java Mon Aug  8 07:41:04 2005
@@ -1,18 +1,31 @@
 package org.roller;
 
-/** 
- * Throw when persistence session user lacks one or more required permissions.
+/**
+ * Thrown when persistence session user lacks one or more required permissions.
  */ 
 public class RollerPermissionsException extends RollerException
 {
+	/**
+	 * Construct RollerException, wrapping existing throwable.
+	 * @param s Error message.
+	 * @param t Throwable to be wrapped
+	 */
 	public RollerPermissionsException(String s,Throwable t)
 	{
 		super(s,t);
 	}
+	/**
+	 * Construct RollerException, wrapping existing throwable.
+	 * @param t Throwable to be wrapped
+	 */
 	public RollerPermissionsException(Throwable t)
 	{
         super(t);
 	}
+	/**
+	 * Construct RollerException, with error message.
+	 * @param s Error message
+	 */
 	public RollerPermissionsException(String s)
 	{
 		super(s);

Modified: incubator/roller/branches/roller_2.0/src/org/roller/business/AutoPingManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/business/AutoPingManagerImpl.java?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/business/AutoPingManagerImpl.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/business/AutoPingManagerImpl.java Mon Aug  8 07:41:04 2005
@@ -26,6 +26,9 @@
 import java.util.Iterator;
 import java.util.Collection;
 
+/**
+ * Abstract implementation of AutoPingManager.
+ */
 public abstract class AutoPingManagerImpl implements AutoPingManager
 {
     protected PersistenceStrategy persistenceStrategy;

Modified: incubator/roller/branches/roller_2.0/src/org/roller/business/FileManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/business/FileManagerImpl.java?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/business/FileManagerImpl.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/business/FileManagerImpl.java Mon Aug  8 07:41:04 2005
@@ -46,7 +46,7 @@
         String uploadurl = RollerConfig.getProperty("uploads.url");
         
         if(uploaddir == null || uploaddir.trim().length() < 1)
-            uploaddir = "${user.home}/roller_data/uploads";
+            uploaddir = "${user.home}"+File.separator+"roller_data"+File.separator+"uploads";
         
         if(uploaddir.startsWith("${user.home}"))
             uploaddir = System.getProperty("user.home") + uploaddir.substring(12);
@@ -55,9 +55,9 @@
             uploaddir += File.separator;
         
         if(uploadurl == null || uploadurl.trim().length() < 1)
-            uploadurl = "/resources";
+            uploadurl = File.separator+"resources";
         
-        this.upload_dir = uploaddir;
+        this.upload_dir = uploaddir.replace('/',File.separatorChar);
         this.upload_url = uploadurl;
     }
     

Modified: incubator/roller/branches/roller_2.0/src/org/roller/business/IndexManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/business/IndexManagerImpl.java?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/business/IndexManagerImpl.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/business/IndexManagerImpl.java Mon Aug  8 07:41:04 2005
@@ -26,21 +26,20 @@
 import org.roller.business.search.operations.RemoveWebsiteIndexOperation;
 import org.roller.business.search.operations.WriteToIndexOperation;
 import org.roller.model.IndexManager;
-import org.roller.model.ThreadManager;
 import org.roller.pojos.WeblogEntryData;
 import org.roller.pojos.WebsiteData;
 
 import EDU.oswego.cs.dl.util.concurrent.ReadWriteLock;
 import EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock;
+import org.roller.config.RollerConfig;
+import org.roller.model.RollerFactory;
+import org.roller.util.StringUtils;
 
 /**
+ * Lucene implementation of IndexManager. This is the central entry point into the Lucene
+ * searching API.
  * @author aim4min
- * @author mraible (formatting and indexDir configurable)
- * 
- * This is the lucene manager. This is the central entry point into the Lucene
- * searching API. This should be retrieved from the roller context, and not
- * instatiated manually.
- *  
+ * @author mraible (formatting and making indexDir configurable)
  */
 public class IndexManagerImpl implements IndexManager
 {
@@ -55,7 +54,7 @@
     //~ Instance fields
     // ========================================================
 
-    private ThreadManager mThreadManager;
+    private boolean searchEnabled = true;
 
     File indexConsistencyMarker;
 
@@ -81,72 +80,106 @@
      * @param indexDir -
      *            the path to the index directory
      */
-    public IndexManagerImpl(String indexDir, ThreadManager manager)
+    public IndexManagerImpl()
     {
-        this.mThreadManager = manager;
-
-        this.indexDir = indexDir;
+        // check config to see if the internal search is enabled
+        String enabled = RollerConfig.getProperty("search.enabled");
+        if("false".equalsIgnoreCase(enabled))
+            this.searchEnabled = false;
+        
+        // we also need to know what our index directory is
+        String indexDir = RollerConfig.getProperty("search.index.dir");
+        if (indexDir.indexOf("${user.home}") != -1) 
+        {
+            indexDir = StringUtils.replace(
+                    indexDir, "${user.home}",
+                    System.getProperty("user.home"));
+        }
+
+        this.indexDir = indexDir.replace('/', File.separatorChar);
+        
+        // a little debugging
+        mLogger.info("search enabled: " + this.searchEnabled);
+        mLogger.info("index dir: " + this.indexDir);
 
         String test = indexDir + File.separator + ".index-inconsistent";
         indexConsistencyMarker = new File(test);
 
-        // 1. If inconsistency marker exists.
-        //     Delete index
-        // 2. if we're using RAM index
-        //     load ram index wrapper around index
-        //
-        if (indexConsistencyMarker.exists())
-        {
-            getFSDirectory(true);
-            inconsistentAtStartup = true;
-        }
-        else
+        // only setup the index if search is enabled
+        if (this.searchEnabled) 
         {
-            try
+            
+            // 1. If inconsistency marker exists.
+            //     Delete index
+            // 2. if we're using RAM index
+            //     load ram index wrapper around index
+            //
+            if (indexConsistencyMarker.exists()) 
+            {
+                getFSDirectory(true);
+                inconsistentAtStartup = true;
+            } 
+            else 
             {
-                File makeIndexDir = new File(indexDir);
-                if (!makeIndexDir.exists())
+                try 
                 {
-                    makeIndexDir.mkdirs();
-                    inconsistentAtStartup = true;
+                    File makeIndexDir = new File(indexDir);
+                    if (!makeIndexDir.exists()) 
+                    {
+                        makeIndexDir.mkdirs();
+                        inconsistentAtStartup = true;
+                    }
+                    indexConsistencyMarker.createNewFile();
+                } 
+                catch (IOException e) 
+                {
+                    mLogger.error(e);
                 }
-                indexConsistencyMarker.createNewFile();
-            }
-            catch (IOException e)
-            {
-                mLogger.error(e);
             }
-        }
-
-        if (indexExists())
-        {
-            if (useRAMIndex)
+            
+            if (indexExists()) 
             {
-                Directory filesystem = getFSDirectory(false);
-
-                try
+                if (useRAMIndex) 
                 {
-                    fRAMindex = new RAMDirectory(filesystem);
+                    Directory filesystem = getFSDirectory(false);
+                    
+                    try 
+                    {
+                        fRAMindex = new RAMDirectory(filesystem);
+                    } 
+                    catch (IOException e)                     
+                    {
+                        mLogger.error("Error creating in-memory index", e);
+                    }
                 }
-                catch (IOException e)
+            } 
+            else 
+            {
+                if (useRAMIndex) 
+                {
+                    fRAMindex = new RAMDirectory();
+                    createIndex(fRAMindex);
+                } 
+                else 
                 {
-                    mLogger.error("Error creating in-memory index", e);
+                    createIndex(getFSDirectory(true));
                 }
             }
-        }
-        else
-        {
-            if (useRAMIndex)
-            {
-                fRAMindex = new RAMDirectory();
-                createIndex(fRAMindex);
-            }
-            else
+            
+            if (isInconsistentAtStartup())
             {
-                createIndex(getFSDirectory(true));
-            }
+                mLogger.info(
+                    "Index was inconsistent. Rebuilding index in the background...");
+                try 
+                {                    
+                    rebuildWebsiteIndex();
+                }
+                catch (RollerException e) 
+                {
+                    mLogger.error("ERROR: scheduling re-index operation");
+                }
+            }       
         }
-
     }
 
     //~ Methods
@@ -208,11 +241,19 @@
         return new StandardAnalyzer();
     }
 
-    public void scheduleIndexOperation(final IndexOperation op)
+    private void scheduleIndexOperation(final IndexOperation op)
     {
         try
         {
-            mThreadManager.executeInBackground(op);
+            // only if search is enabled
+            if(this.searchEnabled) {
+                mLogger.debug("Starting scheduled index operation: "+op.getClass().getName());
+                RollerFactory.getRoller().getThreadManager().executeInBackground(op);
+            }
+        }
+        catch (RollerException re)
+        {
+            mLogger.error("Error getting thread manager", re);
         }
         catch (InterruptedException e)
         {
@@ -227,7 +268,15 @@
     {
         try
         {
-            mThreadManager.executeInForeground(op);
+            // only if search is enabled
+            if(this.searchEnabled) {
+                mLogger.debug("Executing index operation now: "+op.getClass().getName());
+                RollerFactory.getRoller().getThreadManager().executeInForeground(op);
+            }
+        }
+        catch (RollerException re)
+        {
+            mLogger.error("Error getting thread manager", re);
         }
         catch (InterruptedException e)
         {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/business/PingQueueManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/business/PingQueueManagerImpl.java?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/business/PingQueueManagerImpl.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/business/PingQueueManagerImpl.java Mon Aug  8 07:41:04 2005
@@ -14,6 +14,9 @@
 import org.roller.model.PingQueueManager;
 import org.roller.pojos.PingQueueEntryData;
 
+/**
+ * Abstract implementation of PingQueueManager.
+ */
 public abstract class PingQueueManagerImpl implements PingQueueManager
 {
     protected PersistenceStrategy persistenceStrategy;

Modified: incubator/roller/branches/roller_2.0/src/org/roller/business/PingTargetManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/business/PingTargetManagerImpl.java?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/business/PingTargetManagerImpl.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/business/PingTargetManagerImpl.java Mon Aug  8 07:41:04 2005
@@ -24,6 +24,9 @@
 import java.util.Iterator;
 import java.util.List;
 
+/**
+ * Abstract implementation of PingTargetManager.
+ */
 public abstract class PingTargetManagerImpl implements PingTargetManager
 {
     protected PersistenceStrategy persistenceStrategy;

Modified: incubator/roller/branches/roller_2.0/src/org/roller/business/PlanetManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/business/PlanetManagerImpl.java?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/business/PlanetManagerImpl.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/business/PlanetManagerImpl.java Mon Aug  8 07:41:04 2005
@@ -39,13 +39,17 @@
     protected Roller roller = null;
     protected PersistenceStrategy strategy;
     protected Date lastUpdated = new Date();
-    protected List aggregation = null;
     protected Map lastUpdatedByGroup = new HashMap();
     
     // Cache up to 20 aggregations, each for up to 30 minutes
     // TODO: make this aggregation cache configurable
     protected LRUCache2 aggregationsByGroup = 
-            new LRUCache2(20, 30 * 60 * 1000);
+        new LRUCache2(20, 30 * 60 * 1000);
+    
+    // Cache up to 20 aggregations, each for up to 30 minutes
+    // TODO: make this top-subscriptions cache configurable
+    protected LRUCache2 topSubscriptionsByGroup = 
+        new LRUCache2(20, 30 * 60 * 1000);
 
     private static Log logger =
         LogFactory.getFactory().getInstance(PlanetManagerImpl.class);
@@ -209,6 +213,7 @@
                 }
                 sub.purgeEntries();
                 sub.addEntries(newEntries); 
+                if (roller != null) roller.commit();
             }
             long subEndTime = System.currentTimeMillis();  
             logger.info("   " + count + " - " 
@@ -226,8 +231,8 @@
 
     public synchronized void clearCachedAggregations() 
     {
-        aggregation = null;
         aggregationsByGroup.purge();
+        topSubscriptionsByGroup.purge();
         lastUpdatedByGroup.clear();
         lastUpdated = new Date();
     }

Modified: incubator/roller/branches/roller_2.0/src/org/roller/business/RollerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/business/RollerImpl.java?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/business/RollerImpl.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/business/RollerImpl.java Mon Aug  8 07:41:04 2005
@@ -9,12 +9,12 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.roller.RollerException;
-import org.roller.config.RollerConfig;
 import org.roller.model.FileManager;
 import org.roller.model.IndexManager;
 import org.roller.model.Roller;
+import org.roller.model.ThemeManager;
 import org.roller.model.ThreadManager;
-import org.roller.util.StringUtils;
+
 
 
 /**
@@ -32,6 +32,7 @@
     protected FileManager     mFileManager = null;
     protected IndexManager    mIndexManager = null;
     protected ThreadManager   mThreadManager = null;
+    protected ThemeManager    mThemeManager = null;
     
     
     /** Creates a new instance of RollerImpl */
@@ -71,20 +72,21 @@
     {
         if (mIndexManager == null)
         {
-            String indexDir = RollerConfig.getProperty("search.index.dir");
-            if (indexDir.indexOf("${user.home}") != -1)
-            {
-                indexDir = StringUtils.replace(
-                        indexDir, "${user.home}",
-                        System.getProperty("user.home"));
-            }
-            if (mLogger.isDebugEnabled())
-            {
-                mLogger.debug("index dir: " + indexDir);
-            }
-            mIndexManager = new IndexManagerImpl(indexDir, this.getThreadManager());
+            mIndexManager = new IndexManagerImpl();
         }
         return mIndexManager;
+    }
+    
+    /**
+     * @see org.roller.model.Roller#getThemeManager()
+     */
+    public ThemeManager getThemeManager() throws RollerException
+    {
+        if (mThemeManager == null)
+        {
+            mThemeManager = new ThemeManagerImpl();
+        }
+        return mThemeManager;
     }
     
     

Modified: incubator/roller/branches/roller_2.0/src/org/roller/business/UserManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/business/UserManagerImpl.java?rev=230810&r1=230809&r2=230810&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/business/UserManagerImpl.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/business/UserManagerImpl.java Mon Aug  8 07:41:04 2005
@@ -19,7 +19,7 @@
 import org.roller.model.WeblogManager;
 import org.roller.pojos.BookmarkData;
 import org.roller.pojos.FolderData;
-import org.roller.pojos.PageData;
+import org.roller.pojos.WeblogTemplate;
 import org.roller.pojos.PermissionsData;
 import org.roller.pojos.RoleData;
 import org.roller.pojos.UserCookieData;
@@ -116,13 +116,13 @@
     /** 
      * @see org.roller.model.UserManager#retrievePage(java.lang.String)
      */
-    public PageData retrievePageReadOnly(String id) throws RollerException
+    public WeblogTemplate retrievePageReadOnly(String id) throws RollerException
     {
         // Don't hit database for templates stored on disk
         if (id != null && id.endsWith(".vm")) return null; 
 
         // Hibernate has a read-only flag: LockMode.READ
-        return (PageData)mStrategy.load(id,PageData.class);
+        return (WeblogTemplate)mStrategy.load(id,WeblogTemplate.class);
     }
 
     //------------------------------------------------------------------- Role
@@ -144,22 +144,22 @@
 
     //------------------------------------------------------------------- Page
 
-    public PageData retrievePage(String id) throws RollerException
+    public WeblogTemplate retrievePage(String id) throws RollerException
     {
         // Don't hit database for templates stored on disk
         if (id != null && id.endsWith(".vm")) return null; 
 
-        return (PageData)mStrategy.load(id,PageData.class);
+        return (WeblogTemplate)mStrategy.load(id,WeblogTemplate.class);
     }
  
     public void removePage(String id) throws RollerException
     {
-        mStrategy.remove(id,PageData.class);
+        mStrategy.remove(id,WeblogTemplate.class);
     }
 
     public void removePageSafely(String id) throws RollerException
     {
-        PageData pd = retrievePageReadOnly(id);
+        WeblogTemplate pd = retrievePageReadOnly(id);
         if (pd == null) return;
 
         WebsiteData wd = pd.getWebsite();
@@ -174,14 +174,14 @@
     }
 
     /**
-     * @see org.roller.model.UserManager#storePage(org.roller.pojos.PageData)
+     * @see org.roller.model.UserManager#storePage(org.roller.pojos.WeblogTemplate)
      */
-    public void storePage(PageData data) throws RollerException
+    public void storePage(WeblogTemplate data) throws RollerException
     {
         mStrategy.store(data);
     }
     
-    public String fixPageLink(PageData data) throws RollerException
+    public String fixPageLink(WeblogTemplate data) throws RollerException
     {
         String link = Utilities.removeHTML(data.getName());
         link = Utilities.removeNonAlphanumeric(link);
@@ -348,37 +348,6 @@
            "",
             zero, zero, null);
         b6.save();
-
-        //
-        // READ THEME FILES AND CREATE PAGES FOR USER
-        //
-        Iterator iter = pages.keySet().iterator();
-        while ( iter.hasNext() )
-        {
-            String pageName = (String) iter.next();
-            String sb = (String)pages.get( pageName );
-              
-            // Store each Velocity template as a page
-            PageData pd = new PageData( null,
-                website,         // website
-                pageName,        // name
-                pageName,        // description
-                pageName,        // link
-                sb,              // template
-                new Date()       // updateTime                
-            );
-            mStrategy.store(pd);
-            
-            if ( pd.getName().equals("Weblog") )
-            {  
-                website.setDefaultPageId(pd.getId());                 
-            }
-            else if ( pd.getName().equals("_day") )
-            {
-                website.setWeblogDayPageId(pd.getId());                 
-            }                
-        }
-        mStrategy.store(website); 
         
         // Add user as member of website
         PermissionsData perms = new PermissionsData();



Mime
View raw message