Index: lams_build/build.xml =================================================================== diff -u -r0b23d416dfb7822b65e69804312acaa1722ce84a -r24be011190dfeb262da94398fcfd60565ca259e7 --- lams_build/build.xml (.../build.xml) (revision 0b23d416dfb7822b65e69804312acaa1722ce84a) +++ lams_build/build.xml (.../build.xml) (revision 24be011190dfeb262da94398fcfd60565ca259e7) @@ -110,15 +110,11 @@ - - - - @@ -136,13 +132,8 @@ - - - - - - - + + @@ -308,8 +299,6 @@ - - Index: lams_central/build.xml =================================================================== diff -u -r91e573032faae841873b926eee4a7e16592bf3e7 -r24be011190dfeb262da94398fcfd60565ca259e7 --- lams_central/build.xml (.../build.xml) (revision 91e573032faae841873b926eee4a7e16592bf3e7) +++ lams_central/build.xml (.../build.xml) (revision 24be011190dfeb262da94398fcfd60565ca259e7) @@ -121,6 +121,7 @@ + Index: lams_central/conf/xdoclet/listeners.xml =================================================================== diff -u -r2bc886ddb3dcf46f850b924948e6a9a15f497013 -r24be011190dfeb262da94398fcfd60565ca259e7 --- lams_central/conf/xdoclet/listeners.xml (.../listeners.xml) (revision 2bc886ddb3dcf46f850b924948e6a9a15f497013) +++ lams_central/conf/xdoclet/listeners.xml (.../listeners.xml) (revision 24be011190dfeb262da94398fcfd60565ca259e7) @@ -2,10 +2,16 @@ org.springframework.web.context.ContextLoaderListener - + + - org.lamsfoundation.lams.web.SessionListener - + org.lamsfoundation.lams.web.SessionListener + - \ No newline at end of file + + + + org.apache.axis.transport.http.AxisHTTPSessionListener + + Index: lams_central/conf/xdoclet/mime-mappings.xml =================================================================== diff -u --- lams_central/conf/xdoclet/mime-mappings.xml (revision 0) +++ lams_central/conf/xdoclet/mime-mappings.xml (revision 24be011190dfeb262da94398fcfd60565ca259e7) @@ -0,0 +1,14 @@ + + csv + text/plain + + + + wsdl + text/xml + + + + xsd + text/xml + \ No newline at end of file Index: lams_central/conf/xdoclet/servlet-mappings.xml =================================================================== diff -u -r68299ba39394a8ffdd54e8c3fc0c4a8d48ca846a -r24be011190dfeb262da94398fcfd60565ca259e7 --- lams_central/conf/xdoclet/servlet-mappings.xml (.../servlet-mappings.xml) (revision 68299ba39394a8ffdd54e8c3fc0c4a8d48ca846a) +++ lams_central/conf/xdoclet/servlet-mappings.xml (.../servlet-mappings.xml) (revision 24be011190dfeb262da94398fcfd60565ca259e7) @@ -9,12 +9,6 @@ - AxisRESTServlet - /rest/* - - - - AxisServlet /servlet/AxisServlet @@ -28,3 +22,4 @@ AxisServlet /services/* + Index: lams_central/conf/xdoclet/servlets.xml =================================================================== diff -u -r68299ba39394a8ffdd54e8c3fc0c4a8d48ca846a -r24be011190dfeb262da94398fcfd60565ca259e7 --- lams_central/conf/xdoclet/servlets.xml (.../servlets.xml) (revision 68299ba39394a8ffdd54e8c3fc0c4a8d48ca846a) +++ lams_central/conf/xdoclet/servlets.xml (.../servlets.xml) (revision 24be011190dfeb262da94398fcfd60565ca259e7) @@ -40,15 +40,15 @@ AxisServlet Apache-Axis Servlet - org.apache.axis2.transport.http.AxisServlet + org.apache.axis.transport.http.AxisServlet - 2 - AxisRESTServlet - Apache-Axis Servlet (REST) + AdminServlet + Axis Admin Servlet - org.apache.axis2.transport.http.AxisRESTServlet + org.apache.axis.transport.http.AdminServlet - + 100 + \ No newline at end of file Index: lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepository.java =================================================================== diff -u --- lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepository.java (revision 0) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepository.java (revision 24be011190dfeb262da94398fcfd60565ca259e7) @@ -0,0 +1,15 @@ +/** + * 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; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +public interface LearningDesignRepository extends Remote { + public String getLearningDesigns(String serverId, String datetime, String hashValue, String username, Integer mode) throws RemoteException; +} Index: lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositoryService.java =================================================================== diff -u --- lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositoryService.java (revision 0) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositoryService.java (revision 24be011190dfeb262da94398fcfd60565ca259e7) @@ -0,0 +1,22 @@ +/** + * 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; + +import java.net.URL; + +import javax.xml.rpc.Service; +import javax.xml.rpc.ServiceException; + +public interface LearningDesignRepositoryService extends Service { + + public String getLearningDesignRepositoryAddress(); + + public LearningDesignRepository getLearningDesignRepository() throws ServiceException; + + public LearningDesignRepository getLearningDesignRepository(URL portAddress) throws ServiceException; +} Index: lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositorySoapBindingImpl.java =================================================================== diff -u --- lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositorySoapBindingImpl.java (revision 0) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositorySoapBindingImpl.java (revision 24be011190dfeb262da94398fcfd60565ca259e7) @@ -0,0 +1,18 @@ +/** + * LearningDesignRepositorySoapBindingImpl.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; + +import java.rmi.RemoteException; + +public class LearningDesignRepositorySoapBindingImpl implements LearningDesignRepository { + public String getLearningDesigns(String serverId, String datetime, String hashValue, + String username, Integer mode) throws RemoteException { + return null; + } + +} Index: lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositorySoapBindingSkeleton.java =================================================================== diff -u --- lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositorySoapBindingSkeleton.java (revision 0) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositorySoapBindingSkeleton.java (revision 24be011190dfeb262da94398fcfd60565ca259e7) @@ -0,0 +1,87 @@ +/** + * LearningDesignWebServiceSoapBindingSkeleton.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; + +import java.rmi.RemoteException; +import java.util.*; +import javax.xml.namespace.QName; + +import org.apache.axis.wsdl.Skeleton; +import org.apache.axis.description.*; + +@SuppressWarnings( { "serial", "unchecked" }) +public class LearningDesignRepositorySoapBindingSkeleton implements LearningDesignRepository, + Skeleton { + private LearningDesignRepository impl; + + private static Map _myOperations = new Hashtable(); + + private static Collection _myOperationsList = new ArrayList(); + + /** + * Returns List of OperationDesc objects with this name + */ + public static List getOperationDescByName(String methodName) { + return (List) _myOperations.get(methodName); + } + + /** + * Returns Collection of OperationDescs + */ + public static Collection getOperationDescs() { + return _myOperationsList; + } + + static { + OperationDesc _oper; + @SuppressWarnings("unused") + FaultDesc _fault; + ParameterDesc[] _params; + _params = new ParameterDesc[] { + new ParameterDesc(new QName("", "serverId"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), + new ParameterDesc(new QName("", "datetime"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), + new ParameterDesc(new QName("", "hashValue"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), + new ParameterDesc(new QName("", "username"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), + new ParameterDesc(new QName("", "mode"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "int"), Integer.class, false, + false), }; + _oper = new OperationDesc("getLearningDesigns", _params, new QName("", + "getLearningDesignsReturn")); + _oper.setReturnType(new QName("http://schemas.xmlsoap.org/soap/encoding/", "string")); + _oper.setElementQName(new QName("", "getLearningDesigns")); + _oper.setSoapAction(""); + _myOperationsList.add(_oper); + if (_myOperations.get("getLearningDesigns") == null) { + _myOperations.put("getLearningDesigns", new ArrayList()); + } + ((List) _myOperations.get("getLearningDesigns")).add(_oper); + } + + public LearningDesignRepositorySoapBindingSkeleton() { + this.impl = new LearningDesignRepositorySoapBindingImpl(); + } + + public LearningDesignRepositorySoapBindingSkeleton(LearningDesignRepository impl) { + this.impl = impl; + } + + public String getLearningDesigns(String serverId, String datetime, String hashValue, + String username, Integer mode) throws RemoteException { + String ret = impl.getLearningDesigns(serverId, datetime, hashValue, username, mode); + return ret; + } + +} Index: lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManager.java =================================================================== diff -u --- lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManager.java (revision 0) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManager.java (revision 24be011190dfeb262da94398fcfd60565ca259e7) @@ -0,0 +1,23 @@ +/** + * 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; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +public interface LessonManager extends Remote { + public Integer startLesson(String serverId, String datetime, String hashValue, String username, + long ldId, String courseId, String title, String desc) throws RemoteException; + + public Integer scheduleLesson(String serverId, String datetime, String hashValue, + String username, long ldId, String courseId, String title, String desc, String startDate) + throws RemoteException; + + public boolean deleteLearningSession(String serverId, String datetime, String hashValue, + String username, long lsId) throws RemoteException; +} Index: lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerService.java =================================================================== diff -u --- lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerService.java (revision 0) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerService.java (revision 24be011190dfeb262da94398fcfd60565ca259e7) @@ -0,0 +1,19 @@ +/** + * LessonWebServiceService.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; + +import javax.xml.rpc.Service; +import javax.xml.rpc.ServiceException; + +public interface LessonManagerService extends Service { + public java.lang.String getLearningServiceAddress(); + + public LessonManager getLessonManager() throws ServiceException; + + public LessonManager getLessonManager(java.net.URL portAddress) throws ServiceException; +} Index: lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingImpl.java =================================================================== diff -u --- lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingImpl.java (revision 0) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingImpl.java (revision 24be011190dfeb262da94398fcfd60565ca259e7) @@ -0,0 +1,29 @@ +/** + * LessonManagerSoapBindingImpl.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; + +import java.rmi.RemoteException; + +public class LessonManagerSoapBindingImpl implements LessonManager { + public Integer startLesson(String serverId, String datetime, String hashValue, String username, + long ldId, String courseId, String title, String desc) throws RemoteException { + return null; + } + + public Integer scheduleLesson(String serverId, String datetime, String hashValue, + String username, long ldId, String courseId, String title, String desc, String startDate) + throws RemoteException { + return null; + } + + public boolean deleteLearningSession(String serverId, String datetime, String hashValue, + String username, long lsId) throws RemoteException { + return false; + } + +} Index: lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingSkeleton.java =================================================================== diff -u --- lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingSkeleton.java (revision 0) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingSkeleton.java (revision 24be011190dfeb262da94398fcfd60565ca259e7) @@ -0,0 +1,169 @@ +/** + * LessonManagerSoapBindingSkeleton.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; + +import java.rmi.RemoteException; +import java.util.*; +import javax.xml.namespace.QName; + +import org.apache.axis.wsdl.Skeleton; +import org.apache.axis.description.*; + +@SuppressWarnings( { "serial", "unchecked" }) +public class LessonManagerSoapBindingSkeleton implements LessonManager, Skeleton { + private LessonManager impl; + + private static Map _myOperations = new Hashtable(); + + private static Collection _myOperationsList = new ArrayList(); + + /** + * Returns List of OperationDesc objects with this name + */ + public static List getOperationDescByName(java.lang.String methodName) { + return (List) _myOperations.get(methodName); + } + + /** + * Returns Collection of OperationDescs + */ + public static Collection getOperationDescs() { + return _myOperationsList; + } + + static { + OperationDesc _oper; + @SuppressWarnings("unused") + FaultDesc _fault; + ParameterDesc[] _params; + _params = new ParameterDesc[] { + new ParameterDesc(new QName("", "serverId"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), + new ParameterDesc(new QName("", "datetime"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), + new ParameterDesc(new QName("", "hashValue"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), + new ParameterDesc(new QName("", "username"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), + new ParameterDesc(new QName("", "ldId"), ParameterDesc.IN, new QName( + "http://www.w3.org/2001/XMLSchema", "long"), long.class, false, false), + new ParameterDesc(new QName("", "courseId"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), + new ParameterDesc(new QName("", "title"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), + new ParameterDesc(new QName("", "desc"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), }; + _oper = new OperationDesc("startLesson", _params, new QName("", "startLessonReturn")); + _oper.setReturnType(new QName("http://schemas.xmlsoap.org/soap/encoding/", "int")); + _oper.setElementQName(new QName("", "startLesson")); + _oper.setSoapAction(""); + _myOperationsList.add(_oper); + if (_myOperations.get("startLesson") == null) { + _myOperations.put("startLesson", new ArrayList()); + } + ((List) _myOperations.get("startLesson")).add(_oper); + _params = new ParameterDesc[] { + new ParameterDesc(new QName("", "serverId"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), + new ParameterDesc(new QName("", "datetime"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), + new ParameterDesc(new QName("", "hashValue"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), + new ParameterDesc(new QName("", "username"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), + new ParameterDesc(new QName("", "ldId"), ParameterDesc.IN, new QName( + "http://www.w3.org/2001/XMLSchema", "long"), long.class, false, false), + new ParameterDesc(new QName("", "courseId"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), + new ParameterDesc(new QName("", "title"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), + new ParameterDesc(new QName("", "desc"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), + new ParameterDesc(new QName("", "startDate"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), }; + _oper = new OperationDesc("scheduleLesson", _params, new QName("", "scheduleLessonReturn")); + _oper.setReturnType(new QName("http://schemas.xmlsoap.org/soap/encoding/", "int")); + _oper.setElementQName(new QName("", "scheduleLesson")); + _oper.setSoapAction(""); + _myOperationsList.add(_oper); + if (_myOperations.get("scheduleLesson") == null) { + _myOperations.put("scheduleLesson", new ArrayList()); + } + ((List) _myOperations.get("scheduleLesson")).add(_oper); + _params = new ParameterDesc[] { + new ParameterDesc(new QName("", "serverId"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), + new ParameterDesc(new QName("", "datetime"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), + new ParameterDesc(new QName("", "hashValue"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), + new ParameterDesc(new QName("", "username"), ParameterDesc.IN, new QName( + "http://schemas.xmlsoap.org/soap/encoding/", "string"), String.class, + false, false), + new ParameterDesc(new QName("", "lsId"), ParameterDesc.IN, new QName( + "http://www.w3.org/2001/XMLSchema", "long"), long.class, false, false), }; + _oper = new OperationDesc("deleteLearningSession", _params, new QName("", + "deleteLearningSessionReturn")); + _oper.setReturnType(new QName("http://www.w3.org/2001/XMLSchema", "boolean")); + _oper.setElementQName(new QName("", "deleteLearningSession")); + _oper.setSoapAction(""); + _myOperationsList.add(_oper); + if (_myOperations.get("deleteLearningSession") == null) { + _myOperations.put("deleteLearningSession", new ArrayList()); + } + ((List) _myOperations.get("deleteLearningSession")).add(_oper); + } + + public LessonManagerSoapBindingSkeleton() { + this.impl = new LessonManagerSoapBindingImpl(); + } + + public LessonManagerSoapBindingSkeleton(LessonManager impl) { + this.impl = impl; + } + + public Integer startLesson(String serverId, String datetime, String hashValue, String username, + long ldId, String courseId, String title, String desc) throws RemoteException { + Integer ret = impl.startLesson(serverId, datetime, hashValue, username, ldId, courseId, + title, desc); + return ret; + } + + public Integer scheduleLesson(String serverId, String datetime, String hashValue, + String username, long ldId, String courseId, String title, String desc, String startDate) + throws RemoteException { + Integer ret = impl.scheduleLesson(serverId, datetime, hashValue, username, ldId, courseId, + title, desc, startDate); + return ret; + } + + public boolean deleteLearningSession(String serverId, String datetime, String hashValue, + String username, long lsId) throws RemoteException { + boolean ret = impl.deleteLearningSession(serverId, datetime, hashValue, username, lsId); + return ret; + } + +} Fisheye: Tag 24be011190dfeb262da94398fcfd60565ca259e7 refers to a dead (removed) revision in file `lams_central/web/WEB-INF/conf/axis2.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/WEB-INF/modules/addressing-1.0.mar =================================================================== diff -u -rc1b897e7a192f21322bb8e73a281174b5fb0bc61 -r24be011190dfeb262da94398fcfd60565ca259e7 Binary files differ Index: lams_central/web/WEB-INF/modules/soapmonitor-1.0.mar =================================================================== diff -u -rc1b897e7a192f21322bb8e73a281174b5fb0bc61 -r24be011190dfeb262da94398fcfd60565ca259e7 Binary files differ Index: lams_central/web/WEB-INF/services/version.aar =================================================================== diff -u -rc1b897e7a192f21322bb8e73a281174b5fb0bc61 -r24be011190dfeb262da94398fcfd60565ca259e7 Binary files differ