diff --git a/contrib/FLShibboleth/INSTALL.pdf b/contrib/FLShibboleth/INSTALL.pdf deleted file mode 100755 index 60b4e935..00000000 Binary files a/contrib/FLShibboleth/INSTALL.pdf and /dev/null differ diff --git a/contrib/FLShibboleth/README.txt b/contrib/FLShibboleth/README.txt deleted file mode 100755 index 1f5b6089..00000000 --- a/contrib/FLShibboleth/README.txt +++ /dev/null @@ -1,41 +0,0 @@ --------------------------------------------------------------------------------- -Plugin Details --------------------------------------------------------------------------------- -Name: ShibAuth -Version: 0.1 -Date: 01-26-2010 -Authors: Chris Barnes (cpb@ichp.ufl.edu) - Narayan Raum (ndr@ichp.ufl.edu) - Yang Li (yxl@ichp.ufl.edu) -Support: http://ctrip.ufl.edu/contact - --------------------------------------------------------------------------------- -Plugin Description --------------------------------------------------------------------------------- -Adding Shibboleth authentication to the Vitro application. An example of how -ShibAuth . This package serves as an example of how ShibAuth has been -implemented at the University of Florida. In order to use this plugin, your -institution must have a Shibboleth Identity Provider established. For more -information about Shibboleth, visit http://shibboleth.internet2.edu/. - --------------------------------------------------------------------------------- -Plugin Installation --------------------------------------------------------------------------------- -Detailed instructions and documentation are available in the INSTALL.pdf -document. All files in the "includes" directory must be uploaded to the -server running Vitro in order to complete the installation procedure. - -This procedure is an example installation of a Shibboleth 2 Service Provider on -a Linux (Debian Lenny) system. All commands were executed as the root user. -In this example, the following applications have already been installed -and configured: - - - OpenSSL - - Apache 2 - - Tomcat 6 - - Vitro - -The ShibAuth plugin allows a Vitro system administrator to authenticate using -the Shibboleth Service Provider. It is assumed that the user already has an -account in the “Users” table of the database. The field name for the user at -UF is the “glid” field. diff --git a/contrib/FLShibboleth/includes/ShibauthAdminAuthenticate.class b/contrib/FLShibboleth/includes/ShibauthAdminAuthenticate.class deleted file mode 100755 index a0f1044f..00000000 Binary files a/contrib/FLShibboleth/includes/ShibauthAdminAuthenticate.class and /dev/null differ diff --git a/contrib/FLShibboleth/includes/ShibauthAdminAuthenticate.java b/contrib/FLShibboleth/includes/ShibauthAdminAuthenticate.java deleted file mode 100755 index d410cfcf..00000000 --- a/contrib/FLShibboleth/includes/ShibauthAdminAuthenticate.java +++ /dev/null @@ -1,253 +0,0 @@ -package edu.cornell.mannlib.vitro.webapp.controller.edit; - -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ -import java.io.UnsupportedEncodingException; -import java.util.Calendar; -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import com.hp.hpl.jena.ontology.OntModel; - -import edu.cornell.mannlib.vedit.beans.LoginFormBean; -import edu.cornell.mannlib.vitro.webapp.beans.User; -import edu.cornell.mannlib.vitro.webapp.controller.Controllers; -import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; -import edu.cornell.mannlib.vitro.webapp.dao.UserDao; -import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; -import edu.cornell.mannlib.vitro.webapp.dao.jena.LoginEvent; -import edu.cornell.mannlib.vitro.webapp.dao.jena.LoginLogoutEvent; - -/* - * yxl: This is a copy of Authenticate.java and modified for Shibboleth authentication - * - */ -public class ShibauthAdminAuthenticate extends VitroHttpServlet { - private static final int DEFAULT_PORTAL_ID=1; - public static final String USER_SESSION_MAP_ATTR = "userURISessionMap"; - private UserDao userDao = null; - private static final Log log = LogFactory.getLog(Authenticate.class.getName()); - - public void doPost( HttpServletRequest request, HttpServletResponse response ) { - try { - HttpSession session = request.getSession(); - if(session.isNew()){ - session.setMaxInactiveInterval(300); // seconds, not milliseconds - } - userDao = ((WebappDaoFactory)session.getServletContext().getAttribute("webappDaoFactory")).getUserDao(); - LoginFormBean f = (LoginFormBean) session.getAttribute( "loginHandler" ); - - //obtain a db connection and perform a db query - //ensuring that the username exists - - // JCR 20040905 passing on portal home parameter - String portalIdStr=(portalIdStr=request.getParameter("home"))==null?String.valueOf(DEFAULT_PORTAL_ID):portalIdStr; - //request.setAttribute("home",portalIdStr); - - // Build the redirect URLs - String contextPath = request.getContextPath(); - String urlParams = "?home=" + portalIdStr + "&login=block"; - String loginUrl = contextPath + Controllers.LOGIN + urlParams; - String siteAdminUrl = contextPath + Controllers.SITE_ADMIN + urlParams; - - if (userDao==null) { - f.setErrorMsg("loginPassword","unable to get UserDao"); - f.setLoginStatus("no UserDao"); - response.sendRedirect(loginUrl); - return; - } - - /* used for encoding cleartext passwords sent via http before store in database - String loginPassword = ""; - String passwordQuery = "SELECT PASSWORD('" + f.getLoginPassword() + "')"; - ResultSet ps = stmt.executeQuery( passwordQuery ); - while ( ps.next() ) { - loginPassword = ps.getString(1); - } - */ - String userEnteredPasswordAfterMd5Conversion=f.getLoginPassword(); // won't be null - if ( userEnteredPasswordAfterMd5Conversion.equals("") ) { // shouldn't get through JS form verification - f.setErrorMsg( "loginPassword","please enter a password" ); - f.setLoginStatus("bad_password"); - response.sendRedirect(loginUrl); - return; - } - - User user = userDao.getUserByUsername(f.getLoginName()); - - if (user==null) { - f.setErrorMsg( "loginName","No user found with username " + f.getLoginName() ); - f.setLoginStatus("unknown_username"); - response.sendRedirect(loginUrl); - return; - } - - // logic for authentication - // first check for new users (loginCount==0) - // 1) cold (have username but haven't received initial password) - // 2) initial password has been set but user mis-typed it - // 3) correctly typed initial password and oldpassword set to provided password; have to enter a different one - // 4) entered same password again - // 5) entered a new private password, and bypass this stage because logincount set to 1 - // then check for users DBA has set to require changing password (md5password is null, oldpassword is not) - // - // check password; dbMd5Password is md5password from database - if (user.getLoginCount() == 0 ) { // new user - if ( user.getMd5password() == null ) { // user is known but has not been given initial password - f.setErrorMsg( "loginPassword", "Please request a username and initial password via the link below" ); // store password in database but force immediate re-entry - f.setLoginStatus("first_login_no_password"); - } else if (!user.getMd5password().equals( userEnteredPasswordAfterMd5Conversion )) { // mis-typed CCRP-provided initial password - if ( user.getOldPassword() == null ) { // did not make it through match of initially supplied password - f.setErrorMsg( "loginPassword", "Please try entering provided password again" ); - f.setLoginStatus("first_login_mistyped"); - } else if (user.getOldPassword().equals( userEnteredPasswordAfterMd5Conversion ) ) { - f.setErrorMsg( "loginPassword", "Please pick a different password from initially provided one" ); - f.setLoginStatus("changing_password_repeated_old"); - } else { // successfully provided different, private password - f.setErrorMsg( "loginPassword", "Please re-enter new private password" ); - user.setMd5password(userEnteredPasswordAfterMd5Conversion); - user.setLoginCount(1); - userDao.updateUser(user); - f.setLoginStatus("changing_password"); - } - } else { // entered a password that matches initial md5password in database; now force them to change it - // oldpassword could be null or not null depending on number of mistries - f.setErrorMsg( "loginPassword", "Please now choose a private password" ); // store password in database but force immediate re-entry - user.setOldPassword(user.getMd5password()); - userDao.updateUser(user); - f.setLoginStatus("first_login_changing_password"); - } - response.sendRedirect(loginUrl); - return; - } else if ( user.getMd5password()==null ) { // DBA has forced entry of a new password for user with a loginCount > 0 - if ( user.getOldPassword() != null && user.getOldPassword().equals( userEnteredPasswordAfterMd5Conversion ) ) { - f.setErrorMsg( "loginPassword", "Please pick a different password from your old one" ); - f.setLoginStatus("changing_password_repeated_old"); - } else { - f.setErrorMsg( "loginPassword", "Please re-enter new password" ); - user.setMd5password(userEnteredPasswordAfterMd5Conversion); - userDao.updateUser(user); - f.setLoginStatus("changing_password"); - } - response.sendRedirect(loginUrl); - return; - } else if (!user.getMd5password().equals( userEnteredPasswordAfterMd5Conversion )) { - /* - * yxl: comment out the following code so that Shib can login an admin user - * without using a password as long as the glid existed in the "user" table. - */ - - /* - f.setErrorMsg( "loginPassword", "Incorrect password: try again"); - f.setLoginStatus("bad_password"); - f.setLoginPassword(""); // don't even reveal how many characters there were - response.sendRedirect(loginUrl); - return; - */ - } - - //set the login bean properties from the database - - //System.out.println("authenticated; setting login status in loginformbean"); - - f.setUserURI(user.getURI()); - f.setLoginStatus( "authenticated" ); - f.setSessionId( session.getId()); - f.setLoginRole( user.getRoleURI() ); - try { - int loginRoleInt = Integer.decode(f.getLoginRole()); - if( (loginRoleInt>1) && (session.isNew()) ) { - session.setMaxInactiveInterval(32000); // set longer timeout for editors - } - } catch (Exception e) {} - // TODO : might be a problem in next line - no ID - f.setLoginUserId( -2 ); - //f.setEmailAddress ( email ); - f.setLoginPassword( "" ); - f.setErrorMsg( "loginPassword", "" ); // remove any error messages - f.setErrorMsg( "loginUsername", "" ); - - //System.out.println("updating loginCount and modTime"); - - Map userURISessionMap = getUserURISessionMapFromContext( getServletContext() ); - userURISessionMap.put( user.getURI(), request.getSession() ); - - sendLoginNotifyEvent(new LoginEvent( user.getURI() ), getServletContext(), session); - - user.setLoginCount(user.getLoginCount()+1); - userDao.updateUser(user); - - if ( user.getLoginCount() == 2 ) { // first login - Calendar cal = Calendar.getInstance(); - user.setFirstTime(cal.getTime()); - userDao.updateUser(user); - } - - /* - *If you set a postLoginRequest attribute in the session and forward to about - *then this will attempt to send the client back to the original page after the login. - */ - String forwardStr = (String) request.getSession().getAttribute("postLoginRequest"); - request.getSession().removeAttribute("postLoginRequest"); - if (forwardStr == null) { - String contextPostLoginRequest = (String) getServletContext().getAttribute("postLoginRequest"); - if (contextPostLoginRequest != null) { - forwardStr = (contextPostLoginRequest.indexOf(":") == -1) - ? request.getContextPath() + contextPostLoginRequest - : contextPostLoginRequest; - } - } - if (forwardStr != null) { - response.sendRedirect(forwardStr); - } else { - response.sendRedirect(siteAdminUrl); - //RequestDispatcher rd = getServletContext().getRequestDispatcher(url); - //rd.forward(request,response); - } - } catch (Throwable t) { - log.error( t.getMessage() ); - t.printStackTrace(); - } - } - - public static void sendLoginNotifyEvent(LoginLogoutEvent event, ServletContext context, HttpSession session){ - Object sessionOntModel = null; - if( session != null ) - sessionOntModel = session.getAttribute("jenaOntModel"); - Object contextOntModel = null; - if( context != null ) - contextOntModel = context.getAttribute("jenaOntModel"); - - OntModel jenaOntModel = - ( (sessionOntModel != null && sessionOntModel instanceof OntModel) - ? (OntModel)sessionOntModel: (OntModel) context.getAttribute("jenaOntModel") ); - - if( jenaOntModel == null ){ - log.error( "Unable to notify audit model of login event because no model could be found"); - } else { - if( event == null ){ - log.warn("Unable to notify audit model of login because a null event was passed"); - }else{ - jenaOntModel.getBaseModel().notifyEvent( event ); - } - } - } - - public static Map getUserURISessionMapFromContext( ServletContext ctx ) { - Map m = (Map) ctx.getAttribute( USER_SESSION_MAP_ATTR ); - if ( m == null ) { - m = new HashMap(); - ctx.setAttribute( USER_SESSION_MAP_ATTR, m ); - } - return m; - } - -} - diff --git a/contrib/FLShibboleth/includes/ajax-loader.gif b/contrib/FLShibboleth/includes/ajax-loader.gif deleted file mode 100755 index d7812772..00000000 Binary files a/contrib/FLShibboleth/includes/ajax-loader.gif and /dev/null differ diff --git a/contrib/FLShibboleth/includes/loginForm.jsp b/contrib/FLShibboleth/includes/loginForm.jsp deleted file mode 100755 index 421d4d28..00000000 --- a/contrib/FLShibboleth/includes/loginForm.jsp +++ /dev/null @@ -1,125 +0,0 @@ -<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> - -<%-- Included in siteAdmin_body.jsp to handle login/logout form and processing --%> - -<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %> - - - - - - -<% - int securityLevel = loginHandler.ANYBODY; - String loginStatus = loginHandler.getLoginStatus(); - if ( loginStatus.equals("authenticated")) { -%> -
-<% - } else { -%> -
-<% - } - if ( loginStatus.equals("authenticated")) { - - // test whether session is still valid - String currentSessionId = session.getId(); - String storedSessionId = loginHandler.getSessionId(); - - if ( currentSessionId.equals( storedSessionId ) ) { - String currentRemoteAddrStr = request.getRemoteAddr(); - String storedRemoteAddr = loginHandler.getLoginRemoteAddr(); - securityLevel = Integer.parseInt( loginHandler.getLoginRole() ); - - if ( currentRemoteAddrStr.equals( storedRemoteAddr ) ) { -%> -
- - Logged in as - -
- -<% - } else { -%> - ${loginFormTitle} - (IP address has changed)
-<% - loginHandler.setLoginStatus("logged out"); - } - - } else { - loginHandler.setLoginStatus("logged out"); -%> - ${loginFormTitle} - (session has expired)
- -<% - } - - } else { /* not thrown out by coming from different IP address or expired session; check login status returned by authenticate.java */ -%> -

Please log in

-<% - if ( loginStatus.equals("logged out")) { %> - (currently logged out) -<% } else if ( loginStatus.equals("bad_password")) { %> - (password incorrect)
-<% } else if ( loginStatus.equals("unknown_username")) { %> - (unknown username)
-<% } else if ( loginStatus.equals("first_login_no_password")) { %> - (1st login; need to request initial password below) -<% } else if ( loginStatus.equals("first_login_mistyped")) { %> - (1st login; initial password entered incorrectly) -<% } else if ( loginStatus.equals("first_login_changing_password")) { %> - (1st login; changing to new private password) -<% } else if ( loginStatus.equals("changing_password_repeated_old")) { %> - (changing to a different password) -<% } else if ( loginStatus.equals("changing_password")) { %> - (changing to new password) -<% } else if ( loginStatus.equals("none")) { %> - (new session)
-<% } else { %> - Status unrecognized: <%=loginStatus.replace("_", " ")%>
-<% } %> - - -
- - -<% - if ( loginStatus.equals("bad_password") || loginStatus.equals("first_login_no_password") - || loginStatus.equals("first_login_mistyped") || loginStatus.equals("first_login_changing_password") - || loginStatus.equals("changing_password_repeated_old") || loginStatus.equals("changing_password") ) { %> -
-<% } else { %> -
-<% if ( loginStatus.equals("unknown_username") ) { %> - Unknown username -<% } - } -%> - -
- -<% String passwordError=loginHandler.getErrorMsg("loginPassword"); - if (passwordError!=null && !passwordError.equals("")) {%> - <%=passwordError%> -<% } %> - - -

- ">UF Login » -

- Test UF Login » -
-<% } %> - -
diff --git a/contrib/FLShibboleth/includes/shibauth_admin_login.jsp b/contrib/FLShibboleth/includes/shibauth_admin_login.jsp deleted file mode 100755 index 90d5a7e0..00000000 --- a/contrib/FLShibboleth/includes/shibauth_admin_login.jsp +++ /dev/null @@ -1,270 +0,0 @@ -<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> - -<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %> - -<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Portal" %> -<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %> - - -<%@page import="edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener"%> - -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %><%/* this odd thing points to something in web.xml */ %> -<%@ page errorPage="/error.jsp"%> -<% - - Portal portal = (Portal) request.getAttribute("portalBean"); - final String DEFAULT_SEARCH_METHOD = "fulltext"; /* options are fulltext/termlike */ - String loginD = (loginD = request.getParameter("login")) == null ? "block" : loginD.equals("null") || loginD.equals("") ? "block" : loginD; -%> - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -<% if (loginHandler.getLoginStatus().equals("authenticated")) { %> -
-<% } else { %> -
-<% } %> -
- -
-<% if (loginHandler.getLoginStatus().equals("authenticated")) { %> -
-<% } else { %> -
-<% } %> - -<% if ( loginHandler.getLoginStatus().equals("authenticated")) { - /* test if session is still valid */ - String currentSessionId = session.getId(); - String storedSessionId = loginHandler.getSessionId(); - if ( currentSessionId.equals( storedSessionId ) ) { - String currentRemoteAddrStr = request.getRemoteAddr(); - String storedRemoteAddr = loginHandler.getLoginRemoteAddr(); - int securityLevel = Integer.parseInt( loginHandler.getLoginRole() ); - if ( currentRemoteAddrStr.equals( storedRemoteAddr ) ) {%> - Logged in as: -
- - -
- - (${languageModeStr}) - <% - Object plObj = getServletContext().getAttribute("pelletListener"); - if ( (plObj != null) && (plObj instanceof PelletListener) ) { - PelletListener pelletListener = (PelletListener) plObj; - if (!pelletListener.isConsistent()) { - %> -

- INCONSISTENT ONTOLOGY: reasoning halted. -

-

- Cause: <%=pelletListener.getExplanation()%> -

- <% - } - } - %> - -<% } %> - -<% } else { %> - - (IP address has changed)
-<% loginHandler.setLoginStatus("logged out"); - } - } else { - loginHandler.setLoginStatus("logged out"); %> - - (session has expired)
-
- - Username:
- Password:
- -
-<% } - } else { /* not thrown out by coming from different IP address or expired session; check login status returned by authenticate.java */ %> - -<% if ( loginHandler.getLoginStatus().equals("logged out")) { %> - (currently logged out) -<% } else if ( loginHandler.getLoginStatus().equals("bad_password")) { %> - (password incorrect)
-<% } else if ( loginHandler.getLoginStatus().equals("first_login_no_password")) { %> - (1st login; need to request initial password below) -<% } else if ( loginHandler.getLoginStatus().equals("first_login_mistyped")) { %> - (1st login; initial password entered incorrectly) -<% } else if ( loginHandler.getLoginStatus().equals("first_login_changing_password")) { %> - (1st login; changing to new private password) -<% } else if ( loginHandler.getLoginStatus().equals("changing_password_repeated_old")) { %> - (changing to a different password) -<% } else if ( loginHandler.getLoginStatus().equals("changing_password")) { %> - (changing to new password) -<% } else if ( loginHandler.getLoginStatus().equals("none")) { %> - -<% } else { %> - status unrecognized: <%=loginHandler.getLoginStatus()%>
-<% } %> -
- - -<% String status= loginHandler.getLoginStatus(); - if ( status.equals("bad_password") || status.equals("first_login_no_password") - || status.equals("first_login_mistyped") || status.equals("first_login_changing_password") - || status.equals("changing_password_repeated_old") || status.equals("changing_password") ) { %> -
-<% } else { %> - - -<% } %> - - - - - <% String passwordError=loginHandler.getErrorMsg("loginPassword"); - if (passwordError!=null && !passwordError.equals("")) {%> - <%=passwordError%> - <% } %> - -
-<% } %> -
- -
<%-- span-6 --%> - -
-<% String aboutText=portal.getAboutText(); - if (aboutText!=null && !aboutText.equals("")) {%> -
<%=aboutText%>
-<% }%> - -<% String ackText=portal.getAcknowledgeText(); - if (ackText!=null && !ackText.equals("")) {%> -
<%=ackText%>
-<% }%> -
<%-- span-17 --%> - - -
- - - - - diff --git a/contrib/FLShibboleth/includes/shibauth_admin_login_process.jsp b/contrib/FLShibboleth/includes/shibauth_admin_login_process.jsp deleted file mode 100755 index c9230b7d..00000000 --- a/contrib/FLShibboleth/includes/shibauth_admin_login_process.jsp +++ /dev/null @@ -1,95 +0,0 @@ -<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> - -<%@ page isThreadSafe="false" %> -<%@ page import="java.util.*" %> -<%@ page import="javax.servlet.*" %> -<%@ page import="javax.servlet.http.*" %> - -<% final int DEFAULT_PORTAL_ID=1; - String portalIdStr=(portalIdStr=(String)request.getAttribute("home"))==null ? - ((portalIdStr=request.getParameter("home"))==null?String.valueOf(DEFAULT_PORTAL_ID):portalIdStr):portalIdStr; - //int incomingPortalId=Integer.parseInt(portalIdStr); %> - - - - -<% - // Get shib_idp and glid from the shib returned header information - - ////////////////////////////////////////////////////////////////////// - // Change both variables to empty string when shib works - ////////////////////////////////////////////////////////////////////// - String shib_idp = ""; - String glid = ""; - - Enumeration headerNames = request.getHeaderNames(); - while(headerNames.hasMoreElements()) { - String headerName = (String)headerNames.nextElement(); - - if (headerName.equals("shib-identity-provider")) { - shib_idp = request.getHeader(headerName); - } - - if (headerName.equals("glid")) { - glid = request.getHeader(headerName); - } - - //out.println("
" + headerName + ":" + request.getHeader(headerName)); - } - - //out.println("
shib_idp:" + shib_idp); - //out.println("
glid:" + glid); - if (shib_idp.equals("https://login.ufl.edu/idp/shibboleth")) { - //out.println("
portalIdStr:" + portalIdStr); -%> - -<% - String submitModeStr = request.getParameter("loginSubmitMode"); - - //out.println("
loginSubmitMode:" + submitModeStr); - if ( submitModeStr == null ) - submitModeStr = "Log In"; - - //out.println("
loginSubmitMode:" + submitModeStr); - - if ( submitModeStr == null ) - submitModeStr = "unknown"; - if ( submitModeStr.equals("Log Out")) { -%> - - - -<% - } else if ( submitModeStr.equals("Log In")) { - //out.println("
Log In 1"); - //String loginNameStr = request.getParameter("loginName"); - String loginNameStr = glid; - String loginPasswordStr = "sia#ia*9"; //request.getParameter("loginPassword"); %> - - - -<% - //if ( loginHandler.validateLoginForm() ) { - if ( loginNameStr != "" ) { - //out.println("
Log In 2"); - -%> - - - -<% - - } else { - //out.println("
Log In 3"); - - String redirectURL="/vitro/about?home="+portalIdStr+"&login=block"; - response.sendRedirect(redirectURL); -} - } -%> - -<% - } else { - out.println("
Wrong IDP
"); - } -%> diff --git a/contrib/FLShibboleth/includes/transbg50.png b/contrib/FLShibboleth/includes/transbg50.png deleted file mode 100755 index f2770c41..00000000 Binary files a/contrib/FLShibboleth/includes/transbg50.png and /dev/null differ diff --git a/contrib/FLShibboleth/includes/web.xml b/contrib/FLShibboleth/includes/web.xml deleted file mode 100755 index d632c512..00000000 --- a/contrib/FLShibboleth/includes/web.xml +++ /dev/null @@ -1,1171 +0,0 @@ - - - - - - - - - - - - - - - jdbc/vitro/connectionType - - - java.lang.String - PROPERTIES_FILE_POOL - - - - - jdbc/vitro/namedDS - - java.lang.String - mySharedDBPool - - - - - - - - edu.cornell.mannlib.vitro.webapp.servlet.setup.VitroJenaModelMakerSetup - - - - - - - edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaPersistentDataSourceSetup - - - - - - - - - - - - - edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetup - - - - - - - - - edu.cornell.mannlib.vitro.webapp.servlet.setup.PelletReasonerSetup - - - - - - - - - - - - edu.cornell.mannlib.vitro.webapp.search.lucene.LuceneSetup - - - - - - edu.cornell.mannlib.vitro.webapp.auth.policy.setup.EditorEditingPolicySetup - - - - - edu.cornell.mannlib.vitro.webapp.auth.policy.setup.CuratorEditingPolicySetup - - - - - edu.cornell.mannlib.vitro.webapp.auth.policy.setup.DbAdminEditingPolicySetup - - - - - - - - - - - - Character Set Encoding Filter - edu.cornell.mannlib.vitro.webapp.filters.CharsetEncodingFilter - - - Character Set Encoding Filter - /* - - - JSession Strip Filter - edu.cornell.mannlib.vitro.webapp.filters.JSessionStripFilter - - - JSession Strip Filter - /* - - - - URL Rewriter Filter - edu.cornell.mannlib.vitro.webapp.filters.URLRewriterFilter - - - URL Rewriter Filter - /* - - - Portal Picker Filter - edu.cornell.mannlib.vitro.webapp.filters.PortalPickerFilter - - - Portal Picker Filter - /* - - - - VitroRequestPrep - edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep - - - VitroRequestPrep - /* - request - forward - - - - - - - - - jsp - org.apache.jasper.servlet.JspServlet - - fork - false - - - xpoweredBy - false - - - trimSpaces - true - - 3 - - - - IndexController - edu.cornell.mannlib.vitro.webapp.search.controller.IndexController - - - IndexController - /SearchIndex - - - - fetch - edu.cornell.mannlib.vitro.webapp.QueryServlet - - - - - AboutController - edu.cornell.mannlib.vitro.webapp.controller.AboutController - - - AboutController - /about - - - - SiteAdminController - edu.cornell.mannlib.vitro.webapp.controller.edit.SiteAdminController - - - SiteAdminController - /siteAdmin - - - SiteAdminController - /siteAdmin.jsp - - - - ImageUploadController - edu.cornell.mannlib.vitro.webapp.controller.edit.ImageUploadController - - - ImageUploadController - /uploadimages - - - ImageUploadController - /uploadimages.jsp - - - - FlagUpdateController - edu.cornell.mannlib.vitro.webapp.controller.edit.FlagUpdateController - - - FlagUpdateController - /flagUpdate - - - - SitemapIndexController - edu.cornell.mannlib.vitro.webapp.controller.SitemapIndexController - - - SitemapIndexController - /sitemap.xml - - - - RDFUploadFormController - edu.cornell.mannlib.vitro.webapp.controller.jena.RDFUploadFormController - - - RDFUploadFormController - /uploadRDFForm - - - - RDFUploadController - edu.cornell.mannlib.vitro.webapp.controller.jena.RDFUploadController - - - RDFUploadController - /uploadRDF - - - - JenaIngestController - edu.cornell.mannlib.vitro.webapp.controller.jena.JenaIngestController - - - JenaIngestController - /ingest - - - - JenaExportController - edu.cornell.mannlib.vitro.webapp.controller.jena.JenaExportController - - - JenaExportController - /export/* - - - - OwlImportController - edu.cornell.mannlib.vitro.webapp.owl.OwlImportController - - - OwlImportController - /owl - - - - OwlImportServlet - edu.cornell.mannlib.vitro.webapp.owl.ProtegeOwlImportServlet - - - OwlImportServlet - /importOwl - - - - JenaAdminServlet - edu.cornell.mannlib.vitro.webapp.controller.jena.JenaAdminActions - - - JenaAdminServlet - /jenaAdmin - - - - EditFrontController - edu.cornell.mannlib.vedit.controller.EditFrontController - - - EditFrontController - /editForm - - - - OperationController - edu.cornell.mannlib.vedit.controller.OperationController - - - OperationController - /doEdit - - - - EntityEditController - edu.cornell.mannlib.vitro.webapp.controller.edit.EntityEditController - - - EntityEditController - /entityEdit - - - - VclassEditController - edu.cornell.mannlib.vitro.webapp.controller.edit.VclassEditController - - - VclassEditController - /vclassEdit - - - - Classes2ClassesOperationController - edu.cornell.mannlib.vitro.webapp.controller.edit.Classes2ClassesOperationController - - - Classes2ClassesOperationController - /classes2ClassesOp - - - - Properties2PropertiesOperationController - edu.cornell.mannlib.vitro.webapp.controller.edit.Properties2PropertiesOperationController - - - Properties2PropertiesOperationController - /props2PropsOp - - - - NamespacePrefixOperationController - edu.cornell.mannlib.vitro.webapp.controller.edit.NamespacePrefixOperationController - - - NamespacePrefixOperationController - /namespacePrefixOp - - - - RefactorOperationController - edu.cornell.mannlib.vitro.webapp.controller.edit.RefactorOperationController - - - RefactorOperationController - /refactorOp - - - - IndividualTypeOperationController - edu.cornell.mannlib.vitro.webapp.controller.edit.IndividualTypeOperationController - - - IndividualTypeOperationController - /individualTypeOp - - - - Tabs2TypesOperationController - edu.cornell.mannlib.vitro.webapp.controller.edit.Tabs2TypesOperationController - - - Tabs2TypesOperationController - /tabs2TypesOp - - - - TabIndividualRelationOperationController - edu.cornell.mannlib.vitro.webapp.controller.edit.TabIndividualRelationOperationController - - - TabIndividualRelationOperationController - /tabIndividualRelationOp - - - - TabHierarchyOperationController - edu.cornell.mannlib.vitro.webapp.controller.edit.TabHierarchyOperationController - - - TabHierarchyOperationController - /doTabHierarchyOperation - - - - DatapropEditController - edu.cornell.mannlib.vitro.webapp.controller.edit.DatapropEditController - - - DatapropEditController - /datapropEdit - - - - - KeywordEditController - edu.cornell.mannlib.vitro.webapp.controller.edit.KeywordEditController - - - KeywordEditController - /keywordEdit - - - - TabEditController - edu.cornell.mannlib.vitro.webapp.controller.edit.TabEditController - - - TabEditController - /tabEdit - - - - UserEditController - edu.cornell.mannlib.vitro.webapp.controller.edit.UserEditController - - - UserEditController - /userEdit - - - - OntologyEditController - edu.cornell.mannlib.vitro.webapp.controller.edit.OntologyEditController - - - OntologyEditController - /ontologyEdit - - - - PropertyEditController - edu.cornell.mannlib.vitro.webapp.controller.edit.PropertyEditController - - - PropertyEditController - /propertyEdit - - - - PortalEditController - edu.cornell.mannlib.vitro.webapp.controller.edit.PortalEditController - - - PortalEditController - /portalEdit - - - - EntityRetryController - edu.cornell.mannlib.vitro.webapp.controller.edit.EntityRetryController - - - EntityRetryController - /entity_retry - - - - VclassRetryController - edu.cornell.mannlib.vitro.webapp.controller.edit.VclassRetryController - - - VclassRetryController - /vclass_retry - - - - DatatypeRetryController - edu.cornell.mannlib.vitro.webapp.controller.edit.DatatypeRetryController - - - DatatypeRetryController - /datatype_retry - - - - AllTabsForPortalListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.AllTabsForPortalListingController - - - AllTabsForPortalListingController - /listTabs - - - - AllClassGroupsListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.AllClassGroupsListingController - - - AllClassGroupsListingController - /listGroups - - - - PropertyGroupsListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.PropertyGroupsListingController - - - PropertyGroupsListingController - /listPropertyGroups - - - - OntologiesListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.OntologiesListingController - - - OntologiesListingController - /listOntologies - - - - NamespacesListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.jena.NamespacesListingController - - - NamespacesListingController - /listNamespaces - - - - RestrictionsListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.jena.RestrictionsListingController - - - RestrictionsListingController - /listRestrictions - - - - RestrictionOperationController - edu.cornell.mannlib.vitro.webapp.controller.edit.RestrictionOperationController - - - RestrictionOperationController - /addRestriction - - - - PortalsListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.PortalsListingController - - - PortalsListingController - /listPortals - - - - UsersListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.UsersListingController - - - UsersListingController - /listUsers - - - - StatementChangeListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.jena.StatementChangeListingController - - - StatementChangeListingController - /statementHistory - - - - WriteOutChangesController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.jena.WriteOutChangesController - - - WriteOutChangesController - /writeOutChanges - - - - VClassWebappsListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.VClassWebappsListingController - - - VClassWebappsListingController - /listVClassWebapps - - - - IndividualsListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.IndividualsListingController - - - IndividualsListingController - /listIndividuals - - - - - ClassHierarchyListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.ClassHierarchyListingController - - - ClassHierarchyListingController - /showClassHierarchy - - - - ObjectPropertyHierarchyListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.ObjectPropertyHierarchyListingController - - - ObjectPropertyHierarchyListingController - /showObjectPropertyHierarchy - - - - DataPropertyHierarchyListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.DataPropertyHierarchyListingController - - - DataPropertyHierarchyListingController - /showDataPropertyHierarchy - - - - PropertyWebappsListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.PropertyWebappsListingController - - - PropertyWebappsListingController - /listPropertyWebapps - - - - DatatypePropertiesListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.DatatypePropertiesListingController - - - DatatypePropertiesListingController - /listDatatypeProperties - - - - DataPropertyStatementListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.DataPropertyStatementListingController - - - DataPropertyStatementListingController - /listDataPropertyStatements - - - - ObjectPropertyStatementListingController - edu.cornell.mannlib.vitro.webapp.controller.edit.listing.ObjectPropertyStatementListingController - - - ObjectPropertyStatementListingController - /listObjectPropertyStatements - - - - EntityListController - edu.cornell.mannlib.vitro.webapp.controller.EntityListController - - - EntityListController - /entitylist - - - - SearchController - edu.cornell.mannlib.vitro.webapp.search.controller.PagedSearchController - - - SearchController - /search - - - - SearchController - /search.jsp - - - SearchController - /fedsearch - - - SearchController - /searchcontroller - - - - AdminController - edu.cornell.mannlib.vitro.webapp.controller.AdminController - - - AdminController - /adminCon - - - - TermsOfUseController - edu.cornell.mannlib.vitro.webapp.controller.TermsOfUseController - - - TermsOfUseController - /termsOfUse - - - - CommentsController - edu.cornell.mannlib.vitro.webapp.controller.CommentsController - - - CommentsController - /comments - - - - JSON Service - edu.cornell.mannlib.vitro.webapp.controller.JSONServlet - - - JSON Service - /dataservice - - - - TabEntitiesController - edu.cornell.mannlib.vitro.webapp.controller.TabEntitiesController - - - TabEntitiesController - /TabEntitiesController - - - - - TabController - edu.cornell.mannlib.vitro.webapp.controller.TabController - - - TabController - /index.jsp - - - - - - EntityMergedPropertyListController - edu.cornell.mannlib.vitro.webapp.controller.EntityMergedPropertyListController - - - EntityMergedPropertyListController - /entityMergedPropList - - - - DashboardPropertyListController - edu.cornell.mannlib.vitro.webapp.controller.DashboardPropertyListController - - - DashboardPropertyListController - /dashboardPropList - - - - dwr-invoker - uk.ltd.getahead.dwr.DWRServlet - - debug - true - - - logLevel - DEBUG - - - - dwr-invoker - /dwr/* - - - - sendmail - edu.cornell.mannlib.vitro.webapp.controller.ContactMailServlet - 5 - - - - entity - edu.cornell.mannlib.vitro.webapp.controller.EntityController - - - - updateEntityFlags - edu.cornell.mannlib.vitro.webapp.UpdateEntityFlagServlet - - - - - CloneEntityServlet - edu.cornell.mannlib.vitro.webapp.controller.edit.CloneEntityServlet - - - CloneEntityServlet - /cloneEntity - - - - authenticate - edu.cornell.mannlib.vitro.webapp.controller.edit.Authenticate - - - shibauthenticate - edu.cornell.mannlib.vitro.webapp.controller.edit.ShibauthAdminAuthenticate - - - - logout - edu.cornell.mannlib.vitro.webapp.controller.edit.Logout - - properties - WEB-INF/classes/formbeans/Login_forms.properties - - - - - - browsecontroller - edu.cornell.mannlib.vitro.webapp.controller.BrowseController - 5 - - - - pubsbyorg - edu.cornell.mannlib.vitro.webapp.controller.vclass.PubsByDepartmentServlet - - workspaceDir - /usr/local/services/vivo/logs - - - - - - coauthors - edu.cornell.mannlib.vitro.webapp.controller.vclass.CoAuthorServlet - - workspaceDir - /usr/local/services/vivo/logs - - - - - - generic_create - edu.cornell.mannlib.vitro.webapp.GenericDBCreate - - - - - uploadImages - edu.cornell.mannlib.vitro.webapp.controller.edit.UploadImagesServlet - - workspaceDir - - /usr/local/src/Vitro/dream/common/web - - - - - - generic_editprep - edu.cornell.mannlib.vitro.webapp.GenericDBEditPrep - - - - generic_update - edu.cornell.mannlib.vitro.webapp.GenericDBUpdate - - - - generic_delete - edu.cornell.mannlib.vitro.webapp.GenericDBDelete - - - - SparqlQuery - edu.cornell.mannlib.vitro.webapp.controller.SparqlQueryServlet - - - - SparqlQuery - /admin/sparqlquery - - - - authtest - edu.cornell.mannlib.vitro.webapp.auth.AuthTestController - - - authtest - /authtest - - - - - fetch - /fetch - - - sendmail - /sendmail - - - entity - /entity - - - entity - /entity/* - - - entity - /individual/* - - - updateEntityFlags - /updateEntityFlags - - - authenticate - /authenticate - - - shibauthenticate - /shibauthenticate - - - logout - /logout - - - browsecontroller - /browsecontroller - - - pubsbyorg - /pubsbyorg - - - coauthors - /coauthors - - - uploadImages - /uploadImages - - - generic_create - /generic_create - - - generic_editprep - /generic_editprep - - - generic_update - /generic_update - - - generic_delete - /generic_delete - - - - - - /WEB-INF/tlds/database.tld - /WEB-INF/tlds/database.tld - - - - http://java.sun.com/jstl/core - /WEB-INF/tlds/c.tld - - - - http://java.sun.com/jstl/functions - /WEB-INF/tlds/fn.tld - - - - http://vitro.mannlib.cornell.edu/edit/tags - /WEB-INF/tlds/form.tld - - - - http://vitro.mannlib.cornell.edu/vitro/tags - /WEB-INF/tlds/vitroForm.tld - - - - http://vitro.mannlib.cornell.edu/vitro/tags/PropertyEditLink - /WEB-INF/tlds/PropertyEditLink.tld - - - - http://mannlib.cornell.edu/vitro/ListSparqlTag/0.1/ - /WEB-INF/tlds/ListSparqlTag.tld - - - - http://jakarta.apache.org/taglibs/string-1.1 - /WEB-INF/tlds/taglibs-string.tld - - - - - - - - - - - - - - org.apache.axis.transport.http.AxisHTTPSessionListener - - - - AxisServlet - org.apache.axis.transport.http.AxisServlet - - - - AxisAdminServlet - org.apache.axis.transport.http.AdminServlet - 100 - - - - SOAPMonitorService - org.apache.axis.monitor.SOAPMonitorService - - SOAPMonitorPort - 5001 - - 100 - - - - AxisAdminServlet - /AxisAdminServlet - - - - AxisServlet - /servlet/AxisServlet - - - - AxisServlet - *.jws - - - - AxisServlet - /services/* - - - - SOAPMonitorService - /SOAPMonitor - - - - xsd - text/xml - - - wsdl - text/xml - - -