Index: lams_bb_integration/WEB-INF/bb-manifest.xml =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb --- lams_bb_integration/WEB-INF/bb-manifest.xml (.../bb-manifest.xml) (revision 2d8a22624f79146eff859c52775648266d47b826) +++ lams_bb_integration/WEB-INF/bb-manifest.xml (.../bb-manifest.xml) (revision a861902df1adee65242a8c37adc1463b99aa7dcb) @@ -31,9 +31,7 @@ - + @@ -42,32 +40,7 @@ - - - - application-def description goes here - - - - - - - - - - - - - - - - - - - - - - + Index: lams_bb_integration/WEB-INF/config/log4j.properties =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb --- lams_bb_integration/WEB-INF/config/log4j.properties (.../log4j.properties) (revision 2d8a22624f79146eff859c52775648266d47b826) +++ lams_bb_integration/WEB-INF/config/log4j.properties (.../log4j.properties) (revision a861902df1adee65242a8c37adc1463b99aa7dcb) @@ -17,4 +17,4 @@ log4j.appender.LOGFILE.Append=true log4j.appender.LOGFILE.Threshold=INFO log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout -log4j.appender.LOGFILE.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n \ No newline at end of file +log4j.appender.LOGFILE.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n Index: lams_bb_integration/WEB-INF/lib/axis-ant.jar =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb Binary files differ Index: lams_bb_integration/WEB-INF/lib/axis.jar =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb Binary files differ Index: lams_bb_integration/WEB-INF/lib/commons-codec-1.3.jar =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb Binary files differ Index: lams_bb_integration/WEB-INF/lib/commons-discovery-0.2.jar =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb Binary files differ Index: lams_bb_integration/WEB-INF/lib/commons-logging-1.0.4.jar =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb Binary files differ Index: lams_bb_integration/WEB-INF/lib/jaxrpc.jar =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb Binary files differ Index: lams_bb_integration/WEB-INF/lib/log4j-1.2.8.jar =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb Binary files differ Index: lams_bb_integration/WEB-INF/lib/saaj.jar =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb Binary files differ Index: lams_bb_integration/WEB-INF/lib/wsdl4j-1.5.1.jar =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb Binary files differ Index: lams_bb_integration/WEB-INF/web.xml =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb --- lams_bb_integration/WEB-INF/web.xml (.../web.xml) (revision 2d8a22624f79146eff859c52775648266d47b826) +++ lams_bb_integration/WEB-INF/web.xml (.../web.xml) (revision a861902df1adee65242a8c37adc1463b99aa7dcb) @@ -14,14 +14,14 @@ org.lamsfoundation.ld.integration.blackboard.LamsActionRequestServlet - + Fisheye: Tag 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17 refers to a dead (removed) revision in file `lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/BBDBManager.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsActionRequestServlet.java =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb --- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsActionRequestServlet.java (.../LamsActionRequestServlet.java) (revision 2d8a22624f79146eff859c52775648266d47b826) +++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsActionRequestServlet.java (.../LamsActionRequestServlet.java) (revision a861902df1adee65242a8c37adc1463b99aa7dcb) @@ -92,36 +92,15 @@ BbSessionManagerService sessionService = BbServiceManager.getSessionManagerService(); BbSession bbSession = sessionService.getSession( request ); String username = bbSession.getUserName(); - - //attach the learningSessionId, learningDesignId or courseId to the redirect url - //String redirect = LamsSecurityUtil.generateRequestURL(username, p_method); + String redirect = LamsSecurityUtil.generateRequestURL(ctx, p_method); - - //redirect = LamsSecurityUtil.generateRequestURL(username, p_method); - /*if(p_learningSessionId!=null) - { - redirect += '&' + Constants.PARAM_LEARNING_SESSION_ID + '=' + p_learningSessionId; - //redirect1 += '&' + Constants.PARAM_LEARNING_SESSION_ID + '=' + p_learningSessionId; - } - if(p_learningDesignId!=null) - { - redirect += '&' + Constants.PARAM_LEARNING_DESIGN_ID + '=' + p_learningDesignId; - //redirect1 += '&' + Constants.PARAM_LEARNING_SESSION_ID + '=' + p_learningSessionId; - } + if(p_courseId!=null) { redirect += '&' + Constants.PARAM_COURSE_ID + '=' + p_courseId; //redirect1 += '&' + Constants.PARAM_LEARNING_SESSION_ID + '=' + p_learningSessionId; } - */ - - if(p_courseId!=null) - { - redirect += '&' + Constants.PARAM_COURSE_ID + '=' + p_courseId; - //redirect1 += '&' + Constants.PARAM_LEARNING_SESSION_ID + '=' + p_learningSessionId; - } - //response.sendRedirect(redirect1); response.sendRedirect(response.encodeRedirectURL(redirect)); Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb --- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java (.../LamsSecurityUtil.java) (revision 2d8a22624f79146eff859c52775648266d47b826) +++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java (.../LamsSecurityUtil.java) (revision a861902df1adee65242a8c37adc1463b99aa7dcb) @@ -36,26 +36,29 @@ import java.util.Date; import java.util.Locale; import javax.xml.rpc.ServiceException; -import blackboard.platform.context.ContextManager; import blackboard.platform.context.Context; import org.apache.commons.codec.binary.Hex; -import org.lamsfoundation.lams.integrations.sakai.logic.impl.LamstwoUtils; -import org.lamsfoundation.lams.webservice.LessonManager; -import org.lamsfoundation.lams.webservice.LessonManagerService; -import org.lamsfoundation.lams.webservice.LessonManagerServiceLocator; +import javax.servlet.ServletException; + +//import org.lamsfoundation.lams.util.CentralConstants; import org.lamsfoundation.ld.integration.Constants; -import org.lamsfoundation.ld.webservice.*; +import org.lamsfoundation.ld.webservice.LessonManager; +import org.lamsfoundation.ld.webservice.LessonManagerService; +import org.lamsfoundation.ld.webservice.LessonManagerServiceLocator; + + import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; import org.apache.log4j.Logger; -import java.io.*; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; + /** * @author Luke Foxton */ @@ -136,7 +139,6 @@ + "datetime=" + timestamp + "&username=" + URLEncoder.encode(username, "utf8") + "&serverId=" + URLEncoder.encode(serverId, "utf8") - + "&serverKey=" + URLEncoder.encode(serverKey, "utf8") + "&hashValue=" + hash + "&courseId=" + URLEncoder.encode(courseId, "UTF8") + "&country=" + country @@ -188,16 +190,17 @@ - /* - * TODO: - */ + + + + /* Scheduling is handled by blackboard public static Long scheduleLesson(Context ctx, long ldId, String title, String desc, String startDate) { String serverID = getServerID(); String serverAddress = getServerAddress(); String serverKey = getServerKey(); - + String courseId = ctx.getCourse().getCourseId(); String username = ctx.getUser().getUserName(); String siteId = getReqSrc(); @@ -207,9 +210,9 @@ } try { - + String datetime = new Date().toString(); - String hashValue = LamstwoUtils.generateAuthenticationHash(serverID, serverKey, username, datetime); + String hashValue = generateAuthenticationHash(serverID, serverKey, username, datetime); LessonManagerService service = new LessonManagerServiceLocator(); LessonManager lessonManager = service.getLessonManagerService(new URL(serverAddress + "/services/LessonManagerService")); @@ -230,81 +233,198 @@ } return null; } + */ - public static Long startLesson(Context ctx, long ldId, String title, String desc) { - - String serverID = getServerID(); - String serverAddress = getServerAddress(); + + /* + String serverId = request.getParameter(CentralConstants.PARAM_SERVER_ID); + String datetime = request.getParameter(CentralConstants.PARAM_DATE_TIME); + String hashValue = request.getParameter(CentralConstants.PARAM_HASH_VALUE); + String username = request.getParameter(CentralConstants.PARAM_USERNAME); + String courseId = request.getParameter(CentralConstants.PARAM_COURSE_ID); + String ldIdStr = request.getParameter(CentralConstants.PARAM_LEARNING_DESIGN_ID); + String lsIdStr = request.getParameter(CentralConstants.PARAM_LESSON_ID); + String country = request.getParameter(CentralConstants.PARAM_COUNTRY); + String title = request.getParameter(CentralConstants.PARAM_TITLE); + String desc = request.getParameter(CentralConstants.PARAM_DESC); + String startDate = request.getParameter(CentralConstants.PARAM_STARTDATE); + String lang = request.getParameter(CentralConstants.PARAM_LANG); + String method = request.getParameter(CentralConstants.PARAM_METHOD); + + serverId, + datetime, + hashValue, + username, + ldId, + courseId, + title, + desc, + country, + lang + + /lams//services/xml/LessonManager?serverId=lamsbb + &datetime=1186617857718 + &username=administrator + &hashValue=696e870fde732c1e14a6f79a2872f6eaff9be349 + &courseId=1 + &ldId=5 + &country=US + &lang=en + &method=start + &title=test + &desc=+%0D%0A + */ + + public static Long startLesson(Context ctx, long ldId, String title, String desc) + { + String serverId = getServerID(); + String serverAddr = getServerAddress(); String serverKey = getServerKey(); - + String courseId = ctx.getCourse().getCourseId(); String username = ctx.getUser().getUserName(); - String siteId = getReqSrc(); - if (serverID == null || serverAddress == null || serverKey == null ) { + if (serverId == null || serverAddr == null || serverKey == null ) { logger.error("Unable to retrieve learning designs from LAMS, one or more lams configuration properties is null"); return null; } try { - String datetime = new Date().toString(); - String hashValue = LamstwoUtils.generateAuthenticationHash(serverID, serverKey, username, datetime); + String timestamp = new Long(System.currentTimeMillis()).toString(); + String hash = generateAuthenticationHash(timestamp, username, serverId); - LessonManagerService service = new LessonManagerServiceLocator(); - LessonManager lessonManager = service.getLessonManagerService(new URL(serverAddress + "/services/LessonManagerService")); - Long lessonId = lessonManager.startLesson(serverID, datetime, hashValue, username, ldId, siteId, title, desc, "en", "US"); - - return lessonId; + // (serverId, datetime, hashValue, username, ldId, courseId, title, desc, country, lang) + + String serviceURL = serverAddr + "/services/xml/LessonManager?" + + "&serverId=" + URLEncoder.encode(serverId, "utf8") + + "&datetime=" + timestamp + + "&username=" + URLEncoder.encode(username, "utf8") + + "&hashValue=" + hash + + "&courseId=" + URLEncoder.encode(courseId, "utf8") + + "&ldId=" + new Long(ldId).toString() + + "&country=" + "US" + + "&lang=" + "en" + + "&method=" + "start" + + "&title=" + URLEncoder.encode(title, "utf8").trim() + + "&desc=" + URLEncoder.encode(desc, "utf8").trim(); + + System.out.println("START LESSON: " + serviceURL); + + URL url = new URL(serviceURL); + URLConnection conn = url.openConnection(); + if (!(conn instanceof HttpURLConnection)) { + logger.error("Unable to open connection to: " + serviceURL); + } + + HttpURLConnection httpConn = (HttpURLConnection)conn; + + if (httpConn.getResponseCode() != HttpURLConnection.HTTP_OK) { + logger.error("HTTP Response Code: " + httpConn.getResponseCode() + + ", HTTP Response Message: " + httpConn.getResponseMessage()); + } + + InputStream is = url.openConnection().getInputStream(); + + // parse xml response + DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); + DocumentBuilder db = dbf.newDocumentBuilder(); + Document document = db.parse(is); + + // get the lesson id from the response + return Long.parseLong(document.getElementsByTagName("Lesson").item(0).getAttributes().getNamedItem("lessonId").getTextContent()); + + } catch (MalformedURLException e) { logger.error("Unable to start LAMS lesson, bad URL: '" - + serverAddress - + "', please check sakai.properties"); - } catch (ServiceException e) { - logger.error("Unable to start LAMS lesson, RPC Service Exception"); + + serverAddr + + "', please check lams.properties"); e.printStackTrace(); } catch (RemoteException e) { logger.error("Unable to start LAMS lesson, RMI Remote Exception"); e.printStackTrace(); + } catch (UnsupportedEncodingException e) + { + logger.error("Unable to start LAMS lesson, Unsupported Encoding Exception"); + e.printStackTrace(); } + catch (Exception e) + { + logger.error("Unable to start LAMS lesson"); + e.printStackTrace(); + } + return null; } + /* * TODO: */ public static boolean deleteLesson(Context ctx, long lsId) { - String serverID = getServerID(); - String serverAddress = getServerAddress(); + String serverId = getServerID(); + String serverAddr = getServerAddress(); String serverKey = getServerKey(); - String username = ctx.getUser().getUserName(); - - - if (serverID == null || serverAddress == null || serverKey == null ) { - logger.error("Unable to delete LAMS lesson: lsid = " + lsId + ", one or more lams configuration properties is null"); + if (serverId == null || serverAddr == null || serverKey == null ) { + logger.error("Unable to retrieve learning designs from LAMS, one or more lams configuration properties is null"); return false; } try { - String datetime = new Date().toString(); - String hashValue = LamstwoUtils.generateAuthenticationHash(serverID, serverKey, username, datetime); - LessonManagerService service = new LessonManagerServiceLocator(); - LessonManager lessonManager = service.getLessonManagerService(new URL(serverAddress + "/services/LessonManagerService")); - lessonManager.deleteLesson(serverID, datetime, hashValue, username, lsId); - - return true; + String timestamp = new Long(System.currentTimeMillis()).toString(); + String hash = generateAuthenticationHash(serverId, serverKey, username, timestamp); + + // Boolean deleted = deleteLesson(serverId, datetime, hashValue, username, lsId); + + + String serviceURL = serverAddr + "/services/xml/LessonManager?" + + "datetime=" + timestamp + + "&username=" + URLEncoder.encode(username, "utf8") + + "&serverId=" + URLEncoder.encode(serverId, "utf8") + + "&serverKey=" + URLEncoder.encode(serverKey, "utf8") + + "&hashValue=" + hash + + "&lsId=" + new Long(lsId).toString() + + "&method=" + "delete"; + + URL url = new URL(serviceURL); + URLConnection conn = url.openConnection(); + if (!(conn instanceof HttpURLConnection)) { + logger.error("Unable to open connection to: " + serviceURL); + } + + HttpURLConnection httpConn = (HttpURLConnection)conn; + + if (httpConn.getResponseCode() != HttpURLConnection.HTTP_OK) { + logger.error("HTTP Response Code: " + httpConn.getResponseCode() + + ", HTTP Response Message: " + httpConn.getResponseMessage()); + } + + InputStream is = url.openConnection().getInputStream(); + + // parse xml response + DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); + DocumentBuilder db = dbf.newDocumentBuilder(); + Document document = db.parse(is); + + return Boolean.parseBoolean(document.getElementById("lesson").getAttribute("deleted")); + } catch (MalformedURLException e) { - logger.error("Unable to delete LAMS lesson, lsid = " + lsId + ": ', bad URL: '" - + serverAddress - + "', please check sakai.properties"); - } catch (ServiceException e) { - logger.error("Unable to start LAMS lesson, RPC Service Exception"); - e.printStackTrace(); + logger.error("Unable to delete LAMS lesson, bad URL: '" + + serverAddr + + "', please check lams.properties"); } catch (RemoteException e) { - logger.error("Unable to start LAMS lesson, RMI Remote Exception"); + logger.error("Unable to delete LAMS lesson, RMI Remote Exception"); e.printStackTrace(); + } catch (UnsupportedEncodingException e) + { + logger.error("Unable to delet LAMS lesson, Unsupported Encoding Exception"); + e.printStackTrace(); + } catch (Exception e) + { + logger.error("Unable to delete LAMS lesson"); + e.printStackTrace(); } return false; } @@ -434,4 +554,5 @@ throw new RuntimeException(e); } } + } Fisheye: Tag a861902df1adee65242a8c37adc1463b99aa7dcb refers to a dead (removed) revision in file `lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsServiceUtil.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_bb_integration/src/org/lamsfoundation/ld/webservice/LessonManager.java =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb --- lams_bb_integration/src/org/lamsfoundation/ld/webservice/LessonManager.java (.../LessonManager.java) (revision 2d8a22624f79146eff859c52775648266d47b826) +++ lams_bb_integration/src/org/lamsfoundation/ld/webservice/LessonManager.java (.../LessonManager.java) (revision a861902df1adee65242a8c37adc1463b99aa7dcb) @@ -16,7 +16,7 @@ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. */ -package org.lamsfoundation.lams.webservice; +package org.lamsfoundation.ld.webservice; public interface LessonManager extends java.rmi.Remote { public java.lang.Long startLesson(java.lang.String serverId, java.lang.String datetime, java.lang.String hashValue, java.lang.String username, long ldId, java.lang.String courseId, java.lang.String title, java.lang.String desc, java.lang.String countryIsoCode, java.lang.String langIsoCode) throws java.rmi.RemoteException; Index: lams_bb_integration/src/org/lamsfoundation/ld/webservice/LessonManagerService.java =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb --- lams_bb_integration/src/org/lamsfoundation/ld/webservice/LessonManagerService.java (.../LessonManagerService.java) (revision 2d8a22624f79146eff859c52775648266d47b826) +++ lams_bb_integration/src/org/lamsfoundation/ld/webservice/LessonManagerService.java (.../LessonManagerService.java) (revision a861902df1adee65242a8c37adc1463b99aa7dcb) @@ -16,12 +16,12 @@ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. */ -package org.lamsfoundation.lams.webservice; +package org.lamsfoundation.ld.webservice; public interface LessonManagerService extends javax.xml.rpc.Service { public java.lang.String getLessonManagerServiceAddress(); - public org.lamsfoundation.lams.webservice.LessonManager getLessonManagerService() throws javax.xml.rpc.ServiceException; + public org.lamsfoundation.ld.webservice.LessonManager getLessonManagerService() throws javax.xml.rpc.ServiceException; - public org.lamsfoundation.lams.webservice.LessonManager getLessonManagerService(java.net.URL portAddress) throws javax.xml.rpc.ServiceException; + public org.lamsfoundation.ld.webservice.LessonManager getLessonManagerService(java.net.URL portAddress) throws javax.xml.rpc.ServiceException; } Index: lams_bb_integration/src/org/lamsfoundation/ld/webservice/LessonManagerServiceLocator.java =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb --- lams_bb_integration/src/org/lamsfoundation/ld/webservice/LessonManagerServiceLocator.java (.../LessonManagerServiceLocator.java) (revision 2d8a22624f79146eff859c52775648266d47b826) +++ lams_bb_integration/src/org/lamsfoundation/ld/webservice/LessonManagerServiceLocator.java (.../LessonManagerServiceLocator.java) (revision a861902df1adee65242a8c37adc1463b99aa7dcb) @@ -16,9 +16,9 @@ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. */ -package org.lamsfoundation.lams.webservice; +package org.lamsfoundation.ld.webservice; -public class LessonManagerServiceLocator extends org.apache.axis.client.Service implements org.lamsfoundation.lams.webservice.LessonManagerService { +public class LessonManagerServiceLocator extends org.apache.axis.client.Service implements org.lamsfoundation.ld.webservice.LessonManagerService { public LessonManagerServiceLocator() { } @@ -50,7 +50,7 @@ LessonManagerServiceWSDDServiceName = name; } - public org.lamsfoundation.lams.webservice.LessonManager getLessonManagerService() throws javax.xml.rpc.ServiceException { + public org.lamsfoundation.ld.webservice.LessonManager getLessonManagerService() throws javax.xml.rpc.ServiceException { java.net.URL endpoint; try { endpoint = new java.net.URL(LessonManagerService_address); @@ -61,9 +61,9 @@ return getLessonManagerService(endpoint); } - public org.lamsfoundation.lams.webservice.LessonManager getLessonManagerService(java.net.URL portAddress) throws javax.xml.rpc.ServiceException { + public org.lamsfoundation.ld.webservice.LessonManager getLessonManagerService(java.net.URL portAddress) throws javax.xml.rpc.ServiceException { try { - org.lamsfoundation.lams.webservice.LessonManagerServiceSoapBindingStub _stub = new org.lamsfoundation.lams.webservice.LessonManagerServiceSoapBindingStub(portAddress, this); + org.lamsfoundation.ld.webservice.LessonManagerServiceSoapBindingStub _stub = new org.lamsfoundation.ld.webservice.LessonManagerServiceSoapBindingStub(portAddress, this); _stub.setPortName(getLessonManagerServiceWSDDServiceName()); return _stub; } @@ -83,8 +83,8 @@ */ public java.rmi.Remote getPort(Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException { try { - if (org.lamsfoundation.lams.webservice.LessonManager.class.isAssignableFrom(serviceEndpointInterface)) { - org.lamsfoundation.lams.webservice.LessonManagerServiceSoapBindingStub _stub = new org.lamsfoundation.lams.webservice.LessonManagerServiceSoapBindingStub(new java.net.URL(LessonManagerService_address), this); + if (org.lamsfoundation.ld.webservice.LessonManager.class.isAssignableFrom(serviceEndpointInterface)) { + org.lamsfoundation.ld.webservice.LessonManagerServiceSoapBindingStub _stub = new org.lamsfoundation.ld.webservice.LessonManagerServiceSoapBindingStub(new java.net.URL(LessonManagerService_address), this); _stub.setPortName(getLessonManagerServiceWSDDServiceName()); return _stub; } Index: lams_bb_integration/src/org/lamsfoundation/ld/webservice/LessonManagerServiceSoapBindingStub.java =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb --- lams_bb_integration/src/org/lamsfoundation/ld/webservice/LessonManagerServiceSoapBindingStub.java (.../LessonManagerServiceSoapBindingStub.java) (revision 2d8a22624f79146eff859c52775648266d47b826) +++ lams_bb_integration/src/org/lamsfoundation/ld/webservice/LessonManagerServiceSoapBindingStub.java (.../LessonManagerServiceSoapBindingStub.java) (revision a861902df1adee65242a8c37adc1463b99aa7dcb) @@ -16,9 +16,9 @@ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. */ -package org.lamsfoundation.lams.webservice; +package org.lamsfoundation.ld.webservice; -public class LessonManagerServiceSoapBindingStub extends org.apache.axis.client.Stub implements org.lamsfoundation.lams.webservice.LessonManager { +public class LessonManagerServiceSoapBindingStub extends org.apache.axis.client.Stub implements org.lamsfoundation.ld.webservice.LessonManager { private java.util.Vector cachedSerClasses = new java.util.Vector(); private java.util.Vector cachedSerQNames = new java.util.Vector(); private java.util.Vector cachedSerFactories = new java.util.Vector(); Index: lams_bb_integration/web/modules/create.jsp =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb --- lams_bb_integration/web/modules/create.jsp (.../create.jsp) (revision 2d8a22624f79146eff859c52775648266d47b826) +++ lams_bb_integration/web/modules/create.jsp (.../create.jsp) (revision a861902df1adee65242a8c37adc1463b99aa7dcb) @@ -33,13 +33,16 @@
+ + "> "> - + +
+
-
+
Fisheye: Tag a861902df1adee65242a8c37adc1463b99aa7dcb refers to a dead (removed) revision in file `lams_bb_integration/web/modules/create_proc.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag c8c8851ebc6c34fc0e8e13c8a880fe21fc03b8cc refers to a dead (removed) revision in file `lams_bb_integration/web/modules/learnermonitor.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_bb_integration/web/modules/modify.jsp =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb --- lams_bb_integration/web/modules/modify.jsp (.../modify.jsp) (revision 2d8a22624f79146eff859c52775648266d47b826) +++ lams_bb_integration/web/modules/modify.jsp (.../modify.jsp) (revision a861902df1adee65242a8c37adc1463b99aa7dcb) @@ -44,6 +44,7 @@ FormattedText desc = courseDoc.getBody(); String description = desc.getText().replaceFirst(NOT_AVAILABLE, ""); //remove the NOT_AVAILABLE substring + %> @@ -54,38 +55,64 @@ Modify LAMS
- "> - "> - - - - + "> + "> + + + + + - + - - - + + + - >Yes - >No + >Yes + >No >Yes >No - - - + + +
+ + + + - - + +
Index: lams_bb_integration/web/modules/modify_proc.jsp =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb --- lams_bb_integration/web/modules/modify_proc.jsp (.../modify_proc.jsp) (revision 2d8a22624f79146eff859c52775648266d47b826) +++ lams_bb_integration/web/modules/modify_proc.jsp (.../modify_proc.jsp) (revision a861902df1adee65242a8c37adc1463b99aa7dcb) @@ -20,7 +20,8 @@ <% //check permission - if (!PlugInUtil.authorizeForCourseControlPanel(request, response)) + + if (!PlugInUtil.authorizeForCourseControlPanel(request, response)) return; BbPersistenceManager bbPm = BbServiceManager.getPersistenceService().getDbPersistenceManager(); @@ -36,23 +37,7 @@ myContent.setIsAvailable(request.getParameter("isAvailable").equals("true")?true:false); myContent.setIsTracked(request.getParameter("isTracked").equals("true")?true:false); - - //get descriptions entered - String descText = request.getParameter("descriptiontext"); - FormattedText.Type descType = FormattedText.Type.DEFAULT; //type of description (S|H|P) - switch(request.getParameter("descriptiontype").charAt(0)){ - case 'H': - descType = FormattedText.Type.HTML; break; - case 'S': - descType = FormattedText.Type.SMART_TEXT; break; - case 'P': - descType = FormattedText.Type.PLAIN_TEXT; break; - } - if(!myContent.getIsAvailable()){ - descText = "Item is not available.
" + descText; - } - FormattedText description = new FormattedText(descText,descType); - + FormattedText description = new FormattedText(request.getParameter("description"),FormattedText.Type.HTML); myContent.setBody(description); //Parse start/end Date from the @@ -62,6 +47,8 @@ cstart.setTime(formatter.parse(request.getParameter("startDate"))); cend.setTime(formatter.parse(request.getParameter("endDate"))); + + // Set Availability Dates myContent.setStartDate(cstart); if (request.getParameter("restrict_end") != null){ @@ -74,6 +61,9 @@ persister.persist( myContent ); String strReturnUrl = PlugInUtil.getEditableContentReturnURL(myContent.getParentId()); + + + %> @@ -86,7 +76,8 @@ + recallUrl="<%=strReturnUrl%>" + > Content successfully modified.
 Fisheye: Tag c8c8851ebc6c34fc0e8e13c8a880fe21fc03b8cc refers to a dead (removed) revision in file `lams_bb_integration/web/modules/notAllowed.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8ea6dac2e1f9e39a41030dd5907592bc2aa04d17 refers to a dead (removed) revision in file `lams_bb_integration/web/modules/remove.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_bb_integration/web/modules/start_lesson.jsp =================================================================== diff -u -r2d8a22624f79146eff859c52775648266d47b826 -ra861902df1adee65242a8c37adc1463b99aa7dcb --- lams_bb_integration/web/modules/start_lesson.jsp (.../start_lesson.jsp) (revision 2d8a22624f79146eff859c52775648266d47b826) +++ lams_bb_integration/web/modules/start_lesson.jsp (.../start_lesson.jsp) (revision a861902df1adee65242a8c37adc1463b99aa7dcb) @@ -13,7 +13,6 @@ <%@ page import="blackboard.platform.session.BbSession"%> <%@ page import="blackboard.platform.*"%> <%@ page import="blackboard.platform.plugin.PlugInUtil"%> -<%@ page import="org.lamsfoundation.ld.integration.blackboard.LamsServiceUtil"%> <%@ page import="org.lamsfoundation.ld.integration.blackboard.LamsPluginUtil"%> <%@ page import="org.lamsfoundation.ld.integration.Constants"%> @@ -23,23 +22,25 @@ <%@ taglib uri="/bbData" prefix="bbData"%> <% - String courseId = request.getParameter("course_id"); - String contentId = request.getParameter("content_id"); - String designId = request.getParameter("itemSequenceId"); String sequenceID = request.getParameter("sequence_id"); %> -
+ + + "> + "> + + - + @@ -56,7 +57,39 @@ - + +
+ + + + + + +
\ No newline at end of file Fisheye: Tag c8c8851ebc6c34fc0e8e13c8a880fe21fc03b8cc refers to a dead (removed) revision in file `lams_bb_integration/web/modules/start_lesson_proc.jsp'. Fisheye: No comparison available. Pass `N' to diff?