You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by cg...@apache.org on 2013/03/22 17:13:07 UTC
svn commit: r1459881 [7/8] - in /rave/trunk: ./ rave-components/
rave-components/rave-core-api/ rave-components/rave-core-api/src/
rave-components/rave-core-api/src/main/
rave-components/rave-core-api/src/main/java/
rave-components/rave-core-api/src/ma...
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,9 @@
package org.apache.rave.portal.web.controller.admin;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.Authority;
+import org.apache.rave.model.PortalPreference;
+import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.service.AuthorityService;
@@ -262,7 +264,7 @@ public class UserController {
/**
- * Mapping between the submitted form value and an {@link org.apache.rave.portal.model.Authority}
+ * Mapping between the submitted form value and an {@link org.apache.rave.model.Authority}
*/
private class AuthorityEditor extends PropertyEditorSupport {
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java Fri Mar 22 16:12:58 2013
@@ -19,10 +19,10 @@
package org.apache.rave.portal.web.controller.admin;
-import org.apache.rave.portal.model.Category;
-import org.apache.rave.portal.model.PortalPreference;
-import org.apache.rave.portal.model.Widget;
-import org.apache.rave.portal.model.WidgetStatus;
+import org.apache.rave.model.Category;
+import org.apache.rave.model.PortalPreference;
+import org.apache.rave.model.Widget;
+import org.apache.rave.model.WidgetStatus;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.service.CategoryService;
import org.apache.rave.portal.service.PortalPreferenceService;
@@ -41,7 +41,7 @@ import org.springframework.web.bind.WebD
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.support.SessionStatus;
-import static org.apache.rave.portal.model.WidgetStatus.values;
+import static org.apache.rave.model.WidgetStatus.values;
import static org.apache.rave.portal.web.controller.admin.AdminControllerUtil.*;
/**
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=1459881&r1=1459880&r2=1459881&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 Mar 22 16:12:58 2013
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.ViewNames;
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/CategoryEditor.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/CategoryEditor.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/CategoryEditor.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/CategoryEditor.java Fri Mar 22 16:12:58 2013
@@ -17,7 +17,7 @@ package org.apache.rave.portal.web.contr
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.rave.portal.model.Category;
+import org.apache.rave.model.Category;
import org.apache.rave.portal.service.CategoryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -25,7 +25,7 @@ import org.springframework.stereotype.Co
import java.beans.PropertyEditorSupport;
/**
- * Mapping between the submitted form value and a {@link org.apache.rave.portal.model.Category}
+ * Mapping between the submitted form value and a {@link org.apache.rave.model.Category}
*/
@Component
public class CategoryEditor extends PropertyEditorSupport {
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ControllerUtils.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ControllerUtils.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ControllerUtils.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ControllerUtils.java Fri Mar 22 16:12:58 2013
@@ -21,7 +21,7 @@ package org.apache.rave.portal.web.contr
import javax.servlet.http.HttpServletRequest;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.User;
import org.apache.rave.portal.web.model.NavigationItem;
import org.apache.rave.portal.web.model.NavigationMenu;
import org.apache.rave.portal.web.util.ViewNames;
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ModelUtils.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ModelUtils.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ModelUtils.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ModelUtils.java Fri Mar 22 16:12:58 2013
@@ -18,8 +18,8 @@
*/
package org.apache.rave.portal.web.controller.util;
-import org.apache.rave.portal.model.Authority;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.Authority;
+import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.web.model.UserForm;
import org.apache.rave.util.CollectionUtils;
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.model;
-import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.model.PortalPreference;
import org.apache.rave.portal.model.impl.PortalPreferenceImpl;
import java.util.Map;
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/RegionWidgetPreferenceListWrapper.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/RegionWidgetPreferenceListWrapper.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/RegionWidgetPreferenceListWrapper.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/RegionWidgetPreferenceListWrapper.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.model;
-import org.apache.rave.portal.model.RegionWidgetPreference;
+import org.apache.rave.model.RegionWidgetPreference;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
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=1459881&r1=1459880&r2=1459881&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 Mar 22 16:12:58 2013
@@ -21,7 +21,8 @@ package org.apache.rave.portal.web.secur
import org.apache.commons.lang.RandomStringUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.User;
+import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.NewAccountService;
import org.apache.rave.portal.service.UserService;
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/JavaScriptDebugModeTag.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/JavaScriptDebugModeTag.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/JavaScriptDebugModeTag.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/JavaScriptDebugModeTag.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.web.tag;
-import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.model.PortalPreference;
import org.apache.rave.portal.service.PortalPreferenceService;
import org.apache.rave.portal.web.util.PortalPreferenceKeys;
import org.slf4j.Logger;
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/PersonTag.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/PersonTag.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/PersonTag.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/PersonTag.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.web.tag;
-import org.apache.rave.portal.model.Person;
+import org.apache.rave.model.Person;
import org.apache.rave.portal.repository.PersonRepository;
import javax.servlet.jsp.JspException;
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=1459881&r1=1459880&r2=1459881&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 Mar 22 16:12:58 2013
@@ -20,8 +20,8 @@
package org.apache.rave.portal.web.tag;
import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.rave.portal.model.RegionWidget;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.RegionWidget;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.web.renderer.RenderScope;
import org.apache.rave.portal.web.renderer.RenderService;
import org.apache.rave.portal.web.renderer.ScriptLocation;
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/ShowStackTraceTag.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/ShowStackTraceTag.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/ShowStackTraceTag.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/ShowStackTraceTag.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.web.tag;
-import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.model.PortalPreference;
import org.apache.rave.portal.service.PortalPreferenceService;
import org.apache.rave.portal.web.util.PortalPreferenceKeys;
import org.slf4j.Logger;
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/WidgetTag.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/WidgetTag.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/WidgetTag.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/WidgetTag.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.tag;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.repository.WidgetRepository;
/**
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=1459881&r1=1459880&r2=1459881&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 Mar 22 16:12:58 2013
@@ -20,7 +20,7 @@
package org.apache.rave.portal.web.validator;
import org.apache.commons.lang.StringUtils;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.User;
import org.apache.rave.portal.service.UserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewWidgetValidator.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewWidgetValidator.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewWidgetValidator.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewWidgetValidator.java Fri Mar 22 16:12:58 2013
@@ -19,14 +19,14 @@
package org.apache.rave.portal.web.validator;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.service.WidgetService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
/**
- * Validator for adding a new {@link org.apache.rave.portal.model.Widget}
+ * Validator for adding a new {@link org.apache.rave.model.Widget}
*/
@Component
public class NewWidgetValidator extends WidgetValidator {
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UpdateWidgetValidator.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UpdateWidgetValidator.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UpdateWidgetValidator.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UpdateWidgetValidator.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.validator;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.service.WidgetService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
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=1459881&r1=1459880&r2=1459881&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 Mar 22 16:12:58 2013
@@ -20,7 +20,7 @@ package org.apache.rave.portal.web.valid
import org.apache.commons.lang.StringUtils;
import org.apache.commons.validator.routines.EmailValidator;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.User;
import org.apache.rave.portal.service.UserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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=1459881&r1=1459880&r2=1459881&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 Mar 22 16:12:58 2013
@@ -22,13 +22,13 @@ package org.apache.rave.portal.web.valid
import org.apache.commons.lang.StringUtils;
import org.apache.commons.validator.routines.RegexValidator;
import org.apache.commons.validator.routines.UrlValidator;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Widget;
import org.springframework.validation.Errors;
import org.springframework.validation.ValidationUtils;
import org.springframework.validation.Validator;
/**
-Abstract {@link Validator} for {@link org.apache.rave.portal.model.Widget}'s
+Abstract {@link Validator} for {@link org.apache.rave.model.Widget}'s
*/
public abstract class WidgetValidator implements Validator {
protected static final String FIELD_URL = "url";
@@ -42,7 +42,7 @@ public abstract class WidgetValidator im
}
/**
- * Supports {@link org.apache.rave.portal.model.Widget}
+ * Supports {@link org.apache.rave.model.Widget}
* <p/>
* {@inheritDoc}
*/
@@ -65,7 +65,7 @@ public abstract class WidgetValidator im
/**
* Checks if a Widget already exists for this URL.
- * @param widget {@link org.apache.rave.portal.model.Widget} to validate
+ * @param widget {@link org.apache.rave.model.Widget} to validate
* @param errors {@link Errors}
*/
protected abstract void validateIfWidgetAlreadyExists(Widget widget, Errors errors);
@@ -86,7 +86,7 @@ public abstract class WidgetValidator im
/**
* Validates fields that may contain a URL
*
- * @param widget {@link org.apache.rave.portal.model.Widget} to validate
+ * @param widget {@link org.apache.rave.model.Widget} to validate
* @param errors {@link org.springframework.validation.Errors}
*/
private void validateUrlFields(Widget widget, Errors errors) {
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java Fri Mar 22 16:12:58 2013
@@ -18,8 +18,11 @@
*/
package org.apache.rave.portal.web.api.rest;
+import org.apache.rave.model.Page;
+import org.apache.rave.model.Region;
+import org.apache.rave.model.RegionWidget;
+import org.apache.rave.model.RegionWidgetPreference;
import org.apache.rave.portal.model.impl.*;
-import org.apache.rave.portal.model.*;
import org.springframework.http.HttpStatus;
import org.springframework.mock.web.MockHttpServletResponse;
import org.apache.rave.portal.service.OmdlService;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/RegionWidgetApiTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/RegionWidgetApiTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/RegionWidgetApiTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/RegionWidgetApiTest.java Fri Mar 22 16:12:58 2013
@@ -19,8 +19,8 @@
package org.apache.rave.portal.web.api.rest;
-import org.apache.rave.portal.model.RegionWidget;
-import org.apache.rave.portal.model.RegionWidgetPreference;
+import org.apache.rave.model.RegionWidget;
+import org.apache.rave.model.RegionWidgetPreference;
import org.apache.rave.portal.model.impl.RegionWidgetImpl;
import org.apache.rave.portal.model.impl.RegionWidgetPreferenceImpl;
import org.apache.rave.portal.service.RegionWidgetService;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.api.rest;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.*;
import org.apache.rave.portal.model.impl.*;
import org.apache.rave.portal.service.*;
import org.junit.Before;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rpc/PageApiTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rpc/PageApiTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rpc/PageApiTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rpc/PageApiTest.java Fri Mar 22 16:12:58 2013
@@ -19,9 +19,9 @@
package org.apache.rave.portal.web.api.rpc;
-import org.apache.rave.portal.model.Page;
-import org.apache.rave.portal.model.Region;
-import org.apache.rave.portal.model.RegionWidget;
+import org.apache.rave.model.Page;
+import org.apache.rave.model.Region;
+import org.apache.rave.model.RegionWidget;
import org.apache.rave.portal.model.impl.*;
import org.apache.rave.portal.service.OmdlService;
import org.apache.rave.portal.service.PageService;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java Fri Mar 22 16:12:58 2013
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertTha
import java.util.ArrayList;
import java.util.List;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.CaptchaService;
import org.apache.rave.portal.service.NewAccountService;
@@ -127,7 +127,7 @@ public class NewAccountControllerTest {
final String username = "canonical"; //specified username already exists in database
final String password = "password";
final String confirmPassword = password;
- final User existingUser = new UserImpl();
+ final org.apache.rave.model.User existingUser = new UserImpl();
List<ObjectError> errorList = new ArrayList<ObjectError>();
final ObjectError error = new ObjectError("username.exists", "Username already exists");
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java Fri Mar 22 16:12:58 2013
@@ -19,10 +19,10 @@
package org.apache.rave.portal.web.controller;
-import org.apache.rave.portal.model.Page;
-import org.apache.rave.portal.model.PageInvitationStatus;
-import org.apache.rave.portal.model.PageLayout;
-import org.apache.rave.portal.model.PageUser;
+import org.apache.rave.model.Page;
+import org.apache.rave.model.PageInvitationStatus;
+import org.apache.rave.model.PageLayout;
+import org.apache.rave.model.PageUser;
import org.apache.rave.portal.model.impl.PageImpl;
import org.apache.rave.portal.model.impl.PageLayoutImpl;
import org.apache.rave.portal.model.impl.PageUserImpl;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java Fri Mar 22 16:12:58 2013
@@ -19,16 +19,15 @@
package org.apache.rave.portal.web.controller;
-import org.apache.rave.portal.model.Page;
-import org.apache.rave.portal.model.PageLayout;
-import org.apache.rave.portal.model.Person;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.Page;
+import org.apache.rave.model.PageLayout;
+import org.apache.rave.model.Person;
+import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.PageImpl;
import org.apache.rave.portal.model.impl.PageLayoutImpl;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.PageService;
import org.apache.rave.portal.service.UserService;
-import org.apache.rave.portal.service.WidgetService;
import org.apache.rave.portal.web.model.UserForm;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.portal.web.util.ViewNames;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java Fri Mar 22 16:12:58 2013
@@ -20,9 +20,10 @@
package org.apache.rave.portal.web.controller;
-import org.apache.rave.portal.model.Category;
-import org.apache.rave.portal.model.Tag;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Category;
+import org.apache.rave.model.Widget;
+import org.apache.rave.model.Tag;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.model.util.SearchResult;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java Fri Mar 22 16:12:58 2013
@@ -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.User;
+import org.apache.rave.model.Category;
+import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.CategoryImpl;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.CategoryService;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/PortalPreferenceControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/PortalPreferenceControllerTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/PortalPreferenceControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/PortalPreferenceControllerTest.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.controller.admin;
-import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.model.PortalPreference;
import org.apache.rave.portal.model.impl.PortalPreferenceImpl;
import org.apache.rave.portal.service.PortalPreferenceService;
import org.apache.rave.portal.web.model.PortalPreferenceForm;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java Fri Mar 22 16:12:58 2013
@@ -19,8 +19,8 @@
package org.apache.rave.portal.web.controller.admin;
-import org.apache.rave.portal.model.Authority;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.Authority;
+import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.AuthorityImpl;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.util.SearchResult;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java Fri Mar 22 16:12:58 2013
@@ -19,8 +19,8 @@
package org.apache.rave.portal.web.controller.admin;
-import org.apache.rave.portal.model.Category;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Category;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.model.impl.CategoryImpl;
import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.model.util.SearchResult;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/CategoryEditorTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/CategoryEditorTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/CategoryEditorTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/CategoryEditorTest.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.web.controller.util;
-import org.apache.rave.portal.model.Category;
+import org.apache.rave.model.Category;
import org.apache.rave.portal.model.impl.CategoryImpl;
import org.apache.rave.portal.service.CategoryService;
import org.junit.Before;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/ControllerUtilsTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/ControllerUtilsTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/ControllerUtilsTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/ControllerUtilsTest.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.web.controller.util;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.UserImpl;
import org.junit.Before;
import org.junit.Test;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/interceptors/CommonModelHandlerInterceptorTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/interceptors/CommonModelHandlerInterceptorTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/interceptors/CommonModelHandlerInterceptorTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/interceptors/CommonModelHandlerInterceptorTest.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.interceptors;
-import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.model.PortalPreference;
import org.apache.rave.portal.service.PortalPreferenceService;
import org.apache.rave.portal.web.util.ModelKeys;
import org.apache.rave.service.StaticContentFetcherService;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.model;
-import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.model.PortalPreference;
import org.apache.rave.portal.model.impl.PortalPreferenceImpl;
import org.junit.Before;
import org.junit.Test;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapperTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapperTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapperTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapperTest.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,8 @@
package org.apache.rave.portal.web.security;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.User;
+import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.NewAccountService;
import org.apache.rave.portal.service.UserService;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/JavaScriptDebugModeTagTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/JavaScriptDebugModeTagTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/JavaScriptDebugModeTagTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/JavaScriptDebugModeTagTest.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.web.tag;
-import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.model.PortalPreference;
import org.apache.rave.portal.model.impl.PortalPreferenceImpl;
import org.apache.rave.portal.service.PortalPreferenceService;
import org.apache.rave.portal.web.util.PortalPreferenceKeys;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/PersonTagTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/PersonTagTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/PersonTagTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/PersonTagTest.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.web.tag;
-import org.apache.rave.portal.model.Person;
+import org.apache.rave.model.Person;
import org.apache.rave.portal.model.impl.PersonImpl;
import org.apache.rave.portal.repository.PersonRepository;
import org.junit.Before;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java Fri Mar 22 16:12:58 2013
@@ -19,8 +19,8 @@
package org.apache.rave.portal.web.tag;
-import org.apache.rave.portal.model.Region;
-import org.apache.rave.portal.model.RegionWidget;
+import org.apache.rave.model.Region;
+import org.apache.rave.model.RegionWidget;
import org.apache.rave.portal.model.impl.RegionImpl;
import org.apache.rave.portal.model.impl.RegionWidgetImpl;
import org.apache.rave.portal.model.impl.WidgetImpl;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/ShowStackTraceTagTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/ShowStackTraceTagTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/ShowStackTraceTagTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/ShowStackTraceTagTest.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.web.tag;
-import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.model.PortalPreference;
import org.apache.rave.portal.model.impl.PortalPreferenceImpl;
import org.apache.rave.portal.service.PortalPreferenceService;
import org.apache.rave.portal.web.util.PortalPreferenceKeys;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewAccountValidatorTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewAccountValidatorTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewAccountValidatorTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewAccountValidatorTest.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.validator;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.User;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.web.model.UserForm;
import org.junit.Before;
@@ -49,7 +49,7 @@ public class NewAccountValidatorTest {
@Test
public void testSupports() throws Exception {
- assertTrue("Can validate org.apache.rave.portal.model.User",
+ assertTrue("Can validate org.apache.rave.model.User",
newAccountValidator.supports(UserForm.class));
}
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewWidgetValidatorTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewWidgetValidatorTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewWidgetValidatorTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewWidgetValidatorTest.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.validator;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.service.WidgetService;
import org.junit.Before;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/PortalPreferenceFormValidatorTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/PortalPreferenceFormValidatorTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/PortalPreferenceFormValidatorTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/PortalPreferenceFormValidatorTest.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.validator;
-import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.model.PortalPreference;
import org.apache.rave.portal.model.impl.PortalPreferenceImpl;
import org.apache.rave.portal.web.model.PortalPreferenceForm;
import org.junit.Before;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UpdateWidgetValidatorTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UpdateWidgetValidatorTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UpdateWidgetValidatorTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UpdateWidgetValidatorTest.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.validator;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.service.WidgetService;
import org.junit.Before;
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UserProfileValidatorTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UserProfileValidatorTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UserProfileValidatorTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UserProfileValidatorTest.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.validator;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.UserService;
import org.junit.Before;
@@ -45,7 +45,7 @@ public class UserProfileValidatorTest {
@Test
public void testSupports() throws Exception {
- assertTrue("Can validate org.apache.rave.portal.model.User", validator.supports(UserImpl.class));
+ assertTrue("Can validate org.apache.rave.model.User", validator.supports(UserImpl.class));
}
@Test
Modified: rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/WidgetValidatorTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/WidgetValidatorTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/WidgetValidatorTest.java (original)
+++ rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/WidgetValidatorTest.java Fri Mar 22 16:12:58 2013
@@ -21,7 +21,7 @@ package org.apache.rave.portal.web.valid
import org.apache.commons.validator.routines.RegexValidator;
import org.apache.commons.validator.routines.UrlValidator;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.model.impl.WidgetImpl;
import org.junit.Before;
import org.junit.Test;
@@ -44,7 +44,7 @@ public class WidgetValidatorTest {
@Test
public void testSupports() throws Exception {
- assertTrue("Supports org.apache.rave.portal.model.Widget", widgetValidator.supports(WidgetImpl.class));
+ assertTrue("Supports org.apache.rave.model.Widget", widgetValidator.supports(WidgetImpl.class));
}
/*
Modified: rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/java/CustomUserService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/java/CustomUserService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/java/CustomUserService.java (original)
+++ rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/java/CustomUserService.java Fri Mar 22 16:12:58 2013
@@ -22,7 +22,7 @@
package ${package};
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.User;
import org.apache.rave.portal.repository.CategoryRepository;
import org.apache.rave.portal.repository.PageRepository;
import org.apache.rave.portal.repository.PageTemplateRepository;
Modified: rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/java/CustomUserServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/java/CustomUserServiceTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/java/CustomUserServiceTest.java (original)
+++ rave/trunk/rave-custom-project-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/test/java/CustomUserServiceTest.java Fri Mar 22 16:12:58 2013
@@ -22,7 +22,7 @@
package ${package};
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.repository.CategoryRepository;
import org.apache.rave.portal.repository.PageRepository;
Modified: rave/trunk/rave-portal-dependencies/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-dependencies/pom.xml?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal-dependencies/pom.xml (original)
+++ rave/trunk/rave-portal-dependencies/pom.xml Fri Mar 22 16:12:58 2013
@@ -141,6 +141,12 @@
<artifactId>tiles-jsp</artifactId>
</dependency>
+ <!-- CXF -->
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-bundle-jaxrs</artifactId>
+ </dependency>
+
</dependencies>
</project>
Modified: rave/trunk/rave-portal-resources/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/pom.xml?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/pom.xml (original)
+++ rave/trunk/rave-portal-resources/pom.xml Fri Mar 22 16:12:58 2013
@@ -67,6 +67,15 @@
<artifactId>tiles-jsp</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-bundle-jaxrs</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-jaxrs</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext.xml?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext.xml Fri Mar 22 16:12:58 2013
@@ -147,6 +147,7 @@ be overridden by setting a system proper
<import resource="classpath*:org/apache/rave/core-applicationContext.xml"/>
<import resource="classpath*:org/apache/rave/web-applicationContext.xml"/>
+ <import resource="cxf-applicationContext.xml"/>
<import resource="classpath*:org/apache/rave/opensocial-provider-applicationContext.xml"/>
<import resource="classpath*:org/apache/rave/w3c-provider-applicationContext.xml"/>
Added: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/cxf-applicationContext.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/cxf-applicationContext.xml?rev=1459881&view=auto
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/cxf-applicationContext.xml (added)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/cxf-applicationContext.xml Fri Mar 22 16:12:58 2013
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxrs
+ http://cxf.apache.org/schemas/jaxrs.xsd">
+
+ <!-- do not use import statements if CXFServlet init parameters link to this beans.xml -->
+
+ <import resource="classpath:META-INF/cxf/cxf.xml"/>
+ <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
+
+ <jaxrs:server id="rave" address="/rest">
+ <jaxrs:providers>
+ <bean class="org.apache.cxf.jaxrs.provider.JAXBElementProvider"/>
+ </jaxrs:providers>
+ <jaxrs:serviceBeans>
+ <ref bean="peopleBean"/>
+ <ref bean="usersBean"/>
+ </jaxrs:serviceBeans>
+ </jaxrs:server>
+
+ <bean id="peopleBean" class="org.apache.rave.rest.impl.DefaultPeopleResource">
+ <property name="userService" ref="userService"/>
+ </bean>
+
+ <bean id="usersBean" class="org.apache.rave.rest.impl.DefaultUsersResource">
+ <property name="userService" ref="userService"/>
+ </bean>
+</beans>
\ No newline at end of file
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_3_newuser.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_3_newuser.jsp?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_3_newuser.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_3_newuser.jsp Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
--%>
<fmt:setBundle basename="messages"/>
-<%--@elvariable id="page" type="org.apache.rave.portal.model.Page"--%>
+<%--@elvariable id="page" type="org.apache.rave.model.Page"--%>
<div class="columns_3_newuser_static">
<fmt:message key="page.layout.newuser.introtext"/>
</div>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp Fri Mar 22 16:12:58 2013
@@ -42,7 +42,7 @@
<h2><fmt:message key="admin.preferences.shorttitle"/></h2>
<spring:url value="/app/admin/preferencedetail/edit?referringPageId=${referringPageId}" var="detaillink"/>
- <%--@elvariable id="preferenceMap" type="java.util.Map<java.lang.String, org.apache.rave.portal.model.PortalPreference>"--%>
+ <%--@elvariable id="preferenceMap" type="java.util.Map<java.lang.String, org.apache.rave.model.PortalPreference>"--%>
<c:choose>
<c:when test="${fn:length(preferenceMap) eq 0}">
<a class="btn btn-primary" href="<c:out value="${detaillink}"/>"><fmt:message key="admin.preferences.edit"/></a>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp Fri Mar 22 16:12:58 2013
@@ -117,7 +117,7 @@
</fieldset>
<fieldset>
<span class="control-label"><fmt:message key="admin.userdata.authorities"/></span>
- <%--@elvariable id="authorities" type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.Authority>"--%>
+ <%--@elvariable id="authorities" type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.model.Authority>"--%>
<ul class="checkboxlist">
<form:checkboxes path="authorities" items="${authorities.resultSet}" itemLabel="authority" itemValue="authority" element="li"/>
</ul>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-<%--@elvariable id="searchResult" type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.User>"--%>
+<%--@elvariable id="searchResult" type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.model.User>"--%>
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-<%--@elvariable id="searchResult" type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.portal.model.Widget>"--%>
+<%--@elvariable id="searchResult" type="org.apache.rave.portal.model.util.SearchResult<org.apache.rave.model.Widget>"--%>
<fmt:message key="${pageTitleKey}" var="pagetitle"/>
<rave:navbar pageTitle="${pagetitle}"/>
<div class="container-fluid">
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp Fri Mar 22 16:12:58 2013
@@ -19,8 +19,8 @@
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-<jsp:useBean id="pages" type="java.util.List<org.apache.rave.portal.model.Page>" scope="request"/>
-<%--@elvariable id="page" type="org.apache.rave.portal.model.Page"--%>
+<jsp:useBean id="pages" type="java.util.List<org.apache.rave.model.Page>" scope="request"/>
+<%--@elvariable id="page" type="org.apache.rave.model.Page"--%>
<sec:authentication property="principal.username" var="principleUsername" scope="request"/>
<sec:authentication property="principal.displayName" var="displayName" scope="request"/>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp Fri Mar 22 16:12:58 2013
@@ -20,11 +20,11 @@
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-<jsp:useBean id="pages" type="java.util.List<org.apache.rave.portal.model.Page>" scope="request"/>
-<jsp:useBean id="pageUser" type="org.apache.rave.portal.model.PageUser" scope="request"/>
+<jsp:useBean id="pages" type="java.util.List<org.apache.rave.model.Page>" scope="request"/>
+<jsp:useBean id="pageUser" type="org.apache.rave.model.PageUser" scope="request"/>
<jsp:useBean id="pageLayouts" type="java.util.List" scope="request"/>
-<%--@elvariable id="page" type="org.apache.rave.portal.model.Page"--%>
+<%--@elvariable id="page" type="org.apache.rave.model.Page"--%>
<sec:authentication property="principal.id" var="principalId" scope="request"/>
<sec:authentication property="principal.username" var="principleUsername" scope="request"/>
<sec:authentication property="principal.displayName" var="displayName" scope="request"/>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp Fri Mar 22 16:12:58 2013
@@ -21,7 +21,7 @@
<%@ page errorPage="/WEB-INF/jsp/views/error.jsp" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-<jsp:useBean id="userProfile" type="org.apache.rave.portal.model.User" scope="request"/>
+<jsp:useBean id="userProfile" type="org.apache.rave.model.User" scope="request"/>
<sec:authentication property="principal.username" var="principleUsername" scope="request"/>
<sec:authentication property="principal.displayName" var="displayName" scope="request"/>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/regionwidget.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/regionwidget.jsp?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/regionwidget.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/regionwidget.jsp Fri Mar 22 16:12:58 2013
@@ -20,6 +20,6 @@
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-<%--@elvariable id="regionWidget" type="org.apache.rave.portal.model.RegionWidget"--%>
+<%--@elvariable id="regionWidget" type="org.apache.rave.model.RegionWidget"--%>
<rave:region_widget regionWidget="${regionWidget}" />
<portal:render-script location="${'AFTER_RAVE'}" />
\ No newline at end of file
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp Fri Mar 22 16:12:58 2013
@@ -76,7 +76,7 @@
</div>
</c:if>
<ul class="storeItems">
- <%--@elvariable id="widget" type="org.apache.rave.portal.model.Widget"--%>
+ <%--@elvariable id="widget" type="org.apache.rave.model.Widget"--%>
<c:forEach var="widget" items="${widgets.resultSet}">
<%--@elvariable id="widgetsStatistics" type="org.apache.rave.portal.model.util.WidgetStatistics"--%>
<c:set var="widgetStatistics" value="${widgetsStatistics[widget.id]}"/>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/userProfile.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/userProfile.jsp?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/userProfile.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/userProfile.jsp Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
-<jsp:useBean id="userProfile" type="org.apache.rave.portal.model.User" scope="request"/>
+<jsp:useBean id="userProfile" type="org.apache.rave.model.User" scope="request"/>
<div id="content">
<h1>${pagetitle}</h1>
<form:form id="userProfileForm" commandName="userProfile" action="updateUserProfile" method="POST">
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region.tag
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region.tag?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region.tag (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region.tag Fri Mar 22 16:12:58 2013
@@ -24,12 +24,12 @@ Template for rendering a Region on a pag
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
-<%@ attribute name="region" type="org.apache.rave.portal.model.Region" required="true" description="The region object" %>
+<%@ attribute name="region" type="org.apache.rave.model.Region" required="true" description="The region object" %>
<%@ attribute name="regionIdx" required="true" description="The regionIdx" %>
<fmt:setBundle basename="messages"/>
-<%--@elvariable id="region" type="org.apache.rave.portal.model.Region"--%>
+<%--@elvariable id="region" type="org.apache.rave.model.Region"--%>
<div class="region<c:if test="${region.locked || pageUser.editor == false}"> region-locked</c:if> <c:out value="${region.page.pageLayout.code}"/>_${regionIdx} regionNonDragging" id="region-${region.id}-id">
<c:forEach var="regionWidget" items="${region.regionWidgets}">
<rave:region_widget regionWidget="${regionWidget}" />
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag Fri Mar 22 16:12:58 2013
@@ -24,13 +24,13 @@ Template for rendering a RegionWidget in
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib prefix="portal" uri="http://www.apache.org/rave/tags" %>
-<%@ attribute name="regionWidget" type="org.apache.rave.portal.model.RegionWidget" required="true" description="The regionWidget object" %>
+<%@ attribute name="regionWidget" type="org.apache.rave.model.RegionWidget" required="true" description="The regionWidget object" %>
<portal:widget var="widget" id="${regionWidget.widgetId}" />
<c:set var="isLocked" value="${regionWidget.locked}" />
<c:set var="isHideChrome" value="${regionWidget.hideChrome}" />
<fmt:setBundle basename="messages"/>
-<%--@elvariable id="regionWidget" type="org.apache.rave.portal.model.RegionWidget"--%>
+<%--@elvariable id="regionWidget" type="org.apache.rave.model.RegionWidget"--%>
<div class="widget-wrapper<c:if test="${isLocked}"> widget-wrapper-locked</c:if><c:if test="${isHideChrome}"> widget-wrapper-hidechrome</c:if>" id="widget-${regionWidget.id}-wrapper">
<c:if test="${!isHideChrome}">
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/simple_regions.tag
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/simple_regions.tag?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/simple_regions.tag (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/simple_regions.tag Fri Mar 22 16:12:58 2013
@@ -23,9 +23,9 @@ simply render each region one after anot
--%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
-<%@ attribute name="page" type="org.apache.rave.portal.model.Page" required="true" description="The Page object" %>
+<%@ attribute name="page" type="org.apache.rave.model.Page" required="true" description="The Page object" %>
-<%--@elvariable id="region" type="org.apache.rave.portal.model.Region"--%>
+<%--@elvariable id="region" type="org.apache.rave.model.Region"--%>
<div class="widgetRow bottomRow">
<c:forEach var="region" items="${page.regions}" varStatus="status">
<rave:region region="${region}" regionIdx="${status.count}" />
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/title.tag
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/title.tag?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/title.tag (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/title.tag Fri Mar 22 16:12:58 2013
@@ -21,7 +21,7 @@
<fmt:setBundle basename="messages"/>
<c:set var="profileTitleKey" value="page.profile.title" />
<c:set var="personProfileTitleKey" value="page.personProfile.title" />
-<%--@elvariable id="page" type="org.apache.rave.portal.model.Page"--%>
+<%--@elvariable id="page" type="org.apache.rave.model.Page"--%>
<%-- determine if this is a user page, and if so, display the page name in the HTML title --%>
<c:choose>
<c:when test="${not empty page}">
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/web.xml?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/web.xml Fri Mar 22 16:12:58 2013
@@ -72,6 +72,17 @@
<url-pattern>/login</url-pattern>
</servlet-mapping>
+ <servlet>
+ <servlet-name>CXFServlet</servlet-name>
+ <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>CXFServlet</servlet-name>
+ <url-pattern>/api/*</url-pattern>
+ </servlet-mapping>
+
<welcome-file-list>
<welcome-file>index.html</welcome-file>
</welcome-file-list>
Modified: rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java (original)
+++ rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java Fri Mar 22 16:12:58 2013
@@ -20,10 +20,10 @@
package renderer;
-import org.apache.rave.portal.model.Page;
-import org.apache.rave.portal.model.Region;
-import org.apache.rave.portal.model.RegionWidget;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.Page;
+import org.apache.rave.model.Region;
+import org.apache.rave.model.RegionWidget;
+import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.*;
import org.apache.rave.portal.repository.UserRepository;
import org.apache.rave.portal.web.renderer.RenderService;
Modified: rave/trunk/rave-portal/src/test/resources/portal.properties
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal/src/test/resources/portal.properties?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal/src/test/resources/portal.properties (original)
+++ rave/trunk/rave-portal/src/test/resources/portal.properties Fri Mar 22 16:12:58 2013
@@ -17,6 +17,8 @@
# under the License.
#
+# the application version, taken from the maven POM
+portal.version=${project.version}
#
# These properties are used to construct the opensocial engine's URL. See
# for example page.jsp. Changing them does not change the actual path configuration
@@ -44,13 +46,14 @@ jpa.jpaDialect=org.apache.rave.persisten
jpa.jpaVendorAdapter.databasePlatform=org.apache.openjpa.jdbc.sql.H2Dictionary
jpa.jpaVendorAdapter.database=H2
-# General Rave jpa database settings
+# General Rave portal database settings
jpa.jpaVendorAdapter.showSql=true
-jpa.openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=INFO, SQL=WARN
+jpa.openjpa.Log=DefaultLevel=WARN, Runtime=WARN, Tool=WARN, SQL=WARN
jpa.openjpa.RuntimeUnenhancedClasses=unsupported
jpa.openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true)
jpa.openjpa.jdbc.MappingDefaults=ForeignKeyDeleteAction=restrict, JoinForeignKeyDeleteAction=restrict
+
###################################################################
# Properties related to the Rave MongoDB implementation #
###################################################################
@@ -68,8 +71,12 @@ mongo.socketKeepAlive=true
mongo.socketTimeout=60000
mongo.slaveOk=true
+
provider.wookie.wookieServerUrl=http://localhost:8080/wookie
provider.wookie.wookieApiKey=TEST
+provider.wookie.adminUsername=
+provider.wookie.adminPassword=
+
# captcha settings
portal.captcha.enabled=false
portal.captcha.key.private=
@@ -98,3 +105,5 @@ portal.user.account.admin.email=
portal.user.account.admin.subject=Rave User Approval
portal.user.account.admin.template=admin_approval.ftl
portal.mail.service.loginpage=http://localhost:8080/portal/
+# Enable/disable omdl import and export in UI
+portal.export.ui.enable=false
Modified: rave/trunk/rave-portal/src/test/resources/test-applicationContext.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal/src/test/resources/test-applicationContext.xml?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-portal/src/test/resources/test-applicationContext.xml (original)
+++ rave/trunk/rave-portal/src/test/resources/test-applicationContext.xml Fri Mar 22 16:12:58 2013
@@ -19,8 +19,37 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
+
+ <!-- make the the portal.properties props available to autowire injectors, location of the properties can
+be overridden by setting a system property "portal.override.properties" -->
+ <bean id="portalPropertyPlaceholder" class="org.apache.rave.util.OverridablePropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ <property name="systemPropertyName" value="portal.override.properties"/>
+ <property name="location" value="classpath:portal.properties"/>
+ </bean>
+
+ <!-- bean post-processor for JPA annotations -->
+ <context:annotation-config/>
+
+ <!-- enable the use of the @AspectJ style of Spring AOP -->
+ <aop:aspectj-autoproxy/>
+
+ <!-- rave-common component base-package scan (maybe move to a separate common-applicationContext.xml?) -->
+ <context:component-scan base-package="org.apache.rave.service"/>
+ <context:component-scan base-package="org.apache.rave.synchronization"/>
+
+ <!-- rave-core component base-package scan -->
+ <context:component-scan base-package="org.apache.rave.portal.model"/>
+ <context:component-scan base-package="org.apache.rave.portal.repository"/>
<import resource="classpath:org/apache/rave/core-applicationContext.xml"/>
<import resource="classpath:org/apache/rave/web-applicationContext.xml"/>
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/SecurityTokenService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/SecurityTokenService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/SecurityTokenService.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/SecurityTokenService.java Fri Mar 22 16:12:58 2013
@@ -19,8 +19,8 @@
package org.apache.rave.provider.opensocial.service;
-import org.apache.rave.portal.model.RegionWidget;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.RegionWidget;
+import org.apache.rave.model.Widget;
import org.apache.rave.provider.opensocial.exception.SecurityTokenException;
import org.apache.shindig.auth.SecurityToken;
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/DefaultOpenSocialService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/DefaultOpenSocialService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/DefaultOpenSocialService.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/DefaultOpenSocialService.java Fri Mar 22 16:12:58 2013
@@ -20,10 +20,10 @@
package org.apache.rave.provider.opensocial.service.impl;
import org.apache.rave.exception.ResourceNotFoundException;
-import org.apache.rave.portal.model.Page;
-import org.apache.rave.portal.model.RegionWidget;
-import org.apache.rave.portal.model.Widget;
-import org.apache.rave.portal.model.WidgetStatus;
+import org.apache.rave.model.Page;
+import org.apache.rave.model.RegionWidget;
+import org.apache.rave.model.Widget;
+import org.apache.rave.model.WidgetStatus;
import org.apache.rave.portal.model.impl.RegionImpl;
import org.apache.rave.portal.model.impl.RegionWidgetImpl;
import org.apache.rave.portal.service.PageService;
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/EncryptedBlobSecurityTokenService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/EncryptedBlobSecurityTokenService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/EncryptedBlobSecurityTokenService.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/EncryptedBlobSecurityTokenService.java Fri Mar 22 16:12:58 2013
@@ -20,9 +20,9 @@
package org.apache.rave.provider.opensocial.service.impl;
import org.apache.commons.io.FileUtils;
-import org.apache.rave.portal.model.RegionWidget;
-import org.apache.rave.portal.model.User;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.RegionWidget;
+import org.apache.rave.model.User;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.model.impl.*;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.provider.opensocial.exception.SecurityTokenException;