Hope I am not the only one who wants it. I use it in an intranet: the default value
for RELESEED is 'Y'
diff --exclude=CVS --exclude=*.jar --exclude=*.class --exclude=bin --exclude=build
--exclude=*~ --exclude=*.orig --ignore-all-space -Naur jyve/docs/oratables_schema.sql
jyve.orig/docs/oratables_schema.sql
--- jyve/docs/oratables_schema.sql Fri Jul 7 14:52:26 2000
+++ jyve.orig/docs/oratables_schema.sql Mon Jan 10 19:56:10 2000
@@ -115,53 +115,13 @@
CREATE UNIQUE INDEX PERMISSION_NAME_IDX ON PERMISSION(PERMISSION);
-- Add some default permissions
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'view_user');
insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'add_user');
insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'modify_user');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'view_group');
insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'add_group');
insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'modify_group');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'view_permission');
insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'add_permission');
insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'modify_permission');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'view_role');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'add_role');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'modify_role');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'add_project');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'add_faq');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'add_topic');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'add_question');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'add_answer');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'add_unreleased_project');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'add_unreleased_faq');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'add_unreleased_topic');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'add_unreleased_question');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'add_unreleased_answer');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'modify_project');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'modify_faq');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'modify_topic');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'modify_question');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'modify_answer');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'modify_own_project');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'modify_own_faq');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'modify_own_topic');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'modify_own_question');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'modify_own_answer');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'modify_own_unreleased_project');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'modify_own_unreleased_faq');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'modify_own_unreleased_topic');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'modify_own_unreleased_question');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'modify_own_unreleased_answer');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'see_unreleased_project');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'see_unreleased_faq');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'see_unreleased_topic');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'see_unreleased_question');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'see_unreleased_answer');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'release_project');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'release_faq');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'release_topic');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'release_question');
-insert into Permission (permissionid, PERMISSION) values
(permission_sequence.nextval, 'release_answer');
+
-------------------------------------
DROP SEQUENCE ROLE_SEQUENCE;
CREATE SEQUENCE ROLE_SEQUENCE start with 1;
@@ -171,775 +131,80 @@
ROLEID INT NOT NULL,
ROLENAME VARCHAR2(99) NOT NULL
);
+
ALTER TABLE USERROLE
ADD CONSTRAINT ROLE_PK PRIMARY KEY (ROLEID);
+
--CREATE UNIQUE INDEX ROLE_NAME ON USERROLE(ROLENAME);
+
-- Create a Role or Group in this case turbine root
-insert into UserRole (roleid, ROLENAME) values (role_sequence.nextval, 'root');
-insert into UserRole (roleid, ROLENAME) values (role_sequence.nextval, 'user_admin');
-insert into UserRole (roleid, ROLENAME) values (role_sequence.nextval, 'admin');
-insert into UserRole (roleid, ROLENAME) values (role_sequence.nextval,
'trusted_user');
-insert into UserRole (roleid, ROLENAME) values (role_sequence.nextval,
'authenticated_user');
-insert into UserRole (roleid, ROLENAME) values (role_sequence.nextval, 'guest');
+insert into UserRole (roleid, ROLENAME) values (role_sequence.nextval,
+'turbine_root');
+
-------------------------------------
DROP TABLE ROLEPERMISSION cascade constraints;
CREATE TABLE ROLEPERMISSION (
ROLEID INT NOT NULL,
PERMISSIONID INT NOT NULL
);
+
ALTER TABLE ROLEPERMISSION
ADD CONSTRAINT ROLEPERMISSION_PK PRIMARY KEY (ROLEID, PERMISSIONID);
--- Add some permissions for root
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'view_user'
- and UserRole.ROLENAME = 'root';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_user'
- and UserRole.ROLENAME = 'root';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_user'
- and UserRole.ROLENAME = 'root';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'view_group'
- and UserRole.ROLENAME = 'root';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_group'
- and UserRole.ROLENAME = 'root';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_group'
- and UserRole.ROLENAME = 'root';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'view_permission'
- and UserRole.ROLENAME = 'root';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_permission'
- and UserRole.ROLENAME = 'root';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_permission'
- and UserRole.ROLENAME = 'root';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'view_role'
- and UserRole.ROLENAME = 'root';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_role'
- and UserRole.ROLENAME = 'root';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_role'
- and UserRole.ROLENAME = 'root';
+-- Add some permissions for turbine root
insert into RolePermission (ROLEID,PERMISSIONID)
select UserRole.ROLEID, Permission.PERMISSIONID
from UserRole, Permission
- where Permission.PERMISSION = 'view_user'
- and UserRole.ROLENAME = 'user_admin';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
where Permission.PERMISSION = 'add_user'
- and UserRole.ROLENAME = 'user_admin';
+ and UserRole.ROLENAME = 'turbine_root';
insert into RolePermission (ROLEID,PERMISSIONID)
select UserRole.ROLEID, Permission.PERMISSIONID
from UserRole, Permission
where Permission.PERMISSION = 'modify_user'
- and UserRole.ROLENAME = 'user_admin';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'view_group'
- and UserRole.ROLENAME = 'user_admin';
+ and UserRole.ROLENAME = 'turbine_root';
insert into RolePermission (ROLEID,PERMISSIONID)
select UserRole.ROLEID, Permission.PERMISSIONID
from UserRole, Permission
where Permission.PERMISSION = 'add_group'
- and UserRole.ROLENAME = 'user_admin';
+ and UserRole.ROLENAME = 'turbine_root';
insert into RolePermission (ROLEID,PERMISSIONID)
select UserRole.ROLEID, Permission.PERMISSIONID
from UserRole, Permission
where Permission.PERMISSION = 'modify_group'
- and UserRole.ROLENAME = 'user_admin';
+ and UserRole.ROLENAME = 'turbine_root';
insert into RolePermission (ROLEID,PERMISSIONID)
select UserRole.ROLEID, Permission.PERMISSIONID
from UserRole, Permission
- where Permission.PERMISSION = 'view_permission'
- and UserRole.ROLENAME = 'user_admin';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
where Permission.PERMISSION = 'add_permission'
- and UserRole.ROLENAME = 'user_admin';
+ and UserRole.ROLENAME = 'turbine_root';
insert into RolePermission (ROLEID,PERMISSIONID)
select UserRole.ROLEID, Permission.PERMISSIONID
from UserRole, Permission
where Permission.PERMISSION = 'modify_permission'
- and UserRole.ROLENAME = 'user_admin';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'view_role'
- and UserRole.ROLENAME = 'user_admin';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_role'
- and UserRole.ROLENAME = 'user_admin';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_role'
- and UserRole.ROLENAME = 'user_admin';
-
---jyve permissions to role mappings
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_project'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_project'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_project'
- and UserRole.ROLENAME = 'trusted_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_faq'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_faq'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_faq'
- and UserRole.ROLENAME = 'trusted_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_topic'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_topic'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_topic'
- and UserRole.ROLENAME = 'trusted_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_question'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_question'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_question'
- and UserRole.ROLENAME = 'trusted_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_answer'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_answer'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_answer'
- and UserRole.ROLENAME = 'trusted_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_unreleased_project'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_unreleased_project'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_unreleased_project'
- and UserRole.ROLENAME = 'trusted_user';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_unreleased_project'
- and UserRole.ROLENAME = 'authenticated_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_unreleased_faq'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_unreleased_faq'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_unreleased_faq'
- and UserRole.ROLENAME = 'trusted_user';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_unreleased_faq'
- and UserRole.ROLENAME = 'authenticated_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_unreleased_topic'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_unreleased_topic'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_unreleased_topic'
- and UserRole.ROLENAME = 'trusted_user';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_unreleased_topic'
- and UserRole.ROLENAME = 'authenticated_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_unreleased_question'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_unreleased_question'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_unreleased_question'
- and UserRole.ROLENAME = 'trusted_user';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_unreleased_question'
- and UserRole.ROLENAME = 'authenticated_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_unreleased_answer'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_unreleased_answer'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_unreleased_answer'
- and UserRole.ROLENAME = 'trusted_user';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'add_unreleased_answer'
- and UserRole.ROLENAME = 'authenticated_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_project'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_project'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_project'
- and UserRole.ROLENAME = 'trusted_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_faq'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_faq'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_faq'
- and UserRole.ROLENAME = 'trusted_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_topic'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_topic'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_topic'
- and UserRole.ROLENAME = 'trusted_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_question'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_question'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_question'
- and UserRole.ROLENAME = 'trusted_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_answer'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_answer'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_answer'
- and UserRole.ROLENAME = 'trusted_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_project'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_project'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_project'
- and UserRole.ROLENAME = 'trusted_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_faq'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_faq'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_faq'
- and UserRole.ROLENAME = 'trusted_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_topic'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_topic'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_topic'
- and UserRole.ROLENAME = 'trusted_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_question'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_question'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_question'
- and UserRole.ROLENAME = 'trusted_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_answer'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_answer'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_answer'
- and UserRole.ROLENAME = 'trusted_user';
--------------------------------------------------------------------------------
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_unreleased_project'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_unreleased_project'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_unreleased_project'
- and UserRole.ROLENAME = 'trusted_user';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_unreleased_project'
- and UserRole.ROLENAME = 'authenticated_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_unreleased_faq'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_unreleased_faq'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_unreleased_faq'
- and UserRole.ROLENAME = 'trusted_user';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_unreleased_faq'
- and UserRole.ROLENAME = 'authenticated_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_unreleased_topic'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_unreleased_topic'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_unreleased_topic'
- and UserRole.ROLENAME = 'trusted_user';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_unreleased_topic'
- and UserRole.ROLENAME = 'authenticated_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_unreleased_question'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_unreleased_question'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_unreleased_question'
- and UserRole.ROLENAME = 'trusted_user';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_unreleased_question'
- and UserRole.ROLENAME = 'authenticated_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_unreleased_answer'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_unreleased_answer'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_unreleased_answer'
- and UserRole.ROLENAME = 'trusted_user';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'modify_own_unreleased_answer'
- and UserRole.ROLENAME = 'authenticated_user';
--------------------------------------------------
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'see_unreleased_project'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'see_unreleased_project'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'see_unreleased_project'
- and UserRole.ROLENAME = 'trusted_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'see_unreleased_faq'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'see_unreleased_faq'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'see_unreleased_faq'
- and UserRole.ROLENAME = 'trusted_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'see_unreleased_topic'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'see_unreleased_topic'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'see_unreleased_topic'
- and UserRole.ROLENAME = 'trusted_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'see_unreleased_question'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'see_unreleased_question'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'see_unreleased_question'
- and UserRole.ROLENAME = 'trusted_user';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'see_unreleased_answer'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'see_unreleased_answer'
- and UserRole.ROLENAME = 'admin';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'see_unreleased_answer'
- and UserRole.ROLENAME = 'trusted_user';
------------------------------------------
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'release_project'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'release_project'
- and UserRole.ROLENAME = 'admin';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'release_faq'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'release_faq'
- and UserRole.ROLENAME = 'admin';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'release_topic'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'release_topic'
- and UserRole.ROLENAME = 'admin';
-
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'release_question'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'release_question'
- and UserRole.ROLENAME = 'admin';
+ and UserRole.ROLENAME = 'turbine_root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'release_answer'
- and UserRole.ROLENAME = 'root';
-insert into RolePermission (ROLEID,PERMISSIONID)
- select UserRole.ROLEID, Permission.PERMISSIONID
- from UserRole, Permission
- where Permission.PERMISSION = 'release_answer'
- and UserRole.ROLENAME = 'admin';
-------------------------------------
DROP TABLE VISITORROLE cascade constraints;
CREATE TABLE VISITORROLE (
VISITORID INT NOT NULL,
ROLEID INT NOT NULL
);
+
ALTER TABLE VISITORROLE
ADD CONSTRAINT VISITORROLE_PK PRIMARY KEY (VISITORID, ROLEID);
+
-------------------------------------
-CREATE TABLE VISITOR (
+create table Visitor(
VISITORID int not null,
LOGINID varchar2 (32) NOT NULL UNIQUE,
PASSWORD_VALUE varchar2 (32),
CONFIRM_VALUE varchar2 (32),
- FIRST_NAME varchar2 (99),
- LAST_NAME varchar2 (99),
- PREFIX_NAME varchar(16),
- MIDDLE_NAME varchar(99),
- SUFFIX_NAME varchar(16),
- COMPANY_NAME varchar(255),
+ FIRST_NAME varchar2 (99) NOT NULL,
+ LAST_NAME varchar2 (99) NOT NULL,
ADDRESS1 varchar2 (255),
ADDRESS2 varchar2 (255),
CITY varchar2 (255),
@@ -961,68 +226,36 @@
--INDEX ( VISITORID, LOGINID ),
--UNIQUE (LOGINID)
);
+
ALTER TABLE VISITOR
- ADD CONSTRAINT VISITOR_PK PRIMARY KEY (VISITORID,LOGINID)
-;
+ ADD CONSTRAINT VISITOR_PK PRIMARY KEY (VISITORID,LOGINID);
drop sequence visitor_sequence;
create sequence visitor_sequence start with 1;
-insert into Visitor (visitorid, LOGINID, PASSWORD_VALUE, CONFIRM_VALUE, MODIFIED,
CREATED )
- values (visitor_sequence.nextval, 'guest', 'guest', 'CONFIRMED', null, null );
-
-INSERT INTO VISITOR
- (VISITORID,
- LOGINID,
- PASSWORD_VALUE,
- CONFIRM_VALUE,
- MODIFIED,
- CREATED)
- VALUES (VISITOR_SEQUENCE.NEXTVAL,
- 'root',
- 'changeit!',
- 'CONFIRMED',
- null, null );
+insert into Visitor (visitorid, LOGINID, FIRST_NAME, LAST_NAME,
+ PASSWORD_VALUE, MODIFIED, CREATED, LASTLOGIN, CONFIRM_VALUE )
+ values (visitor_sequence.nextval, 'Anonymous Guest', 'Anonymous', 'Guest', '',
+null,
+ null, null, 'CONFIRMED' );
INSERT INTO VISITOR
(VISITORID,
LOGINID,
PASSWORD_VALUE,
- CONFIRM_VALUE,
- MODIFIED,
- CREATED)
+ FIRST_NAME,
+ LAST_NAME)
VALUES (VISITOR_SEQUENCE.NEXTVAL,
- 'sheriff',
- 'changeit!',
- 'CONFIRMED',
- null, null );
-
-
--- Finally, add the user root to the root group
-insert into VisitorRole ( VISITORID, ROLEID )
- select Visitor.VISITORID, UserRole.RoleID
- from Visitor, UserRole
- where Visitor.loginid = 'root'
- AND UserRole.rolename = 'root';
-
-insert into VisitorRole ( VISITORID, ROLEID )
- select Visitor.VISITORID, UserRole.RoleID
- from Visitor, UserRole
- where Visitor.loginid = 'root'
- AND UserRole.rolename = 'user_admin';
+ 'turbine',
+ 'turbine',
+ 'system',
+ 'adminstrator' );
+-- Finally, add the user turbine to the turbine_root group
insert into VisitorRole ( VISITORID, ROLEID )
select Visitor.VISITORID, UserRole.RoleID
from Visitor, UserRole
- where Visitor.loginid = 'sheriff'
- AND UserRole.rolename = 'admin';
-
---insert into VisitorRole ( VISITORID, ROLEID )
--- select Visitor.VISITORID, UserRole.RoleID
--- from Visitor, UserRole
--- where Visitor.loginid = 'guest'
--- AND UserRole.rolename = 'trusted_user';
-
+ where Visitor.loginid = 'turbine'
+ AND UserRole.rolename = 'turbine_root';
-------------------------------------
CREATE TABLE answer (
@@ -1032,9 +265,6 @@
ANSWER_VALUE varchar2(2000) NOT NULL,
VISITORID integer default 1,
DISPLAY_ORDER integer not null,
- RELEASED char(1) default 'Y' check (RELEASED in ('Y','N')),
- RELEASED_BY integer,
- RELEASED_DATE date default null,
DELETED char(1) default 'N' check (DELETED in ('Y','N')), --enum ('Y',
'N') NOT NULL DEFAULT 'N',
SAVETYPE char(1) default 'H' check (savetype in ('H','P')), --enum ('H',
'P') NOT NULL DEFAULT 'H',
DELETED_BY integer,
@@ -1050,21 +280,21 @@
drop sequence answer_sequence;
create sequence answer_sequence start with 1;
---insert into answer (answer_id, ANSWER_VALUE, QUESTION_ID, DISPLAY_ORDER )
--- values (answer_sequence.nextval,
--- 'It is a servlet engine.', 1, 1 );
-
---insert into answer (answer_id, ANSWER_VALUE, QUESTION_ID, DISPLAY_ORDER )
--- values (answer_sequence.nextval,
--- 'It is a web application development environment.', 2, 2 );
-
---insert into answer (answer_id, ANSWER_VALUE, QUESTION_ID, DISPLAY_ORDER )
--- values (answer_sequence.nextval,
--- 'Version 2.0 only.', 3, 3 );
-
---insert into answer (answer_id, ANSWER_VALUE, QUESTION_ID, DISPLAY_ORDER )
--- values (answer_sequence.nextval,
--- 'Future versions of Jakarta will support the latest versions', 3, 4 );
+insert into answer (answer_id, ANSWER_VALUE, QUESTION_ID, DISPLAY_ORDER )
+ values (answer_sequence.nextval,
+ 'It is a servlet engine.', 1, 1 );
+
+insert into answer (answer_id, ANSWER_VALUE, QUESTION_ID, DISPLAY_ORDER )
+ values (answer_sequence.nextval,
+ 'It is a web application development environment.', 2, 2 );
+
+insert into answer (answer_id, ANSWER_VALUE, QUESTION_ID, DISPLAY_ORDER )
+ values (answer_sequence.nextval,
+ 'Version 2.0 only.', 3, 3 );
+
+insert into answer (answer_id, ANSWER_VALUE, QUESTION_ID, DISPLAY_ORDER )
+ values (answer_sequence.nextval,
+ 'Future versions of Jakarta will support the latest versions', 3, 4 );
-------------------------------------
CREATE TABLE question (
QUESTION_ID integer not null, -- int(11) DEFAULT '0' NOT NULL
auto_increment,
@@ -1072,9 +302,6 @@
QUESTION_VALUE varchar2(2000) NOT NULL,
VISITORID integer default 1, -- DEFAULT '1',
DISPLAY_ORDER integer default 0,
- RELEASED char(1) default 'Y' check (RELEASED in ('Y','N')),
- RELEASED_BY integer,
- RELEASED_DATE date default null,
DELETED char(1) default 'N' check (DELETED in ('Y','N')),
DELETED_BY integer,
MODIFIED_BY integer,
@@ -1089,17 +316,17 @@
drop sequence question_sequence;
create sequence question_sequence start with 1;
---insert into question (question_id, QUESTION_VALUE, TOPIC_ID, DISPLAY_ORDER )
--- values (question_sequence.nextval, 'What is Apache JServ?', 1, 1 );
+insert into question (question_id, QUESTION_VALUE, TOPIC_ID, DISPLAY_ORDER )
+ values (question_sequence.nextval, 'What is Apache JServ?', 1, 1 );
---insert into question (question_id, QUESTION_VALUE, TOPIC_ID, DISPLAY_ORDER )
--- values (question_sequence.nextval, 'What is Apache Turbine?', 2, 2 );
+insert into question (question_id, QUESTION_VALUE, TOPIC_ID, DISPLAY_ORDER )
+ values (question_sequence.nextval, 'What is Apache Turbine?', 2, 2 );
---insert into question (question_id, QUESTION_VALUE, TOPIC_ID, DISPLAY_ORDER )
--- values (question_sequence.nextval, 'What version of the JSDK does it support?',
1, 3 );
+insert into question (question_id, QUESTION_VALUE, TOPIC_ID, DISPLAY_ORDER )
+ values (question_sequence.nextval, 'What version of the JSDK does it support?',
+1, 3 );
---insert into question (question_id, QUESTION_VALUE, TOPIC_ID, DISPLAY_ORDER )
--- values (question_sequence.nextval, 'How do I map a servlet to / ?', 4, 4 );
+insert into question (question_id, QUESTION_VALUE, TOPIC_ID, DISPLAY_ORDER )
+ values (question_sequence.nextval, 'How do I map a servlet to / ?', 4, 4 );
-------------------------------------
CREATE TABLE topic (
@@ -1108,9 +335,6 @@
FAQ_ID int NOT NULL,
VISITORID integer default 1,
DISPLAY_ORDER integer default 0,
- RELEASED char(1) default 'Y' check (RELEASED in ('Y','N')),
- RELEASED_BY integer,
- RELEASED_DATE date default null,
DELETED char(1) default 'N' check (DELETED in ('Y','N')),
DELETED_BY integer,
MODIFIED_BY integer,
@@ -1125,27 +349,23 @@
drop sequence topic_sequence;
create sequence topic_sequence start with 1;
---insert into topic (topic_id, TOPIC_VALUE, FAQ_ID, DISPLAY_ORDER)
--- values (topic_sequence.nextval, 'General Questions', 1, 1 );
+insert into topic (topic_id, TOPIC_VALUE, FAQ_ID, DISPLAY_ORDER)
+ values (topic_sequence.nextval, 'General Questions', 1, 1 );
---insert into topic (topic_id, TOPIC_VALUE, FAQ_ID, DISPLAY_ORDER)
--- values (topic_sequence.nextval, 'General Questions', 2, 2 );
+insert into topic (topic_id, TOPIC_VALUE, FAQ_ID, DISPLAY_ORDER)
+ values (topic_sequence.nextval, 'General Questions', 2, 2 );
---insert into topic (topic_id, TOPIC_VALUE, FAQ_ID, DISPLAY_ORDER)
--- values (topic_sequence.nextval, 'General Questions', 3, 3 );
+insert into topic (topic_id, TOPIC_VALUE, FAQ_ID, DISPLAY_ORDER)
+ values (topic_sequence.nextval, 'General Questions', 3, 3 );
---insert into topic (topic_id, TOPIC_VALUE, FAQ_ID, DISPLAY_ORDER)
--- values (topic_sequence.nextval, 'Configuration Questions', 1, 4 );
+insert into topic (topic_id, TOPIC_VALUE, FAQ_ID, DISPLAY_ORDER)
+ values (topic_sequence.nextval, 'Configuration Questions', 1, 4 );
-------------------------------------
CREATE TABLE faq (
FAQ_ID integer not null, --int(11) DEFAULT '0' NOT NULL
auto_increment,
FAQ_VALUE varchar2(2000) not null,
- PROJECT_ID integer not null,
VISITORID integer default 1,
DISPLAY_ORDER integer default 0,
- RELEASED char(1) default 'Y' check (RELEASED in ('Y','N')),
- RELEASED_BY integer,
- RELEASED_DATE date default null,
DELETED char(1) default 'N' check (DELETED in ('Y','N')),
DELETED_BY integer,
MODIFIED_BY integer,
@@ -1160,23 +380,20 @@
drop sequence faq_sequence;
create sequence faq_sequence start with 1;
---insert into faq (faq_id, FAQ_VALUE, PROJECT_ID, DISPLAY_ORDER)
--- values (faq_sequence.nextval, 'Apache JServ', 1, 1 );
+insert into faq (faq_id, FAQ_VALUE, PROJECT_ID, DISPLAY_ORDER)
+ values (faq_sequence.nextval, 'Apache JServ', 1, 1 );
---insert into faq (faq_id, FAQ_VALUE, PROJECT_ID, DISPLAY_ORDER)
--- values (faq_sequence.nextval, 'Apache Turbine', 1, 2 );
+insert into faq (faq_id, FAQ_VALUE, PROJECT_ID, DISPLAY_ORDER)
+ values (faq_sequence.nextval, 'Apache Turbine', 1, 2 );
---insert into faq (faq_id, FAQ_VALUE, PROJECT_ID, DISPLAY_ORDER)
--- values (faq_sequence.nextval, 'Apache Tomcat', 2, 3 );
+insert into faq (faq_id, FAQ_VALUE, PROJECT_ID, DISPLAY_ORDER)
+ values (faq_sequence.nextval, 'Apache Tomcat', 2, 3 );
-------------------------------------
CREATE TABLE project (
- PROJECT_ID integer default 0 not null, --auto_increment,
+ PROJECT_ID integer, --auto_increment,
PROJECT_VALUE varchar2(2000) not null, --text NOT NULL,
VISITORID integer DEFAULT 1,
DISPLAY_ORDER integer DEFAULT 0,
- RELEASED char(1) default 'Y' check (RELEASED in ('Y','N')),
- RELEASED_BY integer,
- RELEASED_DATE date default null,
DELETED char(1) default 'N' check (DELETED in ('Y','N')),
DELETED_BY integer,
MODIFIED_BY integer,
@@ -1191,9 +408,9 @@
drop sequence project_sequence;
create sequence project_sequence start with 1;
---insert into project (project_id, PROJECT_VALUE, DISPLAY_ORDER)
--- values (project_sequence.nextval, 'Java Apache Project', 1 );
+insert into project (project_id, PROJECT_VALUE, DISPLAY_ORDER)
+ values (project_sequence.nextval, 'Java Apache Project', 1 );
---insert into project (project_id, PROJECT_VALUE, DISPLAY_ORDER)
--- values (project_sequence.nextval, 'Jakarta Project', 2 );
+insert into project (project_id, PROJECT_VALUE, DISPLAY_ORDER)
+ values (project_sequence.nextval, 'Jakarta Project', 2 );
diff --exclude=CVS --exclude=*.jar --exclude=*.class --exclude=bin --exclude=build
--exclude=*~ --exclude=*.orig --ignore-all-space -Naur
jyve/src/java/org/apache/jyve/actions/AddNewAnswer.java
jyve.orig/src/java/org/apache/jyve/actions/AddNewAnswer.java
--- jyve/src/java/org/apache/jyve/actions/AddNewAnswer.java Thu Jun 8 15:51:19
2000
+++ jyve.orig/src/java/org/apache/jyve/actions/AddNewAnswer.java Fri Apr 21
+22:29:43 2000
@@ -71,14 +71,13 @@
import org.apache.turbine.services.*;
import org.apache.turbine.services.localization.*;
import org.apache.turbine.util.*;
-import org.apache.turbine.om.peer.*;
import org.apache.turbine.om.security.*;
import org.apache.turbine.util.db.*;
import org.apache.turbine.util.db.pool.*;
import com.workingdogs.village.*;
import org.apache.ecs.*;
import org.apache.ecs.html.*;
-import org.apache.turbine.services.resources.TurbineResources;
+
/**
*/
public class AddNewAnswer extends Action
@@ -118,11 +117,6 @@
try
{
Record rec = tds.addRecord();
- if ( TurbineResources.getString("database.default.driver", "" )
- .startsWith("oracle") )
- {
- rec.setValue("answer_id", BasePeer.getNextId("answer_sequence"));
- }
rec.setValue ( "answer_value", data.parameters.getString("answer_value",
Localization.getString("ADDNEWANSWER_UNTITLED")));
rec.setValue ( "question_id", data.parameters.getInt("question_id") );
diff --exclude=CVS --exclude=*.jar --exclude=*.class --exclude=bin --exclude=build
--exclude=*~ --exclude=*.orig --ignore-all-space -Naur
jyve/src/java/org/apache/jyve/actions/AddNewFaq.java
jyve.orig/src/java/org/apache/jyve/actions/AddNewFaq.java
--- jyve/src/java/org/apache/jyve/actions/AddNewFaq.java Thu Jun 8 15:58:04
2000
+++ jyve.orig/src/java/org/apache/jyve/actions/AddNewFaq.java Fri Apr 21 22:29:43
+2000
@@ -71,14 +71,13 @@
import org.apache.turbine.services.*;
import org.apache.turbine.services.localization.*;
import org.apache.turbine.util.*;
-import org.apache.turbine.om.peer.*;
import org.apache.turbine.om.security.*;
import org.apache.turbine.util.db.*;
import org.apache.turbine.util.db.pool.*;
import com.workingdogs.village.*;
import org.apache.ecs.*;
import org.apache.ecs.html.*;
-import org.apache.turbine.services.resources.TurbineResources;
+
/**
*/
public class AddNewFaq extends Action
@@ -126,11 +125,6 @@
try
{
Record rec = tds.addRecord();
- if ( TurbineResources.getString("database.default.driver", "" )
- .startsWith("oracle") )
- {
- rec.setValue("faq_id", BasePeer.getNextId("faq_sequence"));
- }
rec.setValue ( "faq_value", data.parameters.getString("faq_value",
Localization.getString("ADDNEWFAQ_UNTITLEDFAQ")) );
rec.setValue ( "project_id", project_id.intValue() );
diff --exclude=CVS --exclude=*.jar --exclude=*.class --exclude=bin --exclude=build
--exclude=*~ --exclude=*.orig --ignore-all-space -Naur
jyve/src/java/org/apache/jyve/actions/AddNewProject.java
jyve.orig/src/java/org/apache/jyve/actions/AddNewProject.java
--- jyve/src/java/org/apache/jyve/actions/AddNewProject.java Thu Jun 8 15:51:37
2000
+++ jyve.orig/src/java/org/apache/jyve/actions/AddNewProject.java Fri Apr 21
+22:29:43 2000
@@ -71,14 +71,13 @@
import org.apache.turbine.services.*;
import org.apache.turbine.services.localization.*;
import org.apache.turbine.util.*;
-import org.apache.turbine.om.peer.*;
import org.apache.turbine.om.security.*;
import org.apache.turbine.util.db.*;
import org.apache.turbine.util.db.pool.*;
import com.workingdogs.village.*;
import org.apache.ecs.*;
import org.apache.ecs.html.*;
-import org.apache.turbine.services.resources.TurbineResources;
+
/**
*/
public class AddNewProject extends Action
@@ -114,16 +113,10 @@
Connection connection = db.getConnection();
// execute the query
-
TableDataSet tds = new TableDataSet( connection, "project" );
try
{
Record rec = tds.addRecord();
- if ( TurbineResources.getString("database.default.driver", "" )
- .startsWith("oracle") )
- {
- rec.setValue("project_id", BasePeer.getNextId("project_sequence"));
- }
rec.setValue ( "project_value", data.parameters.getString("project_value",
Localization.getString("ADDNEWPRJ_UNTITLEDPRJ")) );
rec.setValue ( "display_order", data.parameters.getInt("display_order",
0) );
@@ -150,7 +143,6 @@
if ( tds != null ) tds.close();
DBBroker.getInstance().releaseConnection(db);
}
-
data.setMessage (Localization.getString("ADDNEWPRJ_CREATE"));
}
}
diff --exclude=CVS --exclude=*.jar --exclude=*.class --exclude=bin --exclude=build
--exclude=*~ --exclude=*.orig --ignore-all-space -Naur
jyve/src/java/org/apache/jyve/actions/AddNewQuestion.java
jyve.orig/src/java/org/apache/jyve/actions/AddNewQuestion.java
--- jyve/src/java/org/apache/jyve/actions/AddNewQuestion.java Thu Jun 8 15:57:49
2000
+++ jyve.orig/src/java/org/apache/jyve/actions/AddNewQuestion.java Fri Apr 21
+22:29:43 2000
@@ -71,14 +71,13 @@
import org.apache.turbine.services.*;
import org.apache.turbine.services.localization.*;
import org.apache.turbine.util.*;
-import org.apache.turbine.om.peer.*;
import org.apache.turbine.om.security.*;
import org.apache.turbine.util.db.*;
import org.apache.turbine.util.db.pool.*;
import com.workingdogs.village.*;
import org.apache.ecs.*;
import org.apache.ecs.html.*;
-import org.apache.turbine.services.resources.TurbineResources;
+
/**
*/
public class AddNewQuestion extends Action
@@ -119,11 +118,6 @@
try
{
Record rec = tds.addRecord();
- if ( TurbineResources.getString("database.default.driver", "" )
- .startsWith("oracle") )
- {
- rec.setValue("question_id",
BasePeer.getNextId("question_sequence"));
- }
rec.setValue ( "question_value",
data.parameters.getString("question_value",
Localization.getString("ADDNEWQUESTION_UNTITLEDQ")));
rec.setValue ( "topic_id", data.parameters.getInt("topic_id") );
diff --exclude=CVS --exclude=*.jar --exclude=*.class --exclude=bin --exclude=build
--exclude=*~ --exclude=*.orig --ignore-all-space -Naur
jyve/src/java/org/apache/jyve/actions/AddNewTopic.java
jyve.orig/src/java/org/apache/jyve/actions/AddNewTopic.java
--- jyve/src/java/org/apache/jyve/actions/AddNewTopic.java Thu Jun 8 15:57:36
2000
+++ jyve.orig/src/java/org/apache/jyve/actions/AddNewTopic.java Fri Apr 21 22:29:43
+2000
@@ -71,14 +71,13 @@
import org.apache.turbine.services.*;
import org.apache.turbine.services.localization.*;
import org.apache.turbine.util.*;
-import org.apache.turbine.om.peer.*;
import org.apache.turbine.om.security.*;
import org.apache.turbine.util.db.*;
import org.apache.turbine.util.db.pool.*;
import com.workingdogs.village.*;
import org.apache.ecs.*;
import org.apache.ecs.html.*;
-import org.apache.turbine.services.resources.TurbineResources;
+
/**
*/
public class AddNewTopic extends Action
@@ -126,11 +125,6 @@
try
{
Record rec = tds.addRecord();
- if ( TurbineResources.getString("database.default.driver", "" )
- .startsWith("oracle") )
- {
- rec.setValue("topic_id", BasePeer.getNextId("topic_sequence"));
- }
rec.setValue ( "topic_value", data.parameters.getString("topic_value",
Localization.getString("ADDNEWTOPIC_UNTITLEDT")));
rec.setValue ( "display_order", data.parameters.getInt("display_order",
0) );
diff --exclude=CVS --exclude=*.jar --exclude=*.class --exclude=bin --exclude=build
--exclude=*~ --exclude=*.orig --ignore-all-space -Naur
jyve/src/java/org/apache/jyve/actions/CreateNewUserAndConfirm.java
jyve.orig/src/java/org/apache/jyve/actions/CreateNewUserAndConfirm.java
--- jyve/src/java/org/apache/jyve/actions/CreateNewUserAndConfirm.java Wed Jun 7
16:36:54 2000
+++ jyve.orig/src/java/org/apache/jyve/actions/CreateNewUserAndConfirm.java Fri
+Apr 21 22:29:43 2000
@@ -144,7 +144,6 @@
// if the username does not already exist, then we are all good!
if ((output == null || output.size() == 0) && !
username.equalsIgnoreCase(CHNAME))
{
-/*
// get a connection to the db
DBConnection db = DBBroker.getInstance().getConnection();
Connection connection = db.getConnection();
@@ -172,23 +171,6 @@
DBBroker.getInstance().releaseConnection(db);
}
}
-*/
-
- Criteria crit = new Criteria();
- crit.add ( TurbineUserPeer.getColumnName("LOGINID"), username );
- crit.add ( TurbineUserPeer.getColumnName("PASSWORD_VALUE"),
data.getParameters().getString("password") );
- crit.add ( TurbineUserPeer.getColumnName("FIRST_NAME"),
data.getParameters().getString("firstname") );
- crit.add ( TurbineUserPeer.getColumnName("LAST_NAME"),
data.getParameters().getString("lastname") );
- crit.add ( TurbineUserPeer.getColumnName("EMAIL"),
data.getParameters().getString("email") );
- crit.add ( TurbineUserPeer.getColumnName("CREATED"), new java.util.Date() );
- crit.add ( TurbineUserPeer.getColumnName("CONFIRM_VALUE"),
GenerateUniqueId.getIdentifier() );
-
-
- TurbineUserPeer.doInsert(crit);
- data.setMessage(Localization.getString("CREATENEWUSERANDCONFIRM_CREATE"));
-
- ActionLoader.getInstance().exec(data, "SendConfirmationEmail");
- }
else // username exists. show the screen again.
{
data.setMessage(Localization.getString("CREATENEWUSERANDCONFIRM_CHOOSENEWNAME"));
diff --exclude=CVS --exclude=*.jar --exclude=*.class --exclude=bin --exclude=build
--exclude=*~ --exclude=*.orig --ignore-all-space -Naur
jyve/src/java/org/apache/jyve/localization/JyveLocalization_de.java
jyve.orig/src/java/org/apache/jyve/localization/JyveLocalization_de.java
--- jyve/src/java/org/apache/jyve/localization/JyveLocalization_de.java Fri Jun 16
10:57:55 2000
+++ jyve.orig/src/java/org/apache/jyve/localization/JyveLocalization_de.java Wed
+Mar 8 13:09:57 2000
@@ -150,7 +150,7 @@
{"JLOGINUSER_CONFIRMFIRST", "Leider m�ssen Sie erst Ihren Zugang best�tigen
lassen bevor Sie sich anmelden."},
{"JLOGINUSER_NOAUTHUSERROLE", "FEHLER: Das System kann Ihnen die
angeforderten Rechte nicht erteilten: 'The role authenticated_user does not exist in
database.' Bitte benachrichtigen Sie den Administrator des Servers."},
- {"LOGOUTUSER_THANKS", "Vielen Dank f�r Ihren Besuch."},
+ {"LOGOUTUSER_THANKS", "Vielen Dank f�r Ihren Besuch. Bitte kommen Sie bald
+wieder."},
{"SENDCONFIRMATIONEMAIL_BODY1", "Herzlich Willkommen bei Jyve\n\n" +
"Ihr neuer Zugang wurde erstellt.\n\n" +
@@ -372,11 +372,11 @@
{"EDITTOPIC_ORDERNUMMSG", "Ordnungszahl: "},
{"EDITTOPIC_NOMODIFYPERM", "Leider sind Sie nicht berechtigt dieses Thema zu
�ndern!"},
- {"LOGIN_TITLE", "Willkommen bei Jyve - Anmeldeseite!"},
+ {"LOGIN_TITLE", "Willkommen bei Jyve - Einwahl Seite!"},
{"LOGIN_USERNAMEMSG", "Benutzername:"},
{"LOGIN_PASSWORDMSG", "Pa�wort:"},
{"LOGIN_CREATENEWACCOUNT", "Neue Registrierung"},
- {"LOGIN_LOGINBTN", "Anmelden"},
+ {"LOGIN_LOGINBTN", "Einw�hlen"},
{"MAINMENU_TITLE", "Willkommen bei Jyve FAQ!"},
{"MAINMENU_WELCOMEMSG", "Willkommen "},
diff --exclude=CVS --exclude=*.jar --exclude=*.class --exclude=bin --exclude=build
--exclude=*~ --exclude=*.orig --ignore-all-space -Naur
jyve/src/java/org/apache/jyve/navigations/OptionsFooter.java
jyve.orig/src/java/org/apache/jyve/navigations/OptionsFooter.java
--- jyve/src/java/org/apache/jyve/navigations/OptionsFooter.java Fri Jun 16
11:01:56 2000
+++ jyve.orig/src/java/org/apache/jyve/navigations/OptionsFooter.java Fri Apr 21
+22:29:51 2000
@@ -162,7 +162,6 @@
.toString()
).addElement(loginText)
).setColSpan(2)));
- /*
if ( data.getUser().hasLoggedIn() )
{
table.addElement( tr.addElement(new TD (
@@ -173,7 +172,7 @@
).addElement(Localization.getString("OPTIONSFOOTER_EDITACCOUNT"))
).setColSpan(2)));
}
- */
+
ec.addElement ( table );
return ( ec );
diff --exclude=CVS --exclude=*.jar --exclude=*.class --exclude=bin --exclude=build
--exclude=*~ --exclude=*.orig --ignore-all-space -Naur
jyve/src/java/org/apache/jyve/screens/DisplayQuestionAnswer.java
jyve.orig/src/java/org/apache/jyve/screens/DisplayQuestionAnswer.java
--- jyve/src/java/org/apache/jyve/screens/DisplayQuestionAnswer.java Thu Jun 8
14:08:09 2000
+++ jyve.orig/src/java/org/apache/jyve/screens/DisplayQuestionAnswer.java Wed
+Apr 26 14:28:46 2000
@@ -1,6 +1,5 @@
package org.apache.jyve.screens;
-
/*
* Copyright (c) 1997-1999 The Java Apache Project. All rights reserved.
*
diff --exclude=CVS --exclude=*.jar --exclude=*.class --exclude=bin --exclude=build
--exclude=*~ --exclude=*.orig --ignore-all-space -Naur
jyve/src/java/org/apache/jyve/screens/DisplayTopics.java
jyve.orig/src/java/org/apache/jyve/screens/DisplayTopics.java
--- jyve/src/java/org/apache/jyve/screens/DisplayTopics.java Fri Jul 7 14:37:23
2000
+++ jyve.orig/src/java/org/apache/jyve/screens/DisplayTopics.java Wed Apr 26
+14:27:02 2000
@@ -223,26 +223,17 @@
{
// count if an answer is not deleted and
// if it is released or it was created by the current visitor
- /*
sql.append ( " , sum(if((answer.deleted='N' AND (answer.released='Y'
OR answer.visitorid=");
sql.append ( visitorId );
sql.append ( ")),1,0)) as answer_count");
- */
- sql.append( " , (select count(answer.answer_id) from answer where
answer.question_id = question.question_id and answer.deleted='N' AND
(answer.released='Y' OR answer.visitorid=");
- sql.append ( visitorId ) ;
- sql.append ( ")) as answer_count" );
}
else
- /*
sql.append ( " , sum(if(answer.deleted='N',1,0)) as answer_count");
- */
- sql.append( " , (select count(answer.answer_id) from answer where
answer.question_id = question.question_id and answer.deleted='N') as answer_count");
+
sql.append ( " from" );
sql.append ( " question" );
- /*
sql.append ( " left join answer on" );
sql.append ( " question.question_id = answer.question_id" );
- */
sql.append ( " where" );
sql.append ( " question.topic_id in (" );
@@ -273,8 +264,8 @@
sql.append ( ")");
}
- //sql.append ( " group by" );
- //sql.append ( " question.question_id, question.question_value,
question.topic_id" );
+ sql.append ( " group by" );
+ sql.append ( " question.question_id, question.question_value,
+question.topic_id" );
sql.append ( " order by" );
sql.append ( " question.topic_id, question.display_order" );
// Order alphabetical, if same order number
@@ -318,18 +309,16 @@
if ( d_topic_id == topic_ids[i] )
{
- question_ol.addElement
- ( new LI().addElement
- ( new A().setHref
- ( new DynamicURI(data, "DisplayQuestionAnswer",
"SetAll")
+ question_ol.addElement ( new LI().addElement (
+ new A().setHref(
+ new DynamicURI(data, "DisplayQuestionAnswer", "SetAll")
.addPathInfo("project_id", project_id)
.addPathInfo("faq_id", faq_id)
.addPathInfo("topic_id", topic_ids[i])
.addPathInfo("question_id", d_question_id)
.toString()
).addElement(d_question_value)
- ).addElement(" ("+d_answer_count+")")
- );
+ ).addElement(" ("+d_answer_count+")") );
if (
!qds.getRecord(j).getValue("released").asString().equalsIgnoreCase("Y") )
question_ol.addElement(new I().addElement(" (Not released
yet!)"));
diff --exclude=CVS --exclude=*.jar --exclude=*.class --exclude=bin --exclude=build
--exclude=*~ --exclude=*.orig --ignore-all-space -Naur
jyve/src/java/org/apache/jyve/screens/DisplayUnreleased.java
jyve.orig/src/java/org/apache/jyve/screens/DisplayUnreleased.java
--- jyve/src/java/org/apache/jyve/screens/DisplayUnreleased.java Thu Jun 8
13:26:16 2000
+++ jyve.orig/src/java/org/apache/jyve/screens/DisplayUnreleased.java Fri Apr 21
+22:29:53 2000
@@ -136,13 +136,13 @@
sql.append ( ", q.question_id, q.question_value " );
sql.append ( ", p.released as project_released, f.released as faq_released" );
sql.append ( ", t.released as topic_released, q.released as
question_released" );
- // sql.append ( ", sum(if((a.deleted='N' AND a.released='N'),1,0) ) as
answer_count" );
+ sql.append ( ", sum(if((a.deleted='N' AND a.released='N'),1,0) ) as
+answer_count" );
sql.append ( " FROM " );
sql.append ( " ( ( ( ( project p" );
sql.append ( " LEFT JOIN faq f ON p.project_id=f.project_id ) " );
sql.append ( " LEFT JOIN topic t ON f.faq_id=t.faq_id ) " );
sql.append ( " LEFT JOIN question q ON t.topic_id=q.topic_id ) " );
- //sql.append ( " LEFT JOIN answer a ON q.question_id=a.question_id ) " );
+ sql.append ( " LEFT JOIN answer a ON q.question_id=a.question_id ) " );
sql.append ( " WHERE " );
@@ -162,7 +162,7 @@
sql.append ( " OR ( f.released='N') " );
sql.append ( " OR ( t.released='N') " );
sql.append ( " OR ( q.released='N') " );
- //sql.append ( " OR ( a.released='N') ) " );
+ sql.append ( " OR ( a.released='N') ) " );
if (!showUnreleasedProject)
{
@@ -195,7 +195,7 @@
sql.append ( visitorId );
sql.append ( ")");
}
- /*
+
if (!showUnreleasedAnswer)
{
// select if the answer is released or it was created by the current
visitor
@@ -203,7 +203,7 @@
sql.append ( visitorId );
sql.append ( " OR a.released IS NULL)"); // select also, if no answer
}
- */
+
sql.append ( " GROUP BY question_id" );
// execute the query
@@ -252,7 +252,7 @@
int topic_id = qds.getRecord(i).getValue("topic_id").asInt();
int question_id =
qds.getRecord(i).getValue("question_id").asInt();
- int answer_count =
100;//qds.getRecord(i).getValue("answer_count").asInt();
+ int answer_count =
+qds.getRecord(i).getValue("answer_count").asInt();
DynamicURI pduri = new DynamicURI(data, "DisplayProjects",
"SetAll")
.addPathInfo("project_id", project_id );
diff --exclude=CVS --exclude=*.jar --exclude=*.class --exclude=bin --exclude=build
--exclude=*~ --exclude=*.orig --ignore-all-space -Naur
jyve/src/java/org/apache/jyve/screens/Login.java
jyve.orig/src/java/org/apache/jyve/screens/Login.java
--- jyve/src/java/org/apache/jyve/screens/Login.java Fri Jun 16 10:55:30 2000
+++ jyve.orig/src/java/org/apache/jyve/screens/Login.java Fri Apr 21 22:29:53
+2000
@@ -128,7 +128,7 @@
form.addElement ( new BR() );
form.addElement (
new Input ( Input.text, "username",
- data.parameters.getString("username", "guest"))
+ data.parameters.getString("username", ""))
.setSize(12).setMaxlength(25));
form.addElement ( new BR() );
@@ -136,7 +136,7 @@
form.addElement ( new StringElement
(Localization.getString("LOGIN_PASSWORDMSG")));
form.addElement ( new BR() );
form.addElement (
- new Input ( Input.password, "password", "guest" )
+ new Input ( Input.password, "password", "" )
.setSize(12).setMaxlength(25));
form.addElement ( new BR() );
diff --exclude=CVS --exclude=*.jar --exclude=*.class --exclude=bin --exclude=build
--exclude=*~ --exclude=*.orig --ignore-all-space -Naur
jyve/src/java/org/apache/jyve/util/RecordExtractor.java
jyve.orig/src/java/org/apache/jyve/util/RecordExtractor.java
--- jyve/src/java/org/apache/jyve/util/RecordExtractor.java Wed Jun 7 11:24:11
2000
+++ jyve.orig/src/java/org/apache/jyve/util/RecordExtractor.java Thu Mar 16
+21:05:26 2000
@@ -197,12 +197,12 @@
StringBuffer sql = new StringBuffer();
sql.append ( "SELECT CONFIRM_VALUE FROM Visitor WHERE LOGINID='" );
sql.append ( username );
- sql.append ( "'" );
+ sql.append ( "';" );
// get a connection to the db
DBConnection db = DBBroker.getInstance().getConnection();
Connection connection = db.getConnection();
- Log.note(sql.toString());
+
// execute the query
QueryDataSet qds = new QueryDataSet( connection, sql.toString() );
String confirmValue = null;
--
Martin Buechler . DV-Entwickler Systems & Technology
Pixelpark AG . http://www.pixelpark.com
Rotherstr. 8 . 10245 Berlin . Germany
phone: + 49 30 5058 - 1891 fax: - 1600
--
--------------------------------------------------------------
To subscribe: [EMAIL PROTECTED]
To unsubscribe: [EMAIL PROTECTED]
Archives and Other: <http://java.apache.org/main/mail.html>
Problems?: [EMAIL PROTECTED]
