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/09/25 00:01:28 UTC
svn commit: r1627429 - in /roller/trunk: ./ app/
app/src/main/java/org/apache/roller/weblogger/business/jpa/
app/src/main/resources/ app/src/main/webapp/WEB-INF/
app/src/main/webapp/WEB-INF/jsps/admin/
app/src/main/webapp/WEB-INF/jsps/editor/ app/src/t...
Author: gmazza
Date: Wed Sep 24 22:01:28 2014
New Revision: 1627429
URL: http://svn.apache.org/r1627429
Log:
Updated libraries in prep for 5.1.1, comment search now case-insensitive and no longer including URLs, comment and global comment sidebar JSP's consolidated.
Removed:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
Modified:
roller/trunk/app/pom.xml
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp
roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
roller/trunk/app/src/test/resources/roller-custom.properties
roller/trunk/pom.xml
Modified: roller/trunk/app/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1627429&r1=1627428&r2=1627429&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Wed Sep 24 22:01:28 2014
@@ -16,14 +16,8 @@
<packaging>war</packaging>
<properties>
- <testOutputDirectory>${project.build.testOutputDirectory}</testOutputDirectory>
- <testMediaDir>${project.build.testOutputDirectory}${file.separator}mediafiles</testMediaDir>
- <testUploadsDir>${project.build.testOutputDirectory}${file.separator}uploadsdir</testUploadsDir>
- <testThemesDir>${project.build.testOutputDirectory}${file.separator}themes</testThemesDir>
- <testIndexDir>${project.build.testOutputDirectory}${file.separator}index</testIndexDir>
- <testPlanetCache>${project.build.testOutputDirectory}${file.separator}planetcache</testPlanetCache>
- <lucene.version>4.9.0</lucene.version>
- <spring.version>4.0.6.RELEASE</spring.version>
+ <lucene.version>4.10.0</lucene.version>
+ <spring.version>4.1.0.RELEASE</spring.version>
<spring.security.version>3.2.5.RELEASE</spring.security.version>
</properties>
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=1627429&r1=1627428&r2=1627429&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 Wed Sep 24 22:01:28 2014
@@ -635,9 +635,8 @@ public class JPAWeblogEntryManagerImpl i
}
if (csc.getSearchText() != null) {
- params.add(size++, "%" + csc.getSearchText() + "%");
- appendConjuctionToWhereclause(whereClause, "(c.url LIKE ?")
- .append(size).append(" OR c.content LIKE ?").append(size).append(")");
+ params.add(size++, "%" + csc.getSearchText().toUpperCase() + "%");
+ appendConjuctionToWhereclause(whereClause, "upper(c.content) LIKE ?").append(size);
}
if (csc.getStartDate() != null) {
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1627429&r1=1627428&r2=1627429&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Wed Sep 24 22:01:28 2014
@@ -669,7 +669,7 @@ macro.weblog.date.toStringFormat=EEEE MM
macro.weblog.preview=Comment Preview
macro.weblog.commentpermalink.title=comment permalink
# below used by some themes in Roller-extras
-macro.weblog.daypermalink.title=Permanent link to this day
+macro.weblog.daypermalink.title=Permanent link to this day's entries
macro.weblog.readMore=Read More
macro.weblog.readMoreLink=[<a class="readmore" href="{0}">Read More</a>]
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp?rev=1627429&r1=1627428&r2=1627429&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp Wed Sep 24 22:01:28 2014
@@ -21,6 +21,13 @@
<script src="<s:url value="/roller-ui/scripts/jquery-2.1.1.min.js" />"></script>
<script src='<s:url value="/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js"/>'></script>
+<s:if test="actionName == 'comments'">
+ <s:set var="mainAction">comments</s:set>
+</s:if>
+<s:else>
+ <s:set var="mainAction">globalCommentManagement</s:set>
+</s:else>
+
<div class="sidebarFade">
<div class="menu-tr">
<div class="menu-tl">
@@ -32,7 +39,7 @@
<p><s:text name="commentManagement.sidebarDescription" /></p>
- <s:form action="comments!query" id="commentsQuery">
+ <s:form action="%{#mainAction}!query" id="commentsQuery">
<s:hidden name="salt" />
<s:hidden name="weblog" />
Modified: roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml?rev=1627429&r1=1627428&r2=1627429&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml Wed Sep 24 22:01:28 2014
@@ -175,7 +175,7 @@
<definition name=".GlobalCommentManagement" extends=".tiles-tabbedpage" >
<put-attribute name="head" value="/WEB-INF/jsps/tiles/head-ajax.jsp" />
<put-attribute name="content" value="/WEB-INF/jsps/admin/GlobalCommentManagement.jsp" />
- <put-attribute name="sidebar" value="/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp" />
+ <put-attribute name="sidebar" value="/WEB-INF/jsps/editor/CommentsSidebar.jsp" />
<put-attribute name="styles" value="/WEB-INF/jsps/tiles/css-checkboxlistFix.jsp" />
</definition>
Modified: roller/trunk/app/src/test/resources/roller-custom.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/resources/roller-custom.properties?rev=1627429&r1=1627428&r2=1627429&view=diff
==============================================================================
--- roller/trunk/app/src/test/resources/roller-custom.properties (original)
+++ roller/trunk/app/src/test/resources/roller-custom.properties Wed Sep 24 22:01:28 2014
@@ -24,11 +24,11 @@ newuser.blogroll=
newuser.categories=General
# put directories in ${build.tests}
-themes.dir=${testThemesDir}
-search.index.dir=${testIndexDir}
-uploads.dir=${testUploadsDir}
-mediafiles.storage.dir=${testMediaDir}
-cache.dir=${project.build.directory}/planet-cache
+themes.dir=${project.build.testOutputDirectory}/themes
+search.index.dir=${project.build.testOutputDirectory}/index
+uploads.dir=${project.build.testOutputDirectory}/uploadsdir
+mediafiles.storage.dir=${project.build.testOutputDirectory}/mediafiles
+cache.dir=${project.build.testOutputDirectory}/planet-cache
# don't auto migrate during tests
uploads.migrate.auto=false
Modified: roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1627429&r1=1627428&r2=1627429&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Wed Sep 24 22:01:28 2014
@@ -29,7 +29,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <derby.version>10.10.2.0</derby.version>
+ <derby.version>10.11.1.1</derby.version>
</properties>
<modules>
@@ -42,10 +42,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
<fork>true</fork>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
@@ -53,7 +53,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-idea-plugin</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
<configuration>
<downloadSources>true</downloadSources>
</configuration>
@@ -61,12 +61,12 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.0.4.v20130625</version>
+ <version>9.2.3.v20140905</version>
</plugin>
<plugin>
<groupId>com.btmatthews.maven.plugins.inmemdb</groupId>
<artifactId>inmemdb-maven-plugin</artifactId>
- <version>1.4.2</version>
+ <version>1.4.3</version>
<configuration>
<monitorKey>inmemdb</monitorKey>
<monitorPort>11527</monitorPort>