Index: build.xml =================================================================== RCS file: /cvsroot/dspace/dspace/build.xml,v retrieving revision 1.35 diff -u -r1.35 build.xml --- build.xml 7 Jun 2004 13:41:37 -0000 1.35 +++ build.xml 7 Apr 2005 10:13:19 -0000 @@ -82,6 +82,14 @@ + + + + + + + + @@ -108,6 +116,8 @@ destdir="build/classes" debug="on"> + + @@ -120,6 +130,17 @@ + + + + + + + + + + + + @@ -366,6 +390,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: config/dspace.cfg =================================================================== RCS file: /cvsroot/dspace/dspace/config/dspace.cfg,v retrieving revision 1.42 diff -u -r1.42 dspace.cfg --- config/dspace.cfg 1 Mar 2005 02:59:50 -0000 1.42 +++ config/dspace.cfg 7 Apr 2005 10:13:19 -0000 @@ -125,6 +125,7 @@ # The site authenticator - must implement org.dspace.app.webui.SiteAuthenticator webui.site.authenticator = org.dspace.app.webui.SimpleAuthenticator +#webui.site.authenticator = org.dspace.app.webui.CASAuthenticator # Certificate authority webui.cert.ca = /dspace/etc/certificate-ca.pem @@ -216,3 +217,11 @@ # port number of proxy server #http.proxy.port = +##### CAS server ##### +cas.server.url=http://localhost:8080/cas/index.jsp +cas.validate.url=http://localhost:8080/cas/validate +cas.logout.url=http://localhost:8080/cas/logout + +##### SOAP ##### +webservice.url=http://localhost:8080/dspace/services + Index: etc/dspace-web.xml =================================================================== RCS file: /cvsroot/dspace/dspace/etc/dspace-web.xml,v retrieving revision 1.11 diff -u -r1.11 dspace-web.xml --- etc/dspace-web.xml 13 Dec 2004 16:59:44 -0000 1.11 +++ etc/dspace-web.xml 7 Apr 2005 10:13:20 -0000 @@ -109,6 +109,11 @@ /subscribe + + + + org.apache.axis.transport.http.AxisHTTPSessionListener + @@ -315,6 +320,36 @@ org.dspace.app.webui.servlet.admin.WorkflowAbortServlet + + + AxisServlet + Apache-Axis Servlet + + org.apache.axis.transport.http.AxisServlet + + + + + AdminServlet + Axis Admin Servlet + + org.apache.axis.transport.http.AdminServlet + + 100 + + + + SOAPMonitorService + SOAPMonitorService + + org.apache.axis.monitor.SOAPMonitorService + + + SOAPMonitorPort + 5001 + + 100 + @@ -500,7 +535,31 @@ /dspace-admin/workflow + + + AxisServlet + /servlet/AxisServlet + + + + AxisServlet + *.jws + + + + AxisServlet + /services/* + + + + SOAPMonitorService + /SOAPMonitor + + + AdminServlet + /servlet/AdminServlet +

Index: jsp/login/logged-out.jsp =================================================================== RCS file: /cvsroot/dspace/dspace/jsp/login/logged-out.jsp,v retrieving revision 1.3 diff -u -r1.3 logged-out.jsp --- jsp/login/logged-out.jsp 21 Feb 2003 19:51:49 -0000 1.3 +++ jsp/login/logged-out.jsp 7 Apr 2005 10:13:20 -0000 @@ -51,4 +51,12 @@

Thank you for remembering to log out!

+ <% + if (Authenticate.getSiteAuth() instanceof CASAuthenticator) + { + %>+

">Logout from CAS

+ <% + } + %>Index: src/org/dspace/core/Utils.java =================================================================== RCS file: /cvsroot/dspace/dspace/src/org/dspace/core/Utils.java,v retrieving revision 1.10 diff -u -r1.10 Utils.java --- src/org/dspace/core/Utils.java 22 Dec 2004 17:48:45 -0000 1.10 +++ src/org/dspace/core/Utils.java 7 Apr 2005 10:13:20 -0000 @@ -39,11 +39,7 @@ */ package org.dspace.core; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import java.io.*; import java.math.BigInteger; import java.rmi.dgc.VMID; import java.security.MessageDigest; @@ -269,4 +265,12 @@ return value; } -} \ No newline at end of file + + public static String getStackTrace(Throwable e) { + final StringWriter stringWriter = new StringWriter(); + final PrintWriter printWriter = new PrintWriter(stringWriter); + e.printStackTrace(printWriter); + printWriter.flush(); + return stringWriter.toString(); + } +}