Author: scottbw
Date: Fri Feb 7 15:53:58 2014
New Revision: 1565696
URL: http://svn.apache.org/r1565696
Log:
Moved JPA persistence configuration from wookie-server to wookie-jpa
Added:
wookie/trunk/wookie-services/wookie-jpa/src/main/resources/org/
wookie/trunk/wookie-services/wookie-jpa/src/main/resources/org/apache/
wookie/trunk/wookie-services/wookie-jpa/src/main/resources/org/apache/wookie/
wookie/trunk/wookie-services/wookie-jpa/src/main/resources/org/apache/wookie/beans/
wookie/trunk/wookie-services/wookie-jpa/src/main/resources/org/apache/wookie/beans/jpa/
wookie/trunk/wookie-services/wookie-jpa/src/main/resources/org/apache/wookie/beans/jpa/derby-wookie-schema.sql
- copied, changed from r1564870,
wookie/trunk/wookie-server/src/main/resources/org/apache/wookie/beans/jpa/derby-wookie-schema.sql
wookie/trunk/wookie-services/wookie-jpa/src/main/resources/org/apache/wookie/beans/jpa/persistence.properties
- copied unchanged from r1564870,
wookie/trunk/wookie-server/src/main/resources/org/apache/wookie/beans/jpa/persistence.properties
Removed:
wookie/trunk/wookie-server/src/main/resources/org/apache/wookie/beans/jpa/derby-wookie-schema.sql
wookie/trunk/wookie-server/src/main/resources/org/apache/wookie/beans/jpa/persistence.properties
Copied:
wookie/trunk/wookie-services/wookie-jpa/src/main/resources/org/apache/wookie/beans/jpa/derby-wookie-schema.sql
(from r1564870,
wookie/trunk/wookie-server/src/main/resources/org/apache/wookie/beans/jpa/derby-wookie-schema.sql)
URL:
http://svn.apache.org/viewvc/wookie/trunk/wookie-services/wookie-jpa/src/main/resources/org/apache/wookie/beans/jpa/derby-wookie-schema.sql?p2=wookie/trunk/wookie-services/wookie-jpa/src/main/resources/org/apache/wookie/beans/jpa/derby-wookie-schema.sql&p1=wookie/trunk/wookie-server/src/main/resources/org/apache/wookie/beans/jpa/derby-wookie-schema.sql&r1=1564870&r2=1565696&rev=1565696&view=diff
==============================================================================
---
wookie/trunk/wookie-server/src/main/resources/org/apache/wookie/beans/jpa/derby-wookie-schema.sql
(original)
+++
wookie/trunk/wookie-services/wookie-jpa/src/main/resources/org/apache/wookie/beans/jpa/derby-wookie-schema.sql
Fri Feb 7 15:53:58 2014
@@ -287,7 +287,7 @@ CREATE TABLE WidgetInstance
nonce VARCHAR(255),
idKey VARCHAR(255) NOT NULL,
opensocialToken LONG VARCHAR NOT NULL,
- widget_id INTEGER NOT NULL,
+ widget_id VARCHAR(255) NOT NULL,
updated CHAR(1),
shown CHAR(1),
hidden CHAR(1),
@@ -437,9 +437,6 @@ ALTER TABLE Description
ALTER TABLE StartFile
ADD CONSTRAINT FKStartFile1 FOREIGN KEY (widget_id) REFERENCES Widget (id);
-ALTER TABLE WidgetInstance
- ADD CONSTRAINT FKWidgetInstance1 FOREIGN KEY (widget_id) REFERENCES Widget
(id);
-
ALTER TABLE PreferenceDefault
ADD CONSTRAINT FKPreferenceDefault1 FOREIGN KEY (widget_id) REFERENCES
Widget (id);
