taylor 2002/06/20 17:43:11 Modified: build/torque Tag: security_14 build.properties build/torque/schema Tag: security_14 security-schema.xml src/java/org/apache/jetspeed/om/dbpsml Tag: security_14 JetspeedGroupProfilePeer.java JetspeedRoleProfilePeer.java JetspeedUserProfilePeer.java src/java/org/apache/jetspeed/om/dbpsml/map Tag: security_14 JetspeedGroupProfileMapBuilder.java JetspeedRoleProfileMapBuilder.java JetspeedUserProfileMapBuilder.java src/sql Tag: security_14 dbpsml-schema.sql webapp/WEB-INF/conf Tag: security_14 JetspeedSecurity.properties Added: build/torque/schema Tag: security_14 dbpsml-schema.xml Removed: src/java/org/apache/jetspeed/om/dbpsml Tag: security_14 BaseJetspeedGroupProfile.java BaseJetspeedGroupProfilePeer.java BaseJetspeedRoleProfile.java BaseJetspeedRoleProfilePeer.java BaseJetspeedUserProfile.java BaseJetspeedUserProfilePeer.java JetspeedGroupProfile.java JetspeedRoleProfile.java JetspeedUserProfile.java Log: Revision Changes Path No revision No revision 1.4.2.3 +2 -3 jakarta-jetspeed/build/torque/build.properties Index: build.properties =================================================================== RCS file: /home/cvs/jakarta-jetspeed/build/torque/build.properties,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -r1.4.2.2 -r1.4.2.3 --- build.properties 30 May 2002 07:04:09 -0000 1.4.2.2 +++ build.properties 21 Jun 2002 00:43:10 -0000 1.4.2.3 @@ -26,6 +26,8 @@ # project=dbpsml project=security +# targetPackage=org.apache.jetspeed.om.dbpsml +targetPackage=org.apache.jetspeed.om.security.turbine # ------------------------------------------------------------------- # @@ -65,9 +67,6 @@ # # addIntakeRetrievable=implement Intake's Retrievable interface # ------------------------------------------------------------------- - -# targetPackage=org.apache.jetspeed.om.dbpsml -targetPackage=org.apache.jetspeed.om.security.turbine addSaveMethod=true addGetByNameMethod=true No revision No revision 1.1.2.10 +1 -64 jakarta-jetspeed/build/torque/schema/Attic/security-schema.xml Index: security-schema.xml =================================================================== RCS file: /home/cvs/jakarta-jetspeed/build/torque/schema/Attic/security-schema.xml,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -u -r1.1.2.9 -r1.1.2.10 --- security-schema.xml 20 Jun 2002 23:58:17 -0000 1.1.2.9 +++ security-schema.xml 21 Jun 2002 00:43:10 -0000 1.1.2.10 @@ -102,68 +102,5 @@ </foreign-key> </table> - <table name="JETSPEED_USER_PROFILE" idMethod="idbroker" > - - <column name="PSML_ID" required="true" primaryKey="true" - autoIncrement="true" type="INTEGER"/> - <column name="USER_NAME" required="true" size="32" type="VARCHAR"/> - <column name="MEDIA_TYPE" size="99" type="VARCHAR"/> - <column name="LANGUAGE" size="2" type="VARCHAR"/> - <column name="COUNTRY" size="2" type="VARCHAR"/> - <column name="PAGE" size="99" type="VARCHAR"/> - <column name="PROFILE" type="VARBINARY"/> - - <unique name="JETSPEED_USER_PROFILE_UNIQUE"> - <unique-column name="USER_NAME" /> - <unique-column name="MEDIA_TYPE" /> - <unique-column name="LANGUAGE" /> - <unique-column name="COUNTRY" /> - <unique-column name="PAGE" /> - </unique> - - </table> - - <table name="JETSPEED_GROUP_PROFILE" idMethod="idbroker" > - - <column name="PSML_ID" required="true" primaryKey="true" - autoIncrement="true" type="INTEGER"/> - <column name="GROUP_NAME" required="true" size="99" type="VARCHAR"/> - <column name="MEDIA_TYPE" size="99" type="VARCHAR"/> - <column name="LANGUAGE" size="2" type="VARCHAR"/> - <column name="COUNTRY" size="2" type="VARCHAR"/> - <column name="PAGE" size="99" type="VARCHAR"/> - <column name="PROFILE" type="VARBINARY"/> - - <unique name="JETSPEED_GROUP_PROFILE_UNIQUE"> - <unique-column name="GROUP_NAME" /> - <unique-column name="MEDIA_TYPE" /> - <unique-column name="LANGUAGE" /> - <unique-column name="COUNTRY" /> - <unique-column name="PAGE" /> - </unique> - - </table> - - <table name="JETSPEED_ROLE_PROFILE" idMethod="idbroker" > - - <column name="PSML_ID" required="true" primaryKey="true" - autoIncrement="true" type="INTEGER"/> - <column name="ROLE_NAME" required="true" size="99" type="VARCHAR"/> - <column name="MEDIA_TYPE" size="99" type="VARCHAR"/> - <column name="LANGUAGE" size="2" type="VARCHAR"/> - <column name="COUNTRY" size="2" type="VARCHAR"/> - <column name="PAGE" size="99" type="VARCHAR"/> - <column name="PROFILE" type="VARBINARY"/> - - <unique name="JETSPEED_ROLE_PROFILE_UNIQUE"> - <unique-column name="ROLE_NAME" /> - <unique-column name="MEDIA_TYPE" /> - <unique-column name="LANGUAGE" /> - <unique-column name="COUNTRY" /> - <unique-column name="PAGE" /> - </unique> - - </table> - </database> No revision No revision 1.3.2.3 +13 -10 jakarta-jetspeed/build/torque/schema/dbpsml-schema.xml No revision No revision 1.4.2.2 +1 -4 jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedGroupProfilePeer.java Index: JetspeedGroupProfilePeer.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedGroupProfilePeer.java,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -r1.4.2.1 -r1.4.2.2 --- JetspeedGroupProfilePeer.java 17 Jun 2002 21:27:01 -0000 1.4.2.1 +++ JetspeedGroupProfilePeer.java 21 Jun 2002 00:43:11 -0000 1.4.2.2 @@ -1,10 +1,7 @@ package org.apache.jetspeed.om.dbpsml; // JDK classes -import java.util.*; - -// Village classes -import com.workingdogs.village.*; +import java.util.Vector; // Turbine classes import org.apache.turbine.util.RunData; 1.4.2.2 +1 -3 jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedRoleProfilePeer.java Index: JetspeedRoleProfilePeer.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedRoleProfilePeer.java,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -r1.4.2.1 -r1.4.2.2 --- JetspeedRoleProfilePeer.java 17 Jun 2002 21:27:01 -0000 1.4.2.1 +++ JetspeedRoleProfilePeer.java 21 Jun 2002 00:43:11 -0000 1.4.2.2 @@ -1,10 +1,8 @@ package org.apache.jetspeed.om.dbpsml; // JDK classes -import java.util.*; +import java.util.Vector; -// Village classes -import com.workingdogs.village.*; // Turbine classes import org.apache.turbine.util.RunData; 1.4.2.1 +6 -8 jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedUserProfilePeer.java Index: JetspeedUserProfilePeer.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedUserProfilePeer.java,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -r1.4 -r1.4.2.1 --- JetspeedUserProfilePeer.java 6 Apr 2002 23:41:46 -0000 1.4 +++ JetspeedUserProfilePeer.java 21 Jun 2002 00:43:11 -0000 1.4.2.1 @@ -1,7 +1,7 @@ package org.apache.jetspeed.om.dbpsml; // JDK classes -import java.util.*; +import java.util.Vector; // Jetspeed classes (Profiler) import org.apache.jetspeed.om.profile.Profile; @@ -9,13 +9,11 @@ // Jetspeed classes for Database PsmlManager implementation import org.apache.jetspeed.services.psmlmanager.db.DBUtils; -// Village classes -import com.workingdogs.village.*; // Turbine classes -import org.apache.turbine.om.security.*; -import org.apache.turbine.om.peer.*; -import org.apache.turbine.util.*; +import org.apache.jetspeed.om.security.JetspeedUser; +import org.apache.turbine.util.RunData; +import org.apache.turbine.util.Log; //Torque classes import org.apache.torque.util.Criteria; @@ -139,7 +137,7 @@ String country = locator.getCountry(); String pageName = locator.getName(); String userName = null; - User user= locator.getUser(); + JetspeedUser user= locator.getUser(); if (user != null) { userName = user.getUserName(); @@ -177,7 +175,7 @@ * * @param user User object for which all the records will be deleted from the database */ - public void delete(User user) throws Exception + public void delete(JetspeedUser user) throws Exception { Criteria criteria = new Criteria(); No revision No revision 1.2.2.1 +4 -0 jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedGroupProfileMapBuilder.java Index: JetspeedGroupProfileMapBuilder.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedGroupProfileMapBuilder.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- JetspeedGroupProfileMapBuilder.java 6 Apr 2002 23:41:46 -0000 1.2 +++ JetspeedGroupProfileMapBuilder.java 21 Jun 2002 00:43:11 -0000 1.2.2.1 @@ -9,6 +9,10 @@ import org.apache.torque.map.TableMap; /** + * This class was autogenerated by Torque on: + * + * [Thu Jun 20 17:39:11 PDT 2002] + * */ public class JetspeedGroupProfileMapBuilder implements MapBuilder { 1.2.2.1 +4 -0 jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedRoleProfileMapBuilder.java Index: JetspeedRoleProfileMapBuilder.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedRoleProfileMapBuilder.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- JetspeedRoleProfileMapBuilder.java 6 Apr 2002 23:41:46 -0000 1.2 +++ JetspeedRoleProfileMapBuilder.java 21 Jun 2002 00:43:11 -0000 1.2.2.1 @@ -9,6 +9,10 @@ import org.apache.torque.map.TableMap; /** + * This class was autogenerated by Torque on: + * + * [Thu Jun 20 17:39:11 PDT 2002] + * */ public class JetspeedRoleProfileMapBuilder implements MapBuilder { 1.2.2.1 +4 -0 jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedUserProfileMapBuilder.java Index: JetspeedUserProfileMapBuilder.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/map/JetspeedUserProfileMapBuilder.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- JetspeedUserProfileMapBuilder.java 6 Apr 2002 23:41:46 -0000 1.2 +++ JetspeedUserProfileMapBuilder.java 21 Jun 2002 00:43:11 -0000 1.2.2.1 @@ -9,6 +9,10 @@ import org.apache.torque.map.TableMap; /** + * This class was autogenerated by Torque on: + * + * [Thu Jun 20 17:39:11 PDT 2002] + * */ public class JetspeedUserProfileMapBuilder implements MapBuilder { No revision No revision 1.3.2.1 +0 -16 jakarta-jetspeed/src/sql/dbpsml-schema.sql Index: dbpsml-schema.sql =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/sql/dbpsml-schema.sql,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- dbpsml-schema.sql 1 Apr 2002 23:12:21 -0000 1.3 +++ dbpsml-schema.sql 21 Jun 2002 00:43:11 -0000 1.3.2.1 @@ -49,19 +49,3 @@ UNIQUE (ROLE_NAME, MEDIA_TYPE, LANGUAGE, COUNTRY, PAGE) ); - ------------------------------------------------------------------------------ --- JETSPEED_ANON_PROFILE ------------------------------------------------------------------------------ -CREATE TABLE JETSPEED_ANON_PROFILE -( - PSML_ID integer IDENTITY, - MEDIA_TYPE VARCHAR (99), - LANGUAGE VARCHAR (2), - COUNTRY VARCHAR (2), - PAGE VARCHAR (99), - PROFILE BINARY, - PRIMARY KEY(PSML_ID), - UNIQUE (MEDIA_TYPE, LANGUAGE, COUNTRY, PAGE) -); - No revision No revision 1.1.2.23 +0 -0 jakarta-jetspeed/webapp/WEB-INF/conf/Attic/JetspeedSecurity.properties Index: JetspeedSecurity.properties =================================================================== RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/Attic/JetspeedSecurity.properties,v retrieving revision 1.1.2.22 retrieving revision 1.1.2.23 diff -u -r1.1.2.22 -r1.1.2.23
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>