Author: jasha
Date: Fri Aug 3 14:53:42 2012
New Revision: 1369001
URL: http://svn.apache.org/viewvc?rev=1369001&view=rev
Log:
RAVE-691 Table name for PortalPreference#values is generated, should get proper
name
Modified:
rave/trunk/rave-components/rave-core/src/test/resources/test_data.sql
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
rave/trunk/rave-components/rave-jpa/src/test/resources/test_data.sql
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
Modified: rave/trunk/rave-components/rave-core/src/test/resources/test_data.sql
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/resources/test_data.sql?rev=1369001&r1=1369000&r2=1369001&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/resources/test_data.sql
(original)
+++ rave/trunk/rave-components/rave-core/src/test/resources/test_data.sql Fri
Aug 3 14:53:42 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/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java?rev=1369001&r1=1369000&r2=1369001&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
Fri Aug 3 14:53:42 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/trunk/rave-components/rave-jpa/src/test/resources/test_data.sql
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/resources/test_data.sql?rev=1369001&r1=1369000&r2=1369001&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/resources/test_data.sql
(original)
+++ rave/trunk/rave-components/rave-jpa/src/test/resources/test_data.sql Fri
Aug 3 14:53:42 2012
@@ -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/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql?rev=1369001&r1=1369000&r2=1369001&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
Fri Aug 3 14:53:42 2012
@@ -1075,21 +1075,21 @@ values (@user_id_13, @user_authority_id)
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, 'titleSuffix');
-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;
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, 'pageSize');
-INSERT INTO JPAPORTALPREFERENCE_VALUES
+INSERT INTO portal_preference_values
values (@next_portal_preference_id, '10');
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, 'javaScriptDebugMode');
-INSERT INTO JPAPORTALPREFERENCE_VALUES
+INSERT INTO portal_preference_values
values (@next_portal_preference_id, '1');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name =
@portal_preference_seq;
-- end portal preferences
