Author: mfranklin
Date: Mon Jun 4 15:23:21 2012
New Revision: 1346008
URL: http://svn.apache.org/viewvc?rev=1346008&view=rev
Log:
Created impl package for POJOs (RAVE-625)
Added:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AddressImpl.java
- copied, changed from r1345993,
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/AddressImpl.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java
- copied, changed from r1345993,
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/CategoryImpl.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/GroupImpl.java
- copied, changed from r1345993,
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/GroupImpl.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OrganizationImpl.java
- copied, changed from r1345999,
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/OrganizationImpl.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonImpl.java
- copied, changed from r1345993,
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonImpl.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java
- copied, changed from r1345993,
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetCommentImpl.java
Removed:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/AddressImpl.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/CategoryImpl.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/GroupImpl.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/OrganizationImpl.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonImpl.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetCommentImpl.java
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactoryTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaAddressConverterTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaConverterTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetCommentServiceTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/CategoryController.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/CategoryEditorTest.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
Mon Jun 4 15:23:21 2012
@@ -19,6 +19,7 @@
package org.apache.rave.portal.model;
import org.apache.rave.persistence.BasicEntity;
+import org.apache.rave.portal.model.impl.PersonImpl;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
Copied:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AddressImpl.java
(from r1345993,
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/AddressImpl.java)
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AddressImpl.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AddressImpl.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/AddressImpl.java&r1=1345993&r2=1346008&rev=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/AddressImpl.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AddressImpl.java
Mon Jun 4 15:23:21 2012
@@ -1,4 +1,6 @@
-package org.apache.rave.portal.model;
+package org.apache.rave.portal.model.impl;
+
+import org.apache.rave.portal.model.Address;
/**
*/
Copied:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java
(from r1345993,
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/CategoryImpl.java)
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/CategoryImpl.java&r1=1345993&r2=1346008&rev=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/CategoryImpl.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java
Mon Jun 4 15:23:21 2012
@@ -13,7 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.portal.model.impl;
+
+import org.apache.rave.portal.model.*;
import java.util.Date;
import java.util.List;
Copied:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/GroupImpl.java
(from r1345993,
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/GroupImpl.java)
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/GroupImpl.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/GroupImpl.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/GroupImpl.java&r1=1345993&r2=1346008&rev=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/GroupImpl.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/GroupImpl.java
Mon Jun 4 15:23:21 2012
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.portal.model.impl;
+
+import org.apache.rave.portal.model.*;
import java.util.List;
Copied:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OrganizationImpl.java
(from r1345999,
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/OrganizationImpl.java)
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OrganizationImpl.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OrganizationImpl.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/OrganizationImpl.java&r1=1345999&r2=1346008&rev=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/OrganizationImpl.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OrganizationImpl.java
Mon Jun 4 15:23:21 2012
@@ -1,4 +1,6 @@
-package org.apache.rave.portal.model;
+package org.apache.rave.portal.model.impl;
+import org.apache.rave.portal.model.Address;
+
import java.util.Date;
public class OrganizationImpl {
Copied:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonImpl.java
(from r1345993,
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonImpl.java)
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonImpl.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonImpl.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonImpl.java&r1=1345993&r2=1346008&rev=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonImpl.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonImpl.java
Mon Jun 4 15:23:21 2012
@@ -1,8 +1,10 @@
-package org.apache.rave.portal.model;
+package org.apache.rave.portal.model.impl;
+
+import org.apache.rave.portal.model.*;
import java.util.List;
-public class PersonImpl implements Person{
+public class PersonImpl implements Person {
protected String username;
protected String email;
Copied:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java
(from r1345993,
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetCommentImpl.java)
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetCommentImpl.java&r1=1345993&r2=1346008&rev=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetCommentImpl.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java
Mon Jun 4 15:23:21 2012
@@ -16,9 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rave.portal.model;
+package org.apache.rave.portal.model.impl;
+import org.apache.rave.portal.model.*;
+
import java.util.Date;
public class WidgetCommentImpl implements WidgetComment {
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java
Mon Jun 4 15:23:21 2012
@@ -16,7 +16,7 @@
package org.apache.rave.portal.service.impl;
import org.apache.rave.portal.model.Category;
-import org.apache.rave.portal.model.CategoryImpl;
+import org.apache.rave.portal.model.impl.CategoryImpl;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.repository.CategoryRepository;
import org.apache.rave.portal.service.CategoryService;
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactoryTest.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactoryTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactoryTest.java
Mon Jun 4 15:23:21 2012
@@ -2,7 +2,7 @@ package org.apache.rave.portal.model.con
import org.apache.rave.model.ModelConverter;
import org.apache.rave.portal.model.Person;
-import org.apache.rave.portal.model.PersonImpl;
+import org.apache.rave.portal.model.impl.PersonImpl;
import org.junit.Test;
import java.lang.reflect.Proxy;
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaAddressConverterTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaAddressConverterTest.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaAddressConverterTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaAddressConverterTest.java
Mon Jun 4 15:23:21 2012
@@ -1,8 +1,9 @@
package org.apache.rave.portal.model.conversion;
import org.apache.rave.portal.model.Address;
-import org.apache.rave.portal.model.AddressImpl;
+import org.apache.rave.portal.model.impl.AddressImpl;
import org.apache.rave.portal.model.JpaAddress;
+import org.apache.rave.portal.model.impl.AddressImpl;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java
Mon Jun 4 15:23:21 2012
@@ -19,6 +19,7 @@
package org.apache.rave.portal.model.conversion;
import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.impl.CategoryImpl;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaConverterTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaConverterTest.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaConverterTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaConverterTest.java
Mon Jun 4 15:23:21 2012
@@ -2,6 +2,9 @@ package org.apache.rave.portal.model.con
import org.apache.rave.model.ModelConverter;
import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.impl.AddressImpl;
+import org.apache.rave.portal.model.impl.GroupImpl;
+import org.apache.rave.portal.model.impl.PersonImpl;
import org.junit.Before;
import org.junit.Test;
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java
Mon Jun 4 15:23:21 2012
@@ -22,6 +22,8 @@ import static org.hamcrest.CoreMatchers.
import static org.junit.Assert.*;
import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.impl.GroupImpl;
+import org.apache.rave.portal.model.impl.PersonImpl;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java
Mon Jun 4 15:23:21 2012
@@ -21,7 +21,7 @@ package org.apache.rave.portal.model.con
import org.apache.rave.portal.model.JpaWidgetComment;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.WidgetComment;
-import org.apache.rave.portal.model.WidgetCommentImpl;
+import org.apache.rave.portal.model.impl.WidgetCommentImpl;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java
Mon Jun 4 15:23:21 2012
@@ -20,6 +20,7 @@
package org.apache.rave.portal.repository.impl;
import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.impl.CategoryImpl;
import org.apache.rave.portal.model.util.WidgetStatistics;
import org.apache.rave.portal.repository.WidgetRepository;
import org.junit.Test;
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java
Mon Jun 4 15:23:21 2012
@@ -19,6 +19,7 @@
package org.apache.rave.portal.security.impl;
import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.impl.CategoryImpl;
import org.apache.rave.portal.repository.CategoryRepository;
import org.apache.rave.portal.security.ModelPermissionEvaluator;
import org.apache.rave.portal.security.util.AuthenticationUtils;
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java
Mon Jun 4 15:23:21 2012
@@ -17,7 +17,7 @@ package org.apache.rave.portal.security.
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.WidgetComment;
-import org.apache.rave.portal.model.WidgetCommentImpl;
+import org.apache.rave.portal.model.impl.WidgetCommentImpl;
import org.apache.rave.portal.repository.WidgetCommentRepository;
import org.apache.rave.portal.security.ModelPermissionEvaluator.Permission;
import org.apache.rave.portal.security.util.AuthenticationUtils;
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java
Mon Jun 4 15:23:21 2012
@@ -20,8 +20,8 @@
package org.apache.rave.portal.service.impl;
import org.apache.rave.portal.model.Category;
-import org.apache.rave.portal.model.CategoryImpl;
import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.CategoryImpl;
import org.apache.rave.portal.repository.CategoryRepository;
import org.apache.rave.portal.service.CategoryService;
import org.junit.Before;
@@ -32,8 +32,8 @@ import java.util.Date;
import java.util.List;
import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.assertThat;
/**
* Test for {@link org.apache.rave.portal.service.impl.DefaultCategoryService}
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetCommentServiceTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetCommentServiceTest.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetCommentServiceTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetCommentServiceTest.java
Mon Jun 4 15:23:21 2012
@@ -15,21 +15,18 @@
*/
package org.apache.rave.portal.service.impl;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
import org.apache.rave.portal.model.WidgetComment;
-import org.apache.rave.portal.model.WidgetCommentImpl;
+import org.apache.rave.portal.model.impl.WidgetCommentImpl;
import org.apache.rave.portal.repository.WidgetCommentRepository;
import org.apache.rave.portal.service.WidgetCommentService;
import org.junit.Before;
import org.junit.Test;
+import static org.easymock.EasyMock.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
public class DefaultWidgetCommentServiceTest {
private WidgetCommentRepository widgetCommentRepository;
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java
Mon Jun 4 15:23:21 2012
@@ -21,6 +21,7 @@ package org.apache.rave.portal.service.i
import org.apache.rave.exception.DuplicateItemException;
import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.impl.CategoryImpl;
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/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java
Mon Jun 4 15:23:21 2012
@@ -20,6 +20,7 @@
package org.apache.rave.portal.web.api.rest;
import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.impl.WidgetCommentImpl;
import org.apache.rave.portal.service.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/CategoryController.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/CategoryController.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/CategoryController.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/CategoryController.java
Mon Jun 4 15:23:21 2012
@@ -16,8 +16,8 @@
package org.apache.rave.portal.web.controller.admin;
import org.apache.rave.portal.model.Category;
-import org.apache.rave.portal.model.CategoryImpl;
import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.CategoryImpl;
import org.apache.rave.portal.service.CategoryService;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.web.util.ModelKeys;
@@ -25,18 +25,12 @@ import org.apache.rave.portal.web.util.V
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.SessionAttributes;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.support.SessionStatus;
import java.util.List;
-import static
org.apache.rave.portal.web.controller.admin.AdminControllerUtil.addNavigationMenusToModel;
-import static
org.apache.rave.portal.web.controller.admin.AdminControllerUtil.checkTokens;
-import static
org.apache.rave.portal.web.controller.admin.AdminControllerUtil.isCreateDeleteOrUpdate;
+import static
org.apache.rave.portal.web.controller.admin.AdminControllerUtil.*;
@Controller
@SessionAttributes({ModelKeys.CATEGORY, ModelKeys.TOKENCHECK})
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java
Mon Jun 4 15:23:21 2012
@@ -20,6 +20,7 @@
package org.apache.rave.portal.web.api.rest;
import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.impl.WidgetCommentImpl;
import org.apache.rave.portal.service.*;
import org.junit.Before;
import org.junit.Test;
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java
Mon Jun 4 15:23:21 2012
@@ -17,8 +17,8 @@
package org.apache.rave.portal.web.controller.admin;
import org.apache.rave.portal.model.Category;
-import org.apache.rave.portal.model.CategoryImpl;
import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.CategoryImpl;
import org.apache.rave.portal.service.CategoryService;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.web.util.ModelKeys;
@@ -32,15 +32,8 @@ import org.springframework.web.bind.supp
import java.util.ArrayList;
import java.util.List;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertSame;
-import static junit.framework.Assert.assertTrue;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
+import static junit.framework.Assert.*;
+import static org.easymock.EasyMock.*;
/**
* Test for {@link CategoryController}
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java
Mon Jun 4 15:23:21 2012
@@ -20,8 +20,8 @@
package org.apache.rave.portal.web.controller.admin;
import org.apache.rave.portal.model.Category;
-import org.apache.rave.portal.model.CategoryImpl;
import org.apache.rave.portal.model.Widget;
+import org.apache.rave.portal.model.impl.CategoryImpl;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.service.CategoryService;
import org.apache.rave.portal.service.PortalPreferenceService;
@@ -32,7 +32,6 @@ import org.apache.rave.portal.web.util.P
import org.apache.rave.portal.web.util.ViewNames;
import org.apache.rave.portal.web.validator.UpdateWidgetValidator;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.springframework.ui.ExtendedModelMap;
import org.springframework.ui.Model;
@@ -45,9 +44,9 @@ import org.springframework.web.bind.supp
import java.util.ArrayList;
import java.util.List;
-import static org.junit.Assert.*;
import static org.easymock.EasyMock.*;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.*;
/**
* Test for {@link WidgetController}
Modified:
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/CategoryEditorTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/CategoryEditorTest.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/CategoryEditorTest.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/CategoryEditorTest.java
Mon Jun 4 15:23:21 2012
@@ -19,17 +19,15 @@
package org.apache.rave.portal.web.controller.util;
import org.apache.rave.portal.model.Category;
-import org.apache.rave.portal.model.CategoryImpl;
+import org.apache.rave.portal.model.impl.CategoryImpl;
import org.apache.rave.portal.service.CategoryService;
import org.junit.Before;
import org.junit.Test;
-import java.awt.*;
-
+import static org.easymock.EasyMock.*;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
-import static org.easymock.EasyMock.*;
public class CategoryEditorTest {
private CategoryEditor categoryEditor;
Modified:
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java
(original)
+++
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java
Mon Jun 4 15:23:21 2012
@@ -897,7 +897,7 @@ public class FieldRestrictingPerson impl
}
private Organization
convertOrganization(org.apache.rave.portal.model.Organization org) {
- Organization converted = new OrganizationImpl();
+ Organization converted = new
org.apache.shindig.social.core.model.OrganizationImpl();
converted.setAddress(convertAddress(org.getAddress()));
converted.setDescription(org.getDescription());
converted.setStartDate(org.getStartDate());
Modified:
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java
(original)
+++
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java
Mon Jun 4 15:23:21 2012
@@ -22,24 +22,23 @@ package org.apache.rave.opensocial.servi
import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.opensocial.service.impl.FieldRestrictingPerson;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.JpaAddress;
+import org.apache.rave.portal.model.JpaPersonProperty;
+import org.apache.rave.portal.model.PersonProperty;
+import org.apache.rave.portal.model.impl.PersonImpl;
import org.apache.rave.portal.model.util.ModelUtils;
import org.apache.shindig.protocol.model.EnumImpl;
import org.apache.shindig.social.core.model.AddressImpl;
import org.apache.shindig.social.core.model.BodyTypeImpl;
import org.apache.shindig.social.core.model.UrlImpl;
import org.apache.shindig.social.opensocial.model.*;
-import org.apache.shindig.social.opensocial.model.Address;
-import org.apache.shindig.social.opensocial.model.Person;
import org.junit.Test;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
Modified:
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java?rev=1346008&r1=1346007&r2=1346008&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java
(original)
+++
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java
Mon Jun 4 15:23:21 2012
@@ -23,7 +23,7 @@ import com.google.common.collect.Lists;
import org.apache.rave.opensocial.repository.PersonRepository;
import org.apache.rave.opensocial.service.impl.DefaultPersonService;
import org.apache.rave.opensocial.service.impl.FieldRestrictingPerson;
-import org.apache.rave.portal.model.PersonImpl;
+import org.apache.rave.portal.model.impl.PersonImpl;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.protocol.ProtocolException;
import org.apache.shindig.protocol.RestfulCollection;
@@ -43,15 +43,9 @@ import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.expect;
-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.easymock.EasyMock.*;
+import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
public class PersonServiceTest {
