Return-Path: Delivered-To: apmail-incubator-roller-commits-archive@www.apache.org Received: (qmail 74723 invoked from network); 8 Aug 2005 14:43:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 8 Aug 2005 14:43:53 -0000 Received: (qmail 25674 invoked by uid 500); 8 Aug 2005 14:43:46 -0000 Delivered-To: apmail-incubator-roller-commits-archive@incubator.apache.org Received: (qmail 25613 invoked by uid 500); 8 Aug 2005 14:43:45 -0000 Mailing-List: contact roller-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: roller-dev@incubator.apache.org Delivered-To: mailing list roller-commits@incubator.apache.org Received: (qmail 25448 invoked by uid 99); 8 Aug 2005 14:43:43 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 08 Aug 2005 07:43:33 -0700 Received: (qmail 74278 invoked by uid 65534); 8 Aug 2005 14:43:33 -0000 Message-ID: <20050808144333.74277.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: roller-commits@incubator.apache.org From: snoopdave@apache.org X-Mailer: svnmailer-1.0.3 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 @@ - + @@ -74,6 +74,7 @@ + &custom-gen-web; @@ -129,6 +130,7 @@ excludedtags="@version,@author" addedtags="@xdoclet-generated at ${TODAY}" force="true"> + @@ -193,6 +195,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +