You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/03/14 02:49:04 UTC
svn commit: r1577406 - in /roller/trunk/app/src/main:
java/org/apache/roller/planet/tasks/
java/org/apache/roller/weblogger/business/
java/org/apache/roller/weblogger/business/jpa/
java/org/apache/roller/weblogger/business/plugins/entry/ java/org/apach...
Author: gmazza
Date: Fri Mar 14 01:49:03 2014
New Revision: 1577406
URL: http://svn.apache.org/r1577406
Log:
ROL-1870 Disallow creation of bookmarks of a name already in the folder while still allowing legacy duplicate bookmarks and duplicate bookmarks created by moving bookmarks from one folder to another. Also, some Sonar fixes made.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAAutoPingManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/WebloggerConfig.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogMediaResourceRequest.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogResourceRequest.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthAuthorize.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_da.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
roller/trunk/app/src/main/resources/ApplicationResources_sl.properties
Modified: roller/trunk/app/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java Fri Mar 14 01:49:03 2014
@@ -19,9 +19,7 @@
package org.apache.roller.planet.tasks;
import java.io.File;
-import java.util.Collections;
import java.util.Date;
-import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.business.Weblogger;
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManagerImpl.java?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManagerImpl.java Fri Mar 14 01:49:03 2014
@@ -108,7 +108,7 @@ public class FileContentManagerImpl impl
File saveFile = new File(dirPath.getAbsolutePath() + File.separator + fileId);
byte[] buffer = new byte[8192];
- int bytesRead = 0;
+ int bytesRead;
OutputStream bos = null;
try {
bos = new FileOutputStream(saveFile);
@@ -120,8 +120,10 @@ public class FileContentManagerImpl impl
throw new FileIOException("ERROR uploading file", e);
} finally {
try {
- bos.flush();
- bos.close();
+ if (bos != null) {
+ bos.flush();
+ bos.close();
+ }
} catch (Exception ignored) {}
}
@@ -156,7 +158,7 @@ public class FileContentManagerImpl impl
public boolean overQuota(Weblog weblog) {
String maxDir = WebloggerRuntimeConfig.getProperty("uploads.dir.maxsize");
- String maxFile = WebloggerRuntimeConfig.getProperty("uploads.file.maxsize");
+
// maxDirSize in megabytes
BigDecimal maxDirSize = new BigDecimal(maxDir);
@@ -247,15 +249,18 @@ public class FileContentManagerImpl impl
private long getDirSize(File dir, boolean recurse) {
long size = 0;
- if(dir.exists() && dir.isDirectory() && dir.canRead()) {
- File[] files = dir.listFiles();
+
+ if (dir.exists() && dir.isDirectory() && dir.canRead()) {
long dirSize = 0l;
- for (int i=0; i < files.length; i++) {
- if (!files[i].isDirectory()) {
- dirSize += files[i].length();
- } else if(recurse) {
- // count a subdirectory
- dirSize += getDirSize(files[i], recurse);
+ File[] files = dir.listFiles();
+ if (files != null) {
+ for (File file : files) {
+ if (!file.isDirectory()) {
+ dirSize += file.length();
+ } else if(recurse) {
+ // count a subdirectory
+ dirSize += getDirSize(file, recurse);
+ }
}
}
size += dirSize;
@@ -272,7 +277,7 @@ public class FileContentManagerImpl impl
private boolean checkFileType(String[] allowFiles, String[] forbidFiles,
String fileName, String contentType) {
- // TODO: Atom Publushing Protocol figure out how to handle file
+ // TODO: Atom Publishing Protocol figure out how to handle file
// allow/forbid using contentType.
// TEMPORARY SOLUTION: In the allow/forbid lists we will continue to
// allow user to specify file extensions (e.g. gif, png, jpeg) but will
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAAutoPingManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAAutoPingManagerImpl.java?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAAutoPingManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAAutoPingManagerImpl.java Fri Mar 14 01:49:03 2014
@@ -28,7 +28,6 @@ import org.apache.roller.weblogger.pojos
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import javax.persistence.Query;
import org.apache.roller.weblogger.business.Weblogger;
@@ -115,8 +114,6 @@ public class JPAAutoPingManagerImpl impl
public List<AutoPing> getApplicableAutoPings(WeblogEntry changedWeblogEntry) throws WebloggerException {
return getAutoPingsByWebsite(changedWeblogEntry.getWebsite());
- // return (List)strategy.newQuery(AutoPing.class, "AutoPing.getByWebsite")
- // .execute(changedWeblogEntry.getWebsite());
}
public void release() {
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java Fri Mar 14 01:49:03 2014
@@ -111,7 +111,6 @@ public class JPAWeblogEntryManagerImpl i
throw new WebloggerException("Cannot remove category with entries");
}
- Weblog testWeblog = cat.getWeblog();
cat.getWeblog().getWeblogCategories().remove(cat);
// remove cat
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java Fri Mar 14 01:49:03 2014
@@ -29,7 +29,6 @@ import javax.persistence.NoResultExcepti
import javax.persistence.Query;
import java.sql.Timestamp;
import java.util.*;
-import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.MediaFileManager;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogEntryManager;
@@ -114,10 +113,8 @@ public class JPAWeblogManagerImpl implem
UserManager umgr = roller.getUserManager();
WeblogEntryManager emgr = roller.getWeblogEntryManager();
- BookmarkManager bmgr = roller.getBookmarkManager();
//remove theme Assocs
-
Query themeAssocQuery = strategy.getNamedQuery("WeblogThemeAssoc.getThemeAssocsByWeblog");
themeAssocQuery.setParameter(1,website);
List<WeblogThemeAssoc> assocResults = themeAssocQuery.getResultList();
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java Fri Mar 14 01:49:03 2014
@@ -26,8 +26,6 @@ import org.apache.commons.lang3.StringEs
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.BookmarkManager;
-import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.pojos.WeblogBookmark;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -66,26 +64,16 @@ public class BookmarkPlugin implements W
public String render(WeblogEntry entry, String str) {
- String text = str;
- try {
- BookmarkManager bMgr = WebloggerFactory.getWeblogger().getBookmarkManager();
- WeblogBookmarkFolder defaultFolder = bMgr.getDefaultFolder(entry.getWebsite());
- text = lookInFolders(text, entry.getWebsite().getBookmarkFolders());
- } catch (WebloggerException e) {
- // nothing much I can do, go with default "Weblog" value
- // could be WebloggerException or NullPointerException
- mLogger.warn(e);
- }
- return text;
+ return lookInFolders(str, entry.getWebsite().getBookmarkFolders());
}
/**
* Travel given collection of folders, attempting to match up Bookmarks in each one.
*
- * @param text
- * @param folders
- * @return
+ * @param text blog entry text
+ * @param folders list of bookmark folders to match against
+ * @return text with hyperlinks to blogroll items added
*/
private String lookInFolders(String text, Collection<WeblogBookmarkFolder> folders) {
for (WeblogBookmarkFolder folder: folders) {
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java Fri Mar 14 01:49:03 2014
@@ -785,7 +785,6 @@ public class DatabaseInstaller {
* Return true if named table exists in database.
*/
private boolean tableExists(Connection con, String tableName) throws SQLException {
- String[] types = {"TABLE"};
ResultSet rs = con.getMetaData().getTables(null, null, "%", null);
while (rs.next()) {
if (tableName.equalsIgnoreCase(rs.getString("TABLE_NAME").toLowerCase())) {
@@ -859,7 +858,7 @@ public class DatabaseInstaller {
} else {
myversion = parsed;
}
- } catch(Exception e) {}
+ } catch(Exception e) {}
return myversion;
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogSharedTheme.java Fri Mar 14 01:49:03 2014
@@ -166,7 +166,7 @@ public class WeblogSharedTheme extends W
return null;
}
- ThemeTemplate template = null;
+ ThemeTemplate template;
// if name refers to the stylesheet then return result of getStylesheet()
ThemeTemplate stylesheet = getStylesheet();
@@ -197,7 +197,7 @@ public class WeblogSharedTheme extends W
return null;
}
- ThemeTemplate template = null;
+ ThemeTemplate template;
// if name refers to the stylesheet then return result of getStylesheet()
ThemeTemplate stylesheet = getStylesheet();
@@ -229,7 +229,7 @@ public class WeblogSharedTheme extends W
return null;
}
- ThemeResource resource = null;
+ ThemeResource resource;
// first check in our shared theme
resource = this.theme.getResource(path);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/WebloggerConfig.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/WebloggerConfig.java?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/WebloggerConfig.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/WebloggerConfig.java Fri Mar 14 01:49:03 2014
@@ -125,7 +125,6 @@ public class WebloggerConfig {
}
// initialize logging subsystem via WebloggerConfig
- Properties log4jprops = new Properties();
PropertyConfigurator.configure(WebloggerConfig.getPropertiesStartingWith("log4j."));
// finally we can start logging...
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/business/PlanetURLStrategy.java Fri Mar 14 01:49:03 2014
@@ -19,8 +19,6 @@
package org.apache.roller.weblogger.planet.business;
import org.apache.roller.planet.business.MultiPlanetURLStrategy;
-import org.apache.roller.planet.business.PlanetManager;
-import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
@@ -35,13 +33,8 @@ public class PlanetURLStrategy extends M
* @param planet There's only one planet in Roller, so this is ignored.
*/
public String getPlanetURL(String planet) {
-
StringBuilder url = new StringBuilder();
-
- PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
-
url.append(WebloggerRuntimeConfig.getProperty("site.absoluteurl"));
-
return url.toString();
}
@@ -68,7 +61,6 @@ public class PlanetURLStrategy extends M
url.append(sep);
url.append("page=");
url.append(pageNum);
- sep = "&";
}
return url.toString();
@@ -79,7 +71,7 @@ public class PlanetURLStrategy extends M
* Get URL of planet group's newsfeed.
* @param planet There's only one planet in Roller, so this is ignored.
* @param group Handle of planet group (or null for default group).
- * @param feed Feed format to be returned (ignored, currently only RSS is supported).
+ * @param format Feed format to be returned (ignored, currently only RSS is supported).
*/
public String getPlanetGroupFeedURL(String planet, String group, String format) {
@@ -92,7 +84,6 @@ public class PlanetURLStrategy extends M
if (group != null) {
url.append(sep);
url.append("group=").append(group);
- sep = "&";
}
return url.toString();
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java Fri Mar 14 01:49:03 2014
@@ -162,13 +162,25 @@ public class WeblogBookmarkFolder implem
* Add a bookmark to this folder.
*/
public void addBookmark(WeblogBookmark bookmark) {
+ for (WeblogBookmark bookmarkItem : bookmarks) {
+ if (bookmarkItem.getId().equals(bookmark.getId())) {
+ // already in bookmark list
+ return;
+ }
+ }
bookmark.setFolder(this);
- if (!getBookmarks().contains(bookmark)) {
- getBookmarks().add(bookmark);
+ getBookmarks().add(bookmark);
+ }
+
+ public boolean hasBookmarkOfName(String bookmarkName) {
+ for (WeblogBookmark bookmark : bookmarks) {
+ if (bookmark.getName().equals(bookmarkName)) {
+ return true;
+ }
}
+ return false;
}
-
/**
*/
public List<WeblogBookmark> retrieveBookmarks() throws WebloggerException {
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java Fri Mar 14 01:49:03 2014
@@ -97,11 +97,6 @@ public class CommentServlet extends Http
// instantiate a comment validation manager for comment spam checking
commentValidationManager = new CommentValidationManager();
- // instantiate a comment format manager for comment formatting
- String fmtrs = WebloggerConfig
- .getProperty("comment.formatter.classnames");
- String[] formatters = Utilities.stringToStringArray(fmtrs, ",");
-
// are we doing throttling?
if (WebloggerConfig.getBooleanProperty("comment.throttle.enabled")) {
@@ -167,10 +162,10 @@ public class CommentServlet extends Http
throws IOException, ServletException {
String error = null;
- String dispatch_url = null;
+ String dispatch_url;
- Weblog weblog = null;
- WeblogEntry entry = null;
+ Weblog weblog;
+ WeblogEntry entry;
String message = null;
RollerMessages messages = new RollerMessages();
@@ -197,7 +192,7 @@ public class CommentServlet extends Http
return;
}
- WeblogCommentRequest commentRequest = null;
+ WeblogCommentRequest commentRequest;
try {
commentRequest = new WeblogCommentRequest(request);
@@ -242,7 +237,7 @@ public class CommentServlet extends Http
comment.setEmail(commentRequest.getEmail());
comment.setUrl(commentRequest.getUrl());
comment.setContent(commentRequest.getContent());
- comment.setNotify(Boolean.valueOf(commentRequest.isNotify()));
+ comment.setNotify(commentRequest.isNotify());
comment.setWeblogEntry(entry);
comment.setRemoteHost(request.getRemoteHost());
comment.setPostTime(new Timestamp(System.currentTimeMillis()));
@@ -324,7 +319,7 @@ public class CommentServlet extends Http
// add specific error messages if they exist
if (messages.getErrorCount() > 0) {
Iterator errors = messages.getErrors();
- RollerMessage errorKey = null;
+ RollerMessage errorKey;
StringBuilder buf = new StringBuilder();
buf.append("<ul>");
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/MediaResourceServlet.java Fri Mar 14 01:49:03 2014
@@ -66,9 +66,6 @@ public class MediaResourceServlet extend
.getMediaFileManager();
Weblog weblog = null;
- String ctx = request.getContextPath();
- String servlet = request.getServletPath();
- String reqURI = request.getRequestURI();
WeblogMediaResourceRequest resourceRequest = null;
try {
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewResourceServlet.java Fri Mar 14 01:49:03 2014
@@ -68,10 +68,7 @@ public class PreviewResourceServlet exte
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- Weblog weblog = null;
- String ctx = request.getContextPath();
- String servlet = request.getServletPath();
- String reqURI = request.getRequestURI();
+ Weblog weblog;
WeblogPreviewResourceRequest resourceRequest = null;
try {
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogMediaResourceRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogMediaResourceRequest.java?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogMediaResourceRequest.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogMediaResourceRequest.java Fri Mar 14 01:49:03 2014
@@ -51,8 +51,6 @@ public class WeblogMediaResourceRequest
// parent determines weblog handle and locale if specified
super(request);
- String servlet = request.getServletPath();
-
// we only want the path info left over from after our parents parsing
String pathInfo = this.getPathInfo();
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogResourceRequest.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogResourceRequest.java?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogResourceRequest.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogResourceRequest.java Fri Mar 14 01:49:03 2014
@@ -50,8 +50,6 @@ public class WeblogResourceRequest exten
// parent determines weblog handle and locale if specified
super(request);
- String servlet = request.getServletPath();
-
// we only want the path info left over from after our parents parsing
String pathInfo = this.getPathInfo();
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthAuthorize.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthAuthorize.java?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthAuthorize.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/OAuthAuthorize.java Fri Mar 14 01:49:03 2014
@@ -53,12 +53,9 @@ public class OAuthAuthorize extends UIAc
public String execute() {
try {
User ud = getAuthenticatedUser();
-
-
} catch (Exception ex) {
log.error("ERROR fetching user information", ex);
}
-
return SUCCESS;
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java Fri Mar 14 01:49:03 2014
@@ -103,7 +103,6 @@ public class BookmarkAdd extends UIActio
if(!hasActionErrors()) {
try {
-
WeblogBookmark newBookmark = new WeblogBookmark(getFolder(),
getBean().getName(),
getBean().getDescription(),
@@ -136,22 +135,10 @@ public class BookmarkAdd extends UIActio
return INPUT;
}
-
- // TODO: validation
public void myValidate() {
-
// name is required, max length, no html
-
- // url is required, valid url
-
- if (StringUtils.isNotEmpty(getBean().getUrl()) && !validURL(getBean().getUrl())) {
- addError("bookmarkForm.error.invalidURL", getBean().getUrl());
- }
- if (StringUtils.isNotEmpty(getBean().getFeedUrl()) && !validURL(getBean().getFeedUrl())) {
- addError("bookmarkForm.error.invalidURL", getBean().getFeedUrl());
- }
- if (StringUtils.isNotEmpty(getBean().getImage()) && !validURL(getBean().getImage())) {
- addError("bookmarkForm.error.invalidURL", getBean().getImage());
+ if (getFolder().hasBookmarkOfName(getBean().getName())) {
+ addError("bookmarkForm.error.duplicateName", getBean().getUrl());
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java Fri Mar 14 01:49:03 2014
@@ -218,10 +218,10 @@ public class Bookmarks extends UIAction
if (null != bookmarks && bookmarks.length > 0) {
for (int j = 0; j < bookmarks.length; j++) {
WeblogBookmark bd = bmgr.getBookmark(bookmarks[j]);
- folder.getBookmarks().remove(bd);
newFolder.addBookmark(bd);
bd.setFolder(newFolder);
bmgr.saveBookmark(bd);
+ folder.getBookmarks().remove(bd);
}
}
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=1577406&r1=1577405&r2=1577406&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 Fri Mar 14 01:49:03 2014
@@ -130,9 +130,6 @@ public class MediaCollection {
throw new AtomException("Duplicate file name");
}
- if (path.length() > 0) {
- path = path + File.separator;
- }
FileInputStream fis = new FileInputStream(tempFile);
MediaFile mf = new MediaFile();
@@ -495,8 +492,6 @@ public class MediaCollection {
String editMediaURI =
atomURL+"/"+ website.getHandle()
+ "/resource/" + filePath;
- URLStrategy urlStrategy = WebloggerFactory.getWeblogger().getUrlStrategy();
-
String contentType = Utilities.getContentTypeFromFileName(file.getName());
Entry entry = new Entry();
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java Fri Mar 14 01:49:03 2014
@@ -65,7 +65,7 @@ public class RollerAtomService extends A
} catch (WebloggerException re) {
throw new AtomException("Getting user's weblogs", re);
}
- List uploadAccepts = new ArrayList();
+ List uploadAccepts;
try {
uploadAccepts = getAcceptedContentTypeRange();
} catch (WebloggerException re) {
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Fri Mar 14 01:49:03 2014
@@ -45,8 +45,6 @@ bookmarkForm.rssUrl=Newsfeed URL
bookmarkForm.save=Save
bookmarkForm.url=Bookmark URL
-bookmarkForm.error.invalidURL=Invalid URL: {0}
-
# errors from validation
Bookmark.error.nameNull=Name is a required field
Bookmark.error.nameSize=Name cannot be more than 255 characters
@@ -57,6 +55,7 @@ Bookmark.error.priorityNull=Priority is
Bookmark.error.priorityNotInt=Priority must be a valid integer
Bookmark.error.imageBad=The image URL you entered is not valid
Bookmark.error.feedUrlBad=The feed URL you entered is not valid
+bookmarkForm.error.duplicateName=Bookmark with that name already exists in folder
# ----------------------------------------------------------- BookmarksForm.jsp
Modified: roller/trunk/app/src/main/resources/ApplicationResources_da.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_da.properties?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_da.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_da.properties Fri Mar 14 01:49:03 2014
@@ -44,8 +44,6 @@ bookmarkForm.rssUrl=Nyhedsfeedens URL
bookmarkForm.save=Gem
bookmarkForm.url=Bogm�rkets URL
-bookmarkForm.error.invalidURL=Ugyldig URL: {0}
-
# errors from validation
Bookmark.error.nameNull=Navn er kr�vet
Bookmark.error.nameSize=Navn m� ikke v�re l�nger end 255 tegn
Modified: roller/trunk/app/src/main/resources/ApplicationResources_de.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_de.properties?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Fri Mar 14 01:49:03 2014
@@ -98,7 +98,6 @@ bookmarkForm.correct.title=Lesezeichen k
bookmarkForm.description=Beschreibung
bookmarkForm.edit.subtitle=Lesezeichen bearbeiten in Ordner [{0}]
bookmarkForm.edit.title=Lesezeichen bearbeiten
-bookmarkForm.error.invalidURL=Ung\u00FCltige URL: {0}
bookmarkForm.folder=Lesezeichen Ordner
bookmarkForm.image=Bild URL
bookmarkForm.name=Name
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties Fri Mar 14 01:49:03 2014
@@ -1829,7 +1829,6 @@ Bookmark.error.priorityNull=\u512A\u5148
Bookmark.error.priorityNotInt=\u512A\u5148\u9806\u4F4D\u306F\u6574\u6570\u3067\u306A\u3051\u308C\u3070\u3044\u3051\u307E\u305B\u3093
Bookmark.error.imageBad=\u6307\u5B9A\u3055\u308C\u305F\u753B\u50CF\u306EURL\u306F\u7121\u52B9\u306A\u30A2\u30C9\u30EC\u30B9\u3067\u3059
Bookmark.error.feedUrlBad=\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A3\u30FC\u30C9\u306EURL\u306F\u7121\u52B9\u306A\u30A2\u30C9\u30EC\u30B9\u3067\u3059
-bookmarkForm.error.invalidURL=\u7121\u52B9\u306AURL\uFF1A{0}
bookmarksForm.priority=\u512A\u5148\u9806\u4F4D
categoryForm.error.duplicateName=\u30AB\u30C6\u30B4\u30EA\u540D\u300C{0}\u300D\u306F\u3059\u3067\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u307B\u304B\u306E\u540D\u524D\u3092\u4F7F\u3063\u3066\u304F\u3060\u3055\u3044\u3002
Category.error.imageBad=\u6307\u5B9A\u3055\u308C\u305F\u753B\u50CF\u306EURL\u306F\u7121\u52B9\u306A\u30A2\u30C9\u30EC\u30B9\u3067\u3059
Modified: roller/trunk/app/src/main/resources/ApplicationResources_sl.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_sl.properties?rev=1577406&r1=1577405&r2=1577406&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_sl.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_sl.properties Fri Mar 14 01:49:03 2014
@@ -44,8 +44,6 @@ bookmarkForm.rssUrl=URL naslova Kanala N
bookmarkForm.save=Shrani
bookmarkForm.url=Zaznamek URL
-bookmarkForm.error.invalidURL=Nepravilen URL: {0}
-
# errors from validation
Bookmark.error.nameNull=Polje za ime je zahtevano
Bookmark.error.nameSize=Ime ne more biti dalj\u0161e od 255 znakov