Index: lams_common/db/sql/insert_lams_unix_config_data.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_unix_config_data.sql,v diff -u -r1.6.2.4 -r1.6.2.5 --- lams_common/db/sql/insert_lams_unix_config_data.sql 20 Jul 2007 02:58:53 -0000 1.6.2.4 +++ lams_common/db/sql/insert_lams_unix_config_data.sql 24 Jul 2007 23:21:50 -0000 1.6.2.5 @@ -32,14 +32,14 @@ insert into lams_configuration (config_key, config_value) values ('AllowDirectLessonLaunch','false'); insert into lams_configuration (config_key, config_value) values ('LAMS_Community_enable','false'); insert into lams_configuration (config_key, config_value) values ('AllowLiveEdit','true'); -insert into lams_configuration (config_key, config_value) values ('ShibAttrLogin','LAMS-Login'); -insert into lams_configuration (config_key, config_value) values ('ShibAttrFname','LAMS-Login'); -insert into lams_configuration (config_key, config_value) values ('ShibAttrLname','LAMS-Login'); -insert into lams_configuration (config_key, config_value) values ('ShibAttrRoles','LAMS-Roles'); -insert into lams_configuration (config_key, config_value) values ('ShibAttrServerURL','LAMS-ServerURL'); +insert into lams_configuration (config_key, config_value) values ('ShibAttrLogin','LAMS-login'); +insert into lams_configuration (config_key, config_value) values ('ShibAttrFname','LAMS-first_name'); +insert into lams_configuration (config_key, config_value) values ('ShibAttrLname','LAMS-last_name'); +insert into lams_configuration (config_key, config_value) values ('ShibAttrRoles','LAMS-roles'); +insert into lams_configuration (config_key, config_value) values ('ShibAttrEmail','LAMS-email'); +insert into lams_configuration (config_key, config_value) values ('ShibAttrServerURL','LAMS-serverurl'); insert into lams_configuration (config_key, config_value) values ('FedRegistryURL','http://192.168.111.55:8081'); insert into lams_configuration (config_key, config_value) values ('FedKey','blah'); -insert into lams_configuration (config_key, config_value) values ('ShibIdPSSOHandler','https://olive.lamsfoundation.org/shibboleth-idp/SSO'); -insert into lams_configuration (config_key, config_value) values ('ShibIdPEntityId','https://olive.lamsfoundation.org/shibboleth'); +insert into lams_configuration (config_key, config_value) values ('ShibIdPSSOHandler','https://idp-olive.lamsfoundation.org/shibboleth-idp/SSO'); insert into lams_configuration (config_key, config_value) values ('ShibEnabled','true'); insert into lams_configuration (config_key, config_value) values ('ShibOrgId',''); \ No newline at end of file Index: lams_common/db/sql/insert_lams_windows_config_data.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_windows_config_data.sql,v diff -u -r1.3.2.4 -r1.3.2.5 --- lams_common/db/sql/insert_lams_windows_config_data.sql 20 Jul 2007 02:58:53 -0000 1.3.2.4 +++ lams_common/db/sql/insert_lams_windows_config_data.sql 24 Jul 2007 23:21:50 -0000 1.3.2.5 @@ -32,14 +32,14 @@ insert into lams_configuration (config_key, config_value) values ('AllowDirectLessonLaunch','false'); insert into lams_configuration (config_key, config_value) values ('LAMS_Community_enable','false'); insert into lams_configuration (config_key, config_value) values ('AllowLiveEdit','true'); -insert into lams_configuration (config_key, config_value) values ('ShibAttrLogin','LAMS-Login'); -insert into lams_configuration (config_key, config_value) values ('ShibAttrFname','LAMS-Login'); -insert into lams_configuration (config_key, config_value) values ('ShibAttrLname','LAMS-Login'); -insert into lams_configuration (config_key, config_value) values ('ShibAttrRoles','LAMS-Roles'); -insert into lams_configuration (config_key, config_value) values ('ShibAttrServerURL','LAMS-ServerURL'); +insert into lams_configuration (config_key, config_value) values ('ShibAttrLogin','LAMS-login'); +insert into lams_configuration (config_key, config_value) values ('ShibAttrFname','LAMS-first_name'); +insert into lams_configuration (config_key, config_value) values ('ShibAttrLname','LAMS-last_name'); +insert into lams_configuration (config_key, config_value) values ('ShibAttrRoles','LAMS-roles'); +insert into lams_configuration (config_key, config_value) values ('ShibAttrEmail','LAMS-email'); +insert into lams_configuration (config_key, config_value) values ('ShibAttrServerURL','LAMS-serverurl'); insert into lams_configuration (config_key, config_value) values ('FedRegistryURL','http://192.168.111.55:8081'); insert into lams_configuration (config_key, config_value) values ('FedKey','blah'); -insert into lams_configuration (config_key, config_value) values ('ShibIdPSSOHandler','https://olive.lamsfoundation.org/shibboleth-idp/SSO'); -insert into lams_configuration (config_key, config_value) values ('ShibIdPEntityId','https://olive.lamsfoundation.org/shibboleth'); +insert into lams_configuration (config_key, config_value) values ('ShibIdPSSOHandler','https://idp-olive.lamsfoundation.org/shibboleth-idp/SSO'); insert into lams_configuration (config_key, config_value) values ('ShibEnabled','true'); insert into lams_configuration (config_key, config_value) values ('ShibOrgId',''); Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java,v diff -u -r1.23.2.6 -r1.23.2.7 --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java 20 Jul 2007 02:58:53 -0000 1.23.2.6 +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java 24 Jul 2007 23:21:50 -0000 1.23.2.7 @@ -141,6 +141,8 @@ public static String SHIB_ATTR_LNAME = "ShibAttrLname"; + public static String SHIB_ATTR_EMAIL = "ShibAttrEmail"; + public static String SHIB_ATTR_SERVER_URL = "ShibAttrServerURL"; public static String FED_REGISTRY_URL = "FedRegistryURL"; @@ -151,8 +153,6 @@ public static String SHIB_IDP_SSO_HANDLER = "ShibIdPSSOHandler"; - public static String SHIB_IDP_ENTITY_ID = "ShibIdPEntityId"; - public static String SHIB_ENABLED = "ShibEnabled"; public static String SHIB_ORG_ID = "ShibOrgId";