Author: snoopdave Date: Tue May 15 19:36:54 2007 New Revision: 538409 URL: http://svn.apache.org/viewvc?view=rev&rev=538409 Log: Fixing some problems found in testing today
Added: roller/branches/roller_4.0_newbackend/apps/planet/src/java/META-INF/ roller/branches/roller_4.0_newbackend/apps/planet/src/java/META-INF/persistence.xml - copied unchanged from r538258, roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/META-INF/persistence.xml roller/branches/roller_4.0_newbackend/src/META-INF/ roller/branches/roller_4.0_newbackend/src/META-INF/persistence.xml - copied unchanged from r538258, roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/META-INF/persistence.xml Removed: roller/branches/roller_4.0_newbackend/apps/planet/testdata/META-INF/ roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/META-INF/ roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/META-INF/persistence.xml Modified: roller/branches/roller_4.0_newbackend/components/core/src/java/org/apache/roller/business/jpa/JPAPersistenceStrategy.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.orm.xml roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java roller/branches/roller_4.0_newbackend/tools/roller-core/roller-core.jar roller/branches/roller_4.0_newbackend/tools/roller-planet/roller-planet-business.jar Modified: roller/branches/roller_4.0_newbackend/components/core/src/java/org/apache/roller/business/jpa/JPAPersistenceStrategy.java URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/components/core/src/java/org/apache/roller/business/jpa/JPAPersistenceStrategy.java?view=diff&rev=538409&r1=538408&r2=538409 ============================================================================== --- roller/branches/roller_4.0_newbackend/components/core/src/java/org/apache/roller/business/jpa/JPAPersistenceStrategy.java (original) +++ roller/branches/roller_4.0_newbackend/components/core/src/java/org/apache/roller/business/jpa/JPAPersistenceStrategy.java Tue May 15 19:36:54 2007 @@ -44,7 +44,7 @@ /** * The thread local EntityManager. */ - private static final ThreadLocal threadLocalEntityManager = new ThreadLocal(); + private final ThreadLocal threadLocalEntityManager = new ThreadLocal(); /** * The EntityManagerFactory for this Roller instance. Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java?view=diff&rev=538409&r1=538408&r2=538409 ============================================================================== --- roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java (original) +++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java Tue May 15 19:36:54 2007 @@ -1058,7 +1058,7 @@ public List getWeblogsByLetter(char letter, int offset, int length) throws RollerException { Query query = strategy.getNamedQuery( - "WebsiteData.getByHandleOrderByHandle"); + "WebsiteData.getByLetterOrderByHandle"); query.setParameter(1, letter + "%"); if (offset != 0) { query.setFirstResult(offset); Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.orm.xml URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.orm.xml?view=diff&rev=538409&r1=538408&r2=538409 ============================================================================== --- roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.orm.xml (original) +++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.orm.xml Tue May 15 19:36:54 2007 @@ -17,6 +17,9 @@ <named-query name="WebsiteData.getByHandleOrderByHandle"> <query>SELECT w FROM WebsiteData w WHERE w.handle = ?1 ORDER BY w.handle</query> </named-query> + <named-query name="WebsiteData.getByLetterOrderByHandle"> + <query>SELECT w FROM WebsiteData w WHERE UPPER(w.handle) like ?1 ORDER BY w.handle</query> + </named-query> <named-query name="WebsiteData.getByEndDate&StartDate&Enabled&Active&Permissions.user&Permissions.pendingOrderByDateCreatedDesc"> <query>SELECT w FROM WebsiteData w WHERE w.dateCreated < ?1 AND w.dateCreated > ?2 AND w.enabled = ?3 AND w.active = ?4 Modified: roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java?view=diff&rev=538409&r1=538408&r2=538409 ============================================================================== --- roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java (original) +++ roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/WeblogsPager.java Tue May 15 19:36:54 2007 @@ -142,12 +142,15 @@ try { Roller roller = RollerFactory.getRoller(); UserManager umgr = roller.getUserManager(); - List weblogs = null; + List rawWeblogs = null; if (letter == null) { - weblogs = umgr.getWebsites(null, Boolean.TRUE, Boolean.TRUE, startDate, null, offset, length + 1); + rawWeblogs = umgr.getWebsites(null, Boolean.TRUE, Boolean.TRUE, startDate, null, offset, length + 1); } else { - weblogs = umgr.getWeblogsByLetter(letter.charAt(0), offset, length + 1); + rawWeblogs = umgr.getWeblogsByLetter(letter.charAt(0), offset, length + 1); } + // Collections returned by backend are not writeable, so create copy + List weblogs = new ArrayList(); + weblogs.addAll(rawWeblogs); // check if there are more results for paging if(weblogs.size() > length) { Modified: roller/branches/roller_4.0_newbackend/tools/roller-core/roller-core.jar URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/tools/roller-core/roller-core.jar?view=diff&rev=538409&r1=538408&r2=538409 ============================================================================== Binary files - no diff available. Modified: roller/branches/roller_4.0_newbackend/tools/roller-planet/roller-planet-business.jar URL: http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/tools/roller-planet/roller-planet-business.jar?view=diff&rev=538409&r1=538408&r2=538409 ============================================================================== Binary files - no diff available.