You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by dl...@apache.org on 2005/11/26 22:11:30 UTC
svn commit: r349143 - in /portals/jetspeed-2/trunk: components/prefs/xdocs/
components/prefs/xdocs/images/ design-docs/src/prefs/ etc/schema/ etc/sql/
etc/sql/derby/schema/ etc/sql/hsql/ etc/sql/mssql/ etc/sql/mysql/
etc/sql/oracle/ jetspeed-api/src/ja...
Author: dlestrat
Date: Sat Nov 26 13:11:17 2005
New Revision: 349143
URL: http://svn.apache.org/viewcvs?rev=349143&view=rev
Log:
Removing the PropertyManager. Please make sure to read
http://issues.apache.org/jira/browse/JS2-431
The database schema has been changed as a result of this issue.
Removed:
portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/prefs/PropertyException.java
portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/prefs/PropertyManager.java
portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/prefs/om/PropertyKey.java
Modified:
portals/jetspeed-2/trunk/components/prefs/xdocs/images/preferences-schema.gif
portals/jetspeed-2/trunk/components/prefs/xdocs/index.xml
portals/jetspeed-2/trunk/design-docs/src/prefs/preferencesSchema_v1.2.vsd
portals/jetspeed-2/trunk/etc/schema/prefs-schema.xml
portals/jetspeed-2/trunk/etc/sql/derby/schema/prefs-schema.sql
portals/jetspeed-2/trunk/etc/sql/drop.sql
portals/jetspeed-2/trunk/etc/sql/hsql/prefs-drop.sql
portals/jetspeed-2/trunk/etc/sql/mssql/populate-userinfo-for-default-psml.sql
portals/jetspeed-2/trunk/etc/sql/mysql/populate-userinfo-for-default-psml.sql
portals/jetspeed-2/trunk/etc/sql/oracle/populate-userinfo-for-default-psml.sql
portals/jetspeed-2/trunk/etc/sql/populate-userinfo-for-default-psml.sql
portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/prefs/PreferencesProvider.java
portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/prefs/om/Property.java
portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/prefs.xml
Modified: portals/jetspeed-2/trunk/components/prefs/xdocs/images/preferences-schema.gif
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/prefs/xdocs/images/preferences-schema.gif?rev=349143&r1=349142&r2=349143&view=diff
==============================================================================
Binary files - no diff available.
Modified: portals/jetspeed-2/trunk/components/prefs/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/prefs/xdocs/index.xml?rev=349143&r1=349142&r2=349143&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/prefs/xdocs/index.xml (original)
+++ portals/jetspeed-2/trunk/components/prefs/xdocs/index.xml Sat Nov 26 13:11:17 2005
@@ -51,8 +51,32 @@
</li>
</ul>
</p>
- </section>
- <section name="Preferences Implementation Overview">
+ <subsection name="Preferences Goals">
+ <p>
+ The <i>Preferences</i> API provides a generic implementation for organizing properties as illustrated below:
+ <pre>
+<preferences EXTERNAL_XML_VERSION="1.0">
+<root type="user">
+ <map />
+ <node name="user">
+ <map />
+ <node name="principal1">
+ <map />
+ <node name="propertyset1">
+ <map>
+ <entry key="set1prop1" value="256" />
+ <entry key="set1prop2" value="314" />
+ </map>
+ </node>
+ </node>
+</root></pre>
+ </p>
+ <p>
+ A good reference article can be found at <a href="http://www.onjava.com/pub/a/onjava/synd/2001/10/17/j2se.html">
+ ONJava.com</a>.
+ </p>
+ </subsection>
+ <subsection name="Preferences Implementation Overview">
<p>
Jetspeed 2
<code>Preferences</code>
@@ -100,6 +124,7 @@
</td>
</tr>
</table>
+ </subsection>
<subsection name="Preferences Database Schema">
<p>
The following database schema is being used in Jetspeed 2 to store <code>Preferences</code>
@@ -108,7 +133,7 @@
<p>
<img src="images/preferences-schema.gif" border="0"/>
</p>
- </subsection>
+ </subsection>
</section>
</body>
</document>
Modified: portals/jetspeed-2/trunk/design-docs/src/prefs/preferencesSchema_v1.2.vsd
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/design-docs/src/prefs/preferencesSchema_v1.2.vsd?rev=349143&r1=349142&r2=349143&view=diff
==============================================================================
Binary files - no diff available.
Modified: portals/jetspeed-2/trunk/etc/schema/prefs-schema.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/schema/prefs-schema.xml?rev=349143&r1=349142&r2=349143&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/schema/prefs-schema.xml (original)
+++ portals/jetspeed-2/trunk/etc/schema/prefs-schema.xml Sat Nov 26 13:11:17 2005
@@ -24,49 +24,15 @@
<table name="PREFS_PROPERTY_VALUE">
<column name="PROPERTY_VALUE_ID" primaryKey="true" required="true" type="INTEGER"/>
<column name="NODE_ID" type="INTEGER"/>
- <column name="PROPERTY_KEY_ID" type="INTEGER"/>
- <column name="BOOLEAN_VALUE" type="BOOLEANINT"/>
- <column name="DATETIME_VALUE" type="TIMESTAMP"/>
- <column name="LONG_VALUE" type="INTEGER"/>
- <column name="DOUBLE_VALUE" type="DOUBLE"/>
- <column name="TEXT_VALUE" size="254" type="VARCHAR"/>
+ <column name="PROPERTY_NAME" size="100" type="VARCHAR"/>
+ <column name="PROPERTY_VALUE" size="254" type="VARCHAR"/>
<column name="CREATION_DATE" type="TIMESTAMP"/>
<column name="MODIFIED_DATE" type="TIMESTAMP"/>
- <!-- Issue with OJB RC6 when deleting M-N. Foreign Key Violation.
- <foreign-key foreignTable="PREFS_PROPERTY_KEY">
- <reference foreign="PROPERTY_KEY_ID" local="PROPERTY_KEY_ID"/>
- </foreign-key>
- <foreign-key foreignTable="PREFS_NODE">
- <reference foreign="NODE_ID" local="NODE_ID"/>
- </foreign-key>
- -->
- </table>
-
- <!--
- prefs_node_property_key
- -->
- <table name="PREFS_NODE_PROPERTY_KEY">
- <column name="NODE_ID" primaryKey="true" required="true" type="INTEGER"/>
- <column name="PROPERTY_KEY_ID" primaryKey="true" required="true" type="INTEGER"/>
- <!-- Issue with OJB RC6 when deleting M-N. Foreign Key Violation.
- <foreign-key foreignTable="PREFS_PROPERTY_KEY">
- <reference foreign="PROPERTY_KEY_ID" local="PROPERTY_KEY_ID"/>
- </foreign-key>
+ <!-- Still an issue with OJB 1.0.3 when deleting M-N. Foreign Key Violation.
<foreign-key foreignTable="PREFS_NODE">
<reference foreign="NODE_ID" local="NODE_ID"/>
</foreign-key>
-->
- </table>
-
- <!--
- prefs_property_key
- -->
- <table name="PREFS_PROPERTY_KEY">
- <column name="PROPERTY_KEY_ID" primaryKey="true" required="true" type="INTEGER"/>
- <column name="PROPERTY_NAME" size="100" type="VARCHAR"/>
- <column name="PROPERTY_TYPE" type="SMALLINT"/>
- <column name="CREATION_DATE" type="TIMESTAMP"/>
- <column name="MODIFIED_DATE" type="TIMESTAMP"/>
</table>
<!--
Modified: portals/jetspeed-2/trunk/etc/sql/derby/schema/prefs-schema.sql
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/sql/derby/schema/prefs-schema.sql?rev=349143&r1=349142&r2=349143&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/derby/schema/prefs-schema.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/derby/schema/prefs-schema.sql Sat Nov 26 13:11:17 2005
@@ -1,45 +1,4 @@
-----------------------------------------------------------------------------
--- PREFS_PROPERTY_VALUE
------------------------------------------------------------------------------
-
-CREATE TABLE PREFS_PROPERTY_VALUE
-(
- PROPERTY_VALUE_ID INTEGER NOT NULL,
- NODE_ID INTEGER,
- PROPERTY_KEY_ID INTEGER,
- BOOLEAN_VALUE INTEGER,
- DATETIME_VALUE TIMESTAMP,
- LONG_VALUE INTEGER,
- DOUBLE_VALUE DOUBLE,
- TEXT_VALUE VARCHAR(254),
- CREATION_DATE TIMESTAMP,
- MODIFIED_DATE TIMESTAMP,
- PRIMARY KEY(PROPERTY_VALUE_ID));
-
------------------------------------------------------------------------------
--- PREFS_NODE_PROPERTY_KEY
------------------------------------------------------------------------------
-
-CREATE TABLE PREFS_NODE_PROPERTY_KEY
-(
- NODE_ID INTEGER NOT NULL,
- PROPERTY_KEY_ID INTEGER NOT NULL,
- PRIMARY KEY(NODE_ID,PROPERTY_KEY_ID));
-
------------------------------------------------------------------------------
--- PREFS_PROPERTY_KEY
------------------------------------------------------------------------------
-
-CREATE TABLE PREFS_PROPERTY_KEY
-(
- PROPERTY_KEY_ID INTEGER NOT NULL,
- PROPERTY_NAME VARCHAR(100),
- PROPERTY_TYPE SMALLINT,
- CREATION_DATE TIMESTAMP,
- MODIFIED_DATE TIMESTAMP,
- PRIMARY KEY(PROPERTY_KEY_ID));
-
------------------------------------------------------------------------------
-- PREFS_NODE
-----------------------------------------------------------------------------
@@ -55,4 +14,20 @@
PRIMARY KEY(NODE_ID),
FOREIGN KEY (PARENT_NODE_ID) REFERENCES PREFS_NODE (NODE_ID)
);
+
+-----------------------------------------------------------------------------
+-- PREFS_PROPERTY_VALUE
+-----------------------------------------------------------------------------
+CREATE TABLE PREFS_PROPERTY_VALUE
+(
+ PROPERTY_VALUE_ID INTEGER NOT NULL,
+ NODE_ID INTEGER,
+ PROPERTY_NAME VARCHAR(100),
+ PROPERTY_VALUE VARCHAR(254),
+ CREATION_DATE TIMESTAMP,
+ MODIFIED_DATE TIMESTAMP,
+ PRIMARY KEY(PROPERTY_VALUE_ID)
+ -- Still an issue with OJB 1.0.3 when deleting M-N. Foreign Key Violation.
+ -- FOREIGN KEY (NODE_ID) REFERENCES PREFS_NODE (NODE_ID)
+ );
\ No newline at end of file
Modified: portals/jetspeed-2/trunk/etc/sql/drop.sql
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/sql/drop.sql?rev=349143&r1=349142&r2=349143&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/drop.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/drop.sql Sat Nov 26 13:11:17 2005
@@ -37,8 +37,6 @@
DROP TABLE PROFILING_RULE;
drop table PREFS_PROPERTY_VALUE;
-drop table PREFS_NODE_PROPERTY_KEY;
-drop table PREFS_PROPERTY_KEY;
drop table PREFS_NODE;
DROP TABLE PA_METADATA_FIELDS;
DROP TABLE PD_METADATA_FIELDS;
Modified: portals/jetspeed-2/trunk/etc/sql/hsql/prefs-drop.sql
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/sql/hsql/prefs-drop.sql?rev=349143&r1=349142&r2=349143&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/hsql/prefs-drop.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/hsql/prefs-drop.sql Sat Nov 26 13:11:17 2005
@@ -15,7 +15,5 @@
-----------------------------------------------------------------------------
drop table PREFS_PROPERTY_VALUE if exists;
-drop table PREFS_NODE_PROPERTY_KEY if exists;
-drop table PREFS_PROPERTY_KEY if exists;
drop table PREFS_NODE if exists;
Modified: portals/jetspeed-2/trunk/etc/sql/mssql/populate-userinfo-for-default-psml.sql
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/sql/mssql/populate-userinfo-for-default-psml.sql?rev=349143&r1=349142&r2=349143&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/mssql/populate-userinfo-for-default-psml.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/mssql/populate-userinfo-for-default-psml.sql Sat Nov 26 13:11:17 2005
@@ -3,12 +3,8 @@
INSERT INTO PREFS_NODE VALUES(102,101,'admin',0,'/user/admin','2004-05-22 16:27:12.482','2004-05-22 16:27:12.482');
INSERT INTO PREFS_NODE VALUES(103,102,'userinfo',0,'/user/admin/userinfo','2004-05-22 16:27:12.522','2004-05-22 16:27:12.532');
INSERT INTO SECURITY_PRINCIPAL VALUES(1,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/admin','2004-05-22 16:27:12.442','2004-05-22 16:27:12.442');
-INSERT INTO PREFS_PROPERTY_KEY VALUES(61,'user.name.given',3,'2004-05-22 16:27:12.532','2004-05-22 16:27:12.532');
-INSERT INTO PREFS_PROPERTY_VALUE VALUES(41,103,61,0,NULL,0,0.0E0,'Test Dude','2004-05-22 16:27:12.562','2004-05-22 16:27:12.562');
-INSERT INTO PREFS_PROPERTY_KEY VALUES(62,'user.name.family',3,'2004-05-22 16:27:12.532','2004-05-22 16:27:12.532');
-INSERT INTO PREFS_PROPERTY_VALUE VALUES(42,103,62,0,NULL,0,0.0E0,'Dudley','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-INSERT INTO PREFS_NODE_PROPERTY_KEY VALUES(103, 61);
-INSERT INTO PREFS_NODE_PROPERTY_KEY VALUES(103, 62);
+INSERT INTO PREFS_PROPERTY_VALUE VALUES(41,103,'user.name.given','Test Dude','2004-05-22 16:27:12.562','2004-05-22 16:27:12.562');
+INSERT INTO PREFS_PROPERTY_VALUE VALUES(42,103,'user.name.family','Dudley','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
INSERT INTO SECURITY_PRINCIPAL VALUES(2,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/manager','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
INSERT INTO SECURITY_PRINCIPAL VALUES(3,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/user','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
INSERT INTO SECURITY_PRINCIPAL VALUES(4,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/tomcat','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
Modified: portals/jetspeed-2/trunk/etc/sql/mysql/populate-userinfo-for-default-psml.sql
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/sql/mysql/populate-userinfo-for-default-psml.sql?rev=349143&r1=349142&r2=349143&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/mysql/populate-userinfo-for-default-psml.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/mysql/populate-userinfo-for-default-psml.sql Sat Nov 26 13:11:17 2005
@@ -3,12 +3,8 @@
INSERT INTO PREFS_NODE VALUES(102,101,'admin',0,'/user/admin','2004-05-22 16:27:12.482','2004-05-22 16:27:12.482');
INSERT INTO PREFS_NODE VALUES(103,102,'userinfo',0,'/user/admin/userinfo','2004-05-22 16:27:12.522','2004-05-22 16:27:12.532');
INSERT INTO SECURITY_PRINCIPAL VALUES(1,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/admin','2004-05-22 16:27:12.442','2004-05-22 16:27:12.442');
-INSERT INTO PREFS_PROPERTY_KEY VALUES(61,'user.name.given',3,'2004-05-22 16:27:12.532','2004-05-22 16:27:12.532');
-INSERT INTO PREFS_PROPERTY_VALUE VALUES(41,103,61,0,NULL,0,0.0E0,'Test Dude','2004-05-22 16:27:12.562','2004-05-22 16:27:12.562');
-INSERT INTO PREFS_PROPERTY_KEY VALUES(62,'user.name.family',3,'2004-05-22 16:27:12.532','2004-05-22 16:27:12.532');
-INSERT INTO PREFS_PROPERTY_VALUE VALUES(42,103,62,0,NULL,0,0.0E0,'Dudley','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-INSERT INTO PREFS_NODE_PROPERTY_KEY VALUES(103, 61);
-INSERT INTO PREFS_NODE_PROPERTY_KEY VALUES(103, 62);
+INSERT INTO PREFS_PROPERTY_VALUE VALUES(41,103,'user.name.given','Test Dude','2004-05-22 16:27:12.562','2004-05-22 16:27:12.562');
+INSERT INTO PREFS_PROPERTY_VALUE VALUES(42,103,'user.name.family','Dudley','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
INSERT INTO SECURITY_PRINCIPAL VALUES(2,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/manager','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
INSERT INTO SECURITY_PRINCIPAL VALUES(3,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/user','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
INSERT INTO SECURITY_PRINCIPAL VALUES(4,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/tomcat','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
Modified: portals/jetspeed-2/trunk/etc/sql/oracle/populate-userinfo-for-default-psml.sql
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/sql/oracle/populate-userinfo-for-default-psml.sql?rev=349143&r1=349142&r2=349143&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/oracle/populate-userinfo-for-default-psml.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/oracle/populate-userinfo-for-default-psml.sql Sat Nov 26 13:11:17 2005
@@ -3,12 +3,8 @@
INSERT INTO PREFS_NODE VALUES(102,101,'admin',0,'/user/admin',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
INSERT INTO PREFS_NODE VALUES(103,102,'userinfo',0,'/user/admin/userinfo',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
INSERT INTO SECURITY_PRINCIPAL VALUES(1,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/admin',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
-INSERT INTO PREFS_PROPERTY_KEY VALUES(61,'user.name.given',3,to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
-INSERT INTO PREFS_PROPERTY_VALUE VALUES(41,103,61,0,NULL,0,0.0E0,'Test Dude',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
-INSERT INTO PREFS_PROPERTY_KEY VALUES(62,'user.name.family',3,to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
-INSERT INTO PREFS_PROPERTY_VALUE VALUES(42,103,62,0,NULL,0,0.0E0,'Dudley',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
-INSERT INTO PREFS_NODE_PROPERTY_KEY VALUES(103, 61);
-INSERT INTO PREFS_NODE_PROPERTY_KEY VALUES(103, 62);
+INSERT INTO PREFS_PROPERTY_VALUE VALUES(41,103,'user.name.given','Test Dude',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO PREFS_PROPERTY_VALUE VALUES(42,103,'user.name.family','Dudley',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
INSERT INTO SECURITY_PRINCIPAL VALUES(2,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/manager',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
INSERT INTO SECURITY_PRINCIPAL VALUES(3,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/user',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
INSERT INTO SECURITY_PRINCIPAL VALUES(4,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/tomcat',to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'),to_date('2004-05-22 16:27:12','YYYY-MM-DD HH24:MI:SS'));
Modified: portals/jetspeed-2/trunk/etc/sql/populate-userinfo-for-default-psml.sql
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/sql/populate-userinfo-for-default-psml.sql?rev=349143&r1=349142&r2=349143&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/populate-userinfo-for-default-psml.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/populate-userinfo-for-default-psml.sql Sat Nov 26 13:11:17 2005
@@ -3,12 +3,8 @@
INSERT INTO PREFS_NODE VALUES(102,101,'admin',0,'/user/admin','2004-05-22 16:27:12.482','2004-05-22 16:27:12.482');
INSERT INTO PREFS_NODE VALUES(103,102,'userinfo',0,'/user/admin/userinfo','2004-05-22 16:27:12.522','2004-05-22 16:27:12.532');
INSERT INTO SECURITY_PRINCIPAL VALUES(1,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/admin','2004-05-22 16:27:12.442','2004-05-22 16:27:12.442');
-INSERT INTO PREFS_PROPERTY_KEY VALUES(61,'user.name.given',3,'2004-05-22 16:27:12.532','2004-05-22 16:27:12.532');
-INSERT INTO PREFS_PROPERTY_VALUE VALUES(41,103,61,0,NULL,0,0.0E0,'Test Dude','2004-05-22 16:27:12.562','2004-05-22 16:27:12.562');
-INSERT INTO PREFS_PROPERTY_KEY VALUES(62,'user.name.family',3,'2004-05-22 16:27:12.532','2004-05-22 16:27:12.532');
-INSERT INTO PREFS_PROPERTY_VALUE VALUES(42,103,62,0,NULL,0,0.0E0,'Dudley','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
-INSERT INTO PREFS_NODE_PROPERTY_KEY VALUES(103, 61);
-INSERT INTO PREFS_NODE_PROPERTY_KEY VALUES(103, 62);
+INSERT INTO PREFS_PROPERTY_VALUE VALUES(41,103,'user.name.given','Test Dude','2004-05-22 16:27:12.562','2004-05-22 16:27:12.562');
+INSERT INTO PREFS_PROPERTY_VALUE VALUES(42,103,'user.name.family','Dudley','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
INSERT INTO SECURITY_PRINCIPAL VALUES(2,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/manager','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
INSERT INTO SECURITY_PRINCIPAL VALUES(3,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/user','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
INSERT INTO SECURITY_PRINCIPAL VALUES(4,'org.apache.jetspeed.security.JetspeedUserPrincipalImpl',0,1,'/user/tomcat','2004-05-22 16:27:12.572','2004-05-22 16:27:12.572');
Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/prefs/PreferencesProvider.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/prefs/PreferencesProvider.java?rev=349143&r1=349142&r2=349143&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/prefs/PreferencesProvider.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/prefs/PreferencesProvider.java Sat Nov 26 13:11:17 2005
@@ -20,35 +20,37 @@
import org.apache.jetspeed.prefs.om.Node;
/**
- * <p>Utility component used to pass the {@link PersistenceStoreContainer} and
- * store name to the {@link Preferences} SPI implementation.</p>
+ * <p>
+ * Utility component used to pass the {@link PersistenceStoreContainer} and
+ * store name to the {@link Preferences} SPI implementation.
+ * </p>
*
* @author <a href="mailto:dlestrat@apache.org">David Le Strat</a>
*/
public interface PreferencesProvider
-{
- boolean isPropertyManagerEnabled();
-
- Node getNode( String fullPath, int nodeType ) throws NodeDoesNotExistException;
-
- boolean nodeExists( String fullPath, int nodeType );
-
- Node createNode( Node parent, String nodeName, int nodeType, String fullPath )
- throws FailedToCreateNodeException, NodeAlreadyExistsException;
-
+{
+ Node getNode(String fullPath, int nodeType) throws NodeDoesNotExistException;
+
+ boolean nodeExists(String fullPath, int nodeType);
+
+ Node createNode(Node parent, String nodeName, int nodeType, String fullPath) throws FailedToCreateNodeException,
+ NodeAlreadyExistsException;
+
Collection getChildren(Node parentNode);
-
+
void storeNode(Node node);
-
+
void removeNode(Node parentNode, Node node);
-
+
/**
- * Lookup a preference node given the preference name, a property name and value.
- * Options can be set to null if you dont want them included in the query.
+ * Lookup a preference node given the preference name, a property name and
+ * value. Options can be set to null if you dont want them included in the
+ * query.
*
* @param nodeName the name of the node to lookup, such as 'userinfo'
* @param propertyName the name of the property, such as 'user.email'
- * @param propertyValue the value of the property, such as 'taylor@apache.org'
+ * @param propertyValue the value of the property, such as
+ * 'taylor@apache.org'
* @return a collection of found matching elements of type <code>Node</code>
*/
Collection lookupPreference(String nodeName, String propertyName, String propertyValue);
Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/prefs/om/Property.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/prefs/om/Property.java?rev=349143&r1=349142&r2=349143&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/prefs/om/Property.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/prefs/om/Property.java Sat Nov 26 13:11:17 2005
@@ -18,172 +18,120 @@
import java.sql.Timestamp;
/**
- * <p>Interface representing a property key/value pair.</p>
- *
+ * <p>
+ * Interface representing a property key/value pair.
+ * </p>
+ *
* @author <a href="mailto:dlestrat@apache.org">David Le Strat</a>
*/
public interface Property extends Serializable, Cloneable
{
- /** <p>Constant for <code>boolean</code> property value object type.</p> */
- int BOOLEAN_TYPE = 0;
-
- /** <p>Constant for <code>long</code> property value object type.</p> */
- int LONG_TYPE = 1;
-
- /** <p>Constant for <code>double</code> property value object type.</p> */
- int DOUBLE_TYPE = 2;
-
- /** <p>Constant for <code>String</code> property value object type.</p> */
- int STRING_TYPE = 3;
-
- /** <p>Constant for <code>Timestamp</code> property value object type.</p> */
- int TIMESTAMP_TYPE = 3;
-
/**
- * <p>Getter for the property value id.</p>
+ * <p>
+ * Getter for the property value id.
+ * </p>
+ *
* @return The property value id.
*/
long getPropertyValueId();
/**
- * <p>Setter for the property value id.</p>
+ * <p>
+ * Setter for the property value id.
+ * </p>
+ *
* @param propertyValueId The property value id.
*/
void setPropertyValueId(long propertyValueId);
/**
- * <p>Getter for the node id.</p>
+ * <p>
+ * Getter for the node id.
+ * </p>
+ *
* @return The node id.
*/
long getNodeId();
/**
- * <p>Setter for the node id.</p>
+ * <p>
+ * Setter for the node id.
+ * </p>
+ *
* @param nodeId The node id.
*/
void setNodeId(long nodeId);
/**
- * <p>Getter for the node id.</p>
- * @return The property key id.
- */
- long getPropertyKeyId();
-
- /**
- * <p>Setter for the property key id.</p>
- * @param propertyKeyId The property key id.
- */
- void setPropertyKeyId(long propertyKeyId);
-
- /**
- * <p>Getter for the property key object.</p>
- * @return The property key object.
+ * <p>
+ * Getter for the property name.
+ * </p>
+ *
+ * @return The property name.
*/
- PropertyKey getPropertyKey();
+ String getPropertyName();
/**
- * <p>Setter for the property key object.</p>
- * @param propertyKey The property key object.
+ * <p>
+ * Setter for the property name.
+ * </p>
+ *
+ * @param propertyName The property name.
*/
- void setPropertyKey(PropertyKey propertyKey);
+ void setPropertyName(String propertyName);
/**
- * <p>Utility method used to return the property value
- * as a String.</p>
- * @param valueObjectType The value object type.
+ * <p>
+ * Utility method used to return the property value as a String.
+ * </p>
+ *
* @return The property value as a String.
*/
- String getPropertyValue(int valueObjectType);
+ String getPropertyValue();
/**
- * <p>Utility method used to identify with property value to set
- * based on the value object type.</p>
- * @param valueObjectType The value object type.
+ * <p>
+ * Utility method used to identify with property value to set based on the
+ * value object type.
+ * </p>
+ *
* @param valueObject The value object.
*/
- void setPropertyValue(int valueObjectType, String valueObject);
-
- /**
- * <p>Getter for the boolean property value.</p>
- * @return The boolean property value.
- */
- boolean getBooleanPropertyValue();
-
- /**
- * <p>Setter for the boolean property value.</p>
- * @param booleanPropertyValue The boolean property value.
- */
- void setBooleanPropertyValue(boolean booleanPropertyValue);
-
- /**
- * <p>Getter for the date property value.</p>
- * @return The date property value.
- */
- Timestamp getDatePropertyValue();
-
- /**
- * <p>Setter for the date property value.</p>
- * @param datePropertyValue The date property value.
- */
- void setDatePropertyValue(Timestamp datePropertyValue);
-
- /**
- * <p>Getter for the long property value.</p>
- * @return The long property value.
- */
- long getLongPropertyValue();
-
- /**
- * <p>Setter for the long property value.</p>
- * @param longPropertyValue The long property value.
- */
- void setLongPropertyValue(long longPropertyValue);
-
- /**
- * <p>Getter for the double property value.</p>
- * @return The double property value.
- */
- double getDoublePropertyValue();
-
- /**
- * <p>Setter for the double property value.</p>
- * @param doublePropertyValue The double property value.
- */
- void setDoublePropertyValue(double doublePropertyValue);
-
- /**
- * <p>Getter for the text property value.</p>
- * @return The text property value.
- */
- String getTextPropertyValue();
-
- /**
- * <p>Setter for the text property value.</p>
- * @param textPropertyValue The text property value.
- */
- void setTextPropertyValue(String textPropertyValue);
+ void setPropertyValue(String valueObject);
/**
- * <p>Getter for creation date.</p>
+ * <p>
+ * Getter for creation date.
+ * </p>
+ *
* @return The creation date.
*/
Timestamp getCreationDate();
/**
- * <p>Setter for the creation date.</p>
+ * <p>
+ * Setter for the creation date.
+ * </p>
+ *
* @param creationDate The creation date.
*/
void setCreationDate(Timestamp creationDate);
/**
- * <p>Getter for the modified date.</p>
+ * <p>
+ * Getter for the modified date.
+ * </p>
+ *
* @return The modified date.
*/
Timestamp getModifiedDate();
/**
- * <p>Setter for the modified date.</p>
+ * <p>
+ * Setter for the modified date.
+ * </p>
+ *
* @param modifiedDate The modified date.
*/
void setModifiedDate(Timestamp modifiedDate);
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/prefs.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/prefs.xml?rev=349143&r1=349142&r2=349143&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/prefs.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/prefs.xml Sat Nov 26 13:11:17 2005
@@ -22,9 +22,6 @@
<constructor-arg index="0">
<value>JETSPEED-INF/ojb/prefs_repository.xml</value>
</constructor-arg>
- <constructor-arg type="boolean" index="1">
- <value>false</value>
- </constructor-arg>
</bean>
<bean id="org.apache.jetspeed.prefs.PreferencesProvider" parent="baseTransactionProxy" name="prefsProvider">
@@ -52,31 +49,4 @@
</property>
</bean>
- <!-- Property Manager -->
- <bean id="PropertyManagerImpl" class="org.apache.jetspeed.prefs.impl.PropertyManagerImpl">
- <!-- We don't use the Tx proxied prefs provider so that we can demarcate Txs
- exclusively for the PropertyManager -->
- <constructor-arg>
- <ref bean="PreferencesProviderImpl" />
- </constructor-arg>
- </bean>
-
-
- <bean id="org.apache.jetspeed.prefs.PropertyManager" parent="baseTransactionProxy" name="propertyManager">
- <property name="proxyInterfaces">
- <value>org.apache.jetspeed.prefs.PropertyManager</value>
- </property>
-
- <property name="target">
- <ref bean="PropertyManagerImpl" />
- </property>
- <property name="transactionAttributes">
- <props>
- <prop key="add*">PROPAGATION_REQUIRED</prop>
- <prop key="remove*">PROPAGATION_REQUIRED</prop>
- <prop key="update*">PROPAGATION_REQUIRED</prop>
- <prop key="*">PROPAGATION_SUPPORTS</prop>
- </props>
- </property>
- </bean>
</beans>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org