Author: jasha
Date: Fri Jul 19 10:41:44 2013
New Revision: 1504819
URL: http://svn.apache.org/r1504819
Log:
RAVE-992 Use commons-lang3
Modified:
rave/trunk/pom.xml
rave/trunk/rave-components/rave-commons/pom.xml
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/service/impl/DefaultLockService.java
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/synchronization/SynchronizingAspect.java
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/util/CollectionUtils.java
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/util/OverridablePropertyPlaceholderConfigurer.java
rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/util/CollectionUtilsTest.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/ReCaptchaService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/LocalizationUtils.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPeopleResource.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultUsersResource.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/persistence/jpa/impl/H2OpenJpaDialect.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepository.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepositoryTest.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/RegionWidgetApi.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/MessageBundleController.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/AdminControllerUtil.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/handler/OpenIDAuthenticationFailureHandler.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewPasswordValidator.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/WidgetValidator.java
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/commoncontainer/ConfigurablePropertiesModule.java
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultAppDataService.java
Modified: rave/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/pom.xml?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
--- rave/trunk/pom.xml (original)
+++ rave/trunk/pom.xml Fri Jul 19 10:41:44 2013
@@ -28,7 +28,6 @@
<relativePath>../rave-master-pom/pom.xml</relativePath>
</parent>
- <groupId>org.apache.rave</groupId>
<artifactId>rave-project</artifactId>
<name>Apache Rave :: rave-project</name>
<description>Apache Rave Project</description>
@@ -56,6 +55,7 @@
<log4j.version>1.2.17</log4j.version>
<junit.version>4.11</junit.version>
<commons-lang.version>2.6</commons-lang.version>
+ <commons-lang3.version>3.1</commons-lang3.version>
<commons-validator.version>1.4.0</commons-validator.version>
<commons-collections.version>3.2.1</commons-collections.version>
<commons-codec.version>1.8</commons-codec.version>
@@ -458,6 +458,11 @@
<artifactId>commons-lang</artifactId>
<version>${commons-lang.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons-lang3.version}</version>
+ </dependency>
<!-- Validation -->
<dependency>
Modified: rave/trunk/rave-components/rave-commons/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-commons/pom.xml?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-commons/pom.xml (original)
+++ rave/trunk/rave-components/rave-commons/pom.xml Fri Jul 19 10:41:44 2013
@@ -70,8 +70,8 @@
<artifactId>spring-security-web</artifactId>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
Modified:
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/service/impl/DefaultLockService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/service/impl/DefaultLockService.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/service/impl/DefaultLockService.java
(original)
+++
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/service/impl/DefaultLockService.java
Fri Jul 19 10:41:44 2013
@@ -19,7 +19,7 @@
package org.apache.rave.service.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.rave.service.LockService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/synchronization/SynchronizingAspect.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/synchronization/SynchronizingAspect.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/synchronization/SynchronizingAspect.java
(original)
+++
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/synchronization/SynchronizingAspect.java
Fri Jul 19 10:41:44 2013
@@ -19,9 +19,9 @@
package org.apache.rave.synchronization;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
import org.apache.rave.service.LockService;
import org.apache.rave.synchronization.annotation.Synchronized;
import org.aspectj.lang.ProceedingJoinPoint;
Modified:
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/util/CollectionUtils.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/util/CollectionUtils.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/util/CollectionUtils.java
(original)
+++
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/util/CollectionUtils.java
Fri Jul 19 10:41:44 2013
@@ -19,9 +19,13 @@
package org.apache.rave.util;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
public class CollectionUtils {
Modified:
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/util/OverridablePropertyPlaceholderConfigurer.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/util/OverridablePropertyPlaceholderConfigurer.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/util/OverridablePropertyPlaceholderConfigurer.java
(original)
+++
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/util/OverridablePropertyPlaceholderConfigurer.java
Fri Jul 19 10:41:44 2013
@@ -19,7 +19,7 @@
package org.apache.rave.util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeansException;
import
org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
@@ -27,7 +27,10 @@ import org.springframework.core.io.Class
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
/**
* Reads property from the default location unless a system property is set.
Modified:
rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/util/CollectionUtilsTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/util/CollectionUtilsTest.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/util/CollectionUtilsTest.java
(original)
+++
rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/util/CollectionUtilsTest.java
Fri Jul 19 10:41:44 2013
@@ -19,7 +19,7 @@
package org.apache.rave.util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.junit.Before;
import org.junit.Test;
@@ -29,8 +29,13 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
public class CollectionUtilsTest {
private CollectionUtils.CollectionReconciliationHelper<TestObject, String>
reconciliationHelper =
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java
Fri Jul 19 10:41:44 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.service.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.AuthorityService;
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java
Fri Jul 19 10:41:44 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.service.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.rave.model.RegionWidget;
import org.apache.rave.model.RegionWidgetPreference;
import org.apache.rave.portal.model.util.ModelUtils;
@@ -29,10 +29,10 @@ import org.apache.rave.synchronization.a
import org.apache.rave.util.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
-import org.springframework.transaction.annotation.Transactional;
@Service
public class DefaultRegionWidgetService implements RegionWidgetService {
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
Fri Jul 19 10:41:44 2013
@@ -20,12 +20,17 @@
package org.apache.rave.portal.service.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.rave.model.PageType;
import org.apache.rave.model.Person;
import org.apache.rave.model.User;
import org.apache.rave.portal.model.util.SearchResult;
-import org.apache.rave.portal.repository.*;
+import org.apache.rave.portal.repository.CategoryRepository;
+import org.apache.rave.portal.repository.PageRepository;
+import org.apache.rave.portal.repository.PageTemplateRepository;
+import org.apache.rave.portal.repository.PersonRepository;
+import org.apache.rave.portal.repository.UserRepository;
+import org.apache.rave.portal.repository.WidgetRepository;
import org.apache.rave.portal.service.EmailService;
import org.apache.rave.portal.service.UserService;
import org.slf4j.Logger;
@@ -46,7 +51,12 @@ import org.springframework.security.open
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
*
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java
Fri Jul 19 10:41:44 2013
@@ -19,9 +19,15 @@
package org.apache.rave.portal.service.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.rave.exception.DuplicateItemException;
-import org.apache.rave.model.*;
+import org.apache.rave.model.Category;
+import org.apache.rave.model.User;
+import org.apache.rave.model.Widget;
+import org.apache.rave.model.WidgetComment;
+import org.apache.rave.model.WidgetRating;
+import org.apache.rave.model.WidgetStatus;
+import org.apache.rave.model.WidgetTag;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.model.util.WidgetStatistics;
import org.apache.rave.portal.repository.CategoryRepository;
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/ReCaptchaService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/ReCaptchaService.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/ReCaptchaService.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/ReCaptchaService.java
Fri Jul 19 10:41:44 2013
@@ -22,7 +22,7 @@ package org.apache.rave.portal.service.i
import net.tanesha.recaptcha.ReCaptcha;
import net.tanesha.recaptcha.ReCaptchaFactory;
import net.tanesha.recaptcha.ReCaptchaResponse;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.rave.portal.service.CaptchaService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/LocalizationUtils.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/LocalizationUtils.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/LocalizationUtils.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/LocalizationUtils.java
Fri Jul 19 10:41:44 2013
@@ -22,7 +22,7 @@ package org.apache.rave.portal.util;
import com.ibm.icu.util.GlobalizationPreferences;
import com.ibm.icu.util.ULocale;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.rave.portal.model.util.LocalizedString;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPeopleResource.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPeopleResource.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPeopleResource.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPeopleResource.java
Fri Jul 19 10:41:44 2013
@@ -18,11 +18,10 @@
*/
package org.apache.rave.rest.impl;
-import org.apache.commons.lang.NotImplementedException;
import org.apache.rave.model.FriendRequest;
-import org.apache.rave.rest.model.Person;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.rest.PeopleResource;
+import org.apache.rave.rest.model.Person;
import javax.ws.rs.core.Response;
@@ -32,7 +31,7 @@ public class DefaultPeopleResource imple
@Override
public Response getPeople() {
- throw new NotImplementedException();
+ throw new UnsupportedOperationException("Not implemented");
}
@Override
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultUsersResource.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultUsersResource.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultUsersResource.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultUsersResource.java
Fri Jul 19 10:41:44 2013
@@ -18,10 +18,9 @@
*/
package org.apache.rave.rest.impl;
-import org.apache.commons.lang.NotImplementedException;
-import org.apache.rave.rest.model.User;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.rest.UsersResource;
+import org.apache.rave.rest.model.User;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,7 +33,7 @@ public class DefaultUsersResource implem
@Override
public Response getUsers() {
- throw new NotImplementedException();
+ throw new UnsupportedOperationException("Not implemented");
}
@Override
Modified:
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java
(original)
+++
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java
Fri Jul 19 10:41:44 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.service.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.rave.model.RegionWidget;
import org.apache.rave.model.RegionWidgetPreference;
import org.apache.rave.portal.model.impl.RegionWidgetImpl;
@@ -34,8 +34,12 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.easymock.EasyMock.*;
-import static org.hamcrest.CoreMatchers.*;
+import static org.easymock.EasyMock.createNiceMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.sameInstance;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/persistence/jpa/impl/H2OpenJpaDialect.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/persistence/jpa/impl/H2OpenJpaDialect.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/persistence/jpa/impl/H2OpenJpaDialect.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/persistence/jpa/impl/H2OpenJpaDialect.java
Fri Jul 19 10:41:44 2013
@@ -15,9 +15,9 @@
*/
package org.apache.rave.persistence.jpa.impl;
-import org.apache.rave.persistence.impl.TranslatedH2Exception;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.rave.exception.DuplicateItemException;
+import org.apache.rave.persistence.impl.TranslatedH2Exception;
import org.h2.constant.ErrorCode;
import org.h2.jdbc.JdbcSQLException;
import org.springframework.dao.DataAccessException;
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java
Fri Jul 19 10:41:44 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.repository.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.rave.exception.DataSerializationException;
import org.apache.rave.model.ApplicationData;
import org.apache.rave.portal.model.JpaApplicationData;
@@ -31,8 +31,17 @@ import org.springframework.beans.factory
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
-import javax.persistence.*;
-import java.util.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityManager;
+import javax.persistence.Lob;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import static org.apache.rave.persistence.jpa.util.JpaUtil.getSingleResult;
import static org.apache.rave.persistence.jpa.util.JpaUtil.saveOrUpdate;
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
Fri Jul 19 10:41:44 2013
@@ -20,9 +20,19 @@
package org.apache.rave.portal.repository.impl;
-import org.apache.commons.lang.StringUtils;
-import org.apache.rave.model.*;
-import org.apache.rave.portal.model.*;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.rave.model.Tag;
+import org.apache.rave.model.User;
+import org.apache.rave.model.Widget;
+import org.apache.rave.model.WidgetComment;
+import org.apache.rave.model.WidgetRating;
+import org.apache.rave.model.WidgetStatus;
+import org.apache.rave.model.WidgetTag;
+import org.apache.rave.portal.model.JpaRegionWidget;
+import org.apache.rave.portal.model.JpaWidget;
+import org.apache.rave.portal.model.JpaWidgetComment;
+import org.apache.rave.portal.model.JpaWidgetRating;
+import org.apache.rave.portal.model.JpaWidgetTag;
import org.apache.rave.portal.model.conversion.JpaWidgetCommentConverter;
import org.apache.rave.portal.model.conversion.JpaWidgetConverter;
import org.apache.rave.portal.model.conversion.JpaWidgetRatingConverter;
@@ -36,14 +46,25 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
-import javax.persistence.*;
-import javax.persistence.criteria.*;
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+import javax.persistence.TypedQuery;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Order;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.apache.rave.persistence.jpa.util.JpaUtil.*;
+import static org.apache.rave.persistence.jpa.util.JpaUtil.getPagedResultList;
+import static org.apache.rave.persistence.jpa.util.JpaUtil.getSingleResult;
+import static org.apache.rave.persistence.jpa.util.JpaUtil.saveOrUpdate;
@Repository
public class JpaWidgetRepository implements WidgetRepository {
Modified:
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java
(original)
+++
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java
Fri Jul 19 10:41:44 2013
@@ -19,9 +19,8 @@
package org.apache.rave.portal.repository.impl;
-import org.apache.commons.lang.NotImplementedException;
-import org.apache.rave.portal.model.MongoDbPageLayout;
import org.apache.rave.model.PageLayout;
+import org.apache.rave.portal.model.MongoDbPageLayout;
import org.apache.rave.portal.repository.PageLayoutRepository;
import org.apache.rave.util.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -64,7 +63,7 @@ public class MongoDbPageLayoutRepository
@Override
public PageLayout get(String id) {
- throw new NotImplementedException("No use for an id");
+ throw new UnsupportedOperationException("No use for an id");
}
@Override
Modified:
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepository.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepository.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepository.java
(original)
+++
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepository.java
Fri Jul 19 10:41:44 2013
@@ -22,9 +22,13 @@ package org.apache.rave.portal.repositor
import com.google.common.base.Function;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.commons.lang.NotImplementedException;
-import org.apache.rave.model.*;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.FriendRequestStatus;
+import org.apache.rave.model.Page;
+import org.apache.rave.model.Person;
+import org.apache.rave.model.User;
+import org.apache.rave.model.Widget;
+import org.apache.rave.portal.model.MongoDbPersonAssociation;
+import org.apache.rave.portal.model.MongoDbUser;
import org.apache.rave.portal.repository.MongoPageOperations;
import org.apache.rave.portal.repository.MongoUserOperations;
import org.apache.rave.portal.repository.MongoWidgetOperations;
@@ -34,7 +38,9 @@ import org.springframework.data.mongodb.
import org.springframework.stereotype.Component;
import javax.annotation.Nullable;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
@@ -108,17 +114,17 @@ public class MongoDbPersonRepository imp
@Override
public List<Person> findByGroup(String groupId) {
- throw new NotImplementedException(); //TODO build query
+ throw new UnsupportedOperationException("Not implemented"); //TODO
build query
}
@Override
public List<Person> findByGroup(String groupId, String appId) {
- throw new NotImplementedException(); //TODO build query
+ throw new UnsupportedOperationException("Not implemented"); //TODO
build query
}
@Override
public List<Person> findByGroupWithFriend(String groupId, String
friendUsername) {
- throw new NotImplementedException(); //TODO build query
+ throw new UnsupportedOperationException("Not implemented"); //TODO
build query
}
@Override
Modified:
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepositoryTest.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepositoryTest.java
(original)
+++
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepositoryTest.java
Fri Jul 19 10:41:44 2013
@@ -19,9 +19,8 @@
package org.apache.rave.portal.repository.impl;
-import org.apache.commons.lang.NotImplementedException;
-import org.apache.rave.portal.model.MongoDbPageLayout;
import org.apache.rave.model.PageLayout;
+import org.apache.rave.portal.model.MongoDbPageLayout;
import org.apache.rave.portal.repository.util.CollectionNames;
import org.apache.rave.util.CollectionUtils;
import org.junit.Before;
@@ -34,9 +33,17 @@ import org.springframework.data.mongodb.
import java.util.ArrayList;
import java.util.List;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.isA;
-import static org.hamcrest.CoreMatchers.*;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.sameInstance;
import static org.junit.Assert.assertThat;
import static org.springframework.data.mongodb.core.query.Criteria.where;
@@ -97,7 +104,7 @@ public class MongoDbPageLayoutRepository
public void get_Valid() {
String id = "123";
- thrown.expect(NotImplementedException.class);
+ thrown.expect(UnsupportedOperationException.class);
thrown.expectMessage("No use for an id");
pageLayoutRepository.get(id);
}
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/RegionWidgetApi.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/RegionWidgetApi.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/RegionWidgetApi.java
(original)
+++
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/RegionWidgetApi.java
Fri Jul 19 10:41:44 2013
@@ -19,7 +19,8 @@
package org.apache.rave.portal.web.api.rest;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
+import org.apache.rave.model.RegionWidget;
import org.apache.rave.model.RegionWidgetPreference;
import org.apache.rave.portal.service.RegionWidgetService;
import org.apache.rave.portal.web.model.RegionWidgetPreferenceListWrapper;
@@ -27,10 +28,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
-import org.apache.rave.model.RegionWidget;
/**
* Handler for all services exposed under the /api/regionWidgets path.
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/MessageBundleController.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/MessageBundleController.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/MessageBundleController.java
(original)
+++
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/MessageBundleController.java
Fri Jul 19 10:41:44 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.web.controller;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
@@ -83,7 +83,7 @@ public class MessageBundleController {
// only load the messages that are specifically used by the client
code for performance reasons
// strip off the _rave_client. part of the key
if (key.startsWith(CLIENT_MESSAGE_IDENTIFIER)) {
- map.put(key.replaceFirst(CLIENT_MESSAGE_IDENTIFIER, ""),
StringEscapeUtils.escapeJavaScript(resourceBundle.getString(key)));
+ map.put(key.replaceFirst(CLIENT_MESSAGE_IDENTIFIER, ""),
StringEscapeUtils.escapeEcmaScript(resourceBundle.getString(key)));
}
}
return map;
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/AdminControllerUtil.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/AdminControllerUtil.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/AdminControllerUtil.java
(original)
+++
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/AdminControllerUtil.java
Fri Jul 19 10:41:44 2013
@@ -19,8 +19,8 @@
package org.apache.rave.portal.web.controller.admin;
-import org.apache.commons.lang.RandomStringUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.rave.portal.web.model.NavigationItem;
import org.apache.rave.portal.web.model.NavigationMenu;
import org.springframework.ui.Model;
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/handler/OpenIDAuthenticationFailureHandler.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/handler/OpenIDAuthenticationFailureHandler.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/handler/OpenIDAuthenticationFailureHandler.java
(original)
+++
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/handler/OpenIDAuthenticationFailureHandler.java
Fri Jul 19 10:41:44 2013
@@ -19,14 +19,7 @@
package org.apache.rave.portal.web.controller.handler;
-import java.io.IOException;
-import java.util.List;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.web.util.ModelKeys;
@@ -42,6 +35,12 @@ import org.springframework.security.web.
import
org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
import org.springframework.stereotype.Controller;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
/**
* Controller which processes openid authentication failure. If the user
record for particular
* openid user is not found in the DB, it redirects to the account creation
page. Otherwise
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java
(original)
+++
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java
Fri Jul 19 10:41:44 2013
@@ -19,9 +19,8 @@
package org.apache.rave.portal.web.security;
-import org.apache.commons.lang.RandomStringUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.rave.model.User;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.NewAccountService;
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java
(original)
+++
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java
Fri Jul 19 10:41:44 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.tag;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.rave.model.RegionWidget;
import org.apache.rave.model.Widget;
import org.apache.rave.portal.web.renderer.RenderScope;
@@ -86,7 +86,7 @@ public class RegionWidgetTag extends Abs
ScriptManager scriptManager =
getBeanFromContext(ScriptManager.class);
String widgetScript = String.format(DISABLED_SCRIPT_BLOCK,
regionWidget.getRegion().getId(),
regionWidget.getId(),
-
StringEscapeUtils.escapeJavaScript(widget.getDisableRenderingMessage()),
+
StringEscapeUtils.escapeEcmaScript(widget.getDisableRenderingMessage()),
regionWidget.isCollapsed(),
widget.getId());
String key = REGISTER_DISABLED_WIDGET_KEY + "-" +
widget.getId();
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java
(original)
+++
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java
Fri Jul 19 10:41:44 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.web.validator;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.validator.routines.EmailValidator;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.web.model.UserForm;
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewPasswordValidator.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewPasswordValidator.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewPasswordValidator.java
(original)
+++
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewPasswordValidator.java
Fri Jul 19 10:41:44 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.validator;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.rave.model.User;
import org.apache.rave.portal.service.UserService;
import org.slf4j.Logger;
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java
(original)
+++
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java
Fri Jul 19 10:41:44 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.web.validator;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.validator.routines.EmailValidator;
import org.apache.rave.model.User;
import org.apache.rave.portal.service.UserService;
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/WidgetValidator.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/WidgetValidator.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/WidgetValidator.java
(original)
+++
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/WidgetValidator.java
Fri Jul 19 10:41:44 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.validator;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.validator.routines.RegexValidator;
import org.apache.commons.validator.routines.UrlValidator;
import org.apache.rave.model.Widget;
Modified:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/commoncontainer/ConfigurablePropertiesModule.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/commoncontainer/ConfigurablePropertiesModule.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/commoncontainer/ConfigurablePropertiesModule.java
(original)
+++
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/commoncontainer/ConfigurablePropertiesModule.java
Fri Jul 19 10:41:44 2013
@@ -23,7 +23,7 @@ import com.google.inject.AbstractModule;
import com.google.inject.CreationException;
import com.google.inject.name.Names;
import com.google.inject.spi.Message;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
Modified:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultAppDataService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultAppDataService.java?rev=1504819&r1=1504818&r2=1504819&view=diff
==============================================================================
---
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultAppDataService.java
(original)
+++
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultAppDataService.java
Fri Jul 19 10:41:44 2013
@@ -19,12 +19,12 @@
package org.apache.rave.opensocial.service.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.rave.model.ApplicationData;
+import org.apache.rave.model.Person;
+import org.apache.rave.opensocial.service.SimplePersonService;
import org.apache.rave.portal.model.impl.ApplicationDataImpl;
import org.apache.rave.portal.repository.ApplicationDataRepository;
-import org.apache.rave.opensocial.service.SimplePersonService;
-import org.apache.rave.model.Person;
import org.apache.rave.service.LockService;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.util.ImmediateFuture;
@@ -37,7 +37,13 @@ import org.springframework.beans.factory
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import java.util.concurrent.Future;
import java.util.concurrent.locks.Lock;
