Note: This is only public so it can be tested and should not be used outside the impl + * @return a context + */ + public String getCurrentContext() { + return toolManager.getCurrentPlacement().getContext(); + } + + /** + * Get the internal Sakai userId of the current user + *
Note: This is only public so it can be tested and should not be used outside the impl + * @return a userId (not necessarily username) + */ + public String getCurrentUserId() { + return userDirectoryService.getCurrentUser().getId(); + } + + /* (non-Javadoc) + * @see org.lamsfoundation.lams.integrations.sakai.logic.LamstwoLogic#deleteLesson() + */ + public boolean deleteLesson(long lsId) { + String serverID = getServerID(); + String serverAddress = getServerAddress(); + String serverKey = getServerKey(); + + String username = getCurrentUserId(); + + if (serverID == null || serverAddress == null || serverKey == null ) { + log.error("Unable to delete LAMS lesson: lsid = " + lsId + ", 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; + + } catch (MalformedURLException e) { + log.error("Unable to delete LAMS lesson, lsid = " + lsId + ": ', bad URL: '" + + serverAddress + + "', please check sakai.properties"); + } catch (ServiceException e) { + log.error("Unable to start LAMS lesson, RPC Service Exception"); + e.printStackTrace(); + } catch (RemoteException e) { + log.error("Unable to start LAMS lesson, RMI Remote Exception"); + e.printStackTrace(); + } + return false; + } + + /* (non-Javadoc) + * @see org.lamsfoundation.lams.integrations.sakai.logic.LamstwoLogic#getLearningDesigns() + */ + public String getLearningDesigns(Integer mode) { + + + String serverID = getServerID(); + String serverAddress = getServerAddress(); + String serverKey = getServerKey(); + + String username = getCurrentUserId(); + String siteId = getCurrentContext(); + + if (serverID == null || serverAddress == null || serverKey == null ) { + log.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); + + LearningDesignRepositoryService service = new LearningDesignRepositoryServiceLocator(); + LearningDesignRepository ldr = service.getLearningDesignRepository(new URL(serverAddress + "/services/LearningDesignRepositoryService")); + String result = ldr.getLearningDesigns(serverID, datetime, hashValue, username, siteId, mode, getCountryCode(), getLanguageCode()); + + // TODO check if result is valid ?? + + String pattern = "'(\\d+)'"; + String replacement = "'javascript:selectSequence($1)'"; + + result = result.replaceAll(pattern, replacement); + + return result; + + } catch (MalformedURLException e) { + log.error("Unable to retrieve learning designs from LAMS, bad URL: '" + + serverAddress + + "', please check sakai.properties"); + } catch (ServiceException e) { + log.error("Unable to retrieve learning designs from LAMS, RPC Service Exception"); + e.printStackTrace(); + } catch (RemoteException e) { + log.error("Unable to retrieve learning designs from LAMS, RMI Remote Exception"); + e.printStackTrace(); + } + return null; + } + + /* (non-Javadoc) + * @see org.lamsfoundation.lams.integrations.sakai.logic.LamstwoLogic#scheduleLesson() + */ + public Long scheduleLesson(long ldId, String title, String desc, String startDate) { + + + String serverID = getServerID(); + String serverAddress = getServerAddress(); + String serverKey = getServerKey(); + + String username = getCurrentUserId(); + String siteId = getCurrentContext(); + + if (serverID == null || serverAddress == null || serverKey == null ) { + log.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); + + LessonManagerService service = new LessonManagerServiceLocator(); + LessonManager lessonManager = service.getLessonManagerService(new URL(serverAddress + "/services/LessonManagerService")); + Long lessonId = lessonManager.scheduleLesson(serverID, datetime, hashValue, username, ldId, siteId, title, desc, startDate, getCountryCode(), getLanguageCode()); + + return lessonId; + + } catch (MalformedURLException e) { + log.error("Unable to schedule LAMS lesson, bad URL: '" + + serverAddress + + "', please check sakai.properties"); + } catch (ServiceException e) { + log.error("Unable to schedule LAMS lesson, RPC Service Exception"); + e.printStackTrace(); + } catch (RemoteException e) { + log.error("Unable to schedule LAMS lesson, RMI Remote Exception"); + e.printStackTrace(); + } + return null; + } + + /* (non-Javadoc) + * @see org.lamsfoundation.lams.integrations.sakai.logic.LamstwoLogic#startLesson() + */ + public Long startLesson(long ldId, String title, String desc) { + + String serverID = getServerID(); + String serverAddress = getServerAddress(); + String serverKey = getServerKey(); + + String username = getCurrentUserId(); + String siteId = getCurrentContext(); + + if (serverID == null || serverAddress == null || serverKey == null ) { + log.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); + + 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, getCountryCode(), getLanguageCode()); + + return lessonId; + + } catch (MalformedURLException e) { + log.error("Unable to start LAMS lesson, bad URL: '" + + serverAddress + + "', please check sakai.properties"); + } catch (ServiceException e) { + log.error("Unable to start LAMS lesson, RPC Service Exception"); + e.printStackTrace(); + } catch (RemoteException e) { + log.error("Unable to start LAMS lesson, RMI Remote Exception"); + e.printStackTrace(); + } + return null; + } + + /* (non-Javadoc) + * @see org.lamsfoundation.lams.integrations.sakai.logic.LamstwoLogic#getServerAddress() + */ + public String getServerAddress() { + return ServerConfigurationService.getString(LamstwoConstants.CONF_SERVER_ADDRRESS); + } + + /* (non-Javadoc) + * @see org.lamsfoundation.lams.integrations.sakai.logic.LamstwoLogic#getServerID() + */ + public String getServerID() { + return ServerConfigurationService.getString(LamstwoConstants.CONF_SERVER_ID); + } + + /* (non-Javadoc) + * @see org.lamsfoundation.lams.integrations.sakai.logic.LamstwoLogic#getServerKey() + */ + public String getServerKey() { + return ServerConfigurationService.getString(LamstwoConstants.CONF_SERVER_KEY); + } + + /* + * (non-Javadoc) + * @see org.lamsfoundation.lams.integrations.sakai.logic.LamstwoLogic#getRequestSource() + */ + public String getRequestSource() { + return ServerConfigurationService.getString(LamstwoConstants.CONF_REQUEST_SOURCE); + } + + public boolean isHashValid(String[] elements, String hash) { + String generatedHash = generateHash(elements); + log.debug("hash=" + hash + " , generated hash="+ generatedHash); + return generatedHash.equals(hash); + } + + public String generateHash(String[] elements) { + String plaintext = new String(); + for (String str : elements) { + plaintext += str.trim().toLowerCase(); + } + return LamstwoUtils.sha1(plaintext); + } + + public String getUserInfo(String username) { + User user = null; + + try { + user = userDirectoryService.getUser(username); + } catch (UserNotDefinedException e) { + log.error("Could not find user with id: " + username); + return null; + } + + String[] valList = {"", + user.getFirstName(), + user.getLastName(), + "", + "", + "", + "", + "", + "", + "", + "", + user.getEmail(), + "", + "" + }; + + return CSVUtil.write(valList); + } + + private String createURL(String method) { + String timestamp = new Long(java.lang.System.currentTimeMillis()).toString(); + String uid = getCurrentUserId(); + String [] plaintext = {timestamp, uid, method, getServerID(), getServerKey()}; + String hash = generateHash(plaintext); + + ResourceLoader rl = new ResourceLoader(); + Locale locale = rl.getLocale(); + + String siteID = getCurrentContext(); + + String url; + try { + url = getServerAddress() + "/LoginRequest?" + + "uid=" + URLEncoder.encode(uid, "UTF8") + + "&method=" + method + + "&ts=" + timestamp + + "&sid=" + getServerID() + + "&hash=" + hash + + "&courseid=" + URLEncoder.encode(siteID, "UTF8") + + "&country=" + locale.getCountry() + + "&lang=" + locale.getLanguage() + + "&requestSrc=" + URLEncoder.encode(getRequestSource(), "UTF8"); + } catch (UnsupportedEncodingException e) { + log.error("Unable to encode URL"); + throw new RuntimeException(); + } + return url; + } + + private String getCountryCode() { + return new ResourceLoader().getLocale().getCountry(); + + } + + private String getLanguageCode() { + return new ResourceLoader().getLocale().getLanguage(); + } + + /* + * (non-Javadoc) + * @see org.lamsfoundation.lams.integrations.sakai.logic.LamstwoLogic#getAuthorURL() + */ + public String getAuthorURL() { + return createURL("author"); + } + + /* + * (non-Javadoc) + * @see org.lamsfoundation.lams.integrations.sakai.logic.LamstwoLogic#getLearnerURL() + */ + public String getLearnerURL() { + return createURL("learner"); + } + + /* + * (non-Javadoc) + * @see org.lamsfoundation.lams.integrations.sakai.logic.LamstwoLogic#getMonitorURL() + */ + public String getMonitorURL() { + return createURL("monitor"); + } + + /* + * (non-Javadoc) + * @see org.lamsfoundation.lams.integrations.sakai.logic.LamstwoLogic#canCreateItem() + */ + public Boolean canCreateItem() { + String siteId = getCurrentContext(); + String userId = getCurrentUserId(); + log.debug("checking if can create new LAMS item for: " + userId + ", " + siteId ); + String siteRef = siteService.siteReference(siteId); + if ( securityService.isSuperUser(userId) ) { + // the system super user can modify any item + return true; + } else if (securityService.unlock(userId, ITEM_CREATE, siteRef) ) { + // users with permission in the specified site can modify items from that site + return true; + } + return false; + } +} Index: sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/integrations/sakai/logic/impl/LamstwoUtils.java =================================================================== diff -u --- sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/integrations/sakai/logic/impl/LamstwoUtils.java (revision 0) +++ sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/integrations/sakai/logic/impl/LamstwoUtils.java (revision c144f53e688b530044b19ff807e502a41d33039a) @@ -0,0 +1,44 @@ +/****************************************************************************** + * LamstwoUtils.java + * + * Copyright (c) 2007 LAMS Foundation + * Licensed under the Educational Community License version 1.0 + * + * A copy of the Educational Community License has been included in this + * distribution and is available at: http://www.opensource.org/licenses/ecl1.php + * + *****************************************************************************/ + +package org.lamsfoundation.lams.integrations.sakai.logic.impl; + +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + +import org.apache.commons.codec.binary.Hex; + +public class LamstwoUtils { + + public static String generateAuthenticationHash(String serverID, String serverKey, + String username, String datetime) { + String plaintext = datetime.toLowerCase().trim() + + username.toLowerCase().trim() + serverID.toLowerCase().trim() + + serverKey.toLowerCase().trim(); + + return sha1(plaintext); + } + + public static String generateUserAuthenticationHash(String timestamp, String username, String serverID, String serverKey) { + String plaintext = timestamp + username + serverID + serverKey; + return sha1(plaintext); + } + + public static String sha1(String str) { + try { + MessageDigest md = MessageDigest.getInstance("SHA1"); + return new String(Hex.encodeHex(md.digest(str.getBytes()))); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException(e); + } + } + +} Index: sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepository.java =================================================================== diff -u --- sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepository.java (revision 0) +++ sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepository.java (revision c144f53e688b530044b19ff807e502a41d33039a) @@ -0,0 +1,23 @@ +/****************************************************************************** + * LearningDesignRepository.java + * + * Copyright (c) 2007 LAMS Foundation + * Licensed under the Educational Community License version 1.0 + * + * A copy of the Educational Community License has been included in this + * distribution and is available at: http://www.opensource.org/licenses/ecl1.php + * + *****************************************************************************/ + +/** + * LearningDesignRepository.java + * + * This file was auto-generated from WSDL + * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. + */ + +package org.lamsfoundation.lams.webservice; + +public interface LearningDesignRepository extends java.rmi.Remote { + public java.lang.String getLearningDesigns(java.lang.String serverId, java.lang.String datetime, java.lang.String hashValue, java.lang.String username, java.lang.String courseId, java.lang.Integer mode, java.lang.String country, java.lang.String lang) throws java.rmi.RemoteException; +} Index: sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositoryService.java =================================================================== diff -u --- sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositoryService.java (revision 0) +++ sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositoryService.java (revision c144f53e688b530044b19ff807e502a41d33039a) @@ -0,0 +1,27 @@ +/****************************************************************************** + * LamstwoConfigurationException.java + * + * Copyright (c) 2007 LAMS Foundation + * Licensed under the Educational Community License version 1.0 + * + * A copy of the Educational Community License has been included in this + * distribution and is available at: http://www.opensource.org/licenses/ecl1.php + * + *****************************************************************************/ + +/** + * LearningDesignRepositoryService.java + * + * This file was auto-generated from WSDL + * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. + */ + +package org.lamsfoundation.lams.webservice; + +public interface LearningDesignRepositoryService extends javax.xml.rpc.Service { + public java.lang.String getLearningDesignRepositoryAddress(); + + public org.lamsfoundation.lams.webservice.LearningDesignRepository getLearningDesignRepository() throws javax.xml.rpc.ServiceException; + + public org.lamsfoundation.lams.webservice.LearningDesignRepository getLearningDesignRepository(java.net.URL portAddress) throws javax.xml.rpc.ServiceException; +} Index: sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositoryServiceLocator.java =================================================================== diff -u --- sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositoryServiceLocator.java (revision 0) +++ sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositoryServiceLocator.java (revision c144f53e688b530044b19ff807e502a41d33039a) @@ -0,0 +1,153 @@ +/****************************************************************************** + * LamstwoConfigurationException.java + * + * Copyright (c) 2007 LAMS Foundation + * Licensed under the Educational Community License version 1.0 + * + * A copy of the Educational Community License has been included in this + * distribution and is available at: http://www.opensource.org/licenses/ecl1.php + * + *****************************************************************************/ + +/** + * LearningDesignRepositoryServiceLocator.java + * + * This file was auto-generated from WSDL + * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. + */ + +package org.lamsfoundation.lams.webservice; + +public class LearningDesignRepositoryServiceLocator extends org.apache.axis.client.Service implements org.lamsfoundation.lams.webservice.LearningDesignRepositoryService { + + public LearningDesignRepositoryServiceLocator() { + } + + + public LearningDesignRepositoryServiceLocator(org.apache.axis.EngineConfiguration config) { + super(config); + } + + public LearningDesignRepositoryServiceLocator(java.lang.String wsdlLoc, javax.xml.namespace.QName sName) throws javax.xml.rpc.ServiceException { + super(wsdlLoc, sName); + } + + // Use to get a proxy class for LearningDesignRepository + private java.lang.String LearningDesignRepository_address = "http://localhost:8080/lams/services/LearningDesignRepositoryService"; + + public java.lang.String getLearningDesignRepositoryAddress() { + return LearningDesignRepository_address; + } + + // The WSDD service name defaults to the port name. + private java.lang.String LearningDesignRepositoryWSDDServiceName = "LearningDesignRepository"; + + public java.lang.String getLearningDesignRepositoryWSDDServiceName() { + return LearningDesignRepositoryWSDDServiceName; + } + + public void setLearningDesignRepositoryWSDDServiceName(java.lang.String name) { + LearningDesignRepositoryWSDDServiceName = name; + } + + public org.lamsfoundation.lams.webservice.LearningDesignRepository getLearningDesignRepository() throws javax.xml.rpc.ServiceException { + java.net.URL endpoint; + try { + endpoint = new java.net.URL(LearningDesignRepository_address); + } + catch (java.net.MalformedURLException e) { + throw new javax.xml.rpc.ServiceException(e); + } + return getLearningDesignRepository(endpoint); + } + + public org.lamsfoundation.lams.webservice.LearningDesignRepository getLearningDesignRepository(java.net.URL portAddress) throws javax.xml.rpc.ServiceException { + try { + org.lamsfoundation.lams.webservice.LearningDesignRepositorySoapBindingStub _stub = new org.lamsfoundation.lams.webservice.LearningDesignRepositorySoapBindingStub(portAddress, this); + _stub.setPortName(getLearningDesignRepositoryWSDDServiceName()); + return _stub; + } + catch (org.apache.axis.AxisFault e) { + return null; + } + } + + public void setLearningDesignRepositoryEndpointAddress(java.lang.String address) { + LearningDesignRepository_address = address; + } + + /** + * For the given interface, get the stub implementation. + * If this service has no port for the given interface, + * then ServiceException is thrown. + */ + public java.rmi.Remote getPort(Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException { + try { + if (org.lamsfoundation.lams.webservice.LearningDesignRepository.class.isAssignableFrom(serviceEndpointInterface)) { + org.lamsfoundation.lams.webservice.LearningDesignRepositorySoapBindingStub _stub = new org.lamsfoundation.lams.webservice.LearningDesignRepositorySoapBindingStub(new java.net.URL(LearningDesignRepository_address), this); + _stub.setPortName(getLearningDesignRepositoryWSDDServiceName()); + return _stub; + } + } + catch (java.lang.Throwable t) { + throw new javax.xml.rpc.ServiceException(t); + } + throw new javax.xml.rpc.ServiceException("There is no stub implementation for the interface: " + (serviceEndpointInterface == null ? "null" : serviceEndpointInterface.getName())); + } + + /** + * For the given interface, get the stub implementation. + * If this service has no port for the given interface, + * then ServiceException is thrown. + */ + public java.rmi.Remote getPort(javax.xml.namespace.QName portName, Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException { + if (portName == null) { + return getPort(serviceEndpointInterface); + } + java.lang.String inputPortName = portName.getLocalPart(); + if ("LearningDesignRepository".equals(inputPortName)) { + return getLearningDesignRepository(); + } + else { + java.rmi.Remote _stub = getPort(serviceEndpointInterface); + ((org.apache.axis.client.Stub) _stub).setPortName(portName); + return _stub; + } + } + + public javax.xml.namespace.QName getServiceName() { + return new javax.xml.namespace.QName("http://webservice.lams.lamsfoundation.org", "LearningDesignRepositoryService"); + } + + private java.util.HashSet ports = null; + + public java.util.Iterator getPorts() { + if (ports == null) { + ports = new java.util.HashSet(); + ports.add(new javax.xml.namespace.QName("http://webservice.lams.lamsfoundation.org", "LearningDesignRepository")); + } + return ports.iterator(); + } + + /** + * Set the endpoint address for the specified port name. + */ + public void setEndpointAddress(java.lang.String portName, java.lang.String address) throws javax.xml.rpc.ServiceException { + +if ("LearningDesignRepository".equals(portName)) { + setLearningDesignRepositoryEndpointAddress(address); + } + else +{ // Unknown Port Name + throw new javax.xml.rpc.ServiceException(" Cannot set Endpoint Address for Unknown Port" + portName); + } + } + + /** + * Set the endpoint address for the specified port name. + */ + public void setEndpointAddress(javax.xml.namespace.QName portName, java.lang.String address) throws javax.xml.rpc.ServiceException { + setEndpointAddress(portName.getLocalPart(), address); + } + +} Index: sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositorySoapBindingStub.java =================================================================== diff -u --- sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositorySoapBindingStub.java (revision 0) +++ sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositorySoapBindingStub.java (revision c144f53e688b530044b19ff807e502a41d33039a) @@ -0,0 +1,146 @@ +/****************************************************************************** + * LamstwoConfigurationException.java + * + * Copyright (c) 2007 LAMS Foundation + * Licensed under the Educational Community License version 1.0 + * + * A copy of the Educational Community License has been included in this + * distribution and is available at: http://www.opensource.org/licenses/ecl1.php + * + *****************************************************************************/ + +/** + * LearningDesignRepositorySoapBindingStub.java + * + * This file was auto-generated from WSDL + * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. + */ + +package org.lamsfoundation.lams.webservice; + +public class LearningDesignRepositorySoapBindingStub extends org.apache.axis.client.Stub implements org.lamsfoundation.lams.webservice.LearningDesignRepository { + 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(); + private java.util.Vector cachedDeserFactories = new java.util.Vector(); + + static org.apache.axis.description.OperationDesc [] _operations; + + static { + _operations = new org.apache.axis.description.OperationDesc[1]; + _initOperationDesc1(); + } + + private static void _initOperationDesc1(){ + org.apache.axis.description.OperationDesc oper; + org.apache.axis.description.ParameterDesc param; + oper = new org.apache.axis.description.OperationDesc(); + oper.setName("getLearningDesigns"); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "serverId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "datetime"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "hashValue"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "username"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "courseId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "mode"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "int"), java.lang.Integer.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "country"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "lang"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + oper.setReturnType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string")); + oper.setReturnClass(java.lang.String.class); + oper.setReturnQName(new javax.xml.namespace.QName("", "getLearningDesignsReturn")); + oper.setStyle(org.apache.axis.constants.Style.RPC); + oper.setUse(org.apache.axis.constants.Use.ENCODED); + _operations[0] = oper; + + } + + public LearningDesignRepositorySoapBindingStub() throws org.apache.axis.AxisFault { + this(null); + } + + public LearningDesignRepositorySoapBindingStub(java.net.URL endpointURL, javax.xml.rpc.Service service) throws org.apache.axis.AxisFault { + this(service); + super.cachedEndpoint = endpointURL; + } + + public LearningDesignRepositorySoapBindingStub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault { + if (service == null) { + super.service = new org.apache.axis.client.Service(); + } else { + super.service = service; + } + ((org.apache.axis.client.Service)super.service).setTypeMappingVersion("1.2"); + } + + protected org.apache.axis.client.Call createCall() throws java.rmi.RemoteException { + try { + org.apache.axis.client.Call _call = super._createCall(); + if (super.maintainSessionSet) { + _call.setMaintainSession(super.maintainSession); + } + if (super.cachedUsername != null) { + _call.setUsername(super.cachedUsername); + } + if (super.cachedPassword != null) { + _call.setPassword(super.cachedPassword); + } + if (super.cachedEndpoint != null) { + _call.setTargetEndpointAddress(super.cachedEndpoint); + } + if (super.cachedTimeout != null) { + _call.setTimeout(super.cachedTimeout); + } + if (super.cachedPortName != null) { + _call.setPortName(super.cachedPortName); + } + java.util.Enumeration keys = super.cachedProperties.keys(); + while (keys.hasMoreElements()) { + java.lang.String key = (java.lang.String) keys.nextElement(); + _call.setProperty(key, super.cachedProperties.get(key)); + } + return _call; + } + catch (java.lang.Throwable _t) { + throw new org.apache.axis.AxisFault("Failure trying to get the Call object", _t); + } + } + + public java.lang.String getLearningDesigns(java.lang.String serverId, java.lang.String datetime, java.lang.String hashValue, java.lang.String username, java.lang.String courseId, java.lang.Integer mode, java.lang.String country, java.lang.String lang) throws java.rmi.RemoteException { + if (super.cachedEndpoint == null) { + throw new org.apache.axis.NoEndPointException(); + } + org.apache.axis.client.Call _call = createCall(); + _call.setOperation(_operations[0]); + _call.setUseSOAPAction(true); + _call.setSOAPActionURI(""); + _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); + _call.setOperationName(new javax.xml.namespace.QName("http://webservice.lams.lamsfoundation.org", "getLearningDesigns")); + + setRequestHeaders(_call); + setAttachments(_call); + try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {serverId, datetime, hashValue, username, courseId, mode, country, lang}); + + if (_resp instanceof java.rmi.RemoteException) { + throw (java.rmi.RemoteException)_resp; + } + else { + extractAttachments(_call); + try { + return (java.lang.String) _resp; + } catch (java.lang.Exception _exception) { + return (java.lang.String) org.apache.axis.utils.JavaUtils.convert(_resp, java.lang.String.class); + } + } + } catch (org.apache.axis.AxisFault axisFaultException) { + throw axisFaultException; +} + } + +} Index: sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LessonManager.java =================================================================== diff -u --- sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LessonManager.java (revision 0) +++ sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LessonManager.java (revision c144f53e688b530044b19ff807e502a41d33039a) @@ -0,0 +1,25 @@ +/****************************************************************************** + * LamstwoConfigurationException.java + * + * Copyright (c) 2007 LAMS Foundation + * Licensed under the Educational Community License version 1.0 + * + * A copy of the Educational Community License has been included in this + * distribution and is available at: http://www.opensource.org/licenses/ecl1.php + * + *****************************************************************************/ + +/** + * LessonManager.java + * + * This file was auto-generated from WSDL + * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. + */ + +package org.lamsfoundation.lams.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; + public java.lang.Long scheduleLesson(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 startDate, java.lang.String countryIsoCode, java.lang.String langIsoCode) throws java.rmi.RemoteException; + public boolean deleteLesson(java.lang.String serverId, java.lang.String datetime, java.lang.String hashValue, java.lang.String username, long lsId) throws java.rmi.RemoteException; +} Index: sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LessonManagerService.java =================================================================== diff -u --- sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LessonManagerService.java (revision 0) +++ sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LessonManagerService.java (revision c144f53e688b530044b19ff807e502a41d33039a) @@ -0,0 +1,27 @@ +/****************************************************************************** + * LamstwoConfigurationException.java + * + * Copyright (c) 2007 LAMS Foundation + * Licensed under the Educational Community License version 1.0 + * + * A copy of the Educational Community License has been included in this + * distribution and is available at: http://www.opensource.org/licenses/ecl1.php + * + *****************************************************************************/ + +/** + * LessonManagerService.java + * + * This file was auto-generated from WSDL + * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. + */ + +package org.lamsfoundation.lams.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.lams.webservice.LessonManager getLessonManagerService(java.net.URL portAddress) throws javax.xml.rpc.ServiceException; +} Index: sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LessonManagerServiceLocator.java =================================================================== diff -u --- sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LessonManagerServiceLocator.java (revision 0) +++ sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LessonManagerServiceLocator.java (revision c144f53e688b530044b19ff807e502a41d33039a) @@ -0,0 +1,153 @@ +/****************************************************************************** + * LamstwoConfigurationException.java + * + * Copyright (c) 2007 LAMS Foundation + * Licensed under the Educational Community License version 1.0 + * + * A copy of the Educational Community License has been included in this + * distribution and is available at: http://www.opensource.org/licenses/ecl1.php + * + *****************************************************************************/ + +/** + * LessonManagerServiceLocator.java + * + * This file was auto-generated from WSDL + * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. + */ + +package org.lamsfoundation.lams.webservice; + +public class LessonManagerServiceLocator extends org.apache.axis.client.Service implements org.lamsfoundation.lams.webservice.LessonManagerService { + + public LessonManagerServiceLocator() { + } + + + public LessonManagerServiceLocator(org.apache.axis.EngineConfiguration config) { + super(config); + } + + public LessonManagerServiceLocator(java.lang.String wsdlLoc, javax.xml.namespace.QName sName) throws javax.xml.rpc.ServiceException { + super(wsdlLoc, sName); + } + + // Use to get a proxy class for LessonManagerService + private java.lang.String LessonManagerService_address = "http://localhost:8080/lams/services/LessonManagerService"; + + public java.lang.String getLessonManagerServiceAddress() { + return LessonManagerService_address; + } + + // The WSDD service name defaults to the port name. + private java.lang.String LessonManagerServiceWSDDServiceName = "LessonManagerService"; + + public java.lang.String getLessonManagerServiceWSDDServiceName() { + return LessonManagerServiceWSDDServiceName; + } + + public void setLessonManagerServiceWSDDServiceName(java.lang.String name) { + LessonManagerServiceWSDDServiceName = name; + } + + public org.lamsfoundation.lams.webservice.LessonManager getLessonManagerService() throws javax.xml.rpc.ServiceException { + java.net.URL endpoint; + try { + endpoint = new java.net.URL(LessonManagerService_address); + } + catch (java.net.MalformedURLException e) { + throw new javax.xml.rpc.ServiceException(e); + } + return getLessonManagerService(endpoint); + } + + public org.lamsfoundation.lams.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); + _stub.setPortName(getLessonManagerServiceWSDDServiceName()); + return _stub; + } + catch (org.apache.axis.AxisFault e) { + return null; + } + } + + public void setLessonManagerServiceEndpointAddress(java.lang.String address) { + LessonManagerService_address = address; + } + + /** + * For the given interface, get the stub implementation. + * If this service has no port for the given interface, + * then ServiceException is thrown. + */ + 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); + _stub.setPortName(getLessonManagerServiceWSDDServiceName()); + return _stub; + } + } + catch (java.lang.Throwable t) { + throw new javax.xml.rpc.ServiceException(t); + } + throw new javax.xml.rpc.ServiceException("There is no stub implementation for the interface: " + (serviceEndpointInterface == null ? "null" : serviceEndpointInterface.getName())); + } + + /** + * For the given interface, get the stub implementation. + * If this service has no port for the given interface, + * then ServiceException is thrown. + */ + public java.rmi.Remote getPort(javax.xml.namespace.QName portName, Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException { + if (portName == null) { + return getPort(serviceEndpointInterface); + } + java.lang.String inputPortName = portName.getLocalPart(); + if ("LessonManagerService".equals(inputPortName)) { + return getLessonManagerService(); + } + else { + java.rmi.Remote _stub = getPort(serviceEndpointInterface); + ((org.apache.axis.client.Stub) _stub).setPortName(portName); + return _stub; + } + } + + public javax.xml.namespace.QName getServiceName() { + return new javax.xml.namespace.QName("http://webservice.lams.lamsfoundation.org", "LessonManagerService"); + } + + private java.util.HashSet ports = null; + + public java.util.Iterator getPorts() { + if (ports == null) { + ports = new java.util.HashSet(); + ports.add(new javax.xml.namespace.QName("http://webservice.lams.lamsfoundation.org", "LessonManagerService")); + } + return ports.iterator(); + } + + /** + * Set the endpoint address for the specified port name. + */ + public void setEndpointAddress(java.lang.String portName, java.lang.String address) throws javax.xml.rpc.ServiceException { + +if ("LessonManagerService".equals(portName)) { + setLessonManagerServiceEndpointAddress(address); + } + else +{ // Unknown Port Name + throw new javax.xml.rpc.ServiceException(" Cannot set Endpoint Address for Unknown Port" + portName); + } + } + + /** + * Set the endpoint address for the specified port name. + */ + public void setEndpointAddress(javax.xml.namespace.QName portName, java.lang.String address) throws javax.xml.rpc.ServiceException { + setEndpointAddress(portName.getLocalPart(), address); + } + +} Index: sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LessonManagerServiceSoapBindingStub.java =================================================================== diff -u --- sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LessonManagerServiceSoapBindingStub.java (revision 0) +++ sakai-lamstwo/impl/logic/src/java/org/lamsfoundation/lams/webservice/LessonManagerServiceSoapBindingStub.java (revision c144f53e688b530044b19ff807e502a41d33039a) @@ -0,0 +1,262 @@ +/****************************************************************************** + * LamstwoConfigurationException.java + * + * Copyright (c) 2007 LAMS Foundation + * Licensed under the Educational Community License version 1.0 + * + * A copy of the Educational Community License has been included in this + * distribution and is available at: http://www.opensource.org/licenses/ecl1.php + * + *****************************************************************************/ + +/** + * LessonManagerServiceSoapBindingStub.java + * + * This file was auto-generated from WSDL + * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter. + */ + +package org.lamsfoundation.lams.webservice; + +public class LessonManagerServiceSoapBindingStub extends org.apache.axis.client.Stub implements org.lamsfoundation.lams.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(); + private java.util.Vector cachedDeserFactories = new java.util.Vector(); + + static org.apache.axis.description.OperationDesc [] _operations; + + static { + _operations = new org.apache.axis.description.OperationDesc[3]; + _initOperationDesc1(); + } + + private static void _initOperationDesc1(){ + org.apache.axis.description.OperationDesc oper; + org.apache.axis.description.ParameterDesc param; + oper = new org.apache.axis.description.OperationDesc(); + oper.setName("startLesson"); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "serverId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "datetime"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "hashValue"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "username"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "ldId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"), long.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "courseId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "title"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "desc"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "countryIsoCode"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "langIsoCode"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + oper.setReturnType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "long")); + oper.setReturnClass(java.lang.Long.class); + oper.setReturnQName(new javax.xml.namespace.QName("", "startLessonReturn")); + oper.setStyle(org.apache.axis.constants.Style.RPC); + oper.setUse(org.apache.axis.constants.Use.ENCODED); + _operations[0] = oper; + + oper = new org.apache.axis.description.OperationDesc(); + oper.setName("scheduleLesson"); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "serverId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "datetime"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "hashValue"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "username"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "ldId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"), long.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "courseId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "title"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "desc"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "startDate"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "countryIsoCode"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "langIsoCode"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + oper.setReturnType(new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "long")); + oper.setReturnClass(java.lang.Long.class); + oper.setReturnQName(new javax.xml.namespace.QName("", "scheduleLessonReturn")); + oper.setStyle(org.apache.axis.constants.Style.RPC); + oper.setUse(org.apache.axis.constants.Use.ENCODED); + _operations[1] = oper; + + oper = new org.apache.axis.description.OperationDesc(); + oper.setName("deleteLesson"); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "serverId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "datetime"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "hashValue"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "username"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, false, false); + oper.addParameter(param); + param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "lsId"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"), long.class, false, false); + oper.addParameter(param); + oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean")); + oper.setReturnClass(boolean.class); + oper.setReturnQName(new javax.xml.namespace.QName("", "deleteLessonReturn")); + oper.setStyle(org.apache.axis.constants.Style.RPC); + oper.setUse(org.apache.axis.constants.Use.ENCODED); + _operations[2] = oper; + + } + + public LessonManagerServiceSoapBindingStub() throws org.apache.axis.AxisFault { + this(null); + } + + public LessonManagerServiceSoapBindingStub(java.net.URL endpointURL, javax.xml.rpc.Service service) throws org.apache.axis.AxisFault { + this(service); + super.cachedEndpoint = endpointURL; + } + + public LessonManagerServiceSoapBindingStub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault { + if (service == null) { + super.service = new org.apache.axis.client.Service(); + } else { + super.service = service; + } + ((org.apache.axis.client.Service)super.service).setTypeMappingVersion("1.2"); + } + + protected org.apache.axis.client.Call createCall() throws java.rmi.RemoteException { + try { + org.apache.axis.client.Call _call = super._createCall(); + if (super.maintainSessionSet) { + _call.setMaintainSession(super.maintainSession); + } + if (super.cachedUsername != null) { + _call.setUsername(super.cachedUsername); + } + if (super.cachedPassword != null) { + _call.setPassword(super.cachedPassword); + } + if (super.cachedEndpoint != null) { + _call.setTargetEndpointAddress(super.cachedEndpoint); + } + if (super.cachedTimeout != null) { + _call.setTimeout(super.cachedTimeout); + } + if (super.cachedPortName != null) { + _call.setPortName(super.cachedPortName); + } + java.util.Enumeration keys = super.cachedProperties.keys(); + while (keys.hasMoreElements()) { + java.lang.String key = (java.lang.String) keys.nextElement(); + _call.setProperty(key, super.cachedProperties.get(key)); + } + return _call; + } + catch (java.lang.Throwable _t) { + throw new org.apache.axis.AxisFault("Failure trying to get the Call object", _t); + } + } + + 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 { + if (super.cachedEndpoint == null) { + throw new org.apache.axis.NoEndPointException(); + } + org.apache.axis.client.Call _call = createCall(); + _call.setOperation(_operations[0]); + _call.setUseSOAPAction(true); + _call.setSOAPActionURI(""); + _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); + _call.setOperationName(new javax.xml.namespace.QName("http://webservice.lams.lamsfoundation.org", "startLesson")); + + setRequestHeaders(_call); + setAttachments(_call); + try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {serverId, datetime, hashValue, username, new java.lang.Long(ldId), courseId, title, desc, countryIsoCode, langIsoCode}); + + if (_resp instanceof java.rmi.RemoteException) { + throw (java.rmi.RemoteException)_resp; + } + else { + extractAttachments(_call); + try { + return (java.lang.Long) _resp; + } catch (java.lang.Exception _exception) { + return (java.lang.Long) org.apache.axis.utils.JavaUtils.convert(_resp, java.lang.Long.class); + } + } + } catch (org.apache.axis.AxisFault axisFaultException) { + throw axisFaultException; +} + } + + public java.lang.Long scheduleLesson(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 startDate, java.lang.String countryIsoCode, java.lang.String langIsoCode) throws java.rmi.RemoteException { + if (super.cachedEndpoint == null) { + throw new org.apache.axis.NoEndPointException(); + } + org.apache.axis.client.Call _call = createCall(); + _call.setOperation(_operations[1]); + _call.setUseSOAPAction(true); + _call.setSOAPActionURI(""); + _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); + _call.setOperationName(new javax.xml.namespace.QName("http://webservice.lams.lamsfoundation.org", "scheduleLesson")); + + setRequestHeaders(_call); + setAttachments(_call); + try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {serverId, datetime, hashValue, username, new java.lang.Long(ldId), courseId, title, desc, startDate, countryIsoCode, langIsoCode}); + + if (_resp instanceof java.rmi.RemoteException) { + throw (java.rmi.RemoteException)_resp; + } + else { + extractAttachments(_call); + try { + return (java.lang.Long) _resp; + } catch (java.lang.Exception _exception) { + return (java.lang.Long) org.apache.axis.utils.JavaUtils.convert(_resp, java.lang.Long.class); + } + } + } catch (org.apache.axis.AxisFault axisFaultException) { + throw axisFaultException; +} + } + + public boolean deleteLesson(java.lang.String serverId, java.lang.String datetime, java.lang.String hashValue, java.lang.String username, long lsId) throws java.rmi.RemoteException { + if (super.cachedEndpoint == null) { + throw new org.apache.axis.NoEndPointException(); + } + org.apache.axis.client.Call _call = createCall(); + _call.setOperation(_operations[2]); + _call.setUseSOAPAction(true); + _call.setSOAPActionURI(""); + _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); + _call.setOperationName(new javax.xml.namespace.QName("http://webservice.lams.lamsfoundation.org", "deleteLesson")); + + setRequestHeaders(_call); + setAttachments(_call); + try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {serverId, datetime, hashValue, username, new java.lang.Long(lsId)}); + + if (_resp instanceof java.rmi.RemoteException) { + throw (java.rmi.RemoteException)_resp; + } + else { + extractAttachments(_call); + try { + return ((java.lang.Boolean) _resp).booleanValue(); + } catch (java.lang.Exception _exception) { + return ((java.lang.Boolean) org.apache.axis.utils.JavaUtils.convert(_resp, boolean.class)).booleanValue(); + } + } + } catch (org.apache.axis.AxisFault axisFaultException) { + throw axisFaultException; +} + } + +} Index: sakai-lamstwo/impl/logic/src/test/org/lamsfoundation/lams/integrations/sakai/logic/test/LamstwoLogicImplTest.java =================================================================== diff -u --- sakai-lamstwo/impl/logic/src/test/org/lamsfoundation/lams/integrations/sakai/logic/test/LamstwoLogicImplTest.java (revision 0) +++ sakai-lamstwo/impl/logic/src/test/org/lamsfoundation/lams/integrations/sakai/logic/test/LamstwoLogicImplTest.java (revision c144f53e688b530044b19ff807e502a41d33039a) @@ -0,0 +1,489 @@ +/****************************************************************************** + * LamstwoLogicImplTest.java - created by Sakai App Builder -AZ + * + * Copyright (c) 2007 LAMS Foundation + * Licensed under the Educational Community License version 1.0 + * + * A copy of the Educational Community License has been included in this + * distribution and is available at: http://www.opensource.org/licenses/ecl1.php + * + *****************************************************************************/ + +package org.lamsfoundation.lams.integrations.sakai.logic.test; + +import java.util.Date; +import java.util.List; + +import junit.framework.Assert; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.easymock.MockControl; +import org.lamsfoundation.lams.integrations.sakai.dao.LamstwoDao; +import org.lamsfoundation.lams.integrations.sakai.logic.impl.LamstwoLogicImpl; +import org.lamsfoundation.lams.integrations.sakai.model.LamstwoItem; +import org.sakaiproject.authz.api.SecurityService; +import org.sakaiproject.site.api.SiteService; +import org.sakaiproject.tool.api.ToolManager; +import org.sakaiproject.user.api.UserDirectoryService; +import org.springframework.test.AbstractTransactionalSpringContextTests; + + +/** + * Testing the Logic implementation methods + * @author Sakai App Builder -AZ + */ +public class LamstwoLogicImplTest extends + AbstractTransactionalSpringContextTests { + + private static Log log = LogFactory.getLog(LamstwoLogicImplTest.class); + + protected LamstwoLogicImpl logicImpl; + + private ToolManager toolManager; + private MockControl toolManagerControl; + private UserDirectoryService userDirectoryService; + private MockControl userDirectoryServiceControl; + private SecurityService securityService; + private MockControl securityServiceControl; + private SiteService siteService; + private MockControl siteServiceControl; + + private LamstwoItem item1; + private LamstwoItem item2; + private LamstwoItem adminitem; + private LamstwoItem maintitem; + + private final static String USER_NAME = "aaronz"; + private final static String USER_DISPLAY = "Aaron Zeckoski"; + private final static String USER_ID = "user-11111111"; + private final static String OTHER_USER_ID = "user-999999999"; + private final static String ADMIN_USER_ID = "admin"; + private final static String MAINT_USER_ID = "maintainer"; + private final static String SITE_ID = "site-1111111"; + private final static String SITE_REF = "siteref-1111111"; + private final static String SITE2_ID = "site-22222222"; + private final static String SITE2_REF = "siteref-22222222"; + private final static String ITEM_TITLE = "New Title"; + private final static String ITEM_INTRODUCTION = "New Introduction"; + private final static Boolean ITEM_HIDDEN = Boolean.FALSE; + + + protected String[] getConfigLocations() { + // point to the needed spring config files, must be on the classpath + // (add component/src/webapp/WEB-INF to the build path in Eclipse), + // they also need to be referenced in the project.xml file + return new String[] {"hibernate-test.xml", "spring-hibernate.xml"}; + } + + // run this before each test starts + protected void onSetUpBeforeTransaction() throws Exception { + // create test objects + item1 = new LamstwoItem(ITEM_TITLE, ITEM_INTRODUCTION, USER_ID, SITE_ID, ITEM_HIDDEN, new Date()); + item2 = new LamstwoItem(ITEM_TITLE, ITEM_INTRODUCTION, USER_ID, SITE2_ID, ITEM_HIDDEN, new Date()); + maintitem = new LamstwoItem("New maint item title", ITEM_INTRODUCTION, MAINT_USER_ID, SITE_ID, ITEM_HIDDEN, new Date()); + adminitem = new LamstwoItem("New admin item title", ITEM_INTRODUCTION, ADMIN_USER_ID, SITE2_ID, ITEM_HIDDEN, new Date()); + } + + // run this before each test starts and as part of the transaction + protected void onSetUpInTransaction() { + // load the spring created dao class bean from the Spring Application Context + LamstwoDao dao = (LamstwoDao) applicationContext. + getBean("org.lamsfoundation.lams.integrations.sakai.dao.LamstwoDao"); + if (dao == null) { + log.error("onSetUpInTransaction: DAO could not be retrieved from spring context"); + } + + // init the class if needed + + // setup the mock objects + toolManagerControl = MockControl.createControl(ToolManager.class); + toolManager = (ToolManager) toolManagerControl.getMock(); + + userDirectoryServiceControl = MockControl.createControl(UserDirectoryService.class); + userDirectoryService = (UserDirectoryService) userDirectoryServiceControl.getMock(); + + securityServiceControl = MockControl.createControl(SecurityService.class); + securityService = (SecurityService) securityServiceControl.getMock(); + + siteServiceControl = MockControl.createControl(SiteService.class); + siteService = (SiteService) siteServiceControl.getMock(); + + // create and setup the object to be tested + logicImpl = new LamstwoLogicImpl(); + logicImpl.setDao(dao); + logicImpl.setToolManager(toolManager); + logicImpl.setUserDirectoryService(userDirectoryService); + logicImpl.setSecurityService(securityService); + logicImpl.setSiteService(siteService); + + // can set up the default mock object returns here if desired + // Note: Still need to activate them in the test methods though + userDirectoryService.getCurrentUser(); // expect this to be called + userDirectoryServiceControl.setDefaultReturnValue(new TestUser(USER_ID)); + + toolManager.getCurrentPlacement(); // expect this to be called + toolManagerControl.setDefaultReturnValue(new TestPlacement(SITE_ID)); + + siteService.siteReference(SITE_ID); // expect this to be called + siteServiceControl.setReturnValue(SITE_REF, MockControl.ZERO_OR_MORE); // return for above param + siteService.siteReference(SITE2_ID); // expect this to be called + siteServiceControl.setReturnValue(SITE2_REF, MockControl.ZERO_OR_MORE); // return for above param + + securityService.isSuperUser(USER_ID); // normal user + securityServiceControl.setReturnValue(false, MockControl.ZERO_OR_MORE); // return for above param + securityService.isSuperUser(MAINT_USER_ID); // maintain user + securityServiceControl.setReturnValue(false, MockControl.ZERO_OR_MORE); // return for above param + securityService.isSuperUser(ADMIN_USER_ID); // admin user + securityServiceControl.setReturnValue(true, MockControl.ZERO_OR_MORE); // return for above param + + // preload the DB for testing + dao.save(item1); + dao.save(item2); + dao.save(adminitem); + dao.save(maintitem); + } + + /** + * Test method for {@link org.lamsfoundation.lams.integrations.sakai.logic.impl.LamstwoLogicImpl#getItemById(java.lang.Long)}. + */ + public void testGetItemById() { + LamstwoItem item = logicImpl.getItemById(item1.getId()); + Assert.assertNotNull(item); + Assert.assertEquals(item, item1); + + LamstwoItem baditem = logicImpl.getItemById( new Long(9999999) ); + Assert.assertNull(baditem); + + try { + logicImpl.getItemById(null); + Assert.fail("Should have thrown IllegalArgumentException"); + } catch (IllegalArgumentException e) { + Assert.assertNotNull(e.getMessage()); + log.info("Could not get null item (this is correct)"); + } + } + + /** + * Test method for {@link org.lamsfoundation.lams.integrations.sakai.logic.impl.LamstwoLogicImpl#canWriteItem(org.lamsfoundation.lams.integrations.sakai.model.LamstwoItem)}. + */ + public void testCanWriteItemLamstwoItem() { + // minimal testing for convenience methods + + // activate the mock objects + userDirectoryServiceControl.replay(); + toolManagerControl.replay(); + siteServiceControl.replay(); + + // mock objects needed here + Assert.assertTrue( logicImpl.canWriteItem(item1) ); + Assert.assertTrue( logicImpl.canWriteItem(item2) ); + + // verify the mock objects were used + userDirectoryServiceControl.verify(); + toolManagerControl.verify(); + siteServiceControl.verify(); + } + + /** + * Test method for {@link org.lamsfoundation.lams.integrations.sakai.logic.impl.LamstwoLogicImpl#canWriteItem(org.lamsfoundation.lams.integrations.sakai.model.LamstwoItem, java.lang.String, java.lang.String)}. + */ + public void testCanWriteItemLamstwoItemStringString() { + // set up mock objects with return values + securityService.unlock(USER_ID, LamstwoLogicImpl.ITEM_WRITE_ANY, SITE_REF); + securityServiceControl.setReturnValue(false, MockControl.ZERO_OR_MORE); + securityService.unlock(MAINT_USER_ID, LamstwoLogicImpl.ITEM_WRITE_ANY, SITE_REF); + securityServiceControl.setReturnValue(true, MockControl.ZERO_OR_MORE); + + // activate the mock objects + securityServiceControl.replay(); + siteServiceControl.replay(); + + // mock objects needed here + // testing perms as a normal user + Assert.assertFalse( logicImpl.canWriteItem(adminitem, SITE_ID, USER_ID) ); + Assert.assertFalse( logicImpl.canWriteItem(maintitem, SITE_ID, USER_ID) ); + Assert.assertTrue( logicImpl.canWriteItem(item1, SITE_ID, USER_ID) ); + + // testing perms as user with special perms + Assert.assertFalse( logicImpl.canWriteItem(adminitem, SITE_ID, MAINT_USER_ID) ); + Assert.assertTrue( logicImpl.canWriteItem(maintitem, SITE_ID, MAINT_USER_ID) ); + Assert.assertTrue( logicImpl.canWriteItem(item1, SITE_ID, MAINT_USER_ID) ); + + // testing perms as admin user + Assert.assertTrue( logicImpl.canWriteItem(adminitem, SITE_ID, ADMIN_USER_ID) ); + Assert.assertTrue( logicImpl.canWriteItem(maintitem, SITE_ID, ADMIN_USER_ID) ); + Assert.assertTrue( logicImpl.canWriteItem(item1, SITE_ID, ADMIN_USER_ID) ); + + // verify the mock objects were used + securityServiceControl.verify(); + siteServiceControl.verify(); + } + + /** + * Test method for {@link org.lamsfoundation.lams.integrations.sakai.logic.impl.LamstwoLogicImpl#getAllVisibleItems()}. + */ + public void testGetAllVisibleItems() { + // minimal testing for convenience methods + + // set up mock objects with return values + securityService.unlock(USER_ID, LamstwoLogicImpl.ITEM_READ_HIDDEN, SITE_REF); + securityServiceControl.setReturnValue(false, MockControl.ZERO_OR_MORE); + + // activate the mock objects + userDirectoryServiceControl.replay(); + securityServiceControl.replay(); + toolManagerControl.replay(); + siteServiceControl.replay(); + + // mock objects needed below here + List l = logicImpl.getAllVisibleItems(SITE_ID, USER_ID); // test normal user + + Assert.assertNotNull(l); + Assert.assertTrue(l.size() > 0); + Assert.assertTrue(l.contains(item1)); + Assert.assertTrue(! l.contains(item2)); + + // verify the mock objects were used + userDirectoryServiceControl.verify(); + securityServiceControl.verify(); + toolManagerControl.verify(); + siteServiceControl.verify(); + } + + /** + * Test method for {@link org.lamsfoundation.lams.integrations.sakai.logic.impl.LamstwoLogicImpl#getAllVisibleItems(java.lang.String, java.lang.String)}. + */ + public void testGetAllVisibleItemsStringString() { + // always match the mock call regardless of corrent param values + //securityServiceControl.setDefaultMatcher(MockControl.ALWAYS_MATCHER); + + // set up mock objects with return values + securityService.unlock(USER_ID, LamstwoLogicImpl.ITEM_READ_HIDDEN, SITE_REF); + securityServiceControl.setReturnValue(false, MockControl.ZERO_OR_MORE); + securityService.unlock(MAINT_USER_ID, LamstwoLogicImpl.ITEM_READ_HIDDEN, SITE_REF); + securityServiceControl.setReturnValue(true, MockControl.ZERO_OR_MORE); + + // add 2 items to test if we can see the visible one and not the hidden one + LamstwoItem itemHidden = new LamstwoItem("New item title", ITEM_INTRODUCTION, + OTHER_USER_ID, SITE_ID, Boolean.TRUE, new Date()); + logicImpl.saveItem(itemHidden); + LamstwoItem itemVisible = new LamstwoItem("New item title", ITEM_INTRODUCTION, + OTHER_USER_ID, SITE_ID, Boolean.FALSE, new Date()); + logicImpl.saveItem(itemVisible); + + // activate the mock objects + userDirectoryServiceControl.replay(); + securityServiceControl.replay(); + toolManagerControl.replay(); + siteServiceControl.replay(); + + // mock objects needed below here + List l = logicImpl.getAllVisibleItems(SITE_ID, USER_ID); // test normal user + + Assert.assertNotNull(l); + Assert.assertTrue(l.size() > 0); + Assert.assertTrue(l.contains(item1)); + Assert.assertTrue(! l.contains(item2)); + Assert.assertTrue(l.contains(itemVisible)); + Assert.assertTrue(! l.contains(itemHidden)); + + List lmaintain = logicImpl.getAllVisibleItems(SITE_ID, MAINT_USER_ID); // test maintainer + + Assert.assertNotNull(lmaintain); + Assert.assertTrue(lmaintain.size() > 0); + Assert.assertTrue(lmaintain.contains(item1)); + Assert.assertTrue(! lmaintain.contains(item2)); + Assert.assertTrue(lmaintain.contains(itemVisible)); + Assert.assertTrue(lmaintain.contains(itemHidden)); + + List ladmin = logicImpl.getAllVisibleItems(SITE_ID, ADMIN_USER_ID); // test admin + + Assert.assertNotNull(ladmin); + Assert.assertTrue(ladmin.size() > 0); + Assert.assertTrue(ladmin.contains(item1)); + Assert.assertTrue(! ladmin.contains(item2)); + Assert.assertTrue(ladmin.contains(itemVisible)); + Assert.assertTrue(ladmin.contains(itemHidden)); + + // verify the mock objects were used + userDirectoryServiceControl.verify(); + securityServiceControl.verify(); + toolManagerControl.verify(); + siteServiceControl.verify(); + } + + /** + * Test method for {@link org.lamsfoundation.lams.integrations.sakai.logic.impl.LamstwoLogicImpl#removeItem(org.lamsfoundation.lams.integrations.sakai.model.LamstwoItem)}. + */ + public void testRemoveItem() { + // set up mock objects with return values + userDirectoryService.getCurrentUser(); // expect this to be called + userDirectoryServiceControl.setReturnValue(new TestUser(USER_ID)); + userDirectoryServiceControl.setReturnValue(new TestUser(MAINT_USER_ID)); + userDirectoryServiceControl.setReturnValue(new TestUser(ADMIN_USER_ID)); + userDirectoryServiceControl.setReturnValue(new TestUser(MAINT_USER_ID)); + userDirectoryServiceControl.setReturnValue(new TestUser(USER_ID)); + + securityService.unlock(new TestUser(USER_ID), LamstwoLogicImpl.ITEM_WRITE_ANY, SITE_REF); + securityServiceControl.setReturnValue(false, MockControl.ZERO_OR_MORE); + securityService.unlock(new TestUser(MAINT_USER_ID), LamstwoLogicImpl.ITEM_WRITE_ANY, SITE_REF); + securityServiceControl.setReturnValue(true, MockControl.ZERO_OR_MORE); + + // activate the mock objects + userDirectoryServiceControl.replay(); + securityServiceControl.replay(); + toolManagerControl.replay(); + siteServiceControl.replay(); + + // mock object is needed here + try { + logicImpl.removeItem(adminitem); // user cannot delete this + Assert.fail("Should have thrown SecurityException"); + } catch (SecurityException e) { + Assert.assertNotNull(e.getMessage()); + log.info("Could not remove item (this is correct)"); + } + + try { + logicImpl.removeItem(adminitem); // permed user cannot delete this + Assert.fail("Should have thrown SecurityException"); + } catch (SecurityException e) { + Assert.assertNotNull(e.getMessage()); + log.info("Could not remove item (this is correct)"); + } + + LamstwoItem item; + + logicImpl.removeItem(adminitem); // admin can delete this + item = logicImpl.getItemById(adminitem.getId()); + Assert.assertNull(item); + + logicImpl.removeItem(maintitem); // permed user can delete this + item = logicImpl.getItemById(maintitem.getId()); + Assert.assertNull(item); + + logicImpl.removeItem(item1); // user can delete this + item = logicImpl.getItemById(item1.getId()); + Assert.assertNull(item); + + // verify the mock objects were used + userDirectoryServiceControl.verify(); + securityServiceControl.verify(); + toolManagerControl.verify(); + siteServiceControl.verify(); + } + + /** + * Test method for {@link org.lamsfoundation.lams.integrations.sakai.logic.impl.LamstwoLogicImpl#saveItem(org.lamsfoundation.lams.integrations.sakai.model.LamstwoItem)}. + */ + public void testSaveItem() { + // set up the mock objects + userDirectoryService.getCurrentUser(); // expect this to be called + userDirectoryServiceControl.setReturnValue(new TestUser(USER_ID)); // return this + + toolManager.getCurrentPlacement(); // expect this to be called + toolManagerControl.setReturnValue(new TestPlacement(SITE_ID)); // return this + + LamstwoItem item = new LamstwoItem("New item title", ITEM_INTRODUCTION, USER_ID, SITE_ID, ITEM_HIDDEN, new Date()); + logicImpl.saveItem(item); + Long itemId = item.getId(); + Assert.assertNotNull(itemId); + + // test saving an incomplete item + LamstwoItem incompleteItem = new LamstwoItem(); + incompleteItem.setTitle("New incomplete item"); + incompleteItem.setHidden(ITEM_HIDDEN); + + // activate the mock objects + userDirectoryServiceControl.replay(); + toolManagerControl.replay(); + + // mock object is needed here + logicImpl.saveItem(incompleteItem); + + Long incItemId = item.getId(); + Assert.assertNotNull(incItemId); + + item = logicImpl.getItemById(incItemId); + Assert.assertNotNull(item); + Assert.assertEquals(item.getOwnerId(), USER_ID); + Assert.assertEquals(item.getSiteId(), SITE_ID); + + // test saving a null value for failure + try { + logicImpl.saveItem(null); + Assert.fail("Should have thrown NullPointerException"); + } catch (NullPointerException e) { + Assert.assertNotNull(e.getStackTrace()); + log.info("Could not save null item (this is correct)"); + } + + // verify the mock object was used + userDirectoryServiceControl.verify(); + toolManagerControl.verify(); + } + +// /** +// * Test method for {@link org.lamsfoundation.lams.integrations.sakai.logic.impl.LamstwoLogicImpl#getCurrentSiteId()}. +// */ +// public void testGetCurrentSiteId() { +// // set up this mock object +// toolManager.getCurrentPlacement(); // expect this to be called +// toolManagerControl.setReturnValue(new TestPlacement(SITE_ID)); // return this +// +// // activate the mock object +// toolManagerControl.replay(); +// +// // mock object is needed here +// String siteId = logicImpl.getCurrentContext(); +// +// // verify the mock object was used +// toolManagerControl.verify(); +// +// Assert.assertNotNull(siteId); +// Assert.assertEquals(siteId, SITE_ID); +// } +// +// /** +// * Test method for {@link org.lamsfoundation.lams.integrations.sakai.logic.impl.LamstwoLogicImpl#getCurrentUserDisplayName()}. +// */ +// public void testGetCurrentUserDisplayName() { +// userDirectoryService.getCurrentUser(); // expect this to be called +// userDirectoryServiceControl.setReturnValue(new TestUser(USER_ID, USER_NAME, USER_DISPLAY)); // return this +// +// // activate the mock object +// userDirectoryServiceControl.replay(); +// +// // mock object is needed here +// String userDisplayName = logicImpl.getCurrentUserDisplayName(); +// +// // verify the mock object was used +// userDirectoryServiceControl.verify(); +// +// Assert.assertNotNull(userDisplayName); +// Assert.assertEquals(userDisplayName, USER_DISPLAY); +// } +// +// /** +// * Test method for {@link org.lamsfoundation.lams.integrations.sakai.logic.impl.LamstwoLogicImpl#getCurrentUserId()}. +// */ +// public void testGetCurrentUserId() { +// // set up this mock object +// userDirectoryService.getCurrentUser(); // expect this to be called +// userDirectoryServiceControl.setReturnValue(new TestUser(USER_ID)); // return this +// +// // activate the mock object +// userDirectoryServiceControl.replay(); +// +// // mock object is needed here +// String userId = logicImpl.getCurrentUserId(); +// +// // verify the mock object was used +// userDirectoryServiceControl.verify(); +// +// Assert.assertNotNull(userId); +// Assert.assertEquals(userId, USER_ID); +// } + +} Index: sakai-lamstwo/impl/logic/src/test/org/lamsfoundation/lams/integrations/sakai/logic/test/TestPlacement.java =================================================================== diff -u --- sakai-lamstwo/impl/logic/src/test/org/lamsfoundation/lams/integrations/sakai/logic/test/TestPlacement.java (revision 0) +++ sakai-lamstwo/impl/logic/src/test/org/lamsfoundation/lams/integrations/sakai/logic/test/TestPlacement.java (revision c144f53e688b530044b19ff807e502a41d33039a) @@ -0,0 +1,85 @@ +/****************************************************************************** + * TestPlacement.java - created by Sakai App Builder -AZ + * + * Copyright (c) 2007 LAMS Foundation + * Licensed under the Educational Community License version 1.0 + * + * A copy of the Educational Community License has been included in this + * distribution and is available at: http://www.opensource.org/licenses/ecl1.php + * + *****************************************************************************/ + +package org.lamsfoundation.lams.integrations.sakai.logic.test; + +import java.util.Properties; + +import org.sakaiproject.tool.api.Placement; +import org.sakaiproject.tool.api.Tool; + +/** + * Test class for the Sakai Placement object
+ * This has to be here since I cannot create a Placement object in Sakai for some + * reason... sure would be nice if I could though -AZ + * @author Sakai App Builder -AZ + */ +public class TestPlacement implements Placement { + + private String id = "FAKE12345"; + private String context; // a.k.a. siteId + private String title; + private Tool tool; + private String toolId; + + /** + * Construct a test Placement object with a context (siteId) set + * @param context a String representing a site context (siteId) + */ + public TestPlacement(String context) { + this.context = context; + } + + + public Properties getConfig() { + // TODO Auto-generated method stub + return null; + } + + public String getContext() { + return context; + } + + public String getId() { + return id; + } + + public Properties getPlacementConfig() { + // TODO Auto-generated method stub + return null; + } + + public String getTitle() { + return this.title; + } + + public Tool getTool() { + return tool; + } + + public String getToolId() { + return toolId; + } + + public void save() { + // TODO Auto-generated method stub + } + + public void setTitle(String title) { + this.title = title; + } + + public void setTool(String toolId, Tool tool) { + this.tool = tool; + this.toolId = toolId; + } + +} \ No newline at end of file Index: sakai-lamstwo/impl/logic/src/test/org/lamsfoundation/lams/integrations/sakai/logic/test/TestUser.java =================================================================== diff -u --- sakai-lamstwo/impl/logic/src/test/org/lamsfoundation/lams/integrations/sakai/logic/test/TestUser.java (revision 0) +++ sakai-lamstwo/impl/logic/src/test/org/lamsfoundation/lams/integrations/sakai/logic/test/TestUser.java (revision c144f53e688b530044b19ff807e502a41d33039a) @@ -0,0 +1,165 @@ +/****************************************************************************** + * TestUser.java - created by Sakai App Builder -AZ + * + * Copyright (c) 2007 LAMS Foundation + * Licensed under the Educational Community License version 1.0 + * + * A copy of the Educational Community License has been included in this + * distribution and is available at: http://www.opensource.org/licenses/ecl1.php + * + *****************************************************************************/ + +package org.lamsfoundation.lams.integrations.sakai.logic.test; + +import java.util.Stack; + +import org.sakaiproject.entity.api.ResourceProperties; +import org.sakaiproject.time.api.Time; +import org.sakaiproject.user.api.User; +import org.w3c.dom.Document; +import org.w3c.dom.Element; + +/** + * Test class for the Sakai User object
+ * This has to be here since I cannot create a User object in Sakai for some + * reason... sure would be nice if I could though -AZ + * @author Sakai App Builder -AZ + */ +public class TestUser implements User { + private String userId; + private String userEid = "fakeEid"; + private String displayName = "Fake DisplayName"; + + /** + * Construct an empty test user with an id set + * @param userId a id string + */ + public TestUser(String userId) { + this.userId = userId; + } + + /** + * Construct an empty test user with an id and eid set + * @param userId a id string + * @param userEid a username string + */ + public TestUser(String userId, String userEid) { + this.userId = userId; + this.userEid = userEid; + } + + /** + * Construct an empty test user with an id and eid set + * @param userId a id string + * @param userEid a username string + * @param displayName a user display name + */ + public TestUser(String userId, String userEid, String displayName) { + this.userId = userId; + this.userEid = userEid; + this.displayName = displayName; + } + + + public boolean checkPassword(String pw) { + // TODO Auto-generated method stub + return false; + } + + public User getCreatedBy() { + // TODO Auto-generated method stub + return null; + } + + public String getDisplayId() { + // TODO Auto-generated method stub + return null; + } + + public String getDisplayName() { + return this.displayName; + } + + public String getEid() { + return this.userEid; + } + + public String getEmail() { + // TODO Auto-generated method stub + return null; + } + + public String getFirstName() { + // TODO Auto-generated method stub + return null; + } + + public String getLastName() { + // TODO Auto-generated method stub + return null; + } + + public User getModifiedBy() { + // TODO Auto-generated method stub + return null; + } + + public String getSortName() { + // TODO Auto-generated method stub + return null; + } + + public String getType() { + // TODO Auto-generated method stub + return null; + } + + public String getId() { + return userId; + } + + public ResourceProperties getProperties() { + // TODO Auto-generated method stub + return null; + } + + public String getReference() { + // TODO Auto-generated method stub + return null; + } + + public String getReference(String rootProperty) { + // TODO Auto-generated method stub + return null; + } + + public String getUrl() { + // TODO Auto-generated method stub + return null; + } + + public String getUrl(String rootProperty) { + // TODO Auto-generated method stub + return null; + } + + public Element toXml(Document doc, Stack stack) { + // TODO Auto-generated method stub + return null; + } + + public int compareTo(Object arg0) { + // TODO Auto-generated method stub + return 0; + } + + public Time getCreatedTime() { + // TODO Auto-generated method stub + return null; + } + + public Time getModifiedTime() { + // TODO Auto-generated method stub + return null; + } +} Index: sakai-lamstwo/impl/pack/project.xml =================================================================== diff -u --- sakai-lamstwo/impl/pack/project.xml (revision 0) +++ sakai-lamstwo/impl/pack/project.xml (revision c144f53e688b530044b19ff807e502a41d33039a) @@ -0,0 +1,136 @@ + + +
-
+
-
+
+
+ HTMLArea was created and developed up to + version 2.03 by InteractiveTools.com. Version 3.0 is a full rewrite, + developed by Mihai Bazon. + It contains code sponsored by third-party + companies as well. Please see our About Box for details about + who sponsored what plugins. + ]]> +
+ This is recognized by dynaTable. +
]]> +-
+
See the "Decode + Behavior for UISelectOne Components" section as well as for + "Decode + Behavior for UICommand Components". +
Obtain the Map from the "requestParameterMap"
+ property of the ExternalContext.
+If the value in theMap for the value of the "clientId" property of the
+ component is null, create a String by concatenating
+ the value of the "clientId" property of the component with the
+ String ".x" (without the quotes). Create another String in the
+ same manner, but concatenate ".y" (without the quotes). Ifnull is the value in the Map for both
+ Strings, return from decode(). If the value in theMap for the value of the "clientId" property of the
+ component is not null, get the value of the "type"
+ attribute, and convert it to lower case. If the result is equal
+ to the String "reset" (without the quotes), return fromdecode(). Otherwise, create ajavax.faces.event.ActionEvent around the component,
+ and pass it to the queueEvent() method of the
+ component, which must be an instance ofUICommand.
+
+
+
+
Encode Behavior
Render an HTML "select" element. Render the clientId of the
+ component as the value of the "name" attribute. If the
+ "styleClass" attribute is specified, render its value as the value
+ of the "class" attribute on the "select" element. If the component
+ to be rendered is a UISelectMany, render "true" as the value of
+ the "multiple" attribute. Use the number of items as the value of
+ the "size" attribute. See the "Rendering
+ the option elements" specification forListboxRenderer for more detail on how to render the "option" elements in this renderer.
| '+(this.tm7?tme.join('')+(this.tmK.length?' |