You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ca...@apache.org on 2012/02/15 15:54:57 UTC
svn commit: r1244516 [2/2] - in /incubator/rave/trunk:
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/
rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/
rave-components/rave-core/src/main/java/org/apache/r...
Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql?rev=1244516&r1=1244515&r2=1244516&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql Wed Feb 15 14:54:56 2012
@@ -40,6 +40,7 @@ set @portal_preference_seq = 'portal_pre
set @tag_seq = 'tag';
set @widget_tag_seq = 'widget_tag';
set @category_seq = 'category';
+set @page_type_seq = 'page_type';
CREATE TABLE IF NOT EXISTS RAVE_PORTAL_SEQUENCES (seq_name VARCHAR(255) PRIMARY KEY NOT NULL, seq_count BIGINT(19));
INSERT INTO RAVE_PORTAL_SEQUENCES(seq_name, seq_count) values (@page_seq, 1);
@@ -59,6 +60,7 @@ INSERT INTO RAVE_PORTAL_SEQUENCES(seq_na
INSERT INTO RAVE_PORTAL_SEQUENCES(seq_name, seq_count) values (@tag_seq, 1);
INSERT INTO RAVE_PORTAL_SEQUENCES(seq_name, seq_count) values (@widget_tag_seq, 1);
INSERT INTO RAVE_PORTAL_SEQUENCES(seq_name, seq_count) values (@category_seq, 1);
+INSERT INTO RAVE_PORTAL_SEQUENCES(seq_name, seq_count) values (@page_type_seq, 1);
-- ***********************************************************************************
-- start page layout data, required to make the portal work ---
@@ -104,6 +106,20 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
--- end page layout data ----
+-- page types
+set @user_page_type_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_type_seq);
+insert into page_type (entity_id, code, description)
+values (@user_page_type_id, 'USER', 'Standard user pages which are only accessible by the page owner');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_type_seq;
+
+set @person_profile_page_type_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_type_seq);
+insert into page_type (entity_id, code, description)
+values (@person_profile_page_type_id, 'PERSON_PROFILE', 'Person Profile pages which are accessible by anyone and contain Person Profile information');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_type_seq;
+
+-- end page types
+
+
-- ***********************************************************************************
--- start user data ---
set @user_id_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
@@ -303,8 +319,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
--- Layout for user_id_1 ---
set @page_1_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id)
-values (@page_1_id, 'Main', @user_id_1, 1, @newuser_col_id);
+INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
+values (@page_1_id, 'Main', @user_id_1, 1, @newuser_col_id, @user_page_type_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
@@ -346,8 +362,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
set @page_2_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id)
-values (@page_2_id, 'Social', @user_id_1, 2, @two_col_id);
+INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
+values (@page_2_id, 'Social', @user_id_1, 2, @two_col_id, @user_page_type_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
set @page_2_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
@@ -384,8 +400,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
--- Layout for user_id_2 ---
set @page_1_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id)
-values (@page_1_id, 'Main', @user_id_2, 1, @newuser_col_id);
+INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
+values (@page_1_id, 'Main', @user_id_2, 1, @newuser_col_id, @user_page_type_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
set @page_1_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
@@ -426,8 +442,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
--- Layout for user_id_3 ---
set @page_1_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id)
-values (@page_1_id, 'Main', @user_id_3, 1, @newuser_col_id);
+INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
+values (@page_1_id, 'Main', @user_id_3, 1, @newuser_col_id, @user_page_type_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
set @page_1_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
@@ -468,15 +484,15 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
--- Layout for user_id_4 ---
set @page_1_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id)
-values (@page_1_id, 'Main', @user_id_4, 1, @two_col_id);
+INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
+values (@page_1_id, 'Main', @user_id_4, 1, @two_col_id, @user_page_type_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
--- End user_id_4 layout ---
--- Layout for user_id_5 ---
set @page_1_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id)
-values (@page_1_id, 'Main', @user_id_5, 1, @two_col_id);
+INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
+values (@page_1_id, 'Main', @user_id_5, 1, @two_col_id, @user_page_type_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
--- End user_id_5 layout ---
@@ -484,8 +500,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
--- Layout for user_id_6 ---
set @page_1_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id)
-values (@page_1_id, 'Main', @user_id_6, 1, @two_col_id);
+INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
+values (@page_1_id, 'Main', @user_id_6, 1, @two_col_id, @user_page_type_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
set @page_1_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
@@ -521,8 +537,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
--- Layout for user_id_7 ---
set @page_7_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id)
-values (@page_7_id, 'Main', @user_id_7, 1, @one_col_id);
+INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
+values (@page_7_id, 'Main', @user_id_7, 1, @one_col_id, @user_page_type_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
set @page_7_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
@@ -544,8 +560,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
--- Layout for user_id_8 ---
set @page_8_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id)
-values (@page_8_id, 'Main', @user_id_8, 1, @twown_col_id);
+INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
+values (@page_8_id, 'Main', @user_id_8, 1, @twown_col_id, @user_page_type_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
set @page_8_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
@@ -581,8 +597,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
--- Layout for user_id_9 ---
set @page_9_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id)
-values (@page_9_id, 'Main', @user_id_9, 1, @three_col_id);
+INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
+values (@page_9_id, 'Main', @user_id_9, 1, @three_col_id, @user_page_type_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
set @page_9_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
@@ -623,8 +639,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
--- Layout for user_id_10 ---
set @page_10_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id)
-values (@page_10_id, 'Main', @user_id_10, 1, @threewn_col_id);
+INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
+values (@page_10_id, 'Main', @user_id_10, 1, @threewn_col_id, @user_page_type_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
set @page_10_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
@@ -665,8 +681,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
--- Layout for user_id_11 ---
set @page_11_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id)
-values (@page_11_id, 'Main', @user_id_11, 1, @four_col_id);
+INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
+values (@page_11_id, 'Main', @user_id_11, 1, @four_col_id, @user_page_type_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
set @page_11_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
@@ -713,8 +729,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
--- Layout for user_id_12 ---
set @page_12_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id)
-values (@page_12_id, 'Main', @user_id_12, 1, @fourwn_col_id);
+INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
+values (@page_12_id, 'Main', @user_id_12, 1, @fourwn_col_id, @user_page_type_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
set @page_12_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
@@ -760,8 +776,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
--- Layout for user_id_13 ---
set @page_13_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id)
-values (@page_13_id, 'Main', @user_id_13, 1, @fourwn_col_id);
+INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
+values (@page_13_id, 'Main', @user_id_13, 1, @fourwn_col_id, @user_page_type_id);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
set @page_13_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
Modified: incubator/rave/trunk/rave-portal/src/test/resources/portal.properties
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/test/resources/portal.properties?rev=1244516&r1=1244515&r2=1244516&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/resources/portal.properties (original)
+++ incubator/rave/trunk/rave-portal/src/test/resources/portal.properties Wed Feb 15 14:54:56 2012
@@ -45,7 +45,7 @@ portal.jpaVendorAdapter.database=H2
# General Rave portal database settings
portal.jpaVendorAdapter.showSql=true
-portal.openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=INFO, SQL=TRACE
+portal.openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=INFO, SQL=WARN
portal.openjpa.RuntimeUnenhancedClasses=unsupported
portal.openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true)
Modified: incubator/rave/trunk/rave-portal/src/test/resources/test-data.sql
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/test/resources/test-data.sql?rev=1244516&r1=1244515&r2=1244516&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/resources/test-data.sql (original)
+++ incubator/rave/trunk/rave-portal/src/test/resources/test-data.sql Wed Feb 15 14:54:56 2012
@@ -30,6 +30,7 @@ set @region_seq = 'region';
set @region_widget_seq = 'region_widget';
set @user_seq = 'person';
set @widget_seq = 'widget';
+set @page_type_seq = 'page_type';
CREATE TABLE IF NOT EXISTS RAVE_PORTAL_SEQUENCES (seq_name VARCHAR(255) PRIMARY KEY NOT NULL, seq_count BIGINT(19));
INSERT INTO RAVE_PORTAL_SEQUENCES(seq_name, seq_count) values (@page_seq, 1);
@@ -39,6 +40,7 @@ INSERT INTO RAVE_PORTAL_SEQUENCES(seq_na
INSERT INTO RAVE_PORTAL_SEQUENCES(seq_name, seq_count) values ('region_widget_preference', 1);
INSERT INTO RAVE_PORTAL_SEQUENCES(seq_name, seq_count) values (@user_seq, 1);
INSERT INTO RAVE_PORTAL_SEQUENCES(seq_name, seq_count) values (@widget_seq, 1);
+INSERT INTO RAVE_PORTAL_SEQUENCES(seq_name, seq_count) values (@page_type_seq, 1);
-- ***********************************************************************************
-- start page layout data, required to make the portal work ---
@@ -78,6 +80,19 @@ values (@fourwn_col_id, 'columns_3nwn_1_
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_layout_seq;
--- end page layout data ----
+-- page types
+set @user_page_type_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_type_seq);
+insert into page_type (entity_id, code, description)
+values (@user_page_type_id, 'USER', 'Standard user pages which are only accessible by the page owner');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_type_seq;
+
+set @person_profile_page_type_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_type_seq);
+insert into page_type (entity_id, code, description)
+values (@person_profile_page_type_id, 'PERSON_PROFILE', 'Person Profile pages which are only accessible by anyone and contain Person Profile information');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_type_seq;
+
+-- end page types
+
-- ***********************************************************************************
--- start user data ---
set @user_id_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @user_seq);
Modified: incubator/rave/trunk/rave-shindig/src/test/resources/rave.shindig.properties
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/test/resources/rave.shindig.properties?rev=1244516&r1=1244515&r2=1244516&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/test/resources/rave.shindig.properties (original)
+++ incubator/rave/trunk/rave-shindig/src/test/resources/rave.shindig.properties Wed Feb 15 14:54:56 2012
@@ -38,7 +38,7 @@ rave-shindig.jpaVendorAdapter.database=H
# General Rave Shindig database settings
rave-shindig.jpaVendorAdapter.showSql=true
-rave-shindig.openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=INFO, SQL=TRACE
+rave-shindig.openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=INFO, SQL=WARN
rave-shindig.openjpa.RuntimeUnenhancedClasses=supported
rave-shindig.openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true)