Index: lams_admin/.classpath
===================================================================
diff -u -r406cdd685f03fa39a0ea0c85bde60f7b268bc05d -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
--- lams_admin/.classpath (.../.classpath) (revision 406cdd685f03fa39a0ea0c85bde60f7b268bc05d)
+++ lams_admin/.classpath (.../.classpath) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
@@ -3,10 +3,9 @@
-
-
-
-
+
+
+
Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r957d202400d76da39b6a98fdea8c96d5369267f6 -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
--- lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 957d202400d76da39b6a98fdea8c96d5369267f6)
+++ lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
@@ -384,6 +384,7 @@
config.red5.recordings.url =Media Server Recordings URL
admin.gradebook.learner.enable =Enable Gradebook for Learners
admin.gradebook.monitor.enable =Enable Gradebook for Monitors
+sysadmin.serverUrl =External Server URL
#======= End labels: Exported 377 labels for en AU =====
Index: lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -rbb357a02f7534789cc4ee1daa0bc4387dbe3a952 -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
--- lams_admin/conf/language/lams/ApplicationResources_el_GR.properties (.../ApplicationResources_el_GR.properties) (revision bb357a02f7534789cc4ee1daa0bc4387dbe3a952)
+++ lams_admin/conf/language/lams/ApplicationResources_el_GR.properties (.../ApplicationResources_el_GR.properties) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
@@ -320,6 +320,7 @@
cache.explanation2 =\u03a0\u03c1\u03bf\u03b5\u03b9\u03b4\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7: \u0394\u03b9\u03b1\u03b3\u03c1\u03ac\u03c6\u03bf\u03bd\u03c4\u03b1\u03c2 \u03ba\u03cc\u03bc\u03b2\u03bf\u03c5\u03c2 \u03b8\u03b1 \u03bc\u03b5\u03b9\u03ce\u03c3\u03b5\u03c4\u03b5 \u03c4\u03b7\u03bd \u03b5\u03ba\u03c4\u03ad\u03bb\u03b5\u03c3\u03b7 \u03c4\u03bf\u03c5 LAMS SERVER. \u039c\u03b5\u03c4\u03ac \u03b1\u03c0\u03cc \u03bb\u03af\u03b3\u03bf, \u03b7 \u03bc\u03bd\u03ae\u03bc\u03b7 \u03b8\u03b1 \u03b1\u03bd\u03b1\u03ba\u03c4\u03b7\u03b8\u03b5\u03af \u03ba\u03b1\u03b9 \u03c4\u03bf LAMS \u03b8\u03b1 \u03b5\u03ba\u03c4\u03b5\u03bb\u03b5\u03af\u03c4\u03b1\u03b9 \u03ce\u03c2 \u03c3\u03c5\u03bd\u03ae\u03b8\u03c9\u03c2.
role.GROUP.MANAGER =\u0394\u03b9\u03b1\u03c7\u03b5\u03b9\u03c1\u03b9\u03c3\u03c4\u03ae\u03c2 \u039f\u03bc\u03ac\u03b4\u03b1\u03c2
label.group.managers =\u0394\u03b9\u03b1\u03c7\u03b5\u03b9\u03c1\u03b9\u03c3\u03c4\u03ad\u03c2 \u039f\u03bc\u03ac\u03b4\u03b1\u03c2
+sysadmin.serverUrl =URL \u0395\u03be\u03c9\u03c4\u03b5\u03c1\u03b9\u03ba\u03bf\u03cd Server (\u0395\u03be\u03c5\u03c0\u03b7\u03c1\u03b5\u03c4\u03b7\u03c4\u03ae)
config.server.language =\u03a4\u03bf\u03c0\u03b9\u03ba\u03cc
config.ldap.security.protocol =\u03a0\u03c1\u03c9\u03c4\u03cc\u03ba\u03bf\u03bb\u03bf \u0391\u03c3\u03c6\u03b1\u03bb\u03b5\u03af\u03b1\u03c2
msg.num.ldap.users =\u03a5\u03c0\u03ac\u03c1\u03c7\u03bf\u03c5\u03bd {0} \u03c7\u03c1\u03ae\u03c3\u03c4\u03b5\u03c2 LDAP \u03c3\u03c4\u03bf LAMS.
Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r957d202400d76da39b6a98fdea8c96d5369267f6 -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 957d202400d76da39b6a98fdea8c96d5369267f6)
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
@@ -384,6 +384,7 @@
config.red5.recordings.url =Media Server Recordings URL
admin.gradebook.learner.enable =Enable Gradebook for Learners
admin.gradebook.monitor.enable =Enable Gradebook for Monitors
+sysadmin.serverUrl =External Server URL
#======= End labels: Exported 377 labels for en AU =====
Index: lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -r5bd95ffef22a2fdc60414cfd9cfb22968b88c13b -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
--- lams_admin/conf/language/lams/ApplicationResources_es_ES.properties (.../ApplicationResources_es_ES.properties) (revision 5bd95ffef22a2fdc60414cfd9cfb22968b88c13b)
+++ lams_admin/conf/language/lams/ApplicationResources_es_ES.properties (.../ApplicationResources_es_ES.properties) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
@@ -156,7 +156,6 @@
error.authorisation =No esta autorizado para realizar esta operaci\u00f3n
error.newpassword.mismatch =Las contrase\u00f1as no son iguales
error.oldpassword.mismatch =Su vieja contrase\u00f1a no es correcta
-error.img.format =El archivo que ha intentado usar no parece ser un archivo de image. Archivos de imagen suelen tener extensiones .jpg, .gif, .png o .bmp.
error.img.size =El archivo excede el maximo de 4096k de limite
admin.delete =Borrar
error.need.sysadmin =Usted necesita ser Administrador de sistema para realizar esta tarea
@@ -367,6 +366,7 @@
label.tool =Herramienta
label.tool.version =Versi\u00f3n de la herramienta
label.database.version =Versi\u00f3n base de datos
+error.img.format =El archivo que ha intentado usar no parece ser un archivo de image. Archivos de im\u00e1gen suelen tener extensiones .jpg, .gif, .png o .bmp.
admin.user.authentication.method =M\u00e9todo de autenticaci\u00f3n
register.error.field =Se requiere entrada en este campo
register.error.emailRequiredValid =Su direcci\u00f3n de correo no parece correcta.
@@ -381,6 +381,9 @@
config.header.red5 =Server Red5 Media
config.red5.server.url =Server Red5 Media URL
config.red5.recordings.url =Server Red5 grabaciones URL
+admin.gradebook.learner.enable =Activar Libro de Calificaciones para estudiantes
+admin.gradebook.monitor.enable =Activar Libro de Calificaciones para Instructores
+sysadmin.serverUrl =URL del servidor externo
#======= End labels: Exported 375 labels for es ES =====
Index: lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -rbb357a02f7534789cc4ee1daa0bc4387dbe3a952 -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
--- lams_admin/conf/language/lams/ApplicationResources_no_NO.properties (.../ApplicationResources_no_NO.properties) (revision bb357a02f7534789cc4ee1daa0bc4387dbe3a952)
+++ lams_admin/conf/language/lams/ApplicationResources_no_NO.properties (.../ApplicationResources_no_NO.properties) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
@@ -312,6 +312,7 @@
label.sysadmins =Systemadministrasjon
label.author.admins =Forfatter administrator
audit.user.create =Opprettet bruker {0}, med navn {1}
+sysadmin.serverUrl =Ekstern server URL
audit.spreadsheet.error =Feil i prossesering av regnearkets linje {0}: {1}
heading.users =Brukere
label.number.of.users ={0} brukere.
Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -r194da62c33b3687379f2d5810af8ddb0ce6e7971 -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
--- lams_admin/conf/xdoclet/struts-forms.xml (.../struts-forms.xml) (revision 194da62c33b3687379f2d5810af8ddb0ce6e7971)
+++ lams_admin/conf/xdoclet/struts-forms.xml (.../struts-forms.xml) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
@@ -71,6 +71,7 @@
+
Index: lams_admin/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
--- lams_admin/conf/xdoclet/web-settings.xml (.../web-settings.xml) (revision 126d84999e520648cb187e465cb4aaa3baad222e)
+++ lams_admin/conf/xdoclet/web-settings.xml (.../web-settings.xml) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
@@ -7,13 +7,18 @@
org.lamsfoundation.lams.admin.ApplicationResources
+
+ contextClass
+ org.jboss.spring.factory.VFSXmlWebApplicationContext
+
+
contextConfigLocation
classpath:/org/lamsfoundation/lams/admin/adminApplicationContext.xml
locatorFactorySelector
- classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml
+ classpath:/org/lamsfoundation/lams/beanRefContext.xml
parentContextKey
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java
===================================================================
diff -u -rb47e590fe328a0e131c9fa34d1e24633904a42f9 -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java (.../ServerSaveAction.java) (revision b47e590fe328a0e131c9fa34d1e24633904a42f9)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java (.../ServerSaveAction.java) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
@@ -69,104 +69,111 @@
*/
public class ServerSaveAction extends Action {
- private static IIntegrationService service;
- private static IUserManagementService userService;
- private static MessageService messageService;
+ private static IIntegrationService service;
+ private static IUserManagementService userService;
+ private static MessageService messageService;
- @SuppressWarnings("unchecked")
- public ActionForward execute(ActionMapping mapping, ActionForm form,
- HttpServletRequest request, HttpServletResponse response) throws Exception {
+ @SuppressWarnings("unchecked")
+ public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
- if (isCancelled(request)) {
- return mapping.findForward("success");
- }
+ if (isCancelled(request)) {
+ return mapping.findForward("success");
+ }
- service = AdminServiceProxy.getIntegrationService(getServlet().getServletContext());
- userService = AdminServiceProxy.getService(getServlet().getServletContext());
- messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext());
-
- DynaActionForm serverOrgMapForm = (DynaActionForm) form;
- ActionMessages errors = new ActionMessages();
- String[] requiredFields = { "serverid", "serverkey", "servername", "prefix", "userinfoUrl", "timeoutUrl" };
- for (String requiredField : requiredFields) {
- if (StringUtils.trimToNull(serverOrgMapForm.getString(requiredField)) == null) {
- errors.add(requiredField, new ActionMessage("error.required", messageService.getMessage("sysadmin."+requiredField)));
+ service = AdminServiceProxy.getIntegrationService(getServlet().getServletContext());
+ userService = AdminServiceProxy.getService(getServlet().getServletContext());
+ messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext());
+
+ DynaActionForm serverOrgMapForm = (DynaActionForm) form;
+ ActionMessages errors = new ActionMessages();
+ String[] requiredFields = { "serverid", "serverkey", "servername", "prefix", "userinfoUrl", "timeoutUrl" };
+ for (String requiredField : requiredFields) {
+ if (StringUtils.trimToNull(serverOrgMapForm.getString(requiredField)) == null) {
+ errors.add(requiredField, new ActionMessage("error.required", messageService.getMessage("sysadmin."
+ + requiredField)));
+ }
+ }
+ Organisation org = null;
+ UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
+ if ((Boolean) serverOrgMapForm.get("newOrg")) {
+ String orgName = serverOrgMapForm.getString("orgName");
+ if (StringUtils.trimToNull(orgName) == null) {
+ errors.add("orgId", new ActionMessage("error.required", messageService
+ .getMessage("sysadmin.organisation")));
+ } else {
+ org = new Organisation();
+ org.setName(orgName);
+ org.setParentOrganisation(userService.getRootOrganisation());
+ org.setOrganisationType((OrganisationType) userService.findById(OrganisationType.class,
+ OrganisationType.COURSE_TYPE));
+ org.setOrganisationState((OrganisationState) userService.findById(OrganisationState.class,
+ OrganisationState.ACTIVE));
+ SupportedLocale locale = LanguageUtil.getDefaultLocale();
+ org.setLocale(locale);
+ userService.saveOrganisation(org, user.getUserID());
+ serverOrgMapForm.set("orgId", org.getOrganisationId());
+ serverOrgMapForm.set("newOrg", false);
+ serverOrgMapForm.set("orgName", null);
+ }
+ } else {
+ Integer orgId = (Integer) serverOrgMapForm.get("orgId");
+ if (orgId.equals(-1)) {
+ // LDEV-1284 no need for integration organisation anymore
+ // errors.add("orgId",new ActionMessage("error.required", messageService.getMessage("sysadmin.organisation")));
+ } else {
+ org = (Organisation) userService.findById(Organisation.class, orgId);
+ }
+ }
+ Integer sid = (Integer) serverOrgMapForm.get("sid");
+ if (errors.isEmpty()) {//check duplication
+ String[] uniqueFields = { "serverid", "prefix" };
+ for (String uniqueField : uniqueFields) {
+ List list = userService.findByProperty(ExtServerOrgMap.class, uniqueField, serverOrgMapForm
+ .get(uniqueField));
+ if (list != null && list.size() > 0) {
+ if (sid.equals(-1)) {//new map
+ errors.add(uniqueField, new ActionMessage("error.not.unique", messageService
+ .getMessage("sysadmin." + uniqueField)));
+ } else {
+ ExtServerOrgMap map = (ExtServerOrgMap) list.get(0);
+ if (!map.getSid().equals(sid)) {
+ errors.add(uniqueField, new ActionMessage("error.not.unique", messageService
+ .getMessage("sysadmin." + uniqueField)));
}
+ }
+
}
- Organisation org = null;
- UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
- if((Boolean)serverOrgMapForm.get("newOrg")){
- String orgName = serverOrgMapForm.getString("orgName");
- if(StringUtils.trimToNull(orgName)==null){
- errors.add("orgId",new ActionMessage("error.required", messageService.getMessage("sysadmin.organisation")));
- }else{
- org = new Organisation();
- org.setName(orgName);
- org.setParentOrganisation(userService.getRootOrganisation());
- org.setOrganisationType((OrganisationType)userService.findById(OrganisationType.class,OrganisationType.COURSE_TYPE));
- org.setOrganisationState((OrganisationState)userService.findById(OrganisationState.class,OrganisationState.ACTIVE));
- SupportedLocale locale = LanguageUtil.getDefaultLocale();
- org.setLocale(locale);
- userService.saveOrganisation(org, user.getUserID());
- serverOrgMapForm.set("orgId", org.getOrganisationId());
- serverOrgMapForm.set("newOrg", false);
- serverOrgMapForm.set("orgName", null);
- }
- }else{
- Integer orgId = (Integer)serverOrgMapForm.get("orgId");
- if(orgId.equals(-1)){
- // LDEV-1284 no need for integration organisation anymore
- // errors.add("orgId",new ActionMessage("error.required", messageService.getMessage("sysadmin.organisation")));
- }else{
- org = (Organisation)userService.findById(Organisation.class, orgId);
- }
- }
- Integer sid = (Integer) serverOrgMapForm.get("sid");
- if(errors.isEmpty()){//check duplication
- String[] uniqueFields = {"serverid","prefix"};
- for(String uniqueField : uniqueFields){
- List list = userService.findByProperty(ExtServerOrgMap.class,uniqueField,serverOrgMapForm.get(uniqueField));
- if(list!=null && list.size()>0){
- if(sid.equals(-1)){//new map
- errors.add(uniqueField, new ActionMessage("error.not.unique", messageService.getMessage("sysadmin."+uniqueField) ));
- }else{
- ExtServerOrgMap map = (ExtServerOrgMap)list.get(0);
- if(!map.getSid().equals(sid)){
- errors.add(uniqueField, new ActionMessage("error.not.unique", messageService.getMessage("sysadmin."+uniqueField) ));
- }
- }
-
- }
- }
- }
- if (errors.isEmpty()) {
- ExtServerOrgMap map = null;
- if (sid.equals(-1)) {
- map = new ExtServerOrgMap();
- BeanUtils.copyProperties(map, serverOrgMapForm);
- map.setSid(null);
- } else {
- map = service.getExtServerOrgMap(sid);
- BeanUtils.copyProperties(map, serverOrgMapForm);
- }
- map.setOrganisation(org);
- service.saveExtServerOrgMap(map);
- return mapping.findForward("success");
- } else {
- saveErrors(request, errors);
- Map properties = new HashMap();
- properties.put("organisationType.organisationTypeId", OrganisationType.COURSE_TYPE);
- properties.put("organisationState.organisationStateId", OrganisationState.ACTIVE);
- List list = userService.findByProperties(Organisation.class, properties);
- Organisation dummy = new Organisation();
- dummy.setOrganisationId(-1);
- dummy.setName(messageService.getMessage("sysadmin.organisation.select"));
- if(list == null){
- list = new ArrayList();
- }
- list.add(dummy);
- request.setAttribute("orgs", list);
- return mapping.getInputForward();
- }
+ }
}
+ if (errors.isEmpty()) {
+ ExtServerOrgMap map = null;
+ if (sid.equals(-1)) {
+ map = new ExtServerOrgMap();
+ BeanUtils.copyProperties(map, serverOrgMapForm);
+ map.setSid(null);
+ } else {
+ map = service.getExtServerOrgMap(sid);
+ BeanUtils.copyProperties(map, serverOrgMapForm);
+ }
+ map.setOrganisation(org);
+ service.saveExtServerOrgMap(map);
+ return mapping.findForward("success");
+ } else {
+ saveErrors(request, errors);
+ Map properties = new HashMap();
+ properties.put("organisationType.organisationTypeId", OrganisationType.COURSE_TYPE);
+ properties.put("organisationState.organisationStateId", OrganisationState.ACTIVE);
+ List list = userService.findByProperties(Organisation.class, properties);
+ Organisation dummy = new Organisation();
+ dummy.setOrganisationId(-1);
+ dummy.setName(messageService.getMessage("sysadmin.organisation.select"));
+ if (list == null) {
+ list = new ArrayList();
+ }
+ list.add(dummy);
+ request.setAttribute("orgs", list);
+ return mapping.getInputForward();
+ }
+ }
}
Index: lams_admin/web/WEB-INF/jboss-web.xml
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
--- lams_admin/web/WEB-INF/jboss-web.xml (.../jboss-web.xml) (revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/web/WEB-INF/jboss-web.xml (.../jboss-web.xml) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
@@ -1,5 +1,5 @@
-
+
Index: lams_admin/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r194da62c33b3687379f2d5810af8ddb0ce6e7971 -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
--- lams_admin/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 194da62c33b3687379f2d5810af8ddb0ce6e7971)
+++ lams_admin/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
@@ -115,6 +115,7 @@
+
Index: lams_admin/web/servermaintain.jsp
===================================================================
diff -u -r3f45ecf9c05601d7ebdab0965bba3a39b491a734 -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
--- lams_admin/web/servermaintain.jsp (.../servermaintain.jsp) (revision 3f45ecf9c05601d7ebdab0965bba3a39b491a734)
+++ lams_admin/web/servermaintain.jsp (.../servermaintain.jsp) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
@@ -51,6 +51,10 @@
| * |
+ | : |
+ |
+
+
| : |
* |
Index: lams_central/.classpath
===================================================================
diff -u -r406cdd685f03fa39a0ea0c85bde60f7b268bc05d -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
--- lams_central/.classpath (.../.classpath) (revision 406cdd685f03fa39a0ea0c85bde60f7b268bc05d)
+++ lams_central/.classpath (.../.classpath) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
@@ -3,13 +3,19 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
Index: lams_central/build.xml
===================================================================
diff -u -r9a772f5ba1954a3a719a19e7ae237b6b09dc76ef -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
--- lams_central/build.xml (.../build.xml) (revision 9a772f5ba1954a3a719a19e7ae237b6b09dc76ef)
+++ lams_central/build.xml (.../build.xml) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
@@ -5,6 +5,7 @@
+
@@ -185,6 +186,10 @@
+
+
+
+
@@ -306,7 +311,11 @@
+
+
+
+
Index: lams_central/conf/xdoclet/servlets.xml
===================================================================
diff -u -r4b24094f139dd10a9779ce6e678cb8ca38317148 -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
--- lams_central/conf/xdoclet/servlets.xml (.../servlets.xml) (revision 4b24094f139dd10a9779ce6e678cb8ca38317148)
+++ lams_central/conf/xdoclet/servlets.xml (.../servlets.xml) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
@@ -24,7 +24,7 @@
Instructions Download
- Instructions Download
+
download
org.lamsfoundation.lams.contentrepository.client.ToolDownload
@@ -38,15 +38,15 @@
AxisServlet
- Apache-Axis Servlet
+
org.apache.axis.transport.http.AxisServlet
AdminServlet
- Axis Admin Servlet
+
org.apache.axis.transport.http.AdminServlet
@@ -55,23 +55,23 @@
LoginRequest
- LoginRequest Servlet For Integration
+
org.lamsfoundation.lams.web.LoginRequestServlet
LearningDesignRepository
- LearningDesignRepository Servlet
+
org.lamsfoundation.lams.webservice.xml.LearningDesignRepositoryServlet
LessonManager
- LessonManager Servlet
+
org.lamsfoundation.lams.webservice.xml.LessonManagerServlet
Index: lams_central/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rb6544cfe682554653a9590c0bf74ed52186d71ff -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
--- lams_central/conf/xdoclet/web-settings.xml (.../web-settings.xml) (revision b6544cfe682554653a9590c0bf74ed52186d71ff)
+++ lams_central/conf/xdoclet/web-settings.xml (.../web-settings.xml) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
@@ -9,9 +9,9 @@
This refBeanContext.xml contains definition of the shared context. It is located by this entry:
locatorFactorySelector
- classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml
+ classpath:/org/lamsfoundation/lams/beanRefContext.xml
- telling to look for refBeanContext.xml files in selected parts of the classpath.
+ telling to look for refBeanContext.xml files in selected part of the classpath.
Currently LAMS has only one refBeanContext.xml with one shared context definition.
Lams_central uses only beans from the shared context "context.central". That is why there is no value
@@ -22,13 +22,20 @@
If there are local (private for web application; see tools and admin for example) bean definitions,
path to application context XML file can still be added to contextConfigLocation.
-->
+
+
+ contextClass
+ org.jboss.spring.factory.VFSXmlWebApplicationContext
+
contextConfigLocation
locatorFactorySelector
- classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml
+ classpath:/org/lamsfoundation/lams/beanRefContext.xml
parentContextKey
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r22d3a6de1502ff3d6aa974e6fb2243f445698bc9 -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
Binary files differ
Index: lams_tool_assessment/.classpath
===================================================================
diff -u -reed7b3fd37f62db48a6ab1aec9896053ffcfb6ff -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
--- lams_tool_assessment/.classpath (.../.classpath) (revision eed7b3fd37f62db48a6ab1aec9896053ffcfb6ff)
+++ lams_tool_assessment/.classpath (.../.classpath) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
@@ -3,13 +3,16 @@
-
-
-
-
+
+
+
+
+
+
+
Index: lams_tool_assessment/build.properties
===================================================================
diff -u -rb20d7889c1419cea4e67ea9a12797dafc3a8f1c7 -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
--- lams_tool_assessment/build.properties (.../build.properties) (revision b20d7889c1419cea4e67ea9a12797dafc3a8f1c7)
+++ lams_tool_assessment/build.properties (.../build.properties) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
@@ -13,7 +13,7 @@
weblib=lib
#project version
-tool.version=20090109
+tool.version=20090612
# hide tool option
hideTool=false
Index: lams_tool_assessment/build.xml
===================================================================
diff -u -rd2057fdd8708c4c7e5665bdc3ee25b72212aaecb -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
--- lams_tool_assessment/build.xml (.../build.xml) (revision d2057fdd8708c4c7e5665bdc3ee25b72212aaecb)
+++ lams_tool_assessment/build.xml (.../build.xml) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
@@ -231,7 +231,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
- Secure Content
+
+ Secure Content
/*
-
+
LEARNER
TEACHER
@@ -229,61 +234,61 @@
-
- Authoring Update
+
+ Authoring Update
/authoring/*
-
+
AUTHOR
AUTHOR ADMIN
SYSADMIN
-
- Staff Content
+
+ Staff Content
/monitoring.do
-
+
MONITOR
TEACHER
-
- Staff Content
+
+ Staff Content
/definelater.do
-
+
MONITOR
TEACHER
-
- Adminstrator Content
+
+ Adminstrator Content
/admin.do
-
+
ADMIN
-
- LAMS System Adminstrator Content
+
+ LAMS System Adminstrator Content
/sysadmin.do
-
+
SYSADMIN
-
- Download Files
+
+ Download Files
/download/
-
+
LEARNER
AUTHOR
Index: lams_tool_nb/conf/language/lams/ApplicationResources_ja_JP.properties
===================================================================
diff -u -r063e7b6d6e0c516f5ef5c570c543b5fe956f6986 -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9
--- lams_tool_nb/conf/language/lams/ApplicationResources_ja_JP.properties (.../ApplicationResources_ja_JP.properties) (revision 063e7b6d6e0c516f5ef5c570c543b5fe956f6986)
+++ lams_tool_nb/conf/language/lams/ApplicationResources_ja_JP.properties (.../ApplicationResources_ja_JP.properties) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
@@ -2,10 +2,13 @@
#language code: ja
#locale code: JP
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jul 08 08:46:22 BST 2008
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Jun 18 01:31:15 CST 2009
#=================== labels for Noticeboard =================#
+label.off =OFF
+monitor.summary.th.advancedSettings =\u9ad8\u5ea6\u306a\u8a2d\u5b9a
+advanced.reflectOnActivity =\u4ee5\u4e0b\u306e\u6307\u793a\u306b\u5f93\u3063\u3066\u3001\u544a\u77e5\u677f\u306e\u5b8c\u4e86\u6642\u306b\u30ce\u30fc\u30c8\u3092\u8ffd\u52a0\u3057\u3066\u304f\u3060\u3055\u3044:
titleHeading.editActivity =\u7de8\u96c6
activity.description =\u753b\u50cf\u306a\u3069\u3092\u542b\u3080 HTML \u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u8868\u793a\u3059\u308b\u305f\u3081\u306e\u30c4\u30fc\u30eb\u3067\u3059\u3002
label.type =\u30bf\u30a4\u30d7
@@ -20,7 +23,6 @@
heading.group =\u30b0\u30eb\u30fc\u30d7 {0}:
heading.totalLearners =\u5168\u5b66\u7fd2\u8005\u6570:
heading.totalLearnersInGroup =\u3053\u306e\u30b0\u30eb\u30fc\u30d7\u306e\u5b66\u7fd2\u8005\u6570:
-message.contentInUseSet =\u4ed6\u306e\u5b66\u7fd2\u8005\u304c\u30a2\u30af\u30c6\u30a3\u30d3\u30c6\u30a3\u3092\u5b9f\u884c\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u308b\u305f\u3081\u3001\u30b3\u30f3\u30c6\u30f3\u30c4\u306e\u7de8\u96c6\u306f\u3067\u304d\u307e\u305b\u3093\u3002
button.cancel =\u30ad\u30e3\u30f3\u30bb\u30eb
button.ok =OK
button.done =\u5b8c\u4e86
@@ -30,18 +32,15 @@
error.mandatoryField ={0} \u306f\u5fc5\u9808\u9805\u76ee\u3067\u3059
error.missingParam =\u7d9a\u884c\u3067\u304d\u307e\u305b\u3093\u3002{0} \u304c\u3042\u308a\u307e\u305b\u3093\u3002
error.exceedMaxFileSize =\u30d5\u30a1\u30a4\u30eb\u30b5\u30a4\u30ba\u304c\u9650\u754c\u3092\u8d85\u3048\u3066\u3044\u307e\u3059
-error.exception.NbApplication =\u544a\u77e5\u677f\u30c4\u30fc\u30eb\u3067\u5185\u90e8\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u3053\u306e\u30a8\u30e9\u30fc\u3092\u30ec\u30dd\u30fc\u30c8\u3059\u308b\u3068\u304d\u306f\u3001\u4ee5\u4e0b\u306e\u5185\u5bb9\u3092\u4f1d\u3048\u3066\u304f\u3060\u3055\u3044: {0}
-error.contentrepository =\u6307\u793a\u30d5\u30a1\u30a4\u30eb {0} \u306e\u4fdd\u5b58/\u524a\u9664\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u30d5\u30a1\u30a4\u30eb\u306f\u6b63\u3057\u304f\u4fdd\u5b58\u3055\u308c\u3066\u3044\u306a\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
authoring.msg.cancel.save =\u4fdd\u5b58\u305b\u305a\u306b\u9589\u3058\u307e\u3059\u304b\uff1f
button.try.again =\u518d\u8a66\u884c
-advanced.reflectOnActivity =\u4ee5\u4e0b\u306e\u6307\u793a\u306b\u5f93\u3063\u3066\u3001\u544a\u77e5\u677f\u306e\u5b8c\u4e86\u6642\u306b\u30ce\u30fc\u30c8\u3092\u8ffd\u52a0\u3057\u3066\u304f\u3060\u3055\u3044:
button.continue =\u7d9a\u884c
-titleHeading.reflections =\u611f\u60f3
-titleHeading.reflection =\u611f\u60f3
-message.no.reflections =\u611f\u60f3\u306f\u307e\u3060\u3042\u308a\u307e\u305b\u3093\u3002
-message.no.reflection =\u611f\u60f3\u306f\u307e\u3060\u3042\u308a\u307e\u305b\u3093\u3002
+error.exception.NbApplication =\u544a\u77e5\u677f\u30c4\u30fc\u30eb\u3067\u5185\u90e8\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u3053\u306e\u30a8\u30e9\u30fc\u3092\u30ec\u30dd\u30fc\u30c8\u3059\u308b\u3068\u304d\u306f\u3001\u4ee5\u4e0b\u306e\u5185\u5bb9\u3092\u4f1d\u3048\u3066\u304f\u3060\u3055\u3044: {0}
+instructions.uploadOfflineInstr =\u30aa\u30d5\u30e9\u30a4\u30f3\u7528\u306e\u6307\u793a\u30d5\u30a1\u30a4\u30eb:
errors.maxfilesize =\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u306f\u3001\u6700\u5927\u30d5\u30a1\u30a4\u30eb\u30b5\u30a4\u30ba\u5236\u9650\u306e {0} \u30d0\u30a4\u30c8\u3092\u8d85\u3048\u3066\u3044\u307e\u3059
-message.alertContentEdit =\u8b66\u544a: \u3053\u306e\u30a2\u30af\u30c6\u30a3\u30d3\u30c6\u30a3\u306b 1 \u4eba\u4ee5\u4e0a\u306e\u5b66\u7fd2\u8005\u304c\u30a2\u30af\u30bb\u30b9\u3057\u307e\u3057\u305f\u3002\u3053\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u5909\u66f4\u3059\u308b\u3068\u3001\u5b66\u7fd2\u8005\u306e\u7d50\u679c\u304c\u7570\u306a\u308b\u60c5\u5831\u3092\u6301\u3064\u3053\u3068\u306b\u306a\u308a\u307e\u3059\u3002
+instructions.uploadOnlineInstr =\u30aa\u30f3\u30e9\u30a4\u30f3\u7528\u306e\u6307\u793a\u30d5\u30a1\u30a4\u30eb:
+instructions.offlineInstructions =\u30aa\u30d5\u30e9\u30a4\u30f3\u6642\u306e\u6307\u793a:
+instructions.onlineInstructions =\u30aa\u30f3\u30e9\u30a4\u30f3\u6642\u306e\u6307\u793a:
activity.title =\u544a\u77e5\u677f
activity.helptext =\u66f8\u5f0f\u4ed8\u304d\u30c6\u30ad\u30b9\u30c8\u3084\u5916\u90e8\u30bd\u30fc\u30b9\u3078\u306e\u30ea\u30f3\u30af\u3092\u8aad\u307f\u8fbc\u307f\u5c02\u7528\u30da\u30fc\u30b8\u3068\u3057\u3066\u8868\u793a\u3057\u307e\u3059\u3002
tool.display.name =\u544a\u77e5\u677f\u30c4\u30fc\u30eb
@@ -52,15 +51,21 @@
button.upload =\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9
basic.title =\u30bf\u30a4\u30c8\u30eb:
basic.content =\u5185\u5bb9:
-instructions.onlineInstructions =\u30aa\u30f3\u30e9\u30a4\u30f3\u6642\u306e\u6307\u793a:
-instructions.offlineInstructions =\u30aa\u30d5\u30e9\u30a4\u30f3\u6642\u306e\u6307\u793a:
-instructions.uploadOnlineInstr =\u30aa\u30f3\u30e9\u30a4\u30f3\u7528\u306e\u6307\u793a\u30d5\u30a1\u30a4\u30eb:
-instructions.uploadOfflineInstr =\u30aa\u30d5\u30e9\u30a4\u30f3\u7528\u306e\u6307\u793a\u30d5\u30a1\u30a4\u30eb:
+message.no.reflection =\u307e\u3060\u30ce\u30fc\u30c8\u30d6\u30c3\u30af\u306e\u63d0\u51fa\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+message.no.reflections =\u307e\u3060\u30ce\u30fc\u30c8\u30d6\u30c3\u30af\u306e\u63d0\u51fa\u306f\u3042\u308a\u307e\u305b\u3093\u3002
instructions.type.online =\u30aa\u30f3\u30e9\u30a4\u30f3
instructions.type.offline =\u30aa\u30d5\u30e9\u30a4\u30f3
label.filename =\u30d5\u30a1\u30a4\u30eb\u540d
+message.contentInUseSet =\u30b3\u30f3\u30c6\u30f3\u30c4\u306e\u7de8\u96c6\u306b\u306f\u3001 1 \u4eba\u4ee5\u4e0a\u306e\u5b66\u7fd2\u8005\u304c\u30a2\u30af\u30c6\u30a3\u30d3\u30c6\u30a3\u3092\u5b9f\u884c\u3057\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093\u3002
message.runOfflineSet =\u3053\u306e\u30a2\u30af\u30c6\u30a3\u30d3\u30c6\u30a3\u306f\u30b3\u30f3\u30d4\u30e5\u30fc\u30bf\u3067\u5b9f\u884c\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u8a73\u7d30\u306b\u3064\u3044\u3066\u306f\u5148\u751f\u306b\u805e\u3044\u3066\u304f\u3060\u3055\u3044\u3002
titleHeading.instructions =\u6307\u793a
+error.contentrepository =\u6307\u793a\u30d5\u30a1\u30a4\u30eb {0} \u306e\u4fdd\u5b58/\u524a\u9664\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u30d5\u30a1\u30a4\u30eb\u306f\u6b63\u3057\u304f\u4fdd\u5b58\u3055\u308c\u3066\u3044\u306a\u3044\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
+message.alertContentEdit =\u8b66\u544a: \u3053\u306e\u30a2\u30af\u30c6\u30a3\u30d3\u30c6\u30a3\u306b 1 \u4eba\u4ee5\u4e0a\u306e\u5b66\u7fd2\u8005\u304c\u30a2\u30af\u30bb\u30b9\u3057\u307e\u3057\u305f\u3002\u3053\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u5909\u66f4\u3059\u308b\u3068\u3001\u5b66\u7fd2\u8005\u306b\u7570\u306a\u308b\u60c5\u5831\u3092\u4e0e\u3048\u308b\u3053\u3068\u306b\u306a\u308a\u307e\u3059\u3002
+monitor.summary.td.notebookInstructions =\u30ce\u30fc\u30c8\u30d6\u30c3\u30af\u306e\u6307\u793a
+monitor.summary.td.addNotebook =\u544a\u77e5\u677f\u306e\u7d42\u308f\u308a\u306b\u30ce\u30fc\u30c8\u30d6\u30c3\u30af\u3092\u8ffd\u52a0\u3059\u308b
+titleHeading.reflections =\u30ce\u30fc\u30c8\u30d6\u30c3\u30af\u30fb\u30a8\u30f3\u30c8\u30ea
+titleHeading.reflection =\u30ce\u30fc\u30c8\u30d6\u30c3\u30af\u30fb\u30a8\u30f3\u30c8\u30ea
+label.on =\u30aa\u30f3
-#======= End labels: Exported 55 labels for ja JP =====
+#======= End labels: Exported 60 labels for ja JP =====