You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2013/12/01 15:42:55 UTC
svn commit: r1546817 [1/4] - in /roller/branches/rome2: ./
app/src/main/java/org/apache/roller/planet/business/jpa/
app/src/main/java/org/apache/roller/planet/pojos/
app/src/main/java/org/apache/roller/util/
app/src/main/java/org/apache/roller/weblogge...
Author: snoopdave
Date: Sun Dec 1 14:42:52 2013
New Revision: 1546817
URL: http://svn.apache.org/r1546817
Log:
Merging changes from trunk since start of branch.
Used this command:
svn merge -r 1529475:HEAD https://svn.apache.org/repos/asf/roller/trunk .
Modified:
roller/branches/rome2/ (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/Planet.java
roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/Subscription.java
roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java
roller/branches/rome2/app/src/main/java/org/apache/roller/util/DateUtil.java
roller/branches/rome2/app/src/main/java/org/apache/roller/util/PropertyExpander.java
roller/branches/rome2/app/src/main/java/org/apache/roller/util/RegexUtil.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/TestUtils.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/WebloggerException.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/AbstractURLStrategy.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/PreviewURLStrategy.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/URLStrategy.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/pings/WeblogUpdatePinger.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/comment/AutoformatPlugin.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/comment/HTMLSubsetPlugin.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/comment/LinkMarkupPlugin.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java (contents, props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/BookmarkComparator.java (contents, props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/FileContent.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java (contents, props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileComparator.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java (contents, props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectoryComparator.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileFilter.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileTag.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileType.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/ObjectPermission.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/PingQueueEntry.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/PingTarget.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/Resource.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/RollerPermission.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/StatCount.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/StatCountCountComparator.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/StaticTemplate.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/StaticThemeTemplate.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatComparator.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatCountComparator.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/TaskLock.java (contents, props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/Template.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/Theme.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeResource.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeTemplate.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/UserRole.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java (contents, props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java (contents, props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogCategoryPathComparator.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java (contents, props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryComment.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTag.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogHitCount.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTemplate.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogTheme.java (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/ (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CustomOpenIDAuthenticationProcessingFilter.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/AkismetCommentValidator.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/LdapCommentAuthenticator.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/plugins/comments/MathCommentAuthenticator.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PlanetFeedServlet.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/RSDServlet.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/ResourceServlet.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogEntryCommentForm.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerVelocity.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/ThemeResourceLoader.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/VelocityRenderer.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/CommentsPager.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/pagers/EntriesPager.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/tags/StringW.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/ui/tags/XmlW.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/Blacklist.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/HTMLSanitizer.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/IPBanList.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/LRUCache2.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/MediacastUtil.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/RollerMessages.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/URLUtilities.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/ (props changed)
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/oauth/AccessTokenServlet.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/oauth/AuthorizationServlet.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/oauth/RequestTokenServlet.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BaseAPIHandler.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java
roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/config/planet.properties (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/config/planetRuntimeConfigDefs.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/pojos/Planet.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/pojos/PlanetGroup.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/pojos/RuntimeConfigProperty.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/pojos/Subscription.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/planet/pojos/SubscriptionEntry.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/jpa/package.html (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/package.html (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/pings/package.html (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/plugins/comment/package.html (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/plugins/entry/package.html (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/plugins/package.html (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/referrers/package.html (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/runnable/package.html (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/search/operations/package.html (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/search/package.html (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/startup/package.html (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/business/themes/package.html (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/package.html (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties (contents, props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/runtime/package.html (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/planet/business/jpa/package.html (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/planet/business/package.html (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/planet/tasks/package.html (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/PingTarget.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/TaskLock.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/UserAttribute.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/UserRole.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/datamodel40.png (props changed)
roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/pojos/package.html (props changed)
roller/branches/rome2/app/src/main/webapp/WEB-INF/velocity/weblog.vm
roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/BookmarkTest.java
roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java (props changed)
roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/ui/ (props changed)
roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java
roller/branches/rome2/app/src/test/resources/uploadsdir/testblog1/sub1/hawk.jpg (props changed)
roller/branches/rome2/app/src/test/resources/uploadsdir/testblog1/sub1/sub2/nasa.jpg (props changed)
Propchange: roller/branches/rome2/
------------------------------------------------------------------------------
Merged /roller/trunk:r1529476-1546815
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java Sun Dec 1 14:42:52 2013
@@ -205,16 +205,14 @@ public class JPAPlanetManagerImpl extend
}
public List getGroupHandles(Planet planet) throws RollerException {
- List handles = new ArrayList();
- Iterator list = getGroups(planet).iterator();
- while (list.hasNext()) {
- PlanetGroup group = (PlanetGroup) list.next();
+ List<String> handles = new ArrayList<String>();
+ for (PlanetGroup group : getGroups(planet)) {
handles.add(group.getHandle());
}
return handles;
}
- public List getGroups(Planet planet) throws RollerException {
+ public List<PlanetGroup> getGroups(Planet planet) throws RollerException {
Query q = strategy.getNamedQuery("PlanetGroup.getByPlanet");
q.setParameter(1, planet.getHandle());
return q.getResultList();
@@ -237,12 +235,10 @@ public class JPAPlanetManagerImpl extend
public void deleteEntries(Subscription sub)
throws RollerException {
- Iterator entries = sub.getEntries().iterator();
- while(entries.hasNext()) {
- strategy.remove(entries.next());
+ for (Object entry : sub.getEntries()) {
+ strategy.remove(entry);
}
-
- // make sure and clear the other side of the assocation
+ // make sure and clear the other side of the association
sub.getEntries().clear();
}
@@ -284,7 +280,7 @@ public class JPAPlanetManagerImpl extend
try {
long startTime = System.currentTimeMillis();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
List params = new ArrayList();
int size = 0;
sb.append("SELECT e FROM SubscriptionEntry e ");
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/Planet.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/Planet.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/Planet.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/Planet.java Sun Dec 1 14:42:52 2013
@@ -22,11 +22,8 @@ import java.util.Set;
import org.apache.roller.util.UUIDGenerator;
import java.util.TreeSet;
-
/**
* A Roller "Planet".
- *
- * @hibernate.class lazy="true" table="rag_planet"
*/
public class Planet implements Comparable {
@@ -56,10 +53,6 @@ public class Planet implements Comparabl
return getTitle().compareTo(other.getTitle());
}
-
- /**
- * @hibernate.id column="id" generator-class="assigned"
- */
public String getId() {
return id;
}
@@ -68,10 +61,6 @@ public class Planet implements Comparabl
this.id = id;
}
-
- /**
- * @hibernate.property column="handle" non-null="true" unique="true"
- */
public String getHandle() {
return handle;
}
@@ -80,10 +69,6 @@ public class Planet implements Comparabl
this.handle = handle;
}
-
- /**
- * @hibernate.property column="title" non-null="true" unique="false"
- */
public String getTitle() {
return title;
}
@@ -92,10 +77,6 @@ public class Planet implements Comparabl
this.title = title;
}
-
- /**
- * @hibernate.property column="description" non-null="false" unique="false"
- */
public String getDescription() {
return description;
}
@@ -104,12 +85,6 @@ public class Planet implements Comparabl
this.description = description;
}
-
- /**
- * @hibernate.set lazy="true" inverse="true" cascade="all" sort="natural"
- * @hibernate.collection-key column="planet_id"
- * @hibernate.collection-one-to-many class="org.apache.roller.planet.pojos.PlanetGroup"
- */
public Set getGroups() {
return groups;
}
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java Sun Dec 1 14:42:52 2013
@@ -29,8 +29,6 @@ import org.apache.roller.weblogger.busin
/**
* Planet Group.
- *
- * @hibernate.class lazy="true" table="rag_group"
*/
public class PlanetGroup implements Serializable, Comparable {
@@ -61,7 +59,6 @@ public class PlanetGroup implements Seri
this.description = desc;
}
-
/**
* For comparing groups and sorting, ordered by Title.
*/
@@ -70,10 +67,6 @@ public class PlanetGroup implements Seri
return getTitle().compareTo(other.getTitle());
}
-
- /**
- * @hibernate.id column="id" generator-class="assigned"
- */
public String getId() {
return id;
}
@@ -82,10 +75,6 @@ public class PlanetGroup implements Seri
this.id = id;
}
-
- /**
- * @hibernate.property column="handle" non-null="false" unique="false"
- */
public String getHandle() {
return handle;
}
@@ -94,10 +83,6 @@ public class PlanetGroup implements Seri
this.handle = handle;
}
-
- /**
- * @hibernate.property column="title" non-null="false" unique="false"
- */
public String getTitle() {
return title;
}
@@ -106,10 +91,6 @@ public class PlanetGroup implements Seri
this.title = title;
}
-
- /**
- * @hibernate.property column="description" non-null="false" unique="false"
- */
public String getDescription() {
return description;
}
@@ -118,10 +99,6 @@ public class PlanetGroup implements Seri
this.description = description;
}
-
- /**
- * @hibernate.property column="max_feed_entries" non-null="false" unique="false"
- */
public int getMaxFeedEntries() {
return maxFeedEntries;
}
@@ -130,10 +107,6 @@ public class PlanetGroup implements Seri
this.maxFeedEntries = maxFeedEntries;
}
-
- /**
- * @hibernate.property column="max_page_entries" non-null="false" unique="false"
- */
public int getMaxPageEntries() {
return maxPageEntries;
}
@@ -142,10 +115,6 @@ public class PlanetGroup implements Seri
this.maxPageEntries = maxPageEntries;
}
-
- /**
- * @hibernate.property column="cat_restriction" non-null="false" unique="false"
- */
public String getCategoryRestriction() {
return categoryRestriction;
}
@@ -155,10 +124,6 @@ public class PlanetGroup implements Seri
catArray = null;
}
-
- /**
- * @hibernate.many-to-one column="planet_id" cascade="none" non-null="false"
- */
public Planet getPlanet() {
return planet;
}
@@ -167,12 +132,6 @@ public class PlanetGroup implements Seri
this.planet = planet;
}
-
- /**
- * @hibernate.set table="rag_group_subscription" lazy="true" invert="true" cascade="none" sort="natural"
- * @hibernate.collection-key column="group_id"
- * @hibernate.collection-many-to-many column="subscription_id" class="org.apache.roller.planet.pojos.Subscription"
- */
public Set getSubscriptions() {
return subscriptions;
}
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/Subscription.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/Subscription.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/Subscription.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/Subscription.java Sun Dec 1 14:42:52 2013
@@ -20,7 +20,6 @@ import java.io.Serializable;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import org.apache.roller.util.UUIDGenerator;
@@ -197,10 +196,9 @@ public class Subscription implements Ser
/**
* Add a collection of SubscriptionEntry to this Subscription.
*/
- public void addEntries(Collection newEntries) {
+ public void addEntries(Collection<SubscriptionEntry> newEntries) {
// bi-directional one-to-many
- for (Iterator it = newEntries.iterator(); it.hasNext();) {
- SubscriptionEntry entry = (SubscriptionEntry) it.next();
+ for (SubscriptionEntry entry : newEntries) {
entry.setSubscription(this);
}
this.getEntries().addAll(newEntries);
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java Sun Dec 1 14:42:52 2013
@@ -195,7 +195,7 @@ public class SubscriptionEntry implement
Iterator cats = getCategories().iterator();
while (cats.hasNext()) {
String catName = ((String)cats.next()).toLowerCase();
- if (catName.indexOf(category.toLowerCase()) != -1) {
+ if (catName.contains(category.toLowerCase())) {
return true;
}
}
@@ -223,7 +223,6 @@ public class SubscriptionEntry implement
/**
* Return first entry in category collection.
- * @roller.wrapPojoMethod type="pojo"
*/
public Category getCategory() {
Category cat = null;
@@ -235,7 +234,7 @@ public class SubscriptionEntry implement
}
public void setCategoriesString(List categories) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
Iterator cats = categories.iterator();
while (cats.hasNext()) {
String cat = (String)cats.next();
@@ -249,7 +248,6 @@ public class SubscriptionEntry implement
/**
* Returns creator as a UserData object.
- * @roller.wrapPojoMethod type="pojo"
* TODO: make planet model entry author name, email, and uri
*/
public Author getCreator() {
@@ -264,7 +262,6 @@ public class SubscriptionEntry implement
/**
* Returns summary (always null for planet entry)
- * @roller.wrapPojoMethod type="simple"
*/
public String getSummary() {
return null;
@@ -273,7 +270,6 @@ public class SubscriptionEntry implement
/**
* Read-only synomym for getSubscription()
- * @roller.wrapPojoMethod type="pojo"
*/
public Subscription getWebsite() {
return getSubscription();
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/util/DateUtil.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/util/DateUtil.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/util/DateUtil.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/util/DateUtil.java Sun Dec 1 14:42:52 2013
@@ -498,7 +498,7 @@ public abstract class DateUtil {
// to make it a valid ISO-8601 date.
String str = format(date, getIso8601DateFormat());
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append( str.substring(0,str.length()-2) );
sb.append( ":" );
sb.append( str.substring(str.length()-2) );
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/util/PropertyExpander.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/util/PropertyExpander.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/util/PropertyExpander.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/util/PropertyExpander.java Sun Dec 1 14:42:52 2013
@@ -63,7 +63,7 @@ public final class PropertyExpander {
}
Matcher matcher = EXPANSION_PATTERN.matcher(input);
-
+
StringBuffer expanded = new StringBuffer(input.length());
while (matcher.find()) {
String propName = matcher.group(2);
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/util/RegexUtil.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/util/RegexUtil.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/util/RegexUtil.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/util/RegexUtil.java Sun Dec 1 14:42:52 2013
@@ -30,17 +30,17 @@ import org.apache.commons.codec.binary.H
*/
public final class RegexUtil {
- public static final Pattern mailtoPattern =
+ public static final Pattern MAILTO_PATTERN =
Pattern.compile("mailto:([a-zA-Z0-9\\.]+@[a-zA-Z0-9\\.]+\\.[a-zA-Z0-9]+)");
- public static final Pattern emailPattern =
+ public static final Pattern EMAIL_PATTERN =
Pattern.compile("\\b[a-zA-Z0-9\\.]+(@)([a-zA-Z0-9\\.]+)(\\.)([a-zA-Z0-9]+)\\b");
public static String encodeEmail(String str) {
// obfuscate mailto's: turns them into hex encoded,
// so that browsers can still understand the mailto link
- Matcher mailtoMatch = mailtoPattern.matcher(str);
+ Matcher mailtoMatch = MAILTO_PATTERN.matcher(str);
while (mailtoMatch.find()) {
String email = mailtoMatch.group(1);
//System.out.println("email=" + email);
@@ -58,7 +58,7 @@ public final class RegexUtil {
* machines to parse however.
*/
public static String obfuscateEmail(String str) {
- Matcher emailMatch = emailPattern.matcher(str);
+ Matcher emailMatch = EMAIL_PATTERN.matcher(str);
while (emailMatch.find()) {
String at = emailMatch.group(1);
//System.out.println("at=" + at);
@@ -100,7 +100,7 @@ public final class RegexUtil {
* @return
*/
public static String encode(String email) {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
try {
char[] hexString = Hex.encodeHex(email.getBytes("UTF-8"));
for (int i = 0; i < hexString.length; i++) {
Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/TestUtils.java
------------------------------------------------------------------------------
Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/TestUtils.java:r1529476-1546815
Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/WebloggerException.java
------------------------------------------------------------------------------
Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/WebloggerException.java:r1529476-1546815
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/AbstractURLStrategy.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/AbstractURLStrategy.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/AbstractURLStrategy.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/AbstractURLStrategy.java Sun Dec 1 14:42:52 2013
@@ -37,8 +37,8 @@ public abstract class AbstractURLStrateg
* Url to login page.
*/
public String getLoginURL(boolean absolute) {
-
- StringBuffer url = new StringBuffer();
+
+ StringBuilder url = new StringBuilder();
if(absolute) {
url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
@@ -56,8 +56,8 @@ public abstract class AbstractURLStrateg
* Url to logout page.
*/
public String getLogoutURL(boolean absolute) {
-
- StringBuffer url = new StringBuffer();
+
+ StringBuilder url = new StringBuilder();
if(absolute) {
url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
@@ -70,6 +70,24 @@ public abstract class AbstractURLStrateg
return url.toString();
}
+ /**
+ * Url to register page.
+ */
+ public String getRegisterURL(boolean absolute) {
+
+ StringBuilder url = new StringBuilder();
+
+ if(absolute) {
+ url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
+ } else {
+ url.append(WebloggerRuntimeConfig.getRelativeContextURL());
+ }
+
+ url.append("/roller-ui/register.rol");
+
+ return url.toString();
+ }
+
/**
* Get a url to a UI action in a given namespace, optionally specifying
@@ -80,8 +98,8 @@ public abstract class AbstractURLStrateg
String weblogHandle,
Map<String, String> parameters,
boolean absolute) {
-
- StringBuffer url = new StringBuffer();
+
+ StringBuilder url = new StringBuilder();
if(absolute) {
url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
@@ -93,7 +111,7 @@ public abstract class AbstractURLStrateg
url.append("/").append(action).append(".rol");
// put weblog handle parameter, if necessary
- Map<String, String> params = new HashMap();
+ Map<String, String> params = new HashMap<String, String>();
if(weblogHandle != null) {
params.put("weblog", weblogHandle);
}
@@ -116,8 +134,8 @@ public abstract class AbstractURLStrateg
*/
public String getEntryAddURL(String weblogHandle,
boolean absolute) {
-
- StringBuffer url = new StringBuffer();
+
+ StringBuilder url = new StringBuilder();
if(absolute) {
url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
@@ -140,8 +158,8 @@ public abstract class AbstractURLStrateg
public String getEntryEditURL(String weblogHandle,
String entryId,
boolean absolute) {
-
- StringBuffer url = new StringBuffer();
+
+ StringBuilder url = new StringBuilder();
if(absolute) {
url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
@@ -164,8 +182,8 @@ public abstract class AbstractURLStrateg
*/
public String getWeblogConfigURL(String weblogHandle,
boolean absolute) {
-
- StringBuffer url = new StringBuffer();
+
+ StringBuilder url = new StringBuilder();
if(absolute) {
url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
@@ -183,8 +201,8 @@ public abstract class AbstractURLStrateg
public String getXmlrpcURL(boolean absolute) {
-
- StringBuffer url = new StringBuffer();
+
+ StringBuilder url = new StringBuilder();
if(absolute) {
url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
@@ -199,8 +217,8 @@ public abstract class AbstractURLStrateg
public String getAtomProtocolURL(boolean absolute) {
-
- StringBuffer url = new StringBuffer();
+
+ StringBuilder url = new StringBuilder();
if(absolute) {
url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/PreviewURLStrategy.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/PreviewURLStrategy.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/PreviewURLStrategy.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/PreviewURLStrategy.java Sun Dec 1 14:42:52 2013
@@ -51,7 +51,7 @@ public class PreviewURLStrategy extends
return null;
}
- StringBuffer url = new StringBuffer();
+ StringBuilder url = new StringBuilder();
if(absolute) {
url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
@@ -87,8 +87,8 @@ public class PreviewURLStrategy extends
if(weblog == null) {
return null;
}
-
- StringBuffer url = new StringBuffer();
+
+ StringBuilder url = new StringBuilder();
if(absolute) {
url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
@@ -128,8 +128,8 @@ public class PreviewURLStrategy extends
if(weblog == null) {
return null;
}
-
- StringBuffer pathinfo = new StringBuffer();
+
+ StringBuilder pathinfo = new StringBuilder();
Map params = new HashMap();
if(absolute) {
@@ -198,7 +198,7 @@ public class PreviewURLStrategy extends
return null;
}
- StringBuffer pathinfo = new StringBuffer();
+ StringBuilder pathinfo = new StringBuilder();
Map params = new HashMap();
if(absolute) {
@@ -252,7 +252,7 @@ public class PreviewURLStrategy extends
return null;
}
- StringBuffer url = new StringBuffer();
+ StringBuilder url = new StringBuilder();
if(absolute) {
url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/URLStrategy.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/URLStrategy.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/URLStrategy.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/URLStrategy.java Sun Dec 1 14:42:52 2013
@@ -49,6 +49,10 @@ public interface URLStrategy {
*/
String getLogoutURL(boolean absolute);
+ /**
+ * Url to register page.
+ */
+ String getRegisterURL(boolean absolute);
/**
* Get a url to a UI action in a given namespace, optionally specifying
Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
------------------------------------------------------------------------------
Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java:r1529476-1546815
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPingTargetManagerImpl.java Sun Dec 1 14:42:52 2013
@@ -29,7 +29,6 @@ import javax.persistence.Query;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.pings.PingTargetManager;
import org.apache.roller.weblogger.pojos.PingTarget;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -47,13 +46,11 @@ public class JPAPingTargetManagerImpl im
private static Log log = LogFactory.getLog(
JPAPingTargetManagerImpl.class);
- private final Weblogger roller;
private final JPAPersistenceStrategy strategy;
@com.google.inject.Inject
- protected JPAPingTargetManagerImpl(Weblogger roller, JPAPersistenceStrategy strategy) {
- this.roller = roller;
+ protected JPAPingTargetManagerImpl(JPAPersistenceStrategy strategy) {
this.strategy = strategy;
}
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java Sun Dec 1 14:42:52 2013
@@ -657,14 +657,14 @@ public class JPARefererManagerImpl imple
protected List getBlackListedReferer(String[] blacklist) throws
WebloggerException {
- StringBuffer queryString = getQueryStringForBlackList(blacklist);
+ StringBuilder queryString = getQueryStringForBlackList(blacklist);
Query query = strategy.getDynamicQuery(queryString.toString());
return (List) query.getResultList();
}
protected List getBlackListedReferer(Weblog website, String[] blacklist)
throws WebloggerException {
- StringBuffer queryString = getQueryStringForBlackList(blacklist);
+ StringBuilder queryString = getQueryStringForBlackList(blacklist);
queryString.append(" AND r.website = ?1 ");
Query query = strategy.getDynamicQuery(queryString.toString());
query.setParameter(1, website);
@@ -678,9 +678,9 @@ public class JPARefererManagerImpl imple
* @param blacklist
* @return
*/
- private StringBuffer getQueryStringForBlackList(String[] blacklist) {
+ private StringBuilder getQueryStringForBlackList(String[] blacklist) {
assert blacklist.length > 0;
- StringBuffer queryString = new StringBuffer("SELECT r FROM WeblogReferrer r WHERE (");
+ StringBuilder queryString = new StringBuilder("SELECT r FROM WeblogReferrer r WHERE (");
//Search for any matching entry from blacklist[]
final String orKeyword = " OR ";
for (int i = 0; i < blacklist.length; i++) {
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java Sun Dec 1 14:42:52 2013
@@ -206,8 +206,8 @@ public class JPAUserManagerImpl implemen
List params = new ArrayList();
int size = 0;
- StringBuffer queryString = new StringBuffer();
- StringBuffer whereClause = new StringBuffer();
+ StringBuilder queryString = new StringBuilder();
+ StringBuilder whereClause = new StringBuilder();
if (weblog != null) {
queryString.append("SELECT u FROM User u JOIN u.permissions p ");
@@ -429,7 +429,7 @@ public class JPAUserManagerImpl implemen
Query q = strategy.getNamedQuery("User.getCountEnabledDistinct");
q.setParameter(1, Boolean.TRUE);
List results = q.getResultList();
- ret =((Long)results.get(0)).longValue();
+ ret =((Long)results.get(0));
return ret;
}
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java Sun Dec 1 14:42:52 2013
@@ -419,8 +419,8 @@ public class JPAWeblogEntryManagerImpl i
List params = new ArrayList();
int size = 0;
- StringBuffer queryString = new StringBuffer();
- StringBuffer whereClause = new StringBuffer();
+ StringBuilder queryString = new StringBuilder();
+ StringBuilder whereClause = new StringBuilder();
queryString.append("SELECT e FROM WeblogEntry e WHERE ");
params.add(size++, current.getWebsite());
@@ -553,7 +553,7 @@ public class JPAWeblogEntryManagerImpl i
List params = new ArrayList();
int size = 0;
- StringBuffer queryString = new StringBuffer();
+ StringBuilder queryString = new StringBuilder();
//queryString.append("SELECT e FROM WeblogEntry e WHERE ");
if (tags == null || tags.size()==0) {
@@ -676,7 +676,7 @@ public class JPAWeblogEntryManagerImpl i
query.setParameter(1, Boolean.TRUE);
query.setParameter(2, WeblogEntry.PUBLISHED);
if (max != null) {
- query.setMaxResults(max.intValue());
+ query.setMaxResults(max);
}
return query.getResultList();
}
@@ -891,10 +891,10 @@ public class JPAWeblogEntryManagerImpl i
List params = new ArrayList();
int size = 0;
- StringBuffer queryString = new StringBuffer();
+ StringBuilder queryString = new StringBuilder();
queryString.append("SELECT c FROM WeblogEntryComment c ");
- StringBuffer whereClause = new StringBuffer();
+ StringBuilder whereClause = new StringBuilder();
if (entry != null) {
params.add(size++, entry);
whereClause.append("c.weblogEntry = ?").append(size);
@@ -1216,7 +1216,7 @@ public class JPAWeblogEntryManagerImpl i
(String)row[2], // entry anchor
(String)row[3], // entry title
"statCount.weblogEntryCommentCountType", // stat desc
- ((Long)row[0]).longValue()); // count
+ ((Long)row[0])); // count
sc.setWeblogHandle((String)row[1]);
results.add(sc);
}
@@ -1358,7 +1358,7 @@ public class JPAWeblogEntryManagerImpl i
List params = new ArrayList();
int size = 0;
- StringBuffer queryString = new StringBuffer();
+ StringBuilder queryString = new StringBuilder();
queryString.append("SELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregate w WHERE ");
if (website != null) {
@@ -1421,22 +1421,22 @@ public class JPAWeblogEntryManagerImpl i
return false;
}
- StringBuffer queryString = new StringBuffer();
+ StringBuilder queryString = new StringBuilder();
queryString.append("SELECT DISTINCT w.name ");
queryString.append("FROM WeblogEntryTagAggregate w WHERE w.name IN (");
//?1) AND w.weblog = ?2");
//Append tags as parameter markers to avoid potential escaping issues
//The IN clause would be of form (?1, ?2, ?3, ..)
ArrayList params = new ArrayList(tags.size() + 1);
- final String PARAM_SEPARATOR = ", ";
+ final String paramSeparator = ", ";
int i;
for (i=0; i < tags.size(); i++) {
- queryString.append('?').append(i+1).append(PARAM_SEPARATOR);
+ queryString.append('?').append(i+1).append(paramSeparator);
params.add(tags.get(i));
}
- // Remove the trailing PARAM_SEPARATOR
- queryString.delete(queryString.length() - PARAM_SEPARATOR.length(),
+ // Remove the trailing paramSeparator
+ queryString.delete(queryString.length() - paramSeparator.length(),
queryString.length());
// Close the brace of IN clause
queryString.append(')');
@@ -1679,7 +1679,7 @@ public class JPAWeblogEntryManagerImpl i
"WeblogEntryComment.getCountAllDistinctByStatus");
q.setParameter(1, WeblogEntryComment.APPROVED);
List results = q.getResultList();
- return ((Long)results.get(0)).longValue();
+ return ((Long)results.get(0));
}
/**
@@ -1691,7 +1691,7 @@ public class JPAWeblogEntryManagerImpl i
q.setParameter(1, website);
q.setParameter(2, WeblogEntryComment.APPROVED);
List results = q.getResultList();
- return ((Long)results.get(0)).longValue();
+ return ((Long)results.get(0));
}
/**
@@ -1702,7 +1702,7 @@ public class JPAWeblogEntryManagerImpl i
"WeblogEntry.getCountDistinctByStatus");
q.setParameter(1, "PUBLISHED");
List results = q.getResultList();
- return ((Long)results.get(0)).longValue();
+ return ((Long)results.get(0));
}
/**
@@ -1714,7 +1714,7 @@ public class JPAWeblogEntryManagerImpl i
q.setParameter(1, "PUBLISHED");
q.setParameter(2, website);
List results = q.getResultList();
- return ((Long)results.get(0)).longValue();
+ return ((Long)results.get(0));
}
/**
@@ -1725,7 +1725,7 @@ public class JPAWeblogEntryManagerImpl i
* @param expression The given expression
* @return the whereClause.
*/
- private static StringBuffer appendConjuctionToWhereclause(StringBuffer whereClause,
+ private static StringBuilder appendConjuctionToWhereclause(StringBuilder whereClause,
String expression) {
if(whereClause.length() != 0 && expression.length() != 0) {
whereClause.append(" AND ");
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java Sun Dec 1 14:42:52 2013
@@ -460,8 +460,8 @@ public class JPAWeblogManagerImpl implem
List params = new ArrayList();
int size = 0;
- StringBuffer queryString = new StringBuffer();
- StringBuffer whereClause = new StringBuffer();
+ StringBuilder queryString = new StringBuilder();
+ StringBuilder whereClause = new StringBuilder();
queryString.append("SELECT w FROM Weblog w WHERE ");
@@ -539,8 +539,8 @@ public class JPAWeblogManagerImpl implem
List<WeblogPermission> perms = roller.getUserManager().getWeblogPermissions(user);
for (WeblogPermission perm : perms) {
Weblog weblog = perm.getWeblog();
- if (!enabledOnly || weblog.getEnabled().booleanValue()) {
- if (weblog.getActive() != null && weblog.getActive().booleanValue()) {
+ if (!enabledOnly || weblog.getEnabled()) {
+ if (weblog.getActive() != null && weblog.getActive()) {
weblogs.add(weblog);
}
}
@@ -557,7 +557,7 @@ public class JPAWeblogManagerImpl implem
log.error("ERROR user is null, userName:" + perm.getUserName());
continue;
}
- if (!enabledOnly || user.getEnabled().booleanValue()) {
+ if (!enabledOnly || user.getEnabled()) {
users.add(user);
}
}
@@ -745,7 +745,7 @@ public class JPAWeblogManagerImpl implem
(String)row[2], // website handle
(String)row[3], // website name
"statCount.weblogCommentCountType", // stat type
- ((Long)row[0]).longValue()); // # comments
+ ((Long)row[0])); // # comments
sc.setWeblogHandle((String)row[2]);
results.add(sc);
}
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/pings/WeblogUpdatePinger.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/pings/WeblogUpdatePinger.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/pings/WeblogUpdatePinger.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/pings/WeblogUpdatePinger.java Sun Dec 1 14:42:52 2013
@@ -59,7 +59,7 @@ public final class WeblogUpdatePinger {
String message;
public PingResult(Boolean error, String message) {
- this.error = error != null ? error.booleanValue() : false;
+ this.error = error != null && error;
this.message = message != null ? message : "";
}
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/comment/AutoformatPlugin.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/comment/AutoformatPlugin.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/comment/AutoformatPlugin.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/comment/AutoformatPlugin.java Sun Dec 1 14:42:52 2013
@@ -31,7 +31,7 @@ import org.apache.roller.weblogger.pojos
*/
public class AutoformatPlugin implements WeblogEntryCommentPlugin {
- private static final Log log = LogFactory.getLog(AutoformatPlugin.class);
+ private static final Log LOG = LogFactory.getLog(AutoformatPlugin.class);
public AutoformatPlugin() {
@@ -59,7 +59,7 @@ public class AutoformatPlugin implements
public String render(final WeblogEntryComment comment, String text) {
- log.debug("starting value:\n"+text);
+ LOG.debug("starting value:\n" + text);
/*
* setup a buffered reader and iterate through each line
@@ -67,7 +67,7 @@ public class AutoformatPlugin implements
*
* NOTE: we consider a paragraph to be 2 endlines with no text between them
*/
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
try {
BufferedReader br = new BufferedReader(new StringReader(text));
@@ -98,10 +98,10 @@ public class AutoformatPlugin implements
}
} catch(Exception e) {
- log.warn("trouble rendering text.", e);
+ LOG.warn("trouble rendering text.", e);
}
- log.debug("ending value:\n"+buf.toString());
+ LOG.debug("ending value:\n" + buf.toString());
return buf.toString();
}
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/comment/HTMLSubsetPlugin.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/comment/HTMLSubsetPlugin.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/comment/HTMLSubsetPlugin.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/comment/HTMLSubsetPlugin.java Sun Dec 1 14:42:52 2013
@@ -28,11 +28,11 @@ import org.apache.roller.weblogger.util.
* Transforms the given String into a subset of HTML.
*/
public class HTMLSubsetPlugin implements WeblogEntryCommentPlugin {
- private static final Log log = LogFactory.getLog(HTMLSubsetPlugin.class);
+ private static final Log LOG = LogFactory.getLog(HTMLSubsetPlugin.class);
public HTMLSubsetPlugin() {
- log.debug("Instantiating HTMLSubsetPlugin");
+ LOG.debug("Instantiating HTMLSubsetPlugin");
}
@@ -59,14 +59,14 @@ public class HTMLSubsetPlugin implements
// only do this if comment is HTML
if ("text/html".equals(comment.getContentType())) {
- log.debug("ending value:\n" + output);
+ LOG.debug("ending value:\n" + output);
// escape html
output = Utilities.escapeHTML(output);
// just use old utilities method
output = Utilities.transformToHTMLSubset(output);
- log.debug("starting value:\n"+text);
+ LOG.debug("starting value:\n" + text);
}
return output;
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/comment/LinkMarkupPlugin.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/comment/LinkMarkupPlugin.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/comment/LinkMarkupPlugin.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/plugins/comment/LinkMarkupPlugin.java Sun Dec 1 14:42:52 2013
@@ -34,13 +34,13 @@ import org.apache.roller.weblogger.util.
* Contributed by Matthew Montgomery.
*/
public class LinkMarkupPlugin implements WeblogEntryCommentPlugin {
- private static final Log log = LogFactory.getLog(LinkMarkupPlugin.class);
+ private static final Log LOG = LogFactory.getLog(LinkMarkupPlugin.class);
private static final Pattern pattern = Pattern.compile(
"http[s]?://[^/][\\S]+", Pattern.CASE_INSENSITIVE);
public LinkMarkupPlugin() {
- log.debug("Instantiating LinkMarkupPlugin");
+ LOG.debug("Instantiating LinkMarkupPlugin");
}
/**
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/runnable/HitCountProcessingJob.java Sun Dec 1 14:42:52 2013
@@ -73,9 +73,9 @@ public class HitCountProcessingJob imple
Long count = (Long) hitsTally.get(weblogHandle);
if(count == null) {
- count = new Long(1);
+ count = 1L;
} else {
- count = new Long(count.longValue()+1);
+ count = count + 1;
}
hitsTally.put(weblogHandle, count);
}
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java Sun Dec 1 14:42:52 2013
@@ -39,7 +39,7 @@ import org.apache.roller.weblogger.pojos
@com.google.inject.Singleton
public abstract class ThreadManagerImpl implements ThreadManager {
- private static final Log log = LogFactory.getLog(ThreadManagerImpl.class);
+ private static final Log LOG = LogFactory.getLog(ThreadManagerImpl.class);
// our own scheduler thread
private Thread schedulerThread = null;
@@ -50,7 +50,7 @@ public abstract class ThreadManagerImpl
public ThreadManagerImpl() {
- log.info("Instantiating Thread Manager");
+ LOG.info("Instantiating Thread Manager");
serviceScheduler = Executors.newCachedThreadPool();
}
@@ -66,7 +66,7 @@ public abstract class ThreadManagerImpl
String taskClassName = WebloggerConfig.getProperty("tasks."+taskName+".class");
if(taskClassName != null) {
- log.info("Initializing task: "+taskName);
+ LOG.info("Initializing task: " + taskName);
try {
Class taskClass = Class.forName(taskClassName);
@@ -76,7 +76,7 @@ public abstract class ThreadManagerImpl
// make sure there is a tasklock record in the db
TaskLock taskLock = getTaskLockByName(task.getName());
if (taskLock == null) {
- log.debug("Task record does not exist, inserting empty record to start with");
+ LOG.debug("Task record does not exist, inserting empty record to start with");
// insert an empty record
taskLock = new TaskLock();
@@ -93,11 +93,11 @@ public abstract class ThreadManagerImpl
webloggerTasks.add(task);
} catch (ClassCastException ex) {
- log.warn("Task does not extend RollerTask class", ex);
+ LOG.warn("Task does not extend RollerTask class", ex);
} catch (WebloggerException ex) {
- log.error("Error scheduling task", ex);
+ LOG.error("Error scheduling task", ex);
} catch (Exception ex) {
- log.error("Error instantiating task", ex);
+ LOG.error("Error instantiating task", ex);
}
}
}
@@ -107,7 +107,7 @@ public abstract class ThreadManagerImpl
// start scheduler thread, but only if it's not already running
if (schedulerThread == null && scheduler != null) {
- log.debug("Starting scheduler thread");
+ LOG.debug("Starting scheduler thread");
schedulerThread = new Thread(scheduler, "Roller Weblogger Task Scheduler");
// set thread priority between MAX and NORM so we get slightly preferential treatment
schedulerThread.setPriority((Thread.MAX_PRIORITY + Thread.NORM_PRIORITY)/2);
@@ -137,14 +137,14 @@ public abstract class ThreadManagerImpl
public void shutdown() {
- log.debug("starting shutdown sequence");
+ LOG.debug("starting shutdown sequence");
// trigger an immediate shutdown of any backgrounded tasks
serviceScheduler.shutdownNow();
// only stop if we are already running
if(schedulerThread != null) {
- log.debug("Stopping scheduler");
+ LOG.debug("Stopping scheduler");
schedulerThread.interrupt();
}
}
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java Sun Dec 1 14:42:52 2013
@@ -104,27 +104,28 @@ public abstract class IndexOperation imp
Document doc = new Document();
// keyword
- doc.add(new StringField(FieldConstants.ID, data.getId(), Field.Store.YES));
+ doc.add(new StringField(FieldConstants.ID, data.getId(),
+ Field.Store.YES));
// keyword
- doc.add(new StringField(FieldConstants.WEBSITE_HANDLE, data.getWebsite()
- .getHandle(), Field.Store.YES));
+ doc.add(new StringField(FieldConstants.WEBSITE_HANDLE, data
+ .getWebsite().getHandle(), Field.Store.YES));
// text, don't index deleted/disabled users of a group blog
if (data.getCreator() != null) {
- doc.add(new TextField(FieldConstants.USERNAME, data.getCreator().getUserName(),
- Field.Store.YES));
+ doc.add(new TextField(FieldConstants.USERNAME, data.getCreator()
+ .getUserName().toLowerCase(), Field.Store.YES));
}
// text
doc.add(new TextField(FieldConstants.TITLE, data.getTitle(),
Field.Store.YES));
- // keyword
- doc.add(new StringField(FieldConstants.LOCALE, data.getLocale(),
- Field.Store.YES));
+ // keyword needs to be in lower case as we are used in a term
+ doc.add(new StringField(FieldConstants.LOCALE, data.getLocale()
+ .toLowerCase(), Field.Store.YES));
- // index the entry text, but don't store it - moved to end of block
+ // index the entry text, but don't store it
doc.add(new TextField(FieldConstants.CONTENT, data.getText(),
Field.Store.NO));
@@ -136,11 +137,11 @@ public abstract class IndexOperation imp
doc.add(new StringField(FieldConstants.PUBLISHED, data.getPubTime()
.toString(), Field.Store.YES));
- // index Category
+ // index Category, needs to be in lower case as we are used in a term
WeblogCategory categorydata = data.getCategory();
if (categorydata != null) {
- doc.add(new StringField(FieldConstants.CATEGORY, categorydata.getName(),
- Field.Store.YES));
+ doc.add(new StringField(FieldConstants.CATEGORY, categorydata
+ .getName().toLowerCase(), Field.Store.YES));
}
// index Comments, unstored
@@ -148,10 +149,12 @@ public abstract class IndexOperation imp
Field.Store.NO));
// keyword
- doc.add(new StringField(FieldConstants.C_EMAIL, commentEmail, Field.Store.YES));
+ doc.add(new StringField(FieldConstants.C_EMAIL, commentEmail,
+ Field.Store.YES));
// keyword
- doc.add(new StringField(FieldConstants.C_NAME, commentName, Field.Store.YES));
+ doc.add(new StringField(FieldConstants.C_NAME, commentName,
+ Field.Store.YES));
return doc;
}
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java Sun Dec 1 14:42:52 2013
@@ -171,13 +171,17 @@ public class DatabaseInstaller {
} catch (SQLException sqle) {
log.error("ERROR running SQL in database creation script", sqle);
- if (create != null) messages.addAll(create.getMessages());
+ if (create != null) {
+ messages.addAll(create.getMessages());
+ }
errorMessage("ERROR running SQL in database creation script");
throw new StartupException("Error running sql script", sqle);
} catch (Exception ioe) {
log.error("ERROR running database creation script", ioe);
- if (create != null) messages.addAll(create.getMessages());
+ if (create != null) {
+ messages.addAll(create.getMessages());
+ }
errorMessage("ERROR reading/parsing database creation script");
throw new StartupException("Error running SQL script", ioe);
@@ -754,19 +758,19 @@ public class DatabaseInstaller {
String productName = con.getMetaData().getDatabaseProductName();
String handle = "mysql";
- if ( productName.toLowerCase().indexOf("mysql") != -1) {
+ if ( productName.toLowerCase().contains("mysql")) {
handle = "mysql";
- } else if (productName.toLowerCase().indexOf("derby") != -1) {
+ } else if (productName.toLowerCase().contains("derby")) {
handle = "derby";
- } else if (productName.toLowerCase().indexOf("hsql") != -1) {
+ } else if (productName.toLowerCase().contains("hsql")) {
handle = "hsqldb";
- } else if (productName.toLowerCase().indexOf("postgres") != -1) {
+ } else if (productName.toLowerCase().contains("postgres")) {
handle = "postgresql";
- } else if (productName.toLowerCase().indexOf("oracle") != -1) {
+ } else if (productName.toLowerCase().contains("oracle")) {
handle = "oracle";
- } else if (productName.toLowerCase().indexOf("microsoft") != -1) {
+ } else if (productName.toLowerCase().contains("microsoft")) {
handle = "mssql";
- } else if (productName.toLowerCase().indexOf("db2") != -1) {
+ } else if (productName.toLowerCase().contains("db2")) {
handle = "db2";
}
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java Sun Dec 1 14:42:52 2013
@@ -31,7 +31,7 @@ import org.apache.roller.weblogger.confi
*/
public final class WebloggerStartup {
- private static final Log log = LogFactory.getLog(WebloggerStartup.class);
+ private static final Log LOG = LogFactory.getLog(WebloggerStartup.class);
private static boolean prepared = false;
@@ -176,12 +176,12 @@ public final class WebloggerStartup {
try {
mailProvider = new MailProvider();
} catch(StartupException ex) {
- if (log.isDebugEnabled()) {
- log.debug("Failed to setup mail provider, continuing anyways.\n"
- + "Reason: " + ex.getMessage(), ex);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Failed to setup mail provider, continuing anyways.\n"
+ + "Reason: " + ex.getMessage(), ex);
} else {
- log.warn("Failed to setup mail provider, continuing anyways.\n"
- + "Reason: " + ex.getMessage());
+ LOG.warn("Failed to setup mail provider, continuing anyways.\n"
+ + "Reason: " + ex.getMessage());
}
}
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java Sun Dec 1 14:42:52 2013
@@ -329,7 +329,7 @@ public class PingConfig {
}
return defaultValue;
}
- return Boolean.valueOf(configuredVal).booleanValue();
+ return Boolean.valueOf(configuredVal);
}
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java Sun Dec 1 14:42:52 2013
@@ -36,7 +36,7 @@ public class PlanetURLStrategy extends M
*/
public String getPlanetURL(String planet) {
- StringBuffer url = new StringBuffer();
+ StringBuilder url = new StringBuilder();
PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
@@ -54,7 +54,7 @@ public class PlanetURLStrategy extends M
*/
public String getPlanetGroupURL(String planet, String group, int pageNum) {
- StringBuffer url = new StringBuffer();
+ StringBuilder url = new StringBuilder();
String sep = "?";
url.append(getPlanetURL(planet));
@@ -83,7 +83,7 @@ public class PlanetURLStrategy extends M
*/
public String getPlanetGroupFeedURL(String planet, String group, String format) {
- StringBuffer url = new StringBuffer();
+ StringBuilder url = new StringBuilder();
String sep = "?";
url.append(WebloggerRuntimeConfig.getAbsoluteContextURL());
Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java
------------------------------------------------------------------------------
Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java:r1529476-1546815
Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java
------------------------------------------------------------------------------
Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java:r1529476-1546815
Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java
------------------------------------------------------------------------------
Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/tasks/RefreshRollerPlanetTask.java:r1529476-1546815
Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java
------------------------------------------------------------------------------
Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/tasks/SyncWebsitesTask.java:r1529476-1546815
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java Sun Dec 1 14:42:52 2013
@@ -125,10 +125,7 @@ public class PlanetConfig extends Planet
if( updProp.getValue() != null // null check needed w/Oracle
&& (updProp.getValue().equals("true") || updProp.getValue().equals("false"))) {
- if(incomingProp == null || !incomingProp.equals("on"))
- incomingProp = "false";
- else
- incomingProp = "true";
+ incomingProp = (incomingProp == null || !incomingProp.equals("on")) ? "false" : "true";
}
// only work on props that were submitted with the request
Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java
------------------------------------------------------------------------------
Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java:r1529476-1546815
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/BookmarkComparator.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/BookmarkComparator.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/BookmarkComparator.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/BookmarkComparator.java Sun Dec 1 14:42:52 2013
@@ -29,8 +29,8 @@ public class BookmarkComparator implemen
{
WeblogBookmark bd1 = (WeblogBookmark)val1;
WeblogBookmark bd2 = (WeblogBookmark)val2;
- int priority1 = bd1.getPriority().intValue();
- int priority2 = bd2.getPriority().intValue();
+ int priority1 = bd1.getPriority();
+ int priority2 = bd2.getPriority();
if (priority1 > priority2)
{
Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/BookmarkComparator.java
------------------------------------------------------------------------------
Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/BookmarkComparator.java:r1529476-1546815
Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/FileContent.java
------------------------------------------------------------------------------
Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/FileContent.java:r1529476-1546815
Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java
------------------------------------------------------------------------------
Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java:r1529476-1546815
Modified: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java
URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java?rev=1546817&r1=1546816&r2=1546817&view=diff
==============================================================================
--- roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java (original)
+++ roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java Sun Dec 1 14:42:52 2013
@@ -84,8 +84,6 @@ public class MediaFile implements Serial
/**
* Database surrogate key.
- *
- * @roller.wrapPojoMethod type="simple"
*/
public String getId() {
return id;
@@ -290,7 +288,7 @@ public class MediaFile implements Serial
}
public String getTagsAsString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (Iterator it = getTags().iterator(); it.hasNext();) {
sb.append(((MediaFileTag) it.next()).getName()).append(" ");
}
Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java
------------------------------------------------------------------------------
Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java:r1529476-1546815
Propchange: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileComparator.java
------------------------------------------------------------------------------
Merged /roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileComparator.java:r1529476-1546815