Return-Path: Delivered-To: apmail-roller-commits-archive@www.apache.org Received: (qmail 57511 invoked from network); 25 May 2007 20:00:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 May 2007 20:00:32 -0000 Received: (qmail 88527 invoked by uid 500); 25 May 2007 20:00:37 -0000 Delivered-To: apmail-roller-commits-archive@roller.apache.org Received: (qmail 88502 invoked by uid 500); 25 May 2007 20:00:37 -0000 Mailing-List: contact commits-help@roller.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@roller.apache.org Delivered-To: mailing list commits@roller.apache.org Received: (qmail 88467 invoked by uid 99); 25 May 2007 20:00:37 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 May 2007 13:00:37 -0700 X-ASF-Spam-Status: No, hits=-98.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 May 2007 13:00:26 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id CDDBC1A981A; Fri, 25 May 2007 13:00:05 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r541763 [1/5] - in /roller/branches/roller_guice: apps/planet/ apps/planet/nbproject/ apps/planet/src/java/META-INF/ apps/planet/src/java/org/apache/roller/planet/business/ apps/planet/src/java/org/apache/roller/planet/business/hibernate/ a... Date: Fri, 25 May 2007 20:00:00 -0000 To: commits@roller.apache.org From: snoopdave@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070525200005.CDDBC1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: snoopdave Date: Fri May 25 12:59:47 2007 New Revision: 541763 URL: http://svn.apache.org/viewvc?view=rev&rev=541763 Log: Merging latest from trunk Added: roller/branches/roller_guice/apps/planet/src/java/META-INF/ - copied from r541742, roller/trunk/apps/planet/src/java/META-INF/ roller/branches/roller_guice/apps/planet/src/java/META-INF/persistence.xml - copied unchanged from r541742, roller/trunk/apps/planet/src/java/META-INF/persistence.xml roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/DatabaseProvider.java - copied unchanged from r541742, roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/DatabaseProvider.java roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernateConnectionProvider.java - copied unchanged from r541742, roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernateConnectionProvider.java roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/jpa/ - copied from r541742, roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetImpl.java - copied unchanged from r541742, roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetImpl.java roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java - copied unchanged from r541742, roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPropertiesManagerImpl.java - copied unchanged from r541742, roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPropertiesManagerImpl.java roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml - copied unchanged from r541742, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.orm.xml - copied unchanged from r541742, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.orm.xml roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.orm.xml - copied unchanged from r541742, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.orm.xml roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml - copied unchanged from r541742, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PropertyData.orm.xml - copied unchanged from r541742, roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PropertyData.orm.xml roller/branches/roller_guice/apps/planet/testdata/JPAEMF.properties - copied unchanged from r541742, roller/trunk/apps/planet/testdata/JPAEMF.properties roller/branches/roller_guice/apps/planet/web/WEB-INF/classes/JPAEMF.properties - copied unchanged from r541742, roller/trunk/apps/planet/web/WEB-INF/classes/JPAEMF.properties roller/branches/roller_guice/components/ - copied from r541742, roller/trunk/components/ roller/branches/roller_guice/components/core/ - copied from r541742, roller/trunk/components/core/ roller/branches/roller_guice/components/core/build.properties - copied unchanged from r541742, roller/trunk/components/core/build.properties roller/branches/roller_guice/components/core/build.xml - copied unchanged from r541742, roller/trunk/components/core/build.xml roller/branches/roller_guice/components/core/src/ - copied from r541742, roller/trunk/components/core/src/ roller/branches/roller_guice/components/core/src/java/ - copied from r541742, roller/trunk/components/core/src/java/ roller/branches/roller_guice/components/core/src/java/org/ - copied from r541742, roller/trunk/components/core/src/java/org/ roller/branches/roller_guice/components/core/src/java/org/apache/ - copied from r541742, roller/trunk/components/core/src/java/org/apache/ roller/branches/roller_guice/components/core/src/java/org/apache/roller/ - copied from r541742, roller/trunk/components/core/src/java/org/apache/roller/ roller/branches/roller_guice/components/core/src/java/org/apache/roller/RollerException.java - copied unchanged from r541742, roller/trunk/components/core/src/java/org/apache/roller/RollerException.java roller/branches/roller_guice/components/core/src/java/org/apache/roller/business/ - copied from r541742, roller/trunk/components/core/src/java/org/apache/roller/business/ roller/branches/roller_guice/components/core/src/java/org/apache/roller/business/hibernate/ - copied from r541742, roller/trunk/components/core/src/java/org/apache/roller/business/hibernate/ roller/branches/roller_guice/components/core/src/java/org/apache/roller/business/hibernate/HibernatePersistenceStrategy.java - copied unchanged from r541742, roller/trunk/components/core/src/java/org/apache/roller/business/hibernate/HibernatePersistenceStrategy.java roller/branches/roller_guice/components/core/src/java/org/apache/roller/business/hibernate/ThreadLocalSessionContextNoAutoClose.java - copied unchanged from r541742, roller/trunk/components/core/src/java/org/apache/roller/business/hibernate/ThreadLocalSessionContextNoAutoClose.java roller/branches/roller_guice/components/core/src/java/org/apache/roller/business/jpa/ - copied from r541742, roller/trunk/components/core/src/java/org/apache/roller/business/jpa/ roller/branches/roller_guice/components/core/src/java/org/apache/roller/business/jpa/JPAPersistenceStrategy.java - copied unchanged from r541742, roller/trunk/components/core/src/java/org/apache/roller/business/jpa/JPAPersistenceStrategy.java roller/branches/roller_guice/components/core/src/java/org/apache/roller/util/ - copied from r541742, roller/trunk/components/core/src/java/org/apache/roller/util/ roller/branches/roller_guice/components/core/src/java/org/apache/roller/util/UUIDGenerator.java - copied unchanged from r541742, roller/trunk/components/core/src/java/org/apache/roller/util/UUIDGenerator.java roller/branches/roller_guice/src/META-INF/ - copied from r541742, roller/trunk/src/META-INF/ roller/branches/roller_guice/src/META-INF/persistence.xml - copied unchanged from r541742, roller/trunk/src/META-INF/persistence.xml roller/branches/roller_guice/src/org/apache/roller/business/DatabaseProvider.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/business/DatabaseProvider.java roller/branches/roller_guice/src/org/apache/roller/business/hibernate/HibernateConnectionProvider.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/business/hibernate/HibernateConnectionProvider.java roller/branches/roller_guice/src/org/apache/roller/business/jpa/ - copied from r541742, roller/trunk/src/org/apache/roller/business/jpa/ roller/branches/roller_guice/src/org/apache/roller/business/jpa/JPAAutoPingManagerImpl.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/business/jpa/JPAAutoPingManagerImpl.java roller/branches/roller_guice/src/org/apache/roller/business/jpa/JPABookmarkManagerImpl.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/business/jpa/JPABookmarkManagerImpl.java roller/branches/roller_guice/src/org/apache/roller/business/jpa/JPAPingQueueManagerImpl.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/business/jpa/JPAPingQueueManagerImpl.java roller/branches/roller_guice/src/org/apache/roller/business/jpa/JPAPingTargetManagerImpl.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/business/jpa/JPAPingTargetManagerImpl.java roller/branches/roller_guice/src/org/apache/roller/business/jpa/JPAPropertiesManagerImpl.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/business/jpa/JPAPropertiesManagerImpl.java roller/branches/roller_guice/src/org/apache/roller/business/jpa/JPARefererManagerImpl.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/business/jpa/JPARefererManagerImpl.java roller/branches/roller_guice/src/org/apache/roller/business/jpa/JPARollerImpl.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/business/jpa/JPARollerImpl.java roller/branches/roller_guice/src/org/apache/roller/business/jpa/JPAThreadManagerImpl.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/business/jpa/JPAThreadManagerImpl.java roller/branches/roller_guice/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java roller/branches/roller_guice/src/org/apache/roller/business/jpa/JPAWeblogManagerImpl.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/business/jpa/JPAWeblogManagerImpl.java roller/branches/roller_guice/src/org/apache/roller/planet/business/hibernate/ - copied from r541742, roller/trunk/src/org/apache/roller/planet/business/hibernate/ roller/branches/roller_guice/src/org/apache/roller/planet/business/hibernate/HibernateRollerPlanetImpl.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernateRollerPlanetImpl.java roller/branches/roller_guice/src/org/apache/roller/planet/business/jpa/ - copied from r541742, roller/trunk/src/org/apache/roller/planet/business/jpa/ roller/branches/roller_guice/src/org/apache/roller/planet/business/jpa/JPARollerPlanetImpl.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/planet/business/jpa/JPARollerPlanetImpl.java roller/branches/roller_guice/src/org/apache/roller/pojos/AutoPingData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/AutoPingData.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/BookmarkData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/BookmarkData.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/CommentData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/CommentData.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/EntryAttributeData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/EntryAttributeData.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/FolderData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/FolderData.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/HitCountData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/HitCountData.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/ObjectAuditData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/ObjectAuditData.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/PermissionsData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/PermissionsData.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/PingCategoryRestrictionData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/PingCategoryRestrictionData.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/PingQueueEntryData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/PingQueueEntryData.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/PingTargetData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/PingTargetData.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/RefererData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/RefererData.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/RoleData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/RoleData.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/RollerConfigData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/RollerConfigData.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/RollerPropertyData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/RollerPropertyData.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/TaskLockData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/TaskLockData.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/UserData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/UserData.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/WeblogCategoryData.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/WeblogEntryData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/WeblogEntryData.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/WeblogEntryTagData.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/WeblogTemplate.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/WeblogTemplate.orm.xml roller/branches/roller_guice/src/org/apache/roller/pojos/WebsiteData.orm.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/pojos/WebsiteData.orm.xml roller/branches/roller_guice/src/org/apache/roller/ui/core/security/RollerUserDetailsService.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/core/security/RollerUserDetailsService.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/ - copied from r541742, roller/trunk/src/org/apache/roller/ui/struts2/ roller/branches/roller_guice/src/org/apache/roller/ui/struts2/admin/ - copied from r541742, roller/trunk/src/org/apache/roller/ui/struts2/admin/ roller/branches/roller_guice/src/org/apache/roller/ui/struts2/admin/CacheInfo.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/admin/CacheInfo.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/admin/CommonPingTargetAdd.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/admin/CommonPingTargetAdd.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/admin/CommonPingTargetEdit.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/admin/CommonPingTargetEdit.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/admin/CommonPingTargets.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/admin/CommonPingTargets.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/admin/CreateUser.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/admin/CreateUser.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/admin/CreateUserBean.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/admin/CreateUserBean.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/admin/GlobalCommentManagement.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/admin/GlobalCommentManagement.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/admin/GlobalCommentManagementBean.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/admin/GlobalCommentManagementBean.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/admin/GlobalConfig.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/admin/GlobalConfig.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/admin/ModifyUser.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/admin/ModifyUser.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/admin/UserAdmin.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/admin/UserAdmin.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/admin/admin-menu.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/admin/admin-menu.xml roller/branches/roller_guice/src/org/apache/roller/ui/struts2/ajax/ - copied from r541742, roller/trunk/src/org/apache/roller/ui/struts2/ajax/ roller/branches/roller_guice/src/org/apache/roller/ui/struts2/ajax/CommentDataServlet.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/ajax/CommentDataServlet.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/ajax/UserDataServlet.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/ajax/UserDataServlet.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/common/ - copied from r541742, roller/trunk/src/org/apache/roller/ui/struts2/common/ roller/branches/roller_guice/src/org/apache/roller/ui/struts2/common/PingTargetAddBase.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/common/PingTargetAddBase.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/common/PingTargetEditBase.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/common/PingTargetEditBase.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/common/PingTargetFormBean.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/common/PingTargetFormBean.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/common/PingTargetsBase.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/common/PingTargetsBase.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/core/ - copied from r541742, roller/trunk/src/org/apache/roller/ui/struts2/core/ roller/branches/roller_guice/src/org/apache/roller/ui/struts2/core/CreateWeblog-validation.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/core/CreateWeblog-validation.xml roller/branches/roller_guice/src/org/apache/roller/ui/struts2/core/CreateWeblog.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/core/CreateWeblog.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/core/CreateWeblogBean.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/core/CreateWeblogBean.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/core/Login.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/core/Login.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/core/MainMenu.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/core/MainMenu.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/core/Profile-validation.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/core/Profile-validation.xml roller/branches/roller_guice/src/org/apache/roller/ui/struts2/core/Profile.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/core/Profile.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/core/ProfileBean.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/core/ProfileBean.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/core/Register-validation.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/core/Register-validation.xml roller/branches/roller_guice/src/org/apache/roller/ui/struts2/core/Register.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/core/Register.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/core/Setup.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/core/Setup.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/ - copied from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/ roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/BookmarkAdd-validation.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarkAdd-validation.xml roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/BookmarkAdd.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarkAdd.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/BookmarkBean.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarkBean.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/BookmarkEdit-validation.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarkEdit-validation.xml roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/BookmarkEdit.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarkEdit.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/Bookmarks.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/Bookmarks.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/BookmarksImport.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/BookmarksImport.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/Categories.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/Categories.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/CategoryAdd-validation.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryAdd-validation.xml roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/CategoryAdd.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryAdd.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/CategoryBean.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryBean.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/CategoryEdit-validation.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryEdit-validation.xml roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/CategoryEdit.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryEdit.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/CategoryRemove.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/CategoryRemove.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/Comments.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/Comments.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/CommentsBean.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/CommentsBean.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/CustomPingTargetAdd.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/CustomPingTargetAdd.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/CustomPingTargetEdit.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/CustomPingTargetEdit.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/CustomPingTargets.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/CustomPingTargets.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/Entries.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/Entries.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/EntriesBean.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/EntriesBean.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/EntryAdd-validation.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryAdd-validation.xml roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/EntryAdd.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryAdd.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/EntryBase.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryBase.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/EntryBean.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryBean.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/EntryEdit-validation.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryEdit-validation.xml roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/EntryEdit.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryEdit.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/EntryRemove.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/EntryRemove.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/FolderAdd-validation.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/FolderAdd-validation.xml roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/FolderAdd.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/FolderAdd.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/FolderBean.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/FolderBean.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/FolderEdit-validation.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/FolderEdit-validation.xml roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/FolderEdit.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/FolderEdit.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/Maintenance.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/Maintenance.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/Members.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/Members.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/MembersInvite.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/MembersInvite.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/Pings.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/Pings.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/Referrers.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/Referrers.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/Resources.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/Resources.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/StylesheetEdit.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/StylesheetEdit.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/TemplateAdd.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/TemplateAdd.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/TemplateEdit-validation.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/TemplateEdit-validation.xml roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/TemplateEdit.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/TemplateEdit.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/TemplateEditBean.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/TemplateEditBean.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/TemplateRemove.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/TemplateRemove.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/Templates.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/Templates.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/ThemeEdit.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/ThemeEdit.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/WeblogConfig-validation.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/WeblogConfig-validation.xml roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/WeblogConfig.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/WeblogConfig.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/WeblogConfigBean.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/WeblogConfigBean.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/WeblogRemove.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/WeblogRemove.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/editor/editor-menu.xml - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/editor/editor-menu.xml roller/branches/roller_guice/src/org/apache/roller/ui/struts2/util/ - copied from r541742, roller/trunk/src/org/apache/roller/ui/struts2/util/ roller/branches/roller_guice/src/org/apache/roller/ui/struts2/util/KeyValueObject.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/util/KeyValueObject.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/util/UIAction.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/util/UIAction.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/util/UIActionInterceptor.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/util/UIActionInterceptor.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/util/UIActionPreparable.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/util/UIActionPreparable.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/util/UIActionPrepareInterceptor.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/util/UIActionPrepareInterceptor.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/util/UISecurityEnforced.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/util/UISecurityEnforced.java roller/branches/roller_guice/src/org/apache/roller/ui/struts2/util/UISecurityInterceptor.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/ui/struts2/util/UISecurityInterceptor.java roller/branches/roller_guice/src/org/apache/roller/util/I18nMessages.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/util/I18nMessages.java roller/branches/roller_guice/src/org/apache/roller/util/I18nUtils.java - copied unchanged from r541742, roller/trunk/src/org/apache/roller/util/I18nUtils.java roller/branches/roller_guice/testdata/WEB-INF/classes/JPAEMF.properties - copied unchanged from r541742, roller/trunk/testdata/WEB-INF/classes/JPAEMF.properties roller/branches/roller_guice/tools/lib/commons-collections-3.2.jar - copied unchanged from r541742, roller/trunk/tools/lib/commons-collections-3.2.jar roller/branches/roller_guice/tools/lib/commons-id-0.1-SNAPSHOT.jar - copied unchanged from r541742, roller/trunk/tools/lib/commons-id-0.1-SNAPSHOT.jar roller/branches/roller_guice/tools/openjpa-0.9.7/ - copied from r541742, roller/trunk/tools/openjpa-0.9.7/ roller/branches/roller_guice/tools/openjpa-0.9.7/geronimo-j2ee-connector_1.5_spec-1.0.1.jar - copied unchanged from r541742, roller/trunk/tools/openjpa-0.9.7/geronimo-j2ee-connector_1.5_spec-1.0.1.jar roller/branches/roller_guice/tools/openjpa-0.9.7/geronimo-jpa_3.0_spec-1.0.jar - copied unchanged from r541742, roller/trunk/tools/openjpa-0.9.7/geronimo-jpa_3.0_spec-1.0.jar roller/branches/roller_guice/tools/openjpa-0.9.7/geronimo-jta_1.0.1B_spec-1.0.1.jar - copied unchanged from r541742, roller/trunk/tools/openjpa-0.9.7/geronimo-jta_1.0.1B_spec-1.0.1.jar roller/branches/roller_guice/tools/openjpa-0.9.7/openjpa-0.9.7-incubating.jar - copied unchanged from r541742, roller/trunk/tools/openjpa-0.9.7/openjpa-0.9.7-incubating.jar roller/branches/roller_guice/tools/openjpa-0.9.7/serp-1.11.0.jar - copied unchanged from r541742, roller/trunk/tools/openjpa-0.9.7/serp-1.11.0.jar roller/branches/roller_guice/tools/roller-core/ - copied from r541742, roller/trunk/tools/roller-core/ roller/branches/roller_guice/tools/roller-core/roller-core.jar - copied unchanged from r541742, roller/trunk/tools/roller-core/roller-core.jar Removed: roller/branches/roller_guice/apps/planet/testdata/hibernate.cfg.xml roller/branches/roller_guice/apps/planet/testdata/planet.properties roller/branches/roller_guice/apps/planet/testdata/planetRuntimeConfigDefs.xml roller/branches/roller_guice/apps/planet/testdata/rome.properties roller/branches/roller_guice/src/org/apache/roller/planet/ui/admin/ roller/branches/roller_guice/src/org/apache/roller/ui/admin/ roller/branches/roller_guice/src/org/apache/roller/ui/authoring/ roller/branches/roller_guice/src/org/apache/roller/ui/common/ roller/branches/roller_guice/src/org/apache/roller/ui/core/filters/RequestFilter.java roller/branches/roller_guice/src/org/apache/roller/ui/core/filters/StrutsCharEncodingFilter.java roller/branches/roller_guice/src/org/apache/roller/ui/core/struts/ roller/branches/roller_guice/src/org/apache/roller/ui/core/struts2/ roller/branches/roller_guice/src/org/apache/roller/ui/core/tags/LinkParamTag.java roller/branches/roller_guice/src/org/apache/roller/ui/core/tags/LinkTag.java roller/branches/roller_guice/src/org/apache/roller/ui/core/tags/RowTag.java roller/branches/roller_guice/src/org/apache/roller/ui/core/tags/StatusMessageTag.java roller/branches/roller_guice/src/org/apache/roller/ui/core/util/struts2/ roller/branches/roller_guice/src/org/apache/roller/util/MessageUtilities.java roller/branches/roller_guice/tests/org/apache/roller/ui/ServletTestBase.java roller/branches/roller_guice/tests/org/apache/roller/ui/StrutsActionTestBase.java roller/branches/roller_guice/tests/org/apache/roller/ui/UITestSuite.java roller/branches/roller_guice/tests/org/apache/roller/ui/authoring/ roller/branches/roller_guice/tests/org/apache/roller/ui/rendering/plugins/ roller/branches/roller_guice/tools/lib/commons-collections-3.1.jar Modified: roller/branches/roller_guice/apps/planet/build.properties roller/branches/roller_guice/apps/planet/build.xml roller/branches/roller_guice/apps/planet/nbproject/project.xml roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/PlanetFactory.java roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePersistenceStrategy.java roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePropertiesManagerImpl.java roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.java roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.java roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetSubscriptionForm.java roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java roller/branches/roller_guice/apps/planet/test/java/org/apache/roller/planet/business/EntryFunctionalTests.java roller/branches/roller_guice/apps/planet/test/java/org/apache/roller/planet/business/SubscriptionFunctionalTests.java roller/branches/roller_guice/apps/planet/testdata/planet-custom.properties roller/branches/roller_guice/apps/planet/web/WEB-INF/classes/hibernate.cfg.xml roller/branches/roller_guice/apps/planet/web/WEB-INF/classes/planet.properties roller/branches/roller_guice/docs/testing/roller-load-test.jmx roller/branches/roller_guice/nbproject/project.xml roller/branches/roller_guice/sandbox/scripting/bsf/build.xml roller/branches/roller_guice/src/org/apache/roller/business/hibernate/HibernateBookmarkManagerImpl.java roller/branches/roller_guice/src/org/apache/roller/pojos/AutoPingData.java roller/branches/roller_guice/src/org/apache/roller/pojos/BookmarkData.java roller/branches/roller_guice/src/org/apache/roller/pojos/CommentData.java roller/branches/roller_guice/src/org/apache/roller/pojos/EntryAttributeData.java roller/branches/roller_guice/src/org/apache/roller/pojos/FolderData.java roller/branches/roller_guice/src/org/apache/roller/pojos/HitCountData.java roller/branches/roller_guice/src/org/apache/roller/pojos/ObjectAuditData.java roller/branches/roller_guice/src/org/apache/roller/pojos/PermissionsData.java roller/branches/roller_guice/src/org/apache/roller/pojos/PingCategoryRestrictionData.java roller/branches/roller_guice/src/org/apache/roller/pojos/PingQueueEntryData.java roller/branches/roller_guice/src/org/apache/roller/pojos/PingTargetData.java roller/branches/roller_guice/src/org/apache/roller/pojos/RefererData.java roller/branches/roller_guice/src/org/apache/roller/pojos/RoleData.java roller/branches/roller_guice/src/org/apache/roller/pojos/RollerConfigData.java roller/branches/roller_guice/src/org/apache/roller/pojos/TaskLockData.java roller/branches/roller_guice/src/org/apache/roller/pojos/UserData.java roller/branches/roller_guice/src/org/apache/roller/pojos/WeblogCategoryData.java roller/branches/roller_guice/src/org/apache/roller/pojos/WeblogEntryData.java roller/branches/roller_guice/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.java roller/branches/roller_guice/src/org/apache/roller/pojos/WeblogEntryTagData.java roller/branches/roller_guice/src/org/apache/roller/pojos/WeblogTemplate.java roller/branches/roller_guice/src/org/apache/roller/pojos/WebsiteData.java roller/branches/roller_guice/src/org/apache/roller/pojos/wrapper/WebsiteDataWrapper.java roller/branches/roller_guice/src/org/apache/roller/ui/core/RollerContext.java roller/branches/roller_guice/src/org/apache/roller/ui/core/filters/CharEncodingFilter.java roller/branches/roller_guice/src/org/apache/roller/ui/core/plugins/TextEditor.java roller/branches/roller_guice/src/org/apache/roller/ui/core/plugins/XinhaEditor.java roller/branches/roller_guice/src/org/apache/roller/ui/core/tags/calendar/CalendarTag.java roller/branches/roller_guice/src/org/apache/roller/ui/core/tags/menu/MenuTag.java roller/branches/roller_guice/src/org/apache/roller/ui/core/util/menu/MenuHelper.java roller/branches/roller_guice/src/org/apache/roller/ui/rendering/model/MessageModel.java roller/branches/roller_guice/src/org/apache/roller/ui/rendering/model/SearchResultsFeedModel.java roller/branches/roller_guice/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java roller/branches/roller_guice/src/org/apache/roller/ui/rendering/pagers/AbstractWeblogEntriesPager.java roller/branches/roller_guice/src/org/apache/roller/ui/rendering/pagers/SearchResultsFeedPager.java roller/branches/roller_guice/src/org/apache/roller/ui/rendering/pagers/SearchResultsPager.java roller/branches/roller_guice/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesDayPager.java roller/branches/roller_guice/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesListPager.java roller/branches/roller_guice/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesMonthPager.java roller/branches/roller_guice/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesPermalinkPager.java roller/branches/roller_guice/src/org/apache/roller/ui/rendering/servlets/CommentServlet.java roller/branches/roller_guice/src/org/apache/roller/ui/rendering/servlets/TrackbackServlet.java roller/branches/roller_guice/src/org/apache/roller/util/MailUtil.java roller/branches/roller_guice/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java roller/branches/roller_guice/testdata/roller-custom.properties roller/branches/roller_guice/tests/org/apache/roller/business/BookmarkTest.java roller/branches/roller_guice/tests/org/apache/roller/business/CommentTest.java roller/branches/roller_guice/tests/org/apache/roller/business/FolderCRUDTest.java roller/branches/roller_guice/tests/org/apache/roller/business/FolderFunctionalityTest.java roller/branches/roller_guice/tests/org/apache/roller/business/FolderParentDeletesTest.java roller/branches/roller_guice/tests/org/apache/roller/business/HitCountTest.java roller/branches/roller_guice/tests/org/apache/roller/business/PermissionTest.java roller/branches/roller_guice/tests/org/apache/roller/business/PingsTest.java roller/branches/roller_guice/tests/org/apache/roller/business/RefererTest.java roller/branches/roller_guice/tests/org/apache/roller/business/WeblogCategoryCRUDTest.java roller/branches/roller_guice/tests/org/apache/roller/business/WeblogCategoryFunctionalityTest.java roller/branches/roller_guice/tests/org/apache/roller/business/WeblogCategoryParentDeletesTest.java roller/branches/roller_guice/tests/org/apache/roller/business/WeblogEntryTest.java roller/branches/roller_guice/tests/org/apache/roller/business/WeblogPageTest.java roller/branches/roller_guice/tests/org/apache/roller/business/WeblogTest.java roller/branches/roller_guice/tools/roller-planet/roller-planet-business.jar Modified: roller/branches/roller_guice/apps/planet/build.properties URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/build.properties?view=diff&rev=541763&r1=541762&r2=541763 ============================================================================== --- roller/branches/roller_guice/apps/planet/build.properties (original) +++ roller/branches/roller_guice/apps/planet/build.properties Fri May 25 12:59:47 2007 @@ -1,7 +1,7 @@ # compile properties build.debug=true -build.sourcelevel=1.4 +build.sourcelevel=1.5 build.deprecation=false @@ -30,9 +30,9 @@ #test.db.initTask=init-db #test.db.stopTask=nothing #test.db.name=mysql -#test.db.cpath=/export/home/java/mysql-connector-java-3.0.14-production/mysql-connector-java-3.0.14-production-bin.jar +#test.db.cpath=/Users/dave/tomcat/common/lib/mysql-connector-java-3.1.14-bin.jar #test.db.driver=com.mysql.jdbc.Driver -#test.db.url=jdbc:mysql://localhost/test_planet -#test.db.username=roller -#test.db.password=roller +#test.db.url=jdbc:mysql://localhost/rollertest +#test.db.username=scott +#test.db.password=tiger Modified: roller/branches/roller_guice/apps/planet/build.xml URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/build.xml?view=diff&rev=541763&r1=541762&r2=541763 ============================================================================== --- roller/branches/roller_guice/apps/planet/build.xml (original) +++ roller/branches/roller_guice/apps/planet/build.xml Fri May 25 12:59:47 2007 @@ -33,6 +33,7 @@ + @@ -47,10 +48,15 @@ + + + + + - + @@ -66,8 +72,17 @@ + + + + + + - + + + @@ -160,9 +175,9 @@ - + - + @@ -196,6 +211,29 @@ + + + + + + + + + + + + + + + @@ -332,7 +370,13 @@ - + + + + + + + @@ -368,8 +412,9 @@ - - + + + Modified: roller/branches/roller_guice/apps/planet/nbproject/project.xml URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/nbproject/project.xml?view=diff&rev=541763&r1=541762&r2=541763 ============================================================================== --- roller/branches/roller_guice/apps/planet/nbproject/project.xml (original) +++ roller/branches/roller_guice/apps/planet/nbproject/project.xml Fri May 25 12:59:47 2007 @@ -20,7 +20,7 @@ src/java - + java test/java @@ -28,7 +28,7 @@ - dist + build @@ -41,35 +41,8 @@ clean - dist + build - - - debug-selected-files - - classname - ./src/java - \.java$ - java-name - - - - - - - test-selected-files - - classname - ./test/java - \.java$ - java-name - - - - - - - @@ -82,7 +55,7 @@ src/java - + test/java @@ -101,8 +74,11 @@ src/java + ../../tools/lib/activation.jar:../../tools/lib/log4j-1.2.11.jar:../../tools/lib/mail.jar:../../tools/lib/rome-0.9.jar:../../tools/lib/rome-fetcher-0.9.jar:../../tools/lib/commons-codec-1.3.jar:../../tools/lib/jdom.jar:../../tools/hibernate-3.1/hibernate3.jar:../../tools/hibernate-3.1/lib/asm-attrs.jar:../../tools/hibernate-3.1/lib/asm.jar:../../tools/hibernate-3.1/lib/cglib-2.1.3.jar:../../tools/hibernate-3.1/lib/dom4j-1.6.1.jar:../../tools/hibernate-3.1/lib/ehcache-1.1.jar:../../tools/hibernate-3.1/lib/jdbc2_0-stdext.jar:../../tools/hibernate-3.1/lib/jta.jar:../../tools/roller-core/roller-core.jar:../../tools/toplink-essentials-9.1/toplink-essentials.jar:../../tools/struts-2.0.6/lib/antlr-2.7.2.jar:../../tools/struts-2.0.6/lib/commons-beanutils-1.6.jar:../../tools/struts-2.0.6/lib/commons-chain-1.1.jar:../../tools/struts-2.0.6/lib/commons-fileupload-1.2.jar:../../tools/struts-2.0.6/lib/commons-io-1.3.1.jar:../../tools/struts-2.0.6/l ib/commons-validator-1.3.0.jar:../../tools/struts-2.0.6/lib/freemarker-2.3.8.jar:../../tools/struts-2.0.6/lib/ognl-2.6.11.jar:../../tools/struts-2.0.6/lib/oro-2.0.8.jar:../../tools/struts-2.0.6/lib/struts2-core-2.0.6.jar:../../tools/struts-2.0.6/lib/struts2-spring-plugin-2.0.6.jar:../../tools/struts-2.0.6/lib/struts2-tiles-plugin-2.0.6.jar:../../tools/struts-2.0.6/lib/tiles-api-2.0-20070207.130156-4.jar:../../tools/struts-2.0.6/lib/tiles-core-2.0-20070207.130156-4.jar:../../tools/struts-2.0.6/lib/xwork-2.0.1.jar:../../tools/lib/commons-codec-1.3.jar:../../tools/lib/commons-collections-3.2.jar:../../tools/lib/commons-id-0.1-SNAPSHOT.jar:../../tools/lib/commons-lang-2.1.jar:../../tools/lib/commons-logging-1.0.4.jar + 1.5 + + test/java - ../../tools/lib/log4j-1.2.11.jar:../../tools/lib/commons-codec-1.3.jar:../../tools/lib/commons-collections-3.1.jar:../../tools/lib/commons-digester-1.6.jar:../../tools/lib/commons-lang-2.1.jar:../../tools/lib/commons-logging-1.0.4.jar:../../tools/lib/activation.jar:../../tools/lib/mail.jar:../../tools/hibernate-3.1/hibernate3.jar:../../tools/hibernate-3.1/lib/asm-attrs.jar:../../tools/hibernate-3.1/lib/cglib-2.1.3.jar:../../tools/hibernate-3.1/lib/ehcache-1.1.jar:../../tools/hibernate-3.1/lib/dom4j-1.6.1.jar:../../tools/hibernate-3.1/lib/jta.jar:../../tools/hibernate-3.1/lib/jdbc2_0-stdext.jar:../../tools/lib/rome-0.9.jar:../../tools/lib/rome-fetcher-0.9.jar:../../tools/lib/jdom.jar:../../tools/buildtime/tomcat-5.0.28/servlet-api.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/jstl.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/serializer.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/standard.jar:../../tools/jakarta-tagli bs-standard-1.1.2/lib/xalan.jar:../../tools/struts-2.0.5/lib/commons-beanutils-1.7.0.jar:../../tools/struts-2.0.5/lib/commons-chain-1.1.jar:../../tools/struts-2.0.5/lib/commons-validator-1.3.0.jar:../../tools/struts-2.0.5/lib/ognl-2.6.9.jar:../../tools/struts-2.0.5/lib/oro-2.0.8.jar:../../tools/struts-2.0.5/lib/struts2-api-2.0.5.jar:../../tools/struts-2.0.5/lib/struts2-core-2.0.5.jar:../../tools/struts-2.0.5/lib/struts2-spring-plugin-2.0.5.jar:../../tools/struts-2.0.5/lib/xwork-2.0.0.jar:../../tools/lib/velocity-1.5.jar:../../tools/buildtime/junit-3.8.1.jar 1.5 Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/PlanetFactory.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/PlanetFactory.java?view=diff&rev=541763&r1=541762&r2=541763 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/PlanetFactory.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/PlanetFactory.java Fri May 25 12:59:47 2007 @@ -30,7 +30,9 @@ public abstract class PlanetFactory { private static final String DEFAULT_IMPL = - "org.apache.roller.planet.business.hibernate.HibernatePlanetImpl"; + "org.apache.roller.planet.business.jpa.JPAPlanetImpl"; + //"org.apache.roller.planet.business.hibernate.HibernatePlanetImpl"; + //"org.apache.roller.planet.business.datamapper.jpa.JPAPlanetImpl"; private static Planet planetInstance = null; Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePersistenceStrategy.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePersistenceStrategy.java?view=diff&rev=541763&r1=541762&r2=541763 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePersistenceStrategy.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePersistenceStrategy.java Fri May 25 12:59:47 2007 @@ -19,9 +19,7 @@ package org.apache.roller.planet.business.hibernate; import java.io.StringBufferInputStream; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; @@ -30,11 +28,7 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.apache.roller.RollerException; -import org.jdom.Attribute; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.input.SAXBuilder; -import org.jdom.output.DOMOutputter; +import org.hibernate.cfg.Environment; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; @@ -45,7 +39,6 @@ * This class serves as a helper/util class for all of the Hibernate * manager implementations by providing a set of basic persistence methods * that can be easily reused. - * */ public class HibernatePersistenceStrategy { @@ -62,133 +55,25 @@ } }; - - public HibernatePersistenceStrategy() { - } - - /** - * Construct self using Hibernate config resource and optional dialect. - * @param configResouce Classpath-based path to Hibernate config file (e.g. "/hibernate.cgf.xml") - * @parma dialect Classname of Hibernate dialect to be used (overriding any specified in the configResource) + /** + * Persistence strategy configures itself by using Roller properties: + * 'hibernate.configResource' - the resource name of Roller's Hibernate XML configuration file, + * 'hibernate.dialect' - the classname of the Hibernate dialect to be used, + * 'hibernate.connectionProvider - the classname of Roller's connnection provider impl. */ - public HibernatePersistenceStrategy( - String configResource, - String dialect) throws Exception { - - log.info("configResource: " + configResource); - log.info("dialect: " + dialect); - - // read configResource into DOM form - SAXBuilder builder = new SAXBuilder(); - builder.setEntityResolver(noOpEntityResolver); - Document configDoc = builder.build( - getClass().getResourceAsStream(configResource)); - Element root = configDoc.getRootElement(); - Element sessionFactoryElem = root.getChild("session-factory"); - - // remove any existing connection.datasource and dialect properties - List propertyElems = sessionFactoryElem.getChildren("property"); - List removeList = new ArrayList(); - for (Iterator it = propertyElems.iterator(); it.hasNext();) { - Element elem = (Element) it.next(); - if (elem.getAttribute("name") != null - && elem.getAttribute("name").getValue().equals("dialect")) { - removeList.add(elem); - } - } - for (Iterator it = removeList.iterator(); it.hasNext();) { - Element elem = (Element) it.next(); - sessionFactoryElem.removeContent(elem); - } - - // add Roller dialect property - Element prop = new Element("property").setAttribute( - new Attribute("name","dialect")); - prop.addContent(dialect); - sessionFactoryElem.addContent(prop); + public HibernatePersistenceStrategy(String configResource, String dialect, String connectionProvider) { + // Read Hibernate config file specified by Roller config Configuration config = new Configuration(); - DOMOutputter outputter = new DOMOutputter(); - config.configure(outputter.output(configDoc)); - this.sessionFactory = config.buildSessionFactory(); - } - - /** - * Construct self using Hibernate config resource and optional dialect. - * @param configResouce Classpath-based path to Hibernate config file (e.g. "/hibernate.cgf.xml") - * @parma dialect Classname of Hibernate dialect to be used (or null to use one specified in configResource) - */ - public HibernatePersistenceStrategy( - String configResource, - String dialect, - String driverClass, - String connectionURL, - String username, - String password) throws Exception { - - log.info("configResource: " + configResource); - log.info("dialect: " + dialect); - log.info("driverClass: " + driverClass); - log.info("connectionURL: " + connectionURL); - log.info("username: " + username); - - // read configResource into DOM form - SAXBuilder builder = new SAXBuilder(); - builder.setEntityResolver(noOpEntityResolver); - Document configDoc = builder.build( - getClass().getResourceAsStream(configResource)); - Element root = configDoc.getRootElement(); - Element sessionFactoryElem = root.getChild("session-factory"); - - // remove any existing connection.datasource and dialect properties - List propertyElems = sessionFactoryElem.getChildren("property"); - List removeList = new ArrayList(); - for (Iterator it = propertyElems.iterator(); it.hasNext();) { - Element elem = (Element) it.next(); - if (elem.getAttribute("name") != null - && elem.getAttribute("name").getValue().equals("connection.datasource")) { - removeList.add(elem); - } - if (elem.getAttribute("name") != null - && elem.getAttribute("name").getValue().equals("dialect")) { - removeList.add(elem); - } - } - for (Iterator it = removeList.iterator(); it.hasNext();) { - Element elem = (Element) it.next(); - sessionFactoryElem.removeContent(elem); - } - - // add JDBC connection params instead - Element prop = new Element("property").setAttribute( - new Attribute("name","hibernate.connection.driver_class")); - prop.addContent(driverClass); - sessionFactoryElem.addContent(prop); + config.configure(configResource); - prop = new Element("property").setAttribute( - new Attribute("name","hibernate.connection.url")); - prop.addContent(connectionURL); - sessionFactoryElem.addContent(prop); + // Add dialect specified by Roller config and our connection provider + Properties props = new Properties(); + props.put(Environment.DIALECT, dialect); + props.put(Environment.CONNECTION_PROVIDER, connectionProvider); + config.mergeProperties(props); - prop = new Element("property").setAttribute( - new Attribute("name","hibernate.connection.username")); - prop.addContent(username); - sessionFactoryElem.addContent(prop); - - prop = new Element("property").setAttribute( - new Attribute("name","hibernate.connection.password")); - prop.addContent(password); - sessionFactoryElem.addContent(prop); - - prop = new Element("property").setAttribute( - new Attribute("name","dialect")); - prop.addContent(dialect); - sessionFactoryElem.addContent(prop); - - Configuration config = new Configuration(); - DOMOutputter outputter = new DOMOutputter(); - config.configure(outputter.output(configDoc)); - this.sessionFactory = config.buildSessionFactory(); + this.sessionFactory = config.buildSessionFactory(); } Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java?view=diff&rev=541763&r1=541762&r2=541763 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java Fri May 25 12:59:47 2007 @@ -18,7 +18,6 @@ package org.apache.roller.planet.business.hibernate; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.roller.RollerException; @@ -26,6 +25,7 @@ import org.apache.roller.planet.config.PlanetConfig; import org.apache.roller.planet.business.Planet; import org.apache.roller.planet.business.PlanetManager; +import org.apache.roller.business.hibernate.HibernatePersistenceStrategy; import org.apache.roller.planet.business.PropertiesManager; import org.apache.roller.planet.business.URLStrategy; @@ -38,7 +38,7 @@ private static Log log = LogFactory.getLog(HibernatePlanetImpl.class); // our singleton instance - private static HibernatePlanetImpl me = null; + protected static HibernatePlanetImpl me = null; // a persistence utility class protected HibernatePersistenceStrategy strategy = null; @@ -59,28 +59,8 @@ * file plus JDBC overrides from planet-custom.properties. */ protected HibernatePlanetImpl() throws RollerException { - try { - if (StringUtils.isNotEmpty(PlanetConfig.getProperty("jdbc.driverClass"))) { - // create and configure for JDBC access - strategy = new HibernatePersistenceStrategy( - PlanetConfig.getProperty("hibernate.configResource"), - PlanetConfig.getProperty("hibernate.dialect"), - PlanetConfig.getProperty("jdbc.driverClass"), - PlanetConfig.getProperty("jdbc.connectionURL"), - PlanetConfig.getProperty("jdbc.username"), - PlanetConfig.getProperty("jdbc.password")); - } else { - // create an configure via config resource only - strategy = new HibernatePersistenceStrategy( - PlanetConfig.getProperty("hibernate.configResource"), - PlanetConfig.getProperty("hibernate.dialect")); - } - - } catch(Throwable t) { - // if this happens then we are screwed - log.fatal("Error initializing Hibernate", t); - throw new RollerException(t); - } + + strategy = getStrategy(); try { String feedFetchClass = PlanetConfig.getProperty("feedfetcher.classname"); @@ -97,6 +77,22 @@ } catch (Exception e) { throw new RollerException("Error initializing feed fetcher", e); } + } + + protected HibernatePersistenceStrategy getStrategy() throws RollerException { + try { + String dialect = + PlanetConfig.getProperty("hibernate.dialect"); + String connectionProvider = + PlanetConfig.getProperty("hibernate.connectionProvider"); + return new HibernatePersistenceStrategy( + "/hibernate.cfg.xml", dialect, connectionProvider); + + } catch(Throwable t) { + // if this happens then we are screwed + log.fatal("Error initializing Hibernate", t); + throw new RollerException(t); + } } Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java?view=diff&rev=541763&r1=541762&r2=541763 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java Fri May 25 12:59:47 2007 @@ -29,6 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.roller.RollerException; +import org.apache.roller.business.hibernate.HibernatePersistenceStrategy; import org.apache.roller.planet.business.AbstractManagerImpl; import org.apache.roller.planet.business.PlanetManager; import org.apache.roller.planet.pojos.PlanetData; @@ -57,8 +58,7 @@ public void savePlanet(PlanetData planet) throws RollerException { strategy.store(planet); } - - + // delete a Planet public void deletePlanet(PlanetData planet) throws RollerException { strategy.remove(planet); @@ -255,8 +255,7 @@ } return ret; } - - + // save an Entry public void saveEntry(PlanetEntryData entry) throws RollerException { strategy.store(entry); @@ -373,5 +372,6 @@ return ret; } + } Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePropertiesManagerImpl.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePropertiesManagerImpl.java?view=diff&rev=541763&r1=541762&r2=541763 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePropertiesManagerImpl.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePropertiesManagerImpl.java Fri May 25 12:59:47 2007 @@ -28,6 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.roller.RollerException; +import org.apache.roller.business.hibernate.HibernatePersistenceStrategy; import org.apache.roller.planet.business.AbstractManagerImpl; import org.apache.roller.planet.business.PropertiesManager; import org.apache.roller.planet.config.PlanetRuntimeConfig; Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java?view=diff&rev=541763&r1=541762&r2=541763 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java Fri May 25 12:59:47 2007 @@ -19,6 +19,7 @@ package org.apache.roller.planet.pojos; import java.util.Set; +import org.apache.roller.util.UUIDGenerator; import java.util.TreeSet; @@ -29,7 +30,7 @@ */ public class PlanetData implements Comparable { - private String id = null; + private String id = UUIDGenerator.generateUUID(); private String handle = null; private String title = null; private String description = null; @@ -79,7 +80,7 @@ this.handle = handle; } - + /** * @hibernate.property column="title" non-null="true" unique="false" */ @@ -102,8 +103,7 @@ public void setDescription(String description) { this.description = description; } - - + /** * @hibernate.set lazy="true" inverse="true" cascade="all" sort="natural" * @hibernate.collection-key column="planet_id" Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.java?view=diff&rev=541763&r1=541762&r2=541763 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.java Fri May 25 12:59:47 2007 @@ -31,6 +31,7 @@ import com.sun.syndication.feed.synd.SyndEntry; import com.sun.syndication.feed.synd.SyndFeed; import org.apache.commons.lang.StringEscapeUtils; +import org.apache.roller.util.UUIDGenerator; /** @@ -45,7 +46,7 @@ */ public class PlanetEntryData implements Serializable, Comparable { - protected String id; + protected String id = UUIDGenerator.generateUUID(); protected String handle; protected String title; protected String guid; Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.java?view=diff&rev=541763&r1=541762&r2=541763 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.java Fri May 25 12:59:47 2007 @@ -20,6 +20,7 @@ import java.util.Set; import java.util.StringTokenizer; import java.util.TreeSet; +import org.apache.roller.util.UUIDGenerator; /** @@ -31,8 +32,10 @@ transient private String[] catArray = null; + /** Database ID */ + private String id = UUIDGenerator.generateUUID(); + // attributes - private String id = null; private String handle = null; private String title = null; private String description = null; Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java?view=diff&rev=541763&r1=541762&r2=541763 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java Fri May 25 12:59:47 2007 @@ -24,6 +24,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import org.apache.roller.util.UUIDGenerator; /** @@ -31,10 +32,12 @@ * * @hibernate.class lazy="true" table="rag_subscription" */ -public class PlanetSubscriptionData implements Serializable, Comparable { +public class PlanetSubscriptionData implements Serializable, Comparable +{ + /** Database ID */ + protected String id = UUIDGenerator.generateUUID(); // attributes - protected String id; protected String title; protected String author; protected String feedUrl; Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java?view=diff&rev=541763&r1=541762&r2=541763 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java Fri May 25 12:59:47 2007 @@ -115,6 +115,7 @@ } else { PlanetGroupData group = getGroup(); group.getSubscriptions().remove(sub); + sub.getGroups().remove(group); pmgr.saveGroup(group); PlanetFactory.getPlanet().flush(); } Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetSubscriptionForm.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetSubscriptionForm.java?view=diff&rev=541763&r1=541762&r2=541763 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetSubscriptionForm.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetSubscriptionForm.java Fri May 25 12:59:47 2007 @@ -96,6 +96,7 @@ // add the sub to the group group.getSubscriptions().add(this.subscription); + this.subscription.getGroups().add(group); pMgr.saveGroup(group); } else { Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java?view=diff&rev=541763&r1=541762&r2=541763 ============================================================================== --- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java (original) +++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java Fri May 25 12:59:47 2007 @@ -133,9 +133,7 @@ private void upgradeDatabaseIfNeeded() throws RollerException { // try { -// InitialContext ic = new InitialContext(); -// DataSource ds = (DataSource)ic.lookup("java:comp/env/jdbc/rollerdb"); -// Connection con = ds.getConnection(); +// Connection con = // get connection somehow // UpgradeDatabase.upgradeDatabase(con, RollerFactory.getRoller().getVersion()); // con.close(); // } catch (NamingException e) { Modified: roller/branches/roller_guice/apps/planet/test/java/org/apache/roller/planet/business/EntryFunctionalTests.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/test/java/org/apache/roller/planet/business/EntryFunctionalTests.java?view=diff&rev=541763&r1=541762&r2=541763 ============================================================================== --- roller/branches/roller_guice/apps/planet/test/java/org/apache/roller/planet/business/EntryFunctionalTests.java (original) +++ roller/branches/roller_guice/apps/planet/test/java/org/apache/roller/planet/business/EntryFunctionalTests.java Fri May 25 12:59:47 2007 @@ -56,7 +56,11 @@ // now associate both subscriptions with the test group testGroup1.getSubscriptions().add(testSub1); + testSub1.getGroups().add(testGroup1); + testGroup1.getSubscriptions().add(testSub2); + testSub2.getGroups().add(testGroup1); + PlanetFactory.getPlanet().getPlanetManager().saveGroup(testGroup1); PlanetFactory.getPlanet().flush(); Modified: roller/branches/roller_guice/apps/planet/test/java/org/apache/roller/planet/business/SubscriptionFunctionalTests.java URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/test/java/org/apache/roller/planet/business/SubscriptionFunctionalTests.java?view=diff&rev=541763&r1=541762&r2=541763 ============================================================================== --- roller/branches/roller_guice/apps/planet/test/java/org/apache/roller/planet/business/SubscriptionFunctionalTests.java (original) +++ roller/branches/roller_guice/apps/planet/test/java/org/apache/roller/planet/business/SubscriptionFunctionalTests.java Fri May 25 12:59:47 2007 @@ -88,18 +88,28 @@ // add group.getSubscriptions().add(sub1); + sub1.getGroups().add(group); + group.getSubscriptions().add(sub2); + sub2.getGroups().add(group); + planet.saveGroup(group); TestUtils.endSession(true); // verify group = null; group = planet.getGroupById(testGroup1.getId()); + sub1 = planet.getSubscriptionById(testSub1.getId()); + sub2 = planet.getSubscriptionById(testSub2.getId()); assertEquals(2, group.getSubscriptions().size()); // remove group.getSubscriptions().remove(sub1); + sub1.getGroups().remove(group); + group.getSubscriptions().remove(sub2); + sub2.getGroups().remove(group); + planet.saveGroup(group); TestUtils.endSession(true); Modified: roller/branches/roller_guice/apps/planet/testdata/planet-custom.properties URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/testdata/planet-custom.properties?view=diff&rev=541763&r1=541762&r2=541763 ============================================================================== --- roller/branches/roller_guice/apps/planet/testdata/planet-custom.properties (original) +++ roller/branches/roller_guice/apps/planet/testdata/planet-custom.properties Fri May 25 12:59:47 2007 @@ -1,12 +1,22 @@ +persistence.planet.classname=org.apache.roller.planet.business.jpa.JPAPlanetImpl +#persistence.planet.classname=org.apache.roller.planet.business.datamapper.jpa.JPAPlanetImpl +#persistence.planet.classname=org.apache.roller.planet.business.hibernate.HibernatePlanetImpl + +database.configurationType=jdbc + +database.jdbc.driverClass=org.apache.derby.jdbc.ClientDriver +database.jdbc.connectionURL=jdbc:derby://localhost:3219/planet +database.jdbc.username=app +database.jdbc.password=app -jdbc.driverClass=org.apache.derby.jdbc.ClientDriver -jdbc.connectionURL=jdbc:derby://localhost:3219/planet -jdbc.username=app -jdbc.password=app hibernate.dialect=org.hibernate.dialect.DerbyDialect #jdbc.driverClass=com.mysql.jdbc.Driver -#jdbc.connectionURL=jdbc:mysql://localhost:3306/test_planet -#jdbc.username=roller -#jdbc.password=roller +#jdbc.connectionURL=jdbc:mysql://localhost:3306/rollertest +#jdbc.username=scott +#jdbc.password=tiger #hibernate.dialect=org.hibernate.dialect.MySQLDialect +#openjpa.jdbc.DBDictionary=mysql(SupportsSubselect=false, UseClobs=true, SearchStringEscape=\\\\) + +#openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=INFO, SQL=TRACE + Modified: roller/branches/roller_guice/apps/planet/web/WEB-INF/classes/hibernate.cfg.xml URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/web/WEB-INF/classes/hibernate.cfg.xml?view=diff&rev=541763&r1=541762&r2=541763 ============================================================================== --- roller/branches/roller_guice/apps/planet/web/WEB-INF/classes/hibernate.cfg.xml (original) +++ roller/branches/roller_guice/apps/planet/web/WEB-INF/classes/hibernate.cfg.xml Fri May 25 12:59:47 2007 @@ -22,11 +22,10 @@ - - java:comp/env/jdbc/rollerdb - - - org.hibernate.dialect.MySQLDialect + false