Author: gmazza
Date: Sun Mar 16 14:35:24 2014
New Revision: 1578087
URL: http://svn.apache.org/r1578087
Log:
Created flatter OPML bookmark import (no longer creating bookmark subfolders,
as they no longer exist), Sonar fixes.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/AuthoritiesPopulator.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java?rev=1578087&r1=1578086&r2=1578087&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java
Sun Mar 16 14:35:24 2014
@@ -156,9 +156,9 @@ public class JPABookmarkManagerImpl impl
// convenience method used when importing bookmarks
// NOTE: this method does not commit any changes;
- // that is done by importBookmarks()
+ // that is done higher up in execution chain
private void importOpmlElement(
- Weblog website, Element elem, WeblogBookmarkFolder parent)
+ Weblog website, Element elem, WeblogBookmarkFolder folder)
throws WebloggerException {
String text = elem.getAttributeValue("text");
String title = elem.getAttributeValue("title");
@@ -195,29 +195,20 @@ public class JPABookmarkManagerImpl impl
// trying to skip invalid ones, but was letting ones
// with an xml url and no html url through
// which could result in a db exception.
- // TODO: Consider providing error feedback instead of
- // silently skipping the invalid bookmarks here.
if (null != title && null != url) {
- WeblogBookmark bd = new WeblogBookmark(parent,
+ WeblogBookmark bd = new WeblogBookmark(folder,
title,
desc,
url,
xmlUrl,
null);
- parent.addBookmark(bd);
- // TODO: maybe this should be saving the folder?
+ folder.addBookmark(bd);
this.strategy.store(bd);
}
} else {
- // Store a folder
- WeblogBookmarkFolder fd = new WeblogBookmarkFolder(
- title,
- parent.getWeblog());
- this.strategy.store(fd);
-
- // Import folder's children
+ // Import suboutline's children into folder
for (Object subelem : elem.getChildren("outline")) {
- importOpmlElement( website, (Element) subelem, fd );
+ importOpmlElement( website, (Element) subelem, folder );
}
}
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java?rev=1578087&r1=1578086&r2=1578087&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
Sun Mar 16 14:35:24 2014
@@ -760,8 +760,10 @@ public class JPAUserManagerImpl implemen
q.setParameter(1, user.getUserName());
List<UserRole> roles = q.getResultList();
List<String> roleNames = new ArrayList<String>();
- for (UserRole userRole : roles) {
- roleNames.add(userRole.getRole());
+ if (roles != null) {
+ for (UserRole userRole : roles) {
+ roleNames.add(userRole.getRole());
+ }
}
return roleNames;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/AuthoritiesPopulator.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/AuthoritiesPopulator.java?rev=1578087&r1=1578086&r2=1578087&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/AuthoritiesPopulator.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/AuthoritiesPopulator.java
Sun Mar 16 14:35:24 2014
@@ -60,7 +60,9 @@ public class AuthoritiesPopulator implem
Weblogger roller = WebloggerFactory.getWeblogger();
UserManager umgr = roller.getUserManager();
user = umgr.getUserByUserName(username, Boolean.TRUE);
- roles = umgr.getRoles(user);
+ if (user != null) {
+ roles = umgr.getRoles(user);
+ }
} catch (WebloggerException ex) {
throw new DataRetrievalFailureException("ERROR in user lookup",
ex);
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java?rev=1578087&r1=1578086&r2=1578087&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java
Sun Mar 16 14:35:24 2014
@@ -116,6 +116,7 @@ public class CustomUserRegistry {
if (!(oPrincipal instanceof UserDetails)) {
LOG.warn("Unsupported Principal type in Authentication.
Skipping auto-registration.");
+ LOG.warn("oPrincipal found of type " +
oPrincipal.getClass().getName() + "; needs to be UserDetails");
return null;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java?rev=1578087&r1=1578086&r2=1578087&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java
Sun Mar 16 14:35:24 2014
@@ -54,8 +54,8 @@ public class WeblogCalendarModel impleme
protected String locale = null;
protected Calendar calendar = null;
protected Weblog weblog = null;
- protected Date prevMonth = null; // prev month or null if none
- protected Date nextMonth = null; // next month or null if
none
+ protected Date prevMonth = null;
+ protected Date nextMonth = null;
protected WeblogPageRequest pageRequest = null;
@@ -69,8 +69,6 @@ public class WeblogCalendarModel impleme
pageRequest.getWeblogHandle());
}
pageLink = pageRequest.getWeblogPageName();
-// day =
DateUtil.parseWeblogURLDateString(pageRequest.getWeblogDate(),
-// weblog.getTimeZoneInstance(),
weblog.getLocaleInstance());
day = parseWeblogURLDateString(pageRequest.getWeblogDate(),
weblog.getTimeZoneInstance(), weblog.getLocaleInstance());
locale = pageRequest.getLocale();
@@ -228,13 +226,8 @@ public class WeblogCalendarModel impleme
char8DateFormat.setCalendar(cal);
ParsePosition pos = new ParsePosition(0);
ret = char8DateFormat.parse(dateString, pos);
-
+
// make sure the requested date is not in the future
-// Date today = null;
-// Calendar todayCal = Calendar.getInstance();
-// todayCal = Calendar.getInstance(tz, locale);
-// todayCal.setTime(new Date());
-// today = todayCal.getTime();
// Date is always ms offset from epoch in UTC, by no means of
timezone.
Date today = new Date();
if(ret.after(today)) {
@@ -250,10 +243,6 @@ public class WeblogCalendarModel impleme
ret = char6DateFormat.parse(dateString, pos);
// make sure the requested date is not in the future
-// Calendar todayCal = Calendar.getInstance();
-// todayCal = Calendar.getInstance(tz, locale);
-// todayCal.setTime(new Date());
-// Date today = todayCal.getTime();
Date today = new Date();
if(ret.after(today)) {
ret = today;
@@ -280,13 +269,14 @@ public class WeblogCalendarModel impleme
dateString = DateUtil.format8chars(day);
dateString = format8chars(day,getCalendar());
} else if (dateString == null && monthURL) {
-// dateString = DateUtil.format6chars(day);
dateString = format6chars(day,getCalendar());
}
try {
- if (pageLink == null) { // create date URL
+ if (pageLink == null) {
+ // create date URL
url =
WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogCollectionURL(weblog,
locale, cat, dateString, null, -1, false);
- } else { // create page URL
+ } else {
+ // create page URL
url =
WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogPageURL(weblog,
locale, pageLink, null, cat, dateString, null, -1, false);
}
} catch (Exception e) {
@@ -321,9 +311,11 @@ public class WeblogCalendarModel impleme
public String computeTodayMonthUrl() {
String url;
- if (pageLink == null) { // create default URL
+ if (pageLink == null) {
+ // create default URL
url =
WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogCollectionURL(weblog,
locale, cat, null, null, -1, false);
- } else { // create page URL
+ } else {
+ // create page URL
url =
WebloggerFactory.getWeblogger().getUrlStrategy().getWeblogPageURL(weblog,
locale, pageLink, null, cat, null, null, -1, false);
}
return url;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java?rev=1578087&r1=1578086&r2=1578087&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java
Sun Mar 16 14:35:24 2014
@@ -22,7 +22,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java?rev=1578087&r1=1578086&r2=1578087&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
Sun Mar 16 14:35:24 2014
@@ -123,7 +123,7 @@ public final class BookmarksImport exten
} else {
String data = "The file is greater than " +
WRITE_THRESHOLD_IN_MB
+" MB, and has not been written to stream."
- +" File Size: "+getOpmlFile().length()+" bytes. "
+ +" File Size: " + getOpmlFile().length() + "
bytes. "
+" This is a limitation of this particular "
+" web application";
addError("bookmarksImport.error", data);
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java?rev=1578087&r1=1578086&r2=1578087&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
Sun Mar 16 14:35:24 2014
@@ -50,7 +50,6 @@ import org.apache.commons.logging.LogFac
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.FileIOException;
import org.apache.roller.weblogger.business.MediaFileManager;
-import org.apache.roller.weblogger.business.URLStrategy;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.WebloggerFactory;
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp?rev=1578087&r1=1578086&r2=1578087&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp Sun Mar
16 14:35:24 2014
@@ -92,8 +92,8 @@ function onMove()
<th class="rollertable" width="5%"><input name="control"
type="checkbox" onclick="toggleFunctionAll(this.checked);"
title="<s:text name="bookmarksForm.selectAllLabel"/>"/></th>
<th class="rollertable" width="25%"><s:text
name="bookmarksForm.name" /></th>
- <th class="rollertable" width="30%"><s:text
name="bookmarksForm.url" /></th>
- <th class="rollertable" width="30%"><s:text
name="bookmarksForm.feedurl" /></th>
+ <th class="rollertable" width="25%"><s:text
name="bookmarksForm.url" /></th>
+ <th class="rollertable" width="35%"><s:text
name="bookmarksForm.feedurl" /></th>
<th class="rollertable" width="5%"><s:text
name="bookmarksForm.edit" /></th>
<th class="rollertable" width="5%"><s:text
name="bookmarksForm.visitLink" /></th>
</tr>
@@ -124,7 +124,7 @@ function onMove()
</td>
<td class="rollertable">
- <str:truncateNicely lower="40" upper="50" ><s:property
value="#bookmark.feedUrl" /></str:truncateNicely>
+ <str:truncateNicely lower="60" upper="70" ><s:property
value="#bookmark.feedUrl" /></str:truncateNicely>
</td>
<td class="rollertable" align="center">
