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 2012/08/09 23:45:34 UTC
svn commit: r1371499 [1/3] - in /rave/branches/model-split: ./
rave-components/rave-core/src/main/java/org/apache/rave/portal/web/util/
rave-components/rave-core/src/test/resources/
rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/ r...
Author: cgeer
Date: Thu Aug 9 21:45:33 2012
New Revision: 1371499
URL: http://svn.apache.org/viewvc?rev=1371499&view=rev
Log:
RAVE-753 Reverse merged from trunk into branch
Added:
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/RegionWidgetController.java
- copied, changed from r1371430, rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/RegionWidgetController.java
rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/partial_layout.jsp
- copied unchanged from r1371430, rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/partial_layout.jsp
rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.w3c.jsp
- copied unchanged from r1371430, rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.w3c.jsp
rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/regionwidget.jsp
- copied unchanged from r1371430, rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/regionwidget.jsp
rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/tags/login_navbar.tag
- copied unchanged from r1371430, rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/login_navbar.tag
Modified:
rave/branches/model-split/ (props changed)
rave/branches/model-split/CHANGELOG
rave/branches/model-split/pom.xml
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java
rave/branches/model-split/rave-components/rave-core/src/test/resources/test_data.sql
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidget.java
rave/branches/model-split/rave-components/rave-jpa/src/test/resources/test_data.sql
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ControllerUtils.java
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ModelKeys.java
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ViewNames.java
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/ControllerUtilsTest.java
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java
rave/branches/model-split/rave-integration-tests/pom.xml
rave/branches/model-split/rave-integration-tests/rave-default-account-tests/src/main/java/org/apache/rave/integrationtests/steps/ProfileSteps.java
rave/branches/model-split/rave-integration-tests/rave-default-account-tests/src/main/stories/johnDoe.story
rave/branches/model-split/rave-portal-dependencies/pom.xml
rave/branches/model-split/rave-portal-resources/src/main/resources/messages.properties
rave/branches/model-split/rave-portal-resources/src/main/resources/messages_es.properties
rave/branches/model-split/rave-portal-resources/src/main/resources/messages_nl.properties
rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp
rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/new_user_form.jsp
rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/login.jsp
rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newaccount.jsp
rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/newpassword.jsp
rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/retrieveusername.jsp
rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/tiles-defs.xml
rave/branches/model-split/rave-portal-resources/src/main/webapp/static/css/rave-css.less
rave/branches/model-split/rave-portal-resources/src/main/webapp/static/script/rave.js
rave/branches/model-split/rave-portal-resources/src/main/webapp/static/script/rave_api.js
rave/branches/model-split/rave-portal-resources/src/main/webapp/static/script/rave_layout.js
rave/branches/model-split/rave-portal-resources/src/main/webapp/static/script/rave_wookie.js
rave/branches/model-split/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java
rave/branches/model-split/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java
rave/branches/model-split/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java
rave/branches/model-split/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java
Propchange: rave/branches/model-split/
------------------------------------------------------------------------------
Merged /rave/trunk:r1365115-1371430
Modified: rave/branches/model-split/CHANGELOG
URL: http://svn.apache.org/viewvc/rave/branches/model-split/CHANGELOG?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/CHANGELOG (original)
+++ rave/branches/model-split/CHANGELOG Thu Aug 9 21:45:33 2012
@@ -1,6 +1,42 @@
Apache Rave Change Log
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311290 (select the version of release and output as text to create this file)
+Release Notes - Rave - Version 0.14
+===========================================================================================================
+
+** Sub-task
+ * [RAVE-452] - Clean up User Profile layout
+ * [RAVE-536] - Admin area: fix layout
+ * [RAVE-579] - Rework the notification mechanism
+ * [RAVE-683] - Revamp like/dislike display
+
+** Bug
+ * [RAVE-624] - Shindig common container is hard coded to debug script
+ * [RAVE-658] - Rave footer is coming twice on submit of newpassword and request user pages
+ * [RAVE-703] - Missing JpaPersonProperties in JpaPerson
+ * [RAVE-712] - Owner does not see that sharing has been declined
+ * [RAVE-713] - Null bean error in SpringBindingModule
+ * [RAVE-714] - Security token Id does not match shindig person id
+ * [RAVE-716] - Late event registrations are never called
+ * [RAVE-722] - Shindig webapp component can't be re-deployed without a container restart
+ * [RAVE-723] - Widget comment button seems to be working for only canonical user
+ * [RAVE-732] - Unable to render two widgets of the same type on the same page
+ * [RAVE-733] - Wrong display name shown in page title on top left for person profile view
+
+** Improvement
+ * [RAVE-556] - User Display name empty
+ * [RAVE-657] - Create new user button on new account page
+ * [RAVE-673] - Rework login screen
+ * [RAVE-702] - Implementation of FriendsWithFriend
+ * [RAVE-720] - Support navigating to secondary named views (i.e. canvas.foo, canvas.bar)
+ * [RAVE-726] - Update the Rave Extension SSO Provider for Rave 0.14-SNAPSHOT
+ * [RAVE-727] - Providing options for relationship status
+ * [RAVE-735] - Bootstrap the log in error messages
+
+** Story
+ * [RAVE-709] - Remove version numbers in URLs for Spring XSDs
+
+
Release Notes - Rave - Version 0.13 (Note: only tagged, not released, see RAVE-704)
================================================================================================================
Modified: rave/branches/model-split/pom.xml
URL: http://svn.apache.org/viewvc/rave/branches/model-split/pom.xml?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/pom.xml (original)
+++ rave/branches/model-split/pom.xml Thu Aug 9 21:45:33 2012
@@ -42,10 +42,11 @@
</scm>
<properties>
- <apache.shindig.version>2.5.0-beta2</apache.shindig.version>
+ <apache.shindig.version>2.5.0-beta3</apache.shindig.version>
<apache.wookie.version>0.10.0-incubating</apache.wookie.version>
- <org.springframework.version>3.1.0.RELEASE</org.springframework.version>
- <org.springframework.mobile.version>1.0.0.M3</org.springframework.mobile.version>
+ <org.springframework.version>3.1.2.RELEASE</org.springframework.version>
+ <org.springframework.security.version>3.1.1.RELEASE</org.springframework.security.version>
+ <org.springframework.mobile.version>1.0.0.RELEASE</org.springframework.mobile.version>
<jstl.version>1.2</jstl.version>
<javax.servlet.version>2.5</javax.servlet.version>
<jsp-api.version>2.1</jsp-api.version>
@@ -249,7 +250,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
- <version>${org.springframework.version}</version>
+ <version>${org.springframework.security.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -264,19 +265,31 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
- <version>${org.springframework.version}</version>
+ <version>${org.springframework.security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId>
- <version>${org.springframework.version}</version>
+ <version>${org.springframework.security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-ldap</artifactId>
- <version>${org.springframework.version}</version>
+ <version>${org.springframework.security.version}</version>
</dependency>
<dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-openid</artifactId>
+ <version>${org.springframework.security.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-oxm</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${org.springframework.version}</version>
@@ -351,6 +364,19 @@
<version>${jersey-server.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.openid4java</groupId>
+ <artifactId>openid4java-consumer</artifactId>
+ <version>${org.openid4java.version}</version>
+ <type>pom</type>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java Thu Aug 9 21:45:33 2012
@@ -27,4 +27,6 @@ public final class PortalPreferenceKeys
public static final String TITLE_SUFFIX = "titleSuffix";
public static final String PAGE_SIZE = "pageSize";
public static final String JAVASCRIPT_DEBUG_MODE = "javaScriptDebugMode";
+ public static final String INITIAL_WIDGET_STATUS = "initialWidgetStatus";
+ public static final String EXTERNAL_MARKETPLACE_URL = "externalMarketplaceUrl";
}
Modified: rave/branches/model-split/rave-components/rave-core/src/test/resources/test_data.sql
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/test/resources/test_data.sql?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/test/resources/test_data.sql (original)
+++ rave/branches/model-split/rave-components/rave-core/src/test/resources/test_data.sql Thu Aug 9 21:45:33 2012
@@ -1003,18 +1003,18 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
set @next_portal_preference_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @portal_preference_seq);
INSERT INTO portal_preference (entity_id, preference_key)
values (@next_portal_preference_id, 'color');
-INSERT INTO JPAPORTALPREFERENCE_VALUES
+INSERT INTO portal_preference_values
values (@next_portal_preference_id, 'red');
-INSERT INTO JPAPORTALPREFERENCE_VALUES
+INSERT INTO portal_preference_values
values (@next_portal_preference_id, 'yellow');
-INSERT INTO JPAPORTALPREFERENCE_VALUES
+INSERT INTO portal_preference_values
values (@next_portal_preference_id, 'blue');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @portal_preference_seq;
set @next_portal_preference_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @portal_preference_seq);
INSERT INTO portal_preference (entity_id, preference_key)
values (@next_portal_preference_id, 'title');
-INSERT INTO JPAPORTALPREFERENCE_VALUES
+INSERT INTO portal_preference_values
values (@next_portal_preference_id, 'Rave');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @portal_preference_seq;
-- end portal preferences
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java Thu Aug 9 21:45:33 2012
@@ -22,7 +22,21 @@ package org.apache.rave.portal.model;
import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.persistence.BasicEntity;
-import javax.persistence.*;
+import javax.persistence.Access;
+import javax.persistence.AccessType;
+import javax.persistence.Basic;
+import javax.persistence.CollectionTable;
+import javax.persistence.Column;
+import javax.persistence.ElementCollection;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.LinkedList;
@@ -59,6 +73,7 @@ public class JpaPortalPreference impleme
private String key;
@ElementCollection(fetch = FetchType.EAGER)
+ @CollectionTable(name = "portal_preference_values")
private List<String> values = new LinkedList<String>();
public JpaPortalPreference() {
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidget.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidget.java?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidget.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidget.java Thu Aug 9 21:45:33 2012
@@ -16,13 +16,36 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.rave.portal.model;
import org.apache.rave.persistence.BasicEntity;
import org.apache.rave.portal.model.conversion.ConvertingListProxyFactory;
import org.apache.rave.portal.model.conversion.JpaConverter;
-import javax.persistence.*;
+import javax.persistence.Access;
+import javax.persistence.AccessType;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.Lob;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
@@ -195,7 +218,7 @@ public class JpaWidget implements BasicE
@XmlElement
@Basic
- @Column(name = "featured")
+ @Column(name = "featured", columnDefinition = "boolean default false")
private boolean featured;
public JpaWidget() {
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/resources/test_data.sql
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/resources/test_data.sql?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/resources/test_data.sql (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/resources/test_data.sql Thu Aug 9 21:45:33 2012
@@ -127,69 +127,69 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
-- ***********************************************************************************
--- start user data ---
set @user_id_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name)
-values (@user_id_1, 'canonical', '$2a$10$TkEgze5kLy9nRlfd8PT1zunh6P1ND8WPjLojFjAMNgZMu1D9D1n4.', FALSE, FALSE, TRUE,'canonical@example.com', @three_col_id, 'User', 'Canonical', 'Paul');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_1, 'canonical', '$2a$10$TkEgze5kLy9nRlfd8PT1zunh6P1ND8WPjLojFjAMNgZMu1D9D1n4.', FALSE, FALSE, TRUE,'canonical@example.com', @three_col_id, 'User', 'Canonical', 'Paul', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_2 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name)
-values (@user_id_2, 'john.doe', '$2a$10$8Dir7boy3UyVqy6erfj6WuQXUTf.ejTldPSsVIty7.pPT3Krkly26', FALSE, FALSE, TRUE,'john.doe@example.com', @three_col_id, 'User', 'Doe', 'John');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_2, 'john.doe', '$2a$10$8Dir7boy3UyVqy6erfj6WuQXUTf.ejTldPSsVIty7.pPT3Krkly26', FALSE, FALSE, TRUE,'john.doe@example.com', @three_col_id, 'User', 'Doe', 'John', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_3 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name)
-values (@user_id_3, 'jane.doe', '$2a$10$YP9cjZEA.gG/ng2YwTBIyucMpuiQ7Fvz0K8rOt14rIBhVwlOrh1tu', FALSE, FALSE, TRUE,'jane.doe@example.net', @three_col_id, 'User', 'Doe', 'Jane');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_3, 'jane.doe', '$2a$10$YP9cjZEA.gG/ng2YwTBIyucMpuiQ7Fvz0K8rOt14rIBhVwlOrh1tu', FALSE, FALSE, TRUE,'jane.doe@example.net', @three_col_id, 'User', 'Doe', 'Jane', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_4 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, forgotPasswordHash)
-values (@user_id_4, 'george.doe', '$2a$10$0bcOUkQgAwE/qmdc1NcUveNzx/IYIcOUu4ydyT8DEicTCxGJF/vcW', FALSE, FALSE, TRUE,'george.doe@example.org', @three_col_id, 'User', 'Doe', 'George', 'ABC123');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, status, forgotPasswordHash)
+values (@user_id_4, 'george.doe', '$2a$10$0bcOUkQgAwE/qmdc1NcUveNzx/IYIcOUu4ydyT8DEicTCxGJF/vcW', FALSE, FALSE, TRUE,'george.doe@example.org', @three_col_id, 'User', 'Doe', 'George', 'Single', 'ABC123');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_5 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name)
-values (@user_id_5,'mario.rossi', '$2a$10$HZ6WHAKQCs8waLooL98l6.fLzwh3D8u/V0.UebIjojawfXJhX1DQ2', FALSE, FALSE, TRUE,'mario.rossi@example.com', @three_col_id, 'User', 'Rossi', 'Mario');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_5,'mario.rossi', '$2a$10$HZ6WHAKQCs8waLooL98l6.fLzwh3D8u/V0.UebIjojawfXJhX1DQ2', FALSE, FALSE, TRUE,'mario.rossi@example.com', @three_col_id, 'User', 'Rossi', 'Mario', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_6 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name)
-values (@user_id_6, 'maija.m', '$2a$10$3feYdjrW40hkqP4/xupKP.YMgdYmDsZZus./vK4FbBs9QZG2.FuNC', FALSE, FALSE, TRUE,'maijam@example.com', @three_col_id, 'User', 'M', 'Maija');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_6, 'maija.m', '$2a$10$3feYdjrW40hkqP4/xupKP.YMgdYmDsZZus./vK4FbBs9QZG2.FuNC', FALSE, FALSE, TRUE,'maijam@example.com', @three_col_id, 'User', 'M', 'Maija', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_7 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name)
-values (@user_id_7, 'one.col', '$2a$10$5VqE2YEqT75pCVjKqjP2b.gNGly9fsTVUOMQR/JEjkHSbqvA3A6IO', FALSE, FALSE, TRUE,'one.col@example.com', @three_col_id, 'User', 'Column', 'One');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_7, 'one.col', '$2a$10$5VqE2YEqT75pCVjKqjP2b.gNGly9fsTVUOMQR/JEjkHSbqvA3A6IO', FALSE, FALSE, TRUE,'one.col@example.com', @three_col_id, 'User', 'Column', 'One', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_8 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name)
-values (@user_id_8, 'twown.col', '$2a$10$Inpufv82TRUGYoPuXhYXVuMCKHkhLz44W6FijxW2e9n3T1hgyxcVq', FALSE, FALSE, TRUE,'twown.col@example.com', @three_col_id, 'User', 'Column', 'Two');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_8, 'twown.col', '$2a$10$Inpufv82TRUGYoPuXhYXVuMCKHkhLz44W6FijxW2e9n3T1hgyxcVq', FALSE, FALSE, TRUE,'twown.col@example.com', @three_col_id, 'User', 'Column', 'Two', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_9 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name)
-values (@user_id_9, 'three.col', '$2a$10$ImRXq4gFC9teBstOBdQrZeEwBkCAJ0S6.CwI9/9r7fxWKTZ30pgVC', FALSE, FALSE, TRUE,'three.col@example.com', @three_col_id, 'User', 'Column', 'Three');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_9, 'three.col', '$2a$10$ImRXq4gFC9teBstOBdQrZeEwBkCAJ0S6.CwI9/9r7fxWKTZ30pgVC', FALSE, FALSE, TRUE,'three.col@example.com', @three_col_id, 'User', 'Column', 'Three', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_10 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name)
-values (@user_id_10, 'threewn.col', '$2a$10$LLYTJoK6MCBpeDBbmdt7tu1LNt7Eenqe1IpMlfem8xVjzynn.HpxW', FALSE, FALSE, TRUE,'threewn.col@example.com', @three_col_id, 'User', 'Column2', 'Three');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_10, 'threewn.col', '$2a$10$LLYTJoK6MCBpeDBbmdt7tu1LNt7Eenqe1IpMlfem8xVjzynn.HpxW', FALSE, FALSE, TRUE,'threewn.col@example.com', @three_col_id, 'User', 'Column2', 'Three', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_11 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name)
-values (@user_id_11, 'four.col', '$2a$10$tZgWcaG2EJPLtseZ339n7uTu3GZn31h3iTr20orwgbbRAI15uoIFK', FALSE, FALSE, TRUE,'four.col@example.com', @three_col_id, 'User', 'Column', 'Four');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_11, 'four.col', '$2a$10$tZgWcaG2EJPLtseZ339n7uTu3GZn31h3iTr20orwgbbRAI15uoIFK', FALSE, FALSE, TRUE,'four.col@example.com', @three_col_id, 'User', 'Column', 'Four', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
set @user_id_12 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name)
-values (@user_id_12, 'fourwn.col', '$2a$10$4kPYhgowurWqXGVDigxOxOVj/M.rqLRwqbn0kT/OD4pISL6pDG/c2', FALSE, FALSE, TRUE,'fourwn.col@example.com', @three_col_id, 'User', 'Column2', 'Four');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_12, 'fourwn.col', '$2a$10$4kPYhgowurWqXGVDigxOxOVj/M.rqLRwqbn0kT/OD4pISL6pDG/c2', FALSE, FALSE, TRUE,'fourwn.col@example.com', @three_col_id, 'User', 'Column2', 'Four', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
-- duplicate user id!!
set @user_id_13 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
-insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name)
-values (@user_id_13, 'http://rave2011.myopenid.com/', '$2a$10$dML97.rnOn4.iSlEEdju8OCB2NckuKw0Ki5yMVzzMmWQsWMvym3qC', FALSE, FALSE, TRUE,'rave2011_openid@example.org', @three_col_id, 'User', 'Openid', 'Rave');
+insert into person (entity_id, username, password, expired, locked, enabled, email, default_page_layout_id, dtype, family_name, given_name, status)
+values (@user_id_13, 'http://rave2011.myopenid.com/', '$2a$10$dML97.rnOn4.iSlEEdju8OCB2NckuKw0Ki5yMVzzMmWQsWMvym3qC', FALSE, FALSE, TRUE,'rave2011_openid@example.org', @three_col_id, 'User', 'Openid', 'Rave', 'Single');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @user_seq;
--- end user data ---
@@ -1021,18 +1021,18 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
set @next_portal_preference_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @portal_preference_seq);
INSERT INTO portal_preference (entity_id, preference_key)
values (@next_portal_preference_id, 'color');
-INSERT INTO JPAPORTALPREFERENCE_VALUES
+INSERT INTO portal_preference_values
values (@next_portal_preference_id, 'red');
-INSERT INTO JPAPORTALPREFERENCE_VALUES
+INSERT INTO portal_preference_values
values (@next_portal_preference_id, 'yellow');
-INSERT INTO JPAPORTALPREFERENCE_VALUES
+INSERT INTO portal_preference_values
values (@next_portal_preference_id, 'blue');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @portal_preference_seq;
set @next_portal_preference_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @portal_preference_seq);
INSERT INTO portal_preference (entity_id, preference_key)
values (@next_portal_preference_id, 'title');
-INSERT INTO JPAPORTALPREFERENCE_VALUES
+INSERT INTO portal_preference_values
values (@next_portal_preference_id, 'Rave');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @portal_preference_seq;
-- end portal preferences
Modified: rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java (original)
+++ rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java Thu Aug 9 21:45:33 2012
@@ -83,9 +83,9 @@ public class ProfileController {
public String updateProfile(ModelMap model,
@RequestParam(required = false) String referringPageId,
@ModelAttribute("updatedUser") UserForm updatedUser) {
- logger.info("Updating " + updatedUser.getUsername() + " profile information");
User user = userService.getAuthenticatedUser();
+ logger.info("Updating " + user.getUsername() + " profile information");
//set the updated fields for optional information
user.setGivenName(updatedUser.getGivenName());
Copied: rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/RegionWidgetController.java (from r1371430, rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/RegionWidgetController.java)
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/RegionWidgetController.java?p2=rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/RegionWidgetController.java&p1=rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/RegionWidgetController.java&r1=1371430&r2=1371499&rev=1371499&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/RegionWidgetController.java (original)
+++ rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/RegionWidgetController.java Thu Aug 9 21:45:33 2012
@@ -40,7 +40,7 @@ public class RegionWidgetController {
}
@RequestMapping(value = {"/api/rest/regionwidget/{regionWidgetId}"}, method = RequestMethod.GET)
- public String viewRegionWidget(Model model, @PathVariable Long regionWidgetId){
+ public String viewRegionWidget(Model model, @PathVariable String regionWidgetId){
RegionWidget rw = regionWidgetService.getRegionWidget(regionWidgetId);
model.addAttribute(ModelKeys.REGION_WIDGET, rw);
return ViewNames.REGION_WIDGET;
Modified: rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java (original)
+++ rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java Thu Aug 9 21:45:33 2012
@@ -197,11 +197,41 @@ public class WidgetStoreController {
public String viewAddWidgetForm(Model model, @RequestParam String referringPageId) {
final Widget widget = new WidgetImpl();
final String view = ViewNames.ADD_WIDGET_FORM;
+ model.addAttribute(ModelKeys.MARKETPLACE, this.preferenceService.getPreference(PortalPreferenceKeys.EXTERNAL_MARKETPLACE_URL));
model.addAttribute(ModelKeys.WIDGET, widget);
model.addAttribute(ModelKeys.REFERRING_PAGE_ID, referringPageId);
ControllerUtils.addNavItemsToModel(view, model, referringPageId, userService.getAuthenticatedUser());
return view;
}
+
+ /**
+ * Shows the Add new Widget form
+ *
+ * @param model
+ * {@link Model}
+ * @param referringPageId
+ * the source {@link org.apache.rave.portal.model.Page } ID
+ * @param type
+ * the type of widget add form to display, e.g. W3C or OpenSocial (default)
+ * @return the view name of the Add new Widget form
+ */
+ @RequestMapping(method = RequestMethod.GET, value = "widget/add/{type}")
+ public String viewAddWidgetFormByType(Model model, @RequestParam String referringPageId, @PathVariable String type) {
+ final Widget widget = new WidgetImpl();
+ String view;
+ if (type != null && type.equalsIgnoreCase("w3c")){
+ view = ViewNames.ADD_WIDGET_W3C;
+ } else {
+ view = ViewNames.ADD_WIDGET_FORM;
+ }
+ model.addAttribute(ModelKeys.MARKETPLACE, this.preferenceService.getPreference(PortalPreferenceKeys.EXTERNAL_MARKETPLACE_URL));
+ model.addAttribute(ModelKeys.WIDGET, widget);
+ model.addAttribute(ModelKeys.REFERRING_PAGE_ID, referringPageId);
+ ControllerUtils.addNavItemsToModel(view, model, referringPageId, userService.getAuthenticatedUser());
+ return view;
+ }
+
+
/**
* Validates the form input, if valid, tries to store the Widget data
@@ -222,13 +252,66 @@ public class WidgetStoreController {
User user = userService.getAuthenticatedUser();
widgetValidator.validate(widget, results);
if (results.hasErrors()) {
- final String view = ViewNames.ADD_WIDGET_FORM;
+ final String view = ViewNames.ADD_WIDGET_FORM;
model.addAttribute(ModelKeys.WIDGET, widget);
model.addAttribute(ModelKeys.REFERRING_PAGE_ID, referringPageId);
ControllerUtils.addNavItemsToModel(view, model, referringPageId, user);
return view;
}
- widget.setWidgetStatus(WidgetStatus.PREVIEW);
+ return finalizeNewWidget(widget,user, referringPageId);
+ }
+
+ /**
+ * Validates the form input, if valid, tries to store the Widget data
+ *
+ * @param widget
+ * {@link org.apache.rave.portal.model.Widget} as submitted by the user
+ * @param results
+ * {@link BindingResult}
+ * @param model
+ * {@link Model}
+ * @param referringPageId
+ * the source {@link org.apache.rave.portal.model.Page } ID
+ * @return if successful the view name of the widget, otherwise the form
+ */
+ @RequestMapping(method = RequestMethod.POST, value = "widget/add/w3c")
+ public String viewAddWidgetResultW3c(@ModelAttribute WidgetImpl widget, BindingResult results, Model model,
+ @RequestParam String referringPageId) {
+ User user = userService.getAuthenticatedUser();
+ widgetValidator.validate(widget, results);
+ if (results.hasErrors()) {
+ final String view = ViewNames.ADD_WIDGET_W3C;
+ model.addAttribute(ModelKeys.WIDGET, widget);
+ model.addAttribute(ModelKeys.REFERRING_PAGE_ID, referringPageId);
+ ControllerUtils.addNavItemsToModel(view, model, referringPageId, user);
+ return view;
+ }
+
+ return finalizeNewWidget(widget,user, referringPageId);
+ }
+
+ /**
+ * Finalize adding a new widget created from validated form data, and redirect to its store detail page
+ * @param widget
+ * {@link org.apache.rave.portal.model.Widget} as created from form input
+ * @param user
+ * the user submitting the new widget
+ * @param referringPageId
+ * the source page ID
+ * @return a redirection string for the store detail page.
+ */
+ private String finalizeNewWidget(WidgetImpl widget, User user, String referringPageId){
+ /*
+ * By default, a new widget has a status of "PREVIEW", however this can be overridden in portal preferences,
+ * skipping the need for an admin to approve a new widget.
+ */
+ PortalPreference status = preferenceService.getPreference(PortalPreferenceKeys.INITIAL_WIDGET_STATUS);
+ if (status != null && status.getValue().equals("PUBLISHED")){
+ widget.setWidgetStatus(WidgetStatus.PUBLISHED);
+ } else {
+ widget.setWidgetStatus(WidgetStatus.PREVIEW);
+ }
+
widget.setOwner(user);
final Widget storedWidget = widgetService.registerNewWidget(widget);
Modified: rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ControllerUtils.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ControllerUtils.java?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ControllerUtils.java (original)
+++ rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ControllerUtils.java Thu Aug 9 21:45:33 2012
@@ -21,7 +21,6 @@ package org.apache.rave.portal.web.contr
import javax.servlet.http.HttpServletRequest;
-import org.apache.rave.portal.model.Page;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.web.model.NavigationItem;
import org.apache.rave.portal.web.model.NavigationMenu;
@@ -73,7 +72,7 @@ public class ControllerUtils {
public static NavigationMenu getTopMenu(String view, String referringPageId, User user, boolean addStoreLink) {
NavigationMenu menu = new NavigationMenu("topnav");
if(view.startsWith(ViewNames.PAGE) || view.startsWith(ViewNames.MOBILE_HOME)) {
- NavigationItem profile = new NavigationItem("page.profile.title", user.getDisplayName() != null ? user.getDisplayName() : user.getUsername(), "/app/person/" + user.getUsername() + "?referringPageId=" + referringPageId);
+ NavigationItem profile = new NavigationItem("page.profile.title", getDisplayName(user), "/app/person/" + user.getUsername() + "?referringPageId=" + referringPageId);
menu.addNavigationItem(profile);
if(addStoreLink){
@@ -124,6 +123,11 @@ public class ControllerUtils {
return menu;
}
+ public static String getDisplayName(User user) {
+ String displayName = user.getDisplayName();
+ return (displayName == null || "".equals(displayName)) ? user.getUsername() : displayName;
+ }
+
private static NavigationItem getBackItem(String referringPageId) {
NavigationItem back = new NavigationItem();
back.setName("page.general.back");
@@ -142,4 +146,4 @@ public class ControllerUtils {
private static NavigationItem getLogoutItem() {
return new NavigationItem("page.general.logout", null, "/j_spring_security_logout");
}
-}
\ No newline at end of file
+}
Modified: rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java (original)
+++ rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java Thu Aug 9 21:45:33 2012
@@ -24,7 +24,11 @@ import org.apache.rave.portal.model.impl
import java.util.Map;
-import static org.apache.rave.portal.web.util.PortalPreferenceKeys.*;
+import static org.apache.rave.portal.web.util.PortalPreferenceKeys.INITIAL_WIDGET_STATUS;
+import static org.apache.rave.portal.web.util.PortalPreferenceKeys.JAVASCRIPT_DEBUG_MODE;
+import static org.apache.rave.portal.web.util.PortalPreferenceKeys.PAGE_SIZE;
+import static org.apache.rave.portal.web.util.PortalPreferenceKeys.TITLE_SUFFIX;
+import static org.apache.rave.portal.web.util.PortalPreferenceKeys.EXTERNAL_MARKETPLACE_URL;
/**
* Form object for portal preferences
@@ -34,6 +38,8 @@ public class PortalPreferenceForm {
public static final String DEFAULT_PAGE_SIZE = "10";
public static final String DEFAULT_TITLE_SUFFIX = "";
public static final String DEFAULT_JAVASCRIPT_DEBUG_MODE = "1";
+ public static final String DEFAULT_INITIAL_WIDGET_STATUS = "PREVIEW";
+ public static final String DEFAULT_EXTERNAL_MARKETPLACE_URL = "";
private Map<String, PortalPreference> preferenceMap;
@@ -54,6 +60,24 @@ public class PortalPreferenceForm {
if (getJavaScriptDebugMode() == null) {
preferenceMap.put(JAVASCRIPT_DEBUG_MODE, new PortalPreferenceImpl(JAVASCRIPT_DEBUG_MODE, DEFAULT_JAVASCRIPT_DEBUG_MODE));
}
+ if (getInitialWidgetStatus() == null){
+ preferenceMap.put(INITIAL_WIDGET_STATUS, new PortalPreferenceImpl(INITIAL_WIDGET_STATUS, DEFAULT_INITIAL_WIDGET_STATUS));
+ }
+ if (getExternalMarketplaceUrl() == null){
+ preferenceMap.put(EXTERNAL_MARKETPLACE_URL, new PortalPreferenceImpl(EXTERNAL_MARKETPLACE_URL, DEFAULT_EXTERNAL_MARKETPLACE_URL));
+ }
+ }
+
+ public PortalPreference getExternalMarketplaceUrl() {
+ return preferenceMap.get(EXTERNAL_MARKETPLACE_URL);
+ }
+
+ public void setExternalMarketplaceUrl(PortalPreference externalMarketplaceUrl){
+ preferenceMap.put(EXTERNAL_MARKETPLACE_URL, externalMarketplaceUrl);
+ }
+
+ public PortalPreference getInitialWidgetStatus(){
+ return preferenceMap.get(INITIAL_WIDGET_STATUS);
}
public PortalPreference getPageSize() {
@@ -87,4 +111,8 @@ public class PortalPreferenceForm {
public void setPreferenceMap(Map<String, PortalPreference> preferenceMap) {
this.preferenceMap = preferenceMap;
}
+
+ public void setInitialWidgetStatus(PortalPreference initialWidgetStatus){
+ preferenceMap.put(INITIAL_WIDGET_STATUS, initialWidgetStatus);
+ }
}
Modified: rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ModelKeys.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ModelKeys.java?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ModelKeys.java (original)
+++ rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ModelKeys.java Thu Aug 9 21:45:33 2012
@@ -33,6 +33,8 @@ public class ModelKeys {
public static final String ERROR_MESSAGE = "errorMessage"; // an error message to be reported to the user
public static final String WIDGETS = "widgets"; // a list of widget objects
public static final String WIDGET = "widget";
+ public static final String REGION_WIDGET = "regionWidget";
+ public static final String MARKETPLACE = "marketplace"; // whether there is an external widget marketplace configured
public static final String WIDGET_STATISTICS = "widgetStatistics"; //statistics for a single widget
public static final String WIDGETS_STATISTICS = "widgetsStatistics"; //list of statistics for a list of widgets
public static final String CATEGORY = "category"; //category
Modified: rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ViewNames.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ViewNames.java?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ViewNames.java (original)
+++ rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/util/ViewNames.java Thu Aug 9 21:45:33 2012
@@ -26,15 +26,19 @@ public final class ViewNames {
private ViewNames() {}
private static final String USER_PREFIX = "templates.user.";
private static final String ADMIN_PREFIX = "templates.admin.";
-
+ private static final String PARTIAL_PREFIX = "templates.partial.";
+
public static final String PAGE = USER_PREFIX + "page";
public static final String MOBILE_HOME = USER_PREFIX + "mobile_home";
public static final String STORE = USER_PREFIX + "store";
public static final String WIDGET = USER_PREFIX + "widget";
+ public static final String REGION_WIDGET = PARTIAL_PREFIX + "regionwidget";
public static final String ADD_WIDGET_FORM = USER_PREFIX + "addwidget";
public static final String NEW_ACCOUNT = USER_PREFIX + "newaccount";
public static final String USER_PROFILE = USER_PREFIX + "userProfile";
public static final String PERSON_PROFILE = USER_PREFIX + "personProfile";
+ public static final String ADD_WIDGET_MARKETPLACE = ADD_WIDGET_FORM + ".marketplace";
+ public static final String ADD_WIDGET_W3C = ADD_WIDGET_FORM + ".w3c";
public static final String ADMIN_HOME = ADMIN_PREFIX + "home";
public static final String ADMIN_NEW_ACCOUNT = ADMIN_PREFIX + "newaccount";
Modified: rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java (original)
+++ rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java Thu Aug 9 21:45:33 2012
@@ -83,7 +83,9 @@ public class WidgetStoreControllerTest {
replay(userService);
PortalPreferenceService preferenceService = createMock(PortalPreferenceService.class);
+ expect(preferenceService.getPreference(PortalPreferenceKeys.INITIAL_WIDGET_STATUS)).andReturn(null);
expect(preferenceService.getPreference(PortalPreferenceKeys.PAGE_SIZE)).andReturn(null);
+ expect(preferenceService.getPreference(PortalPreferenceKeys.EXTERNAL_MARKETPLACE_URL)).andReturn(null);
replay(preferenceService);
NewWidgetValidator widgetValidator = new NewWidgetValidator(widgetService);
Modified: rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/ControllerUtilsTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/ControllerUtilsTest.java?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/ControllerUtilsTest.java (original)
+++ rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/ControllerUtilsTest.java Thu Aug 9 21:45:33 2012
@@ -18,6 +18,8 @@
*/
package org.apache.rave.portal.web.controller.util;
+import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.junit.Before;
import org.junit.Test;
import org.springframework.mobile.device.DeviceResolver;
@@ -26,16 +28,19 @@ import org.springframework.mobile.device
import org.springframework.mock.web.MockHttpServletRequest;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
public class ControllerUtilsTest {
private MockHttpServletRequest request;
private DeviceResolver deviceResolver;
+ private User user;
@Before
public void setUp() {
request = new MockHttpServletRequest();
deviceResolver = new LiteDeviceResolver();
+ user = new UserImpl();
+ user.setDisplayName("Test");
}
@Test
@@ -69,4 +74,23 @@ public class ControllerUtilsTest {
request.setAttribute(DeviceUtils.CURRENT_DEVICE_ATTRIBUTE, deviceResolver.resolveDevice(request));
assertThat(ControllerUtils.getDeviceAppropriateView(request, defaultView, mobileView), is(mobileView));
}
+
+ @Test
+ public void getDisplayName_withDisplayName(){
+ assertEquals(user.getDisplayName(), ControllerUtils.getDisplayName(user));
+ }
+
+ @Test
+ public void getDisplayName_withoutDisplayName(){
+ user.setDisplayName("");
+ user.setUsername("username");
+ assertEquals(user.getUsername(), ControllerUtils.getDisplayName(user));
+ }
+
+ @Test
+ public void getDisplayName_withNullDisplayName(){
+ user.setDisplayName(null);
+ user.setUsername("username");
+ assertEquals(user.getUsername(), ControllerUtils.getDisplayName(user));
+ }
}
\ No newline at end of file
Modified: rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java (original)
+++ rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java Thu Aug 9 21:45:33 2012
@@ -28,7 +28,10 @@ import java.util.HashMap;
import java.util.Map;
import static junit.framework.Assert.assertEquals;
-import static org.apache.rave.portal.web.util.PortalPreferenceKeys.*;
+import static org.apache.rave.portal.web.util.PortalPreferenceKeys.INITIAL_WIDGET_STATUS;
+import static org.apache.rave.portal.web.util.PortalPreferenceKeys.JAVASCRIPT_DEBUG_MODE;
+import static org.apache.rave.portal.web.util.PortalPreferenceKeys.PAGE_SIZE;
+import static org.apache.rave.portal.web.util.PortalPreferenceKeys.TITLE_SUFFIX;
/**
* Test for {@link PortalPreferenceForm}
@@ -44,6 +47,8 @@ public class PortalPreferenceFormTest {
preferenceMap.put(PAGE_SIZE, pageSizePref);
PortalPreference javaScriptDebugMode = new PortalPreferenceImpl(JAVASCRIPT_DEBUG_MODE, "0");
preferenceMap.put(JAVASCRIPT_DEBUG_MODE, javaScriptDebugMode);
+ PortalPreference initialWidgetStatus = new PortalPreferenceImpl(INITIAL_WIDGET_STATUS, "PUBLISHED");
+ preferenceMap.put(INITIAL_WIDGET_STATUS, initialWidgetStatus);
}
@Test
@@ -52,6 +57,7 @@ public class PortalPreferenceFormTest {
assertEquals("Test portal", form.getTitleSuffix().getValue());
assertEquals("20", form.getPageSize().getValue());
assertEquals("0", form.getJavaScriptDebugMode().getValue());
+ assertEquals("PUBLISHED", form.getInitialWidgetStatus().getValue());
}
@Test
@@ -60,5 +66,6 @@ public class PortalPreferenceFormTest {
assertEquals(PortalPreferenceForm.DEFAULT_PAGE_SIZE, form.getPageSize().getValue());
assertEquals(PortalPreferenceForm.DEFAULT_TITLE_SUFFIX, form.getTitleSuffix().getValue());
assertEquals(PortalPreferenceForm.DEFAULT_JAVASCRIPT_DEBUG_MODE, form.getJavaScriptDebugMode().getValue());
+ assertEquals(PortalPreferenceForm.DEFAULT_INITIAL_WIDGET_STATUS, form.getInitialWidgetStatus().getValue());
}
}
Modified: rave/branches/model-split/rave-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-integration-tests/pom.xml?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-integration-tests/pom.xml (original)
+++ rave/branches/model-split/rave-integration-tests/pom.xml Thu Aug 9 21:45:33 2012
@@ -42,7 +42,7 @@
<org.hamcrest.version>1.2.1</org.hamcrest.version>
<commons-logging.version>1.1.1</commons-logging.version>
<!-- New Selenium versions are often needed after an upgrade of Mozilla Firefox -->
- <selenium.version>[2.20.0, 2.22)</selenium.version>
+ <selenium.version>[2.25.0,2.26)</selenium.version>
<meta.filter />
<!-- Cargo configuration properties -->
Modified: rave/branches/model-split/rave-integration-tests/rave-default-account-tests/src/main/java/org/apache/rave/integrationtests/steps/ProfileSteps.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-integration-tests/rave-default-account-tests/src/main/java/org/apache/rave/integrationtests/steps/ProfileSteps.java?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-integration-tests/rave-default-account-tests/src/main/java/org/apache/rave/integrationtests/steps/ProfileSteps.java (original)
+++ rave/branches/model-split/rave-integration-tests/rave-default-account-tests/src/main/java/org/apache/rave/integrationtests/steps/ProfileSteps.java Thu Aug 9 21:45:33 2012
@@ -24,6 +24,7 @@ import org.jbehave.core.annotations.Then
import org.jbehave.core.annotations.When;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.Select;
import org.springframework.beans.factory.annotation.Autowired;
import static org.hamcrest.CoreMatchers.equalTo;
@@ -78,9 +79,10 @@ public class ProfileSteps {
changeFieldValue("aboutMeField", aboutMe);
}
- @When("I change the status to \"$status\"")
+ @When("I choose the status as \"$status\"")
public void changeStatus(String status) {
- changeFieldValue("statusField", status);
+ final Select relationshipStatus = new Select(portal.findElement(By.id("statusField")));
+ relationshipStatus.selectByValue(status);
}
private void changeFieldValue(String fieldId, String value) {
Modified: rave/branches/model-split/rave-integration-tests/rave-default-account-tests/src/main/stories/johnDoe.story
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-integration-tests/rave-default-account-tests/src/main/stories/johnDoe.story?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-integration-tests/rave-default-account-tests/src/main/stories/johnDoe.story (original)
+++ rave/branches/model-split/rave-integration-tests/rave-default-account-tests/src/main/stories/johnDoe.story Thu Aug 9 21:45:33 2012
@@ -37,16 +37,16 @@ When I log in with username "john.doe" a
And I go to "http://localhost:8080/portal/app/person/john.doe"
Then I see the email address "john.doe@example.com" on the profile page
And I see the about me "" on the profile page
-And I see the status "" on the profile page
+And I see the status "Single" on the profile page
When I click on the "profileEdit" button
Then I can edit the email address
When I change the email address to "john.doe@example.net"
And I change the about me to "I'm a test user"
-And I change the status to "It's complicated"
+And I choose the status as "Committed"
And I submit the edit profile form
Then I see the email address "john.doe@example.net" on the profile page
And I see the about me "I'm a test user" on the profile page
-And I see the status "It's complicated" on the profile page
+And I see the status "Committed" on the profile page
When I log out
Scenario: John Doe reverts his profile after logging out and in
@@ -54,16 +54,16 @@ When I log in with username "john.doe" a
And I go to "http://localhost:8080/portal/app/person/john.doe"
Then I see the email address "john.doe@example.net" on the profile page
And I see the about me "I'm a test user" on the profile page
-And I see the status "It's complicated" on the profile page
+And I see the status "Committed" on the profile page
When I click on the "profileEdit" button
Then I can edit the email address
When I change the email address to "john.doe@example.com"
And I change the about me to ""
-And I change the status to ""
+And I choose the status as "Single"
And I submit the edit profile form
Then I see the email address "john.doe@example.com" on the profile page
And I see the about me "" on the profile page
-And I see the status "" on the profile page
+And I see the status "Single" on the profile page
When I log out
Scenario: John Doe adds a new page
Modified: rave/branches/model-split/rave-portal-dependencies/pom.xml
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-portal-dependencies/pom.xml?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-portal-dependencies/pom.xml (original)
+++ rave/branches/model-split/rave-portal-dependencies/pom.xml Thu Aug 9 21:45:33 2012
@@ -89,7 +89,6 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-openid</artifactId>
- <version>${org.springframework.version}</version>
</dependency>
<dependency>
@@ -105,21 +104,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId>
- <version>${org.springframework.version}</version>
</dependency>
<!-- OpenId integration -->
<dependency>
<groupId>org.openid4java</groupId>
<artifactId>openid4java-consumer</artifactId>
- <version>${org.openid4java.version}</version>
<type>pom</type>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Apache DS (LDAP) -->
Modified: rave/branches/model-split/rave-portal-resources/src/main/resources/messages.properties
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-portal-resources/src/main/resources/messages.properties?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-portal-resources/src/main/resources/messages.properties (original)
+++ rave/branches/model-split/rave-portal-resources/src/main/resources/messages.properties Thu Aug 9 21:45:33 2012
@@ -73,11 +73,16 @@ page.general.toadmininterface=Admin inte
page.general.username=Username:
page.general.login.information=Enter Login Information
page.general.personal.information=Enter Personal Information (optional)
-page.general.first.name=First Name:
-page.general.last.name=Last Name:
-page.general.display.name=Name seen by other users:
-page.general.status=Status:
-page.general.about.me=Describe Yourself:
+page.general.first.name=First Name:
+page.general.last.name=Last Name:
+page.general.display.name=Name seen by other users:
+page.general.relation.status=Relationship Status:
+page.general.about.me=Describe Yourself:
+
+page.general.relation.single=Single
+page.general.relation.committed=Committed
+page.general.relation.married=Married
+page.general.relation.other=Other
page.general.addpage.title=Title
page.general.addpage.layout.columns_1=One Column
@@ -104,17 +109,18 @@ page.layout.newuser.introtext=This is th
page.layout.newuser.subtitle=We have provided a few sample widgets for you to try out. Click on the Widget Store link above to add more widgets!
page.login.title=Login
+page.login.button=Return to login page
page.login.createaccount=New User
page.login.createaccount.label=Register:
page.login.createaccount.button=Create New Account
page.login.openid=OpenID Identity
-page.login.openid.button=Login with OpenID
+page.login.openid.button=Log in with OpenID
page.login.openid.fail=OpenID identification failed.
page.login.openid.identifier=Identity:
page.login.rememberme=Remember me
page.login.usernamepassword=Username and Password
page.login.usernamepassword.fail=The username or password is incorrect.
-page.login.usernamepassword.login=Login
+page.login.usernamepassword.login=Log in
page.login.forgot.password=Forgot password
page.login.forgot.password.label=Password reminder
page.login.forgot.password.button=Request new password
@@ -171,6 +177,8 @@ page.widget.tags.or=--or--
page.widget.tags.select=Select from list:
page.addwidget.title=Add new widget
+page.addwidget.w3c.title=Add new widget
+page.addwidget.marketplace.title=Add new widget
page.addwidget.form.header=Widget
page.addwidget.form.submit=Add widget
page.addwidget.result.exists=The widget you submitted already exists.
@@ -178,14 +186,14 @@ page.addwidget.result.success=The widget
page.profile.title={0}''s Profile
page.profile.personal.info=Personal Information
-page.profile.first.name=First Name:
-page.profile.last.name=Last Name:
-page.profile.display.name=Display Name:
+page.profile.first.name=First Name:
+page.profile.last.name=Last Name:
+page.profile.display.name=Display Name:
page.profile.basic.info=Basic Information
-page.profile.about.me=About Me:
-page.profile.status=Status:
+page.profile.about.me=About Me:
+page.profile.status=Relationship Status:
page.profile.contact.info=Contact Information
-page.profile.email=Email ID:
+page.profile.email=Email ID:
page.profile.posts=Posts
page.profile.posts.page=/WEB-INF/jsp/views/profile_posts.jsp
page.profile.about=About
@@ -201,14 +209,14 @@ page.profile.cancel=Cancel
page.personProfile.title={0}''s Profile
page.personProfile.personal.info=Personal Information
-page.personProfile.first.name=First Name:
-page.personProfile.last.name=Last Name:
-page.personProfile.display.name=Display Name:
+page.personProfile.first.name=First Name:
+page.personProfile.last.name=Last Name:
+page.personProfile.display.name=Display Name:
page.personProfile.basic.info=Basic Information
-page.personProfile.about.me=About Me:
-page.personProfile.status=Status:
+page.personProfile.about.me=About Me:
+page.personProfile.status=Relationship Status:
page.personProfile.contact.info=Contact Information
-page.personProfile.email=Email ID:
+page.personProfile.email=Email ID:
page.personProfile.posts=Posts
page.personProfile.posts.page=/WEB-INF/jsp/views/profile_posts.jsp
page.personProfile.about=About
@@ -262,6 +270,10 @@ admin.preferences.title=Rave admin inter
admin.preferences.shorttitle=Preferences
admin.preferences.edit=Edit preferences
admin.preferencedetail.title=Rave admin interface - Preferences
+admin.preferencedetail.initialWidgetStatus=Initial status to use for new widgets
+admin.preferencedetail.initialWidgetStatus.preview=PREVIEW
+admin.preferencedetail.initialWidgetStatus.published=PUBLISHED
+admin.preferencedetail.externalMarketplaceUrl=Location (URL) of external widget marketplace
admin.preferencedetail.titleSuffix=Page title suffix
admin.preferencedetail.pageSize=Number of items per page (list)
admin.preferencedetail.pageSize.malformed=Enter a whole number greater than 0
@@ -359,7 +371,7 @@ _rave_client.common.accept=Accept
_rave_client.common.decline=Decline
_rave_client.common.username=Username
_rave_client.common.sharing=Sharing
-_rave_client.common.editing.auth=Edit Permission
+_rave_client.common.editing.auth=Edit Permission
_rave_client.form.password.invalid_match=The password does not match
_rave_client.opensocial.render_error=Unable to render OpenSocial Gadget:
_rave_client.page.add=Add a New Page
@@ -382,3 +394,4 @@ _rave_client.grant.editing.user.confirm=
_rave_client.revoke.editing.user.confirm=Are you sure you wish to remove editing rights from the following user?
_rave_client.no.results.found=No results found
_rave_client.get.metadata=Get Metadata
+page.general.status=Relationship Status\:
Modified: rave/branches/model-split/rave-portal-resources/src/main/resources/messages_es.properties
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-portal-resources/src/main/resources/messages_es.properties?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-portal-resources/src/main/resources/messages_es.properties (original)
+++ rave/branches/model-split/rave-portal-resources/src/main/resources/messages_es.properties Thu Aug 9 21:45:33 2012
@@ -81,6 +81,11 @@ page.general.display.name=Nombre que ver
page.general.status=Estado Marital\:
page.general.about.me=Describase\:
+page.general.relation.single=Soltero
+page.general.relation.committed=Comprometido
+page.general.relation.married=Casado
+page.general.relation.other=Otro
+
page.general.addpage.title=Titulo
page.general.addpage.layout.columns_1=Una Columna
page.general.addpage.layout.columns_2=Dos Columnas
@@ -114,6 +119,7 @@ page.layout.newuser.subtitle=Hemos provi
Seleccione el link(arriba) del Widget Store para agregar mas Widgets\!
page.login.title=Iniciar sesi\u00F3n
+page.login.button=Volver a p\u00E1gina de acceso
page.login.createaccount=Nuevo Usuario
page.login.createaccount.label=Registrarse\:
page.login.createaccount.button=Cree un nueva cuenta
@@ -392,3 +398,4 @@ _rave_client.grant.editing.user.confirm=
_rave_client.revoke.editing.user.confirm=Esta seguro/a que desea remover los derechos de edici\u00F3n al siguiente usuario?
_rave_client.no.results.found=No fueron encontrados resultados
_rave_client.get.metadata=Obtener metadata
+page.general.relation.status=Estado Marital\:
Modified: rave/branches/model-split/rave-portal-resources/src/main/resources/messages_nl.properties
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-portal-resources/src/main/resources/messages_nl.properties?rev=1371499&r1=1371498&r2=1371499&view=diff
==============================================================================
--- rave/branches/model-split/rave-portal-resources/src/main/resources/messages_nl.properties (original)
+++ rave/branches/model-split/rave-portal-resources/src/main/resources/messages_nl.properties Thu Aug 9 21:45:33 2012
@@ -65,7 +65,7 @@ page.general.movethispage=Verplaats deze
page.general.movethispage.after=Na {0}
page.general.movethispage.tofirst=Naar eerste tab
page.general.sharepage=Deel pagina
-page.general.removeshare=Trek delen in
+page.general.removeshare=Trek delen in
page.general.search.title=Zoek of blader voor gebruiker
page.general.password=Wachtwoord:
page.general.screenshot=schermafbeelding
@@ -75,11 +75,16 @@ page.general.toadmininterface=Beheeromge
page.general.username=Gebruikersnaam:
page.general.login.information=Voer inloggegevens in
page.general.personal.information=Voer persoonlijke informatie in (optioneel)
-page.general.first.name=Voornaam:
-page.general.last.name=Achternaam:
-page.general.display.name=Naam gezien door andere gebruikers:
-page.general.status=Burgerlijke staat:
-page.general.about.me=Beschrijf Uzelf:
+page.general.first.name=Voornaam:
+page.general.last.name=Achternaam:
+page.general.display.name=Naam gezien door andere gebruikers:
+page.general.status=Burgerlijke staat:
+page.general.about.me=Beschrijf Uzelf:
+
+page.general.relation.single=Ongehuwd
+page.general.relation.committed=Verloofd
+page.general.relation.married=Gehuwd
+page.general.relation.other=Ander
page.general.addpage.title=Titel
page.general.addpage.layout.columns_1=Een kolom
@@ -115,6 +120,7 @@ page.layout.newuser.subtitle=We hebben e
Klik op de Widgetwinkel link hierboven om meer widgets toe te voegen!
page.login.title=Inloggen
+page.login.button=Terug naar login pagina
page.login.createaccount=Nieuwe gebruiker
page.login.createaccount.label=Registreer:
page.login.createaccount.button=Cre\u00EBer een nieuw account
@@ -167,15 +173,15 @@ page.userprofile.message.success=Uw gebr
page.widget.title=Widgetdetail
page.widget.addToPage=Voeg toe aan pagina
page.widget.backToStore=Terug naar de winkel
-page.widget.widgetPreview=Widget preview
+page.widget.widgetPreview=Widget voorvertoning
page.widget.rate=Waardering:
page.widget.rate.likebtn=Leuk
page.widget.rate.dislikebtn=Niet leuk
page.widget.comments=Opmerkingen
page.widget.comment.edit=Bewerk opmerking
page.widget.usercount=gebruikers
-page.widget.rate.likes=mensen zoals deze widget
-page.widget.rate.dislikes=mensen hekel aan deze widget
+page.widget.rate.likes=mensen vinden deze widget leuk
+page.widget.rate.dislikes=mensen vinden deze widget niet leuk
page.widget.tags.title=Labels:
page.widget.tags.add=Nieuwe tag toevoegen:
page.widget.tags.or=--of--
@@ -189,14 +195,14 @@ page.addwidget.result.success=De widget
page.profile.title=Profiel van {0}
page.profile.personal.info=Persoonsgegevens
-page.profile.first.name=Voornaam:
-page.profile.last.name=Achternaam:
+page.profile.first.name=Voornaam:
+page.profile.last.name=Achternaam:
page.profile.display.name=Volledige naam\:
page.profile.basic.info=Algemene informatie
-page.profile.about.me=Over mij:
-page.profile.status=Burgerlijke staat:
+page.profile.about.me=Over mij:
+page.profile.status=Burgerlijke staat:
page.profile.contact.info=Contact informatie
-page.profile.email=E-mail:
+page.profile.email=E-mail:
page.profile.posts=Berichten
page.profile.posts.page=/WEB-INF/jsp/views/profile_posts.jsp
page.profile.about=Over mij
@@ -212,14 +218,14 @@ page.profile.cancel=Annuleer
page.personProfile.title=Profiel van {0}
page.personProfile.personal.info=Persoonsgegevens
-page.personProfile.first.name=Voornaam:
-page.personProfile.last.name=Achternaam:
+page.personProfile.first.name=Voornaam:
+page.personProfile.last.name=Achternaam:
page.personProfile.display.name=Volledige naam\:
page.personProfile.basic.info=Algemene informatie
-page.personProfile.about.me=Over mij:
-page.personProfile.status=Burgerlijke staat:
+page.personProfile.about.me=Over mij:
+page.personProfile.status=Burgerlijke staat:
page.personProfile.contact.info=Contact informatie
-page.personProfile.email=E-mail:
+page.personProfile.email=E-mail:
page.personProfile.posts=Berichten
page.personProfile.posts.page=/WEB-INF/jsp/views/profile_posts.jsp
page.personProfile.about=Over mij
@@ -256,7 +262,7 @@ admin.userdata.email=E-mail
admin.userdata.accountstatus=Account status:
admin.userdata.enabled=Account ingeschakeld
admin.userdata.expired=Account verlopen
-admin.userdata.locked=Account op slot
+admin.userdata.locked=Account geblokkeerd
admin.userdata.authorities=Autoriteiten\:
admin.newaccount.title=Nieuwe gebruiker aanmaken
admin.widgets.search=Zoek widgets
@@ -296,8 +302,8 @@ admin.categoryDetail.action.update.succe
admin.categoryDetail.action.delete.success=Categorie verwijderd
admin.categoryDetail.action.create.success=Categorie aangemaakt
admin.categoryDetail.goback=\u00ab Terug naar categorie\u00EBn
-admin.categoryDetail.action.delete.confirm=Ja, ik wil deze categorie wilt verwijderen
-admin.categoryDetail.editData=Wijzig de categorie van gegevens
+admin.categoryDetail.action.delete.confirm=Ja, ik wil deze categorie verwijderen
+admin.categoryDetail.editData=Wijzig de categorie
admin.categoryDetail.label.text=Tekst:
admin.categoryDetail.title=Rave admin interface - Categorie
admin.clearsearch=Maak zoekveld leeg
@@ -308,14 +314,14 @@ admin.list.result.x.to.y={0} - {1} van {
admin.list.search.noresult=Geen resultaten gevonden voor ''{0}''
admin.list.search.result.x.to.y={0} - {1} van {2} resultaten getoond welke overeenkomen met ''{3}''
-widget.author=Eigenaar
-widget.authorEmail=E-mail adres eigenaar
+widget.author=Maker
+widget.authorEmail=E-mail adres maker
widget.categories=Categorie\u00EBn:
widget.description=Beschrijving
widget.description.required=Beschrijving is verplicht
widget.disableRendering=Schakel widget uit
widget.disableRenderingMessage=Tekst uitgeschakelde widget
-widget.screenshotUrl=Screenshot
+widget.screenshotUrl=Schermafbeelding
widget.screenshotUrl.malformed=URL is niet correct
widget.thumbnailUrl=Miniatuur
widget.thumbnailUrl.malformed=URL is niet correct
@@ -354,23 +360,23 @@ sharing.page.tab.icon.tip.to=U hebt deze
#######################################################################################################################
# boodschappen ter beschikking van de opdrachtgever javascript via de MessageBundleController moet beginnen met "_rave_client."
#######################################################################################################################
-_rave_client.api.error=Rave is een fout opgetreden tijdens een poging om de server contact. Laad de pagina opnieuw en probeer het opnieuw. fout:
-_rave_client.api.rpc.error.invalid_params=Rave geprobeerd de server met uw recente wijzigingen bij te werken, maar de veranderingen waren geweigerd door de server als ongeldig.
-_rave_client.api.rpc.error.internal=Rave geprobeerd de server met uw recente wijzigingen bij te werken, maar de server heeft een interne fout.
-_rave_client.api.widget_metadata.invalid_params=Zowel de url en het type zijn nodig om de metadata te krijgen
+_rave_client.api.error=In Rave is een fout opgetreden tijdens het contact met de server. Laad de pagina opnieuw en probeer het opnieuw. Fout\:
+_rave_client.api.rpc.error.invalid_params=Rave heeft geprobeerd de server met uw recente wijzigingen bij te werken, maar de veranderingen zijn geweigerd door de server als ongeldig.
+_rave_client.api.rpc.error.internal=Rave heeft geprobeerd de server met uw recente wijzigingen bij te werken, maar in de server is een interne fout opgetreden.
+_rave_client.api.widget_metadata.invalid_params=Zowel de url als het type zijn nodig om de metadata op te halen
_rave_client.api.widget_metadata.parse_error=Kan de metadata van de Widget niet inlezen.nnControleer of de URL verwijst naar een geldige Widget van het opgegeven type.
_rave_client.api.rpc.empty.search.term=Zoekterm mag niet leeg zijn
_rave_client.common.add=Toevoegen
-_rave_client.common.remove=Verwijder
+_rave_client.common.remove=Verwijderen
_rave_client.common.cancel=Annuleren
-_rave_client.common.move=Bewegen
+_rave_client.common.move=Verplaatsen
_rave_client.common.save=Bewaren
_rave_client.common.update=Bijwerken
_rave_client.common.accept=Accepteer
-_rave_client.common.decline=Wijs af
-_rave_client.common.username=Gebruikersnaam
+_rave_client.common.decline=Wijs af
+_rave_client.common.username=Gebruikersnaam
_rave_client.common.sharing=Delen
-_rave_client.common.editing.auth=Geef Toestemming uit
+_rave_client.common.editing.auth=Bewerk toestemming
_rave_client.form.password.invalid_match=Het wachtwoord komt niet overeen
_rave_client.opensocial.render_error=Kan OpenSocial Gadget niet weergeven\:
_rave_client.page.add=Voeg een nieuwe pagina toe
@@ -380,16 +386,17 @@ _rave_client.widget.add_prefix=De widget
_rave_client.widget.add_suffix= is toegevoegd aan uw pagina
_rave_client.widget.prefs.required.title=* is een verplicht veld
_rave_client.widget.provider.error=Dit type widget wordt momenteel niet ondersteund. Neem contact op met uw beheerder en zorg ervoor dat de juiste provider is geregistreerd.
-_rave_client.widget.remove_confirm=Weet u zeker dat u deze widget wilt verwijderen van uw pagina?
+_rave_client.widget.remove_confirm=Wilt u deze widget verwijderen van uw pagina?
_rave_client.widget.users.added_by=is toegevoegd door...
_rave_client.search.list.result.x.to.y=Toont resultaat {0} - {1} van {2}
_rave_client.create.share=Gebruiker is toegevoegd aan deze pagina
-_rave_client.revoke.share=Gebruiker is verwijderd van deze pagina
-_rave_client.create.share.confirm=Weet je zeker dat je deze gebruiker wilt toevoegen?
-_rave_client.revoke.share.confirm=Weet je zeker dat je deze gebruiker wilt verwijderen?
+_rave_client.revoke.share=Gebruiker is verwijderd van deze pagina
+_rave_client.create.share.confirm=Wilt u deze gebruiker toevoegen?
+_rave_client.revoke.share.confirm=Wilt u deze gebruiker verwijderen?
_rave_client.revoke.share.current.user=Deze pagina is niet langer gedeeld.
-_rave_client.revoke.share.current.user.confirm=Weet je zeker dat je deze gedeelde pagina wilt verwijderen?
-_rave_client.grant.editing.user.confirm=Bent zeker u u wenst om het uitgeven rechten op de volgende gebruiker te geven?
-_rave_client.revoke.editing.user.confirm=Bent zeker u u wenst om het uitgeven rechten uit de volgende gebruiker te verwijderen?
+_rave_client.revoke.share.current.user.confirm=Wilt u deze gedeelde pagina verwijderen?
+_rave_client.grant.editing.user.confirm=Wilt u deze gebruiker rechten geven om de pagina bewerken?
+_rave_client.revoke.editing.user.confirm=Wilt u deze gebruiker de rechten afnemen om de pagina te bewerken?
_rave_client.no.results.found=Geen resultaten gevonden
_rave_client.get.metadata=Haal metadata op
+page.general.relation.status=Burgerlijke staat\: