Fisheye: Tag b17119b936035f92dffe540c83c05ba4079fcf63 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/OpenIDConfigAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag b17119b936035f92dffe540c83c05ba4079fcf63 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/OpenIDConfigForm.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java =================================================================== diff -u -rd0b6f213cba1026b0c9fdbdaa5dd44a49eddd3aa -rb17119b936035f92dffe540c83c05ba4079fcf63 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java (.../SysAdminStartAction.java) (revision d0b6f213cba1026b0c9fdbdaa5dd44a49eddd3aa) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java (.../SysAdminStartAction.java) (revision b17119b936035f92dffe540c83c05ba4079fcf63) @@ -34,7 +34,6 @@ import org.apache.struts.action.ActionMapping; import org.lamsfoundation.lams.admin.service.AdminServiceProxy; import org.lamsfoundation.lams.admin.web.dto.LinkBean; -import org.lamsfoundation.lams.openid.OpenIDConfig; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; @@ -74,10 +73,6 @@ links.add(new LinkBean("themeManagement.do", "admin.themes.title")); links.add(new LinkBean("timezonemanagement.do", "admin.timezone.title")); - OpenIDConfig openIDEnabled = (OpenIDConfig) service.findById(OpenIDConfig.class, OpenIDConfig.KEY_ENABLED); - if (openIDEnabled != null && Boolean.parseBoolean(openIDEnabled.getConfigValue()) == Boolean.TRUE) { - links.add(new LinkBean("openIDConfig.do", "admin.openid.title")); - } } else if (service.isUserGlobalGroupAdmin()) { LinkBean linkBean = new LinkBean("usersearch.do", "admin.user.find"); links.add(linkBean); Fisheye: Tag b17119b936035f92dffe540c83c05ba4079fcf63 refers to a dead (removed) revision in file `lams_admin/web/openidConfig.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_build/build.xml =================================================================== diff -u -rbf53c8a97c1eda9ff308c684e30f7bc81fd8579b -rb17119b936035f92dffe540c83c05ba4079fcf63 --- lams_build/build.xml (.../build.xml) (revision bf53c8a97c1eda9ff308c684e30f7bc81fd8579b) +++ lams_build/build.xml (.../build.xml) (revision b17119b936035f92dffe540c83c05ba4079fcf63) @@ -203,7 +203,6 @@ - Index: lams_build/lib/joid/joid.jar =================================================================== diff -u -rab19db088359a46353cc92e806c40ff5cff818b9 -rb17119b936035f92dffe540c83c05ba4079fcf63 Binary files differ Index: lams_build/liblist.txt =================================================================== diff -u -r36a9fb1bc3c241d9734dd62ea853c5d8ce940f63 -rb17119b936035f92dffe540c83c05ba4079fcf63 --- lams_build/liblist.txt (.../liblist.txt) (revision 36a9fb1bc3c241d9734dd62ea853c5d8ce940f63) +++ lams_build/liblist.txt (.../liblist.txt) (revision b17119b936035f92dffe540c83c05ba4079fcf63) @@ -51,10 +51,6 @@ jlatexmath jlatexmath-1.0.3.jar 1.0.3 -joid joid.jar 2.0 Apache License 2.0 Java Open ID library - - - lucene lucene-core-2.4.0.jar 2.4.0 Apache License 2.0 Apache text search engine library lucene-snowball-2.4.0.jar 2.4.0 Index: lams_central/conf/xdoclet/filters.xml =================================================================== diff -u -r2b88dada3266a4b0f83f4b5c4cf617553496ca59 -rb17119b936035f92dffe540c83c05ba4079fcf63 --- lams_central/conf/xdoclet/filters.xml (.../filters.xml) (revision 2b88dada3266a4b0f83f4b5c4cf617553496ca59) +++ lams_central/conf/xdoclet/filters.xml (.../filters.xml) (revision b17119b936035f92dffe540c83c05ba4079fcf63) @@ -26,24 +26,4 @@ org.lamsfoundation.lams.web.filter.LocaleFilter - - - - OpenIdFilter - org.verisign.joid.consumer.OpenIdFilter - - saveInCookie - true - - - - ignorePaths - /servlet/authoring/storeLearningDesignDetails - \ No newline at end of file Fisheye: Tag b17119b936035f92dffe540c83c05ba4079fcf63 refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/openid/OpenIDConfig.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040058.sql =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040058.sql (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040058.sql (revision b17119b936035f92dffe540c83c05ba4079fcf63) @@ -0,0 +1,8 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; + +-- LDEV-3749 Remove OpenId DB stuff +DROP TABLE lams_openid_config; + +COMMIT; +SET AUTOCOMMIT = 1; \ No newline at end of file Fisheye: Tag b17119b936035f92dffe540c83c05ba4079fcf63 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/openid/OpenIDConfig.java'. Fisheye: No comparison available. Pass `N' to diff?