Author: gmazza
Date: Sat Jan 18 17:58:08 2014
New Revision: 1559379
URL: http://svn.apache.org/r1559379
Log:
Updated to Spring Security 3.2 and a few other library updates per mvn
versions:display-dependency-updates.
Modified:
roller/trunk/app/pom.xml
roller/trunk/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java
roller/trunk/app/src/main/webapp/WEB-INF/security.xml
Modified: roller/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1559379&r1=1559378&r2=1559379&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Sat Jan 18 17:58:08 2014
@@ -24,7 +24,7 @@
<testPlanetCache>${project.build.testOutputDirectory}${file.separator}planetcache</testPlanetCache>
<lucene.version>4.6.0</lucene.version>
<spring.version>3.2.4.RELEASE</spring.version>
- <spring.security.version>3.1.4.RELEASE</spring.security.version>
+ <spring.security.version>3.2.0.RELEASE</spring.security.version>
</properties>
<dependencies>
@@ -275,13 +275,13 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-spring-plugin</artifactId>
- <version>2.3.15.3</version>
+ <version>2.3.16</version>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-tiles-plugin</artifactId>
- <version>2.3.15.3</version>
+ <version>2.3.16</version>
</dependency>
<dependency>
@@ -338,12 +338,12 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.8.3</version>
+ <version>1.9.1</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.8</version>
+ <version>1.9</version>
</dependency>
<!-- test deps -->
@@ -358,7 +358,7 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
<scope>test</scope>
</dependency>
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java?rev=1559379&r1=1559378&r2=1559379&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
Sat Jan 18 17:58:08 2014
@@ -21,10 +21,8 @@ package org.apache.roller.planet.busines
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Date;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import javax.persistence.NoResultException;
import javax.persistence.Query;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java?rev=1559379&r1=1559378&r2=1559379&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java
Sat Jan 18 17:58:08 2014
@@ -231,12 +231,12 @@ public class SubscriptionEntry implement
return cat;
}
- public void setCategoriesString(List<Category> categories) {
+ public void setCategoriesString(List<String> categoryNames) {
StringBuilder sb = new StringBuilder();
- Iterator cats = categories.iterator();
+ Iterator cats = categoryNames.iterator();
while (cats.hasNext()) {
- String cat = (String)cats.next();
- sb.append(cat);
+ String catName = (String) cats.next();
+ sb.append(catName);
if (cats.hasNext()) {
sb.append(",");
}
Modified: roller/trunk/app/src/main/webapp/WEB-INF/security.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/security.xml?rev=1559379&r1=1559378&r2=1559379&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/security.xml (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/security.xml Sat Jan 18 17:58:08
2014
@@ -22,7 +22,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/security
-
http://www.springframework.org/schema/security/spring-security-3.1.xsd";>
+
http://www.springframework.org/schema/security/spring-security-3.2.xsd";>
<http pattern="/images/**" security="none"/>
<http pattern="/scripts/**" security="none"/>
