diff --git a/src/main/java/de/bps/olat/user/ChangeEMailController.java b/src/main/java/de/bps/olat/user/ChangeEMailController.java
index 1d9a28a2f8334665162fd885e1be35e0da6f4024..e90be1c46047289aa0ad66c91df4fe4be87304f4 100644
--- a/src/main/java/de/bps/olat/user/ChangeEMailController.java
+++ b/src/main/java/de/bps/olat/user/ChangeEMailController.java
@@ -52,7 +52,7 @@ public class ChangeEMailController extends DefaultController {
protected static final String PACKAGE = ProfileAndHomePageEditController.class.getPackage().getName();
protected static final String CHANGE_EMAIL_ENTRY = "change.email.login";
- public static int TIME_OUT = 3;
+ public static int TIME_OUT = 30;
protected Translator pT;
protected String emKey;
diff --git a/src/main/java/org/olat/course/_spring/courseContext.xml b/src/main/java/org/olat/course/_spring/courseContext.xml
index b3425610a941f0ec96d48fb8ecfa1f59f0df45db..b9e50f7792ce8f3857d96b0ff352fad42a59effb 100644
--- a/src/main/java/org/olat/course/_spring/courseContext.xml
+++ b/src/main/java/org/olat/course/_spring/courseContext.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+ http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
@@ -34,28 +34,7 @@
If you changing the identifier there will be a new course deployed and the old one will stay.
-->
<property name="courseExportFiles">
- <list>
- <bean class="org.olat.course.DeployableCourseExport">
-
- <property name="courseUrl" value="http://nexus.openolat.org/nexus/content/repositories/openolat-snapshots/org/openolat/course/Demo-Kurs/7.1-SNAPSHOT/Demo-Kurs-7.1-SNAPSHOT.zip" />
- <property name="identifier" value="Demo Kurs" />
- <property name="version" value="7.1" />
- </bean>
- <!-- this one is the help course which will server as the online help, helpAsser flag is TRUE! -->
- <bean class="org.olat.course.DeployableCourseExport">
- <property name="courseUrl" value="http://nexus.openolat.org/nexus/content/repositories/openolat/org/openolat/help/OpenOLAT-Help/8.1/OpenOLAT-Help-8.1.zip" />
- <property name="identifier" value="OLAT::help-course_de.zip" />
- <property name="access" value="4" />
- <property name="version" value="8.1" />
- <property name="redeploy" value="true" />
- <!--
- Url to the course which should be used as help course. The specified course will be used
- in all languages.
- To disable the help course feature, leave the helpCourseFile configuration empty.
- Have also a look at the ContextHelpModule configuration.
- -->
- </bean>
- </list>
+ <ref bean="deployedCourseList"/>
</property>
@@ -120,4 +99,33 @@
</property>
</bean>
+ <bean id="deployedCourseList" class="java.util.ArrayList">
+ <constructor-arg>
+ <list>
+ <ref bean="deployedCourse_Demo" />
+ <ref bean="deployedCourse_OpenOLATHelp" />
+ </list>
+ </constructor-arg>
+ </bean>
+
+ <bean id="deployedCourse_Demo" class="org.olat.course.DeployableCourseExport">
+ <property name="courseUrl" value="http://nexus.openolat.org/nexus/content/repositories/openolat-snapshots/org/openolat/course/Demo-Kurs/7.1-SNAPSHOT/Demo-Kurs-7.1-SNAPSHOT.zip" />
+ <property name="identifier" value="Demo Kurs" />
+ <property name="version" value="7.1" />
+ </bean>
+ <!-- this one is the help course which will server as the online help, helpAsser flag is TRUE! -->
+ <bean id="deployedCourse_OpenOLATHelp" class="org.olat.course.DeployableCourseExport">
+ <property name="courseUrl" value="http://nexus.openolat.org/nexus/content/repositories/openolat/org/openolat/help/OpenOLAT-Help/8.1/OpenOLAT-Help-8.1.zip" />
+ <property name="identifier" value="OLAT::help-course_de.zip" />
+ <property name="access" value="4" />
+ <property name="version" value="8.1" />
+ <property name="redeploy" value="true" />
+ <!--
+ Url to the course which should be used as help course. The specified course will be used
+ in all languages.
+ To disable the help course feature, leave the helpCourseFile configuration empty.
+ Have also a look at the ContextHelpModule configuration.
+ -->
+ </bean>
+
</beans>
\ No newline at end of file
diff --git a/src/main/java/org/olat/user/_spring/userContext.xml b/src/main/java/org/olat/user/_spring/userContext.xml
index 973ba1f24717dc127c6b2f978acbb2affb450a28..dc09867826ff5a68bab78a15101488685dbe8ab1 100644
--- a/src/main/java/org/olat/user/_spring/userContext.xml
+++ b/src/main/java/org/olat/user/_spring/userContext.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+ http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
<bean id="userModule" class="org.olat.user.UserModule"
@@ -169,16 +169,16 @@
<value>[\.\-_].*</value>
<value>[\.\-_]*</value>
</list>
-</property>
-<!--
-<property name="afterLoginConfig">
--->
- <!-- enable Controllers or add others if you want them presented right after the Login of a user in an overlay. -->
+</property>
+ <property name="afterLoginConfig">
+ <ref bean="org.olat.user.AfterLoginConfig"/>
+ </property>
+
+</bean>
- <!-- <bean id="org.olat.user.AfterLoginConfig" class="org.olat.login.AfterLoginConfig" scope="prototype">
+ <bean id="org.olat.user.AfterLoginConfig" class="org.olat.login.AfterLoginConfig" scope="prototype">
<property name="afterLoginControllerList">
<list>
- -->
<!-- Configuration to force users to regularly check and update the user profile, redoTimeout sets the interval (seconds)
<map>
<entry key="controller">
@@ -233,13 +233,9 @@
<entry key="i18nIntro"><value>org.olat.user:runonce.intro</value></entry>
</map>
-->
- <!-- </list>
+ </list>
</property>
- </bean> -->
-<!--
-</property>
--->
-</bean>
+ </bean>
<bean id="triggerUserModuleInit" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
<property name="targetObject" ref="userModule" />
@@ -260,17 +256,7 @@
<ref bean="org.olat.user.UserPropertiesConfig" />
</property>
<property name="userNameAndPasswordSyntaxChecker">
- <!-- a) enable to use standard username and password checker -->
- <bean name="org.olat.user.UserNameAndPasswordSyntaxChecker" class="org.olat.user.UserNameAndPasswordSyntaxChecker" />
- <!-- b) enable to use email-adresses as usernames (allowing @ in username) -->
- <!--<bean name="org.olat.user.UserNameAndPasswordSyntaxChecker" class="org.olat.user.UserNameAndPasswordSyntaxCheckerWithEmail" />-->
- <!-- c) enable to use a generic regexp based email and password checker. Make sure you adjusted also the corresponding i18n keys -->
- <!--
- <bean name="org.olat.user.UserNameAndPasswordSyntaxChecker" class="org.olat.user.UserNameAndPasswordSyntaxCheckerWithRegexp">
- <property name="usernameRegExp" value="[0-9a-z\\.\\-_@]{3,32}" />
- <property name="passwordRegExp"><value><![CDATA[^[\\p{Graph}[^'\\"]]{4,128}$]]></value></property>
- </bean>
- -->
+ <ref bean="org.olat.user.UserNameAndPasswordSyntaxChecker"/>
</property>
<property name="userDisplayNameCreator">
<!-- Implementation to display "firstname lastname"
@@ -281,6 +267,9 @@
</property>
</bean>
+ <!-- enable to use a generic regexp based email and password checker. Make sure you adjusted also the corresponding i18n keys -->
+ <bean id="org.olat.user.UserNameAndPasswordSyntaxChecker" class="org.olat.user.UserNameAndPasswordSyntaxCheckerWithEmail" />
+
<bean id="personalFolderManager" class="org.olat.user.PersonalFolderManager">
<constructor-arg ref="userDeletionManager"></constructor-arg>
</bean>
diff --git a/src/main/java/org/olat/user/propertyhandlers/_spring/userPropertriesHandlersContext.xml b/src/main/java/org/olat/user/propertyhandlers/_spring/userPropertriesHandlersContext.xml
index bc716941d465c20ea33226fd95a4716825d63bb6..794979f42d9856041247e7378581b10ec0636e30 100644
--- a/src/main/java/org/olat/user/propertyhandlers/_spring/userPropertriesHandlersContext.xml
+++ b/src/main/java/org/olat/user/propertyhandlers/_spring/userPropertriesHandlersContext.xml
@@ -1,174 +1,171 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+ http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
<!--
Define all available user properties and its handlers
-->
- <bean name="userPropertyFirstName" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="userPropertyFirstName" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="firstName" />
<property name="group" value="account" />
<property name="deletable" value="false" />
</bean>
- <bean name="userPropertyLastName" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="userPropertyLastName" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="lastName" />
<property name="group" value="account" />
<property name="deletable" value="false" />
</bean>
- <bean name="userPropertyEmail" class="org.olat.user.propertyhandlers.EmailProperty">
+ <bean id="userPropertyEmail" class="org.olat.user.propertyhandlers.EmailProperty">
<property name="name" value="email" />
<property name="group" value="account" />
<property name="deletable" value="false" />
</bean>
- <bean name="userPropertyBirthDay" class="org.olat.user.propertyhandlers.PastDatePropertyHandler">
+ <bean id="userPropertyBirthDay" class="org.olat.user.propertyhandlers.PastDatePropertyHandler">
<property name="name" value="birthDay" />
<property name="group" value="person" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertyGender" class="org.olat.user.propertyhandlers.GenderPropertyHandler">
+ <bean id="userPropertyGender" class="org.olat.user.propertyhandlers.GenderPropertyHandler">
<property name="name" value="gender" />
<property name="group" value="person" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertyTelPrivate" class="org.olat.user.propertyhandlers.PhonePropertyHandler">
+ <bean id="userPropertyTelPrivate" class="org.olat.user.propertyhandlers.PhonePropertyHandler">
<property name="name" value="telPrivate" />
<property name="group" value="contact" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertyTelMobile" class="org.olat.user.propertyhandlers.PhonePropertyHandler">
+ <bean id="userPropertyTelMobile" class="org.olat.user.propertyhandlers.PhonePropertyHandler">
<property name="name" value="telMobile" />
<property name="group" value="contact" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertyTelOffice" class="org.olat.user.propertyhandlers.PhonePropertyHandler">
+ <bean id="userPropertyTelOffice" class="org.olat.user.propertyhandlers.PhonePropertyHandler">
<property name="name" value="telOffice" />
<property name="group" value="contact" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertySkype" class="org.olat.user.propertyhandlers.SkypePropertyHandler">
+ <bean id="userPropertySkype" class="org.olat.user.propertyhandlers.SkypePropertyHandler">
<property name="name" value="skype" />
<property name="group" value="contact" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertyMSN" class="org.olat.user.propertyhandlers.MSNPropertyHandler">
+ <bean id="userPropertyMSN" class="org.olat.user.propertyhandlers.MSNPropertyHandler">
<property name="name" value="msn" />
<property name="group" value="contact" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertyXing" class="org.olat.user.propertyhandlers.XingPropertyHandler">
+ <bean id="userPropertyXing" class="org.olat.user.propertyhandlers.XingPropertyHandler">
<property name="name" value="xing" />
<property name="group" value="contact" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertyICQ" class="org.olat.user.propertyhandlers.ICQPropertyHandler">
+ <bean id="userPropertyICQ" class="org.olat.user.propertyhandlers.ICQPropertyHandler">
<property name="name" value="icq" />
<property name="group" value="contact" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertyHomepage" class="org.olat.user.propertyhandlers.URLPropertyHandler">
+ <bean id="userPropertyHomepage" class="org.olat.user.propertyhandlers.URLPropertyHandler">
<property name="name" value="homepage" />
<property name="group" value="contact" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertyStreet" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="userPropertyStreet" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="street" />
<property name="group" value="address" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertyExtendedAddress" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="userPropertyExtendedAddress" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="extendedAddress" />
<property name="group" value="address" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertyPoBox" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="userPropertyPoBox" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="poBox" />
<property name="group" value="address" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertyZipCode" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="userPropertyZipCode" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="zipCode" />
<property name="group" value="address" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertyRegion" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="userPropertyRegion" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="region" />
<property name="group" value="address" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertyCity" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="userPropertyCity" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="city" />
<property name="group" value="address" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertyCountry" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="userPropertyCountry" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="country" />
<property name="group" value="address" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertyInstitutionalName" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="userPropertyInstitutionalName" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="institutionalName" />
<property name="group" value="institute" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertyInstitutionalUserIdentifier" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="userPropertyInstitutionalUserIdentifier" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="institutionalUserIdentifier" />
<property name="group" value="institute" />
<property name="deletable" value="false" />
</bean>
- <bean name="userPropertyInstitutionalEmail" class="org.olat.user.propertyhandlers.EmailProperty">
+ <bean id="userPropertyInstitutionalEmail" class="org.olat.user.propertyhandlers.EmailProperty">
<property name="name" value="institutionalEmail" />
<property name="group" value="institute" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertyOrgUnit" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="userPropertyOrgUnit" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="orgUnit" />
<property name="group" value="institute" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertyStudySubject" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="userPropertyStudySubject" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="studySubject" />
<property name="group" value="institute" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertyEmailChangedKey" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="userPropertyEmailChangedKey" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="emchangeKey" />
<property name="group" value="account" />
<property name="deletable" value="true" />
</bean>
- <bean name="userPropertyEmailDisabled" class="de.bps.olat.user.propertyhandlers.GenericCheckboxPropertyHandler">
+ <bean id="userPropertyEmailDisabled" class="de.bps.olat.user.propertyhandlers.GenericCheckboxPropertyHandler">
<property name="name" value="emailDisabled" />
<property name="group" value="account" />
<property name="deletable" value="true" />
@@ -197,63 +194,63 @@
before you go live with your system, and if you change the order or remove/replace something, that your statistics get confused.
-->
- <bean name="usertrackingAttrEduPersonAffiliation" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="usertrackingAttrEduPersonAffiliation" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="eduPersonAffiliation" />
<property name="group" value="shibbattr" />
<property name="deletable" value="false" />
</bean>
- <bean name="usertrackingAttrSwissEduHomeOrganisation" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="usertrackingAttrSwissEduHomeOrganisation" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="swissEduPersonHomeOrganization" />
<property name="group" value="shibbattr" />
<property name="deletable" value="false" />
</bean>
- <bean name="usertrackingAttrSwissEduPersonStudyLevel" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="usertrackingAttrSwissEduPersonStudyLevel" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="swissEduPersonStudyLevel" />
<property name="group" value="shibbattr" />
<property name="deletable" value="false" />
</bean>
- <bean name="usertrackingAttrSwissEduPersonHomeOrganisationType" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="usertrackingAttrSwissEduPersonHomeOrganisationType" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="swissEduPersonHomeOrganizationType" />
<property name="group" value="shibbattr" />
<property name="deletable" value="false" />
</bean>
- <bean name="usertrackingAttrEmployeeNumber" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="usertrackingAttrEmployeeNumber" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="employeeNumber" />
<property name="group" value="shibbattr" />
<property name="deletable" value="false" />
</bean>
- <bean name="usertrackingAttrSwissEduPersonStaffCategory" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="usertrackingAttrSwissEduPersonStaffCategory" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="swissEduPersonStaffCategory" />
<property name="group" value="shibbattr" />
<property name="deletable" value="false" />
</bean>
- <bean name="usertrackingAttrOrganizationalUnit" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="usertrackingAttrOrganizationalUnit" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="organizationalUnit" />
<property name="group" value="shibbattr" />
<property name="deletable" value="false" />
</bean>
- <bean name="usertrackingAttrSwissEduPersonStudyBranch1" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="usertrackingAttrSwissEduPersonStudyBranch1" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="swissEduPersonStudyBranch1" />
<property name="group" value="shibbattr" />
<property name="deletable" value="false" />
</bean>
- <bean name="usertrackingAttrSwissEduPersonStudyBranch2" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="usertrackingAttrSwissEduPersonStudyBranch2" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="swissEduPersonStudyBranch2" />
<property name="group" value="shibbattr" />
<property name="deletable" value="false" />
</bean>
- <bean name="usertrackingAttrSwissEduPersonStudyBranch3" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="usertrackingAttrSwissEduPersonStudyBranch3" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="swissEduPersonStudyBranch3" />
<property name="group" value="shibbattr" />
<property name="deletable" value="false" />
</bean>
- <bean name="usertrackingLanguage" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="usertrackingLanguage" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="language" />
<property name="group" value="olatattr" />
<property name="deletable" value="false" />
</bean>
- <bean name="usertrackingWebDAV" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
+ <bean id="usertrackingWebDAV" class="org.olat.user.propertyhandlers.Generic127CharTextPropertyHandler">
<property name="name" value="iswebdav" />
<property name="group" value="olatattr" />
<property name="deletable" value="false" />
diff --git a/src/main/resources/serviceconfig/brasatoconfig.xml b/src/main/resources/serviceconfig/brasatoconfig.xml
index 573ab2755486a0fb106b985c8bab9dc5507e0302..9164f566e3ad939026fc0a6e7ea6372f87f4912c 100644
--- a/src/main/resources/serviceconfig/brasatoconfig.xml
+++ b/src/main/resources/serviceconfig/brasatoconfig.xml
@@ -16,7 +16,7 @@
<property name="mailConfig">
<map>
<entry key="mailhost" value="${smtp.host}"/>
- <entry key="mailTimeout" value="5000"/> <!-- timeout in milliseconds -->
+ <entry key="mailTimeout" value="8000"/> <!-- timeout in milliseconds -->
<entry key="smtpUser" value="${smtp.user}"/>
<entry key="smtpPwd" value="${smtp.pwd}"/>
<entry key="sslEnabled" value="${smtp.sslEnabled}"/>
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index 1c939e2348e7c302f9b963c50ac77c7a494e4546..d2bd215ec6f424a62e1cb50f2d6fbbcf4359524f 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -361,6 +361,10 @@ minimalhome.ext.calendar=true
minimalhome.ext.mysettings=true
minimalhome.ext.portal=true
+site.home.order=1
+site.repository.enable=true
+site.groups.enable=true
+
course.db.enabled=false
########################################################################
diff --git a/src/main/resources/serviceconfig/org/olat/_spring/extensionContext.xml b/src/main/resources/serviceconfig/org/olat/_spring/extensionContext.xml
index 96964858d3fadb89b2bc2ea82e2bda751e1926c6..cf72abab9ad67a315d4b0e9809fc4cacc9c17921 100644
--- a/src/main/resources/serviceconfig/org/olat/_spring/extensionContext.xml
+++ b/src/main/resources/serviceconfig/org/olat/_spring/extensionContext.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+ http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
<!-- generic OLAT extensions -->
<bean id="extmanager" class="org.olat.core.extensions.ExtManager" />
@@ -482,8 +482,6 @@
<property name="parentTreeNodeIdentifier" value="sysAdminMenueNodeCustomizing" />
</bean>
-
-
<!-- SYSADMIN maintenance parent node
<bean class="org.olat.core.extensions.action.GenericActionExtension" init-method="initExtensionPoints">
<property name="order" value="7300" />
diff --git a/src/main/resources/serviceconfig/org/olat/_spring/sitedefContext.xml b/src/main/resources/serviceconfig/org/olat/_spring/sitedefContext.xml
index a1fdc89e263ab0a3b8beafc8146727edc29d9d6c..044327372905a5116cea88911c29df4d954c8afa 100644
--- a/src/main/resources/serviceconfig/org/olat/_spring/sitedefContext.xml
+++ b/src/main/resources/serviceconfig/org/olat/_spring/sitedefContext.xml
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+ http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
<!-- OLAT sites -->
@@ -16,23 +13,25 @@
<!-- Disable site by adding '<property name="enabled" value="false"/>' -->
<bean id="olatsites_home" class="org.olat.home.HomeSiteDef" scope="prototype" >
- <property name="order" value="1" />
+ <property name="order" value="${site.home.order}" />
<property name="enabled" value="${site.minimalhome.enabled}"/>
</bean>
<bean id="olatsites_groups" class="org.olat.group.site.GroupsSiteDef" scope="prototype" >
- <property name="order" value="2" />
+ <property name="order" value="4" />
+ <property name="enabled" value="${site.groups.enable}"/>
</bean>
<bean id="olatsites_repository" class="org.olat.repository.site.RepositorySiteDef" scope="prototype" >
- <property name="order" value="3" />
+ <property name="order" value="5" />
+ <property name="enabled" value="${site.repository.enable}"/>
</bean>
<bean id="olatsites_useradmin" class="org.olat.admin.site.UserAdminSiteDef" scope="prototype" >
- <property name="order" value="5" />
+ <property name="order" value="9" />
</bean>
<bean id="olatsites_admin" class="org.olat.admin.site.AdminSiteDef" scope="prototype">
- <property name="order" value="6" />
+ <property name="order" value="10" />
</bean>
<bean id="olatsites_guidemo" class="org.olat.gui.demo.site.GUIDemoSiteDef" scope="prototype" >
- <property name="order" value="7" />
+ <property name="order" value="11" />
<property name="enabled" value="${guidemo.enabled}"/>
</bean>
diff --git a/src/main/resources/serviceconfig/org/olat/_spring/webdavContext.xml b/src/main/resources/serviceconfig/org/olat/_spring/webdavContext.xml
index 68babd990c78438e75c2e718146796351961bb53..1f8fe1e6830bd6fa92739d973389a32d73c0d99e 100644
--- a/src/main/resources/serviceconfig/org/olat/_spring/webdavContext.xml
+++ b/src/main/resources/serviceconfig/org/olat/_spring/webdavContext.xml
@@ -3,17 +3,24 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+ http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
<!-- WebDAV provider factory -->
<bean id="webdavfactory" class="org.olat.core.util.servlets.WebDAVProviderFactory" >
<property name="webdavProviderList">
<list>
- <!-- WebDAV providers -->
- <bean id="webdav_briefcase" class="org.olat.core.commons.modules.bc.BriefcaseWebDAVProvider" scope="prototype" />
- <bean id="webdav_coursefolders" class="org.olat.course.CoursefolderWebDAVProvider" scope="prototype" />
- <bean id="webdav_sharedfolders" class="org.olat.modules.sharedfolder.SharedFolderWebDAVProvider" scope="prototype" >
+ <ref bean="webdav_briefcase"/>
+ <ref bean="webdav_coursefolders"/>
+ <ref bean="webdav_sharedfolders"/>
+ <ref bean="webdav_groupfolders"/>
+ </list>
+ </property>
+ </bean>
+
+ <bean id="webdav_briefcase" class="org.olat.core.commons.modules.bc.BriefcaseWebDAVProvider" scope="prototype" />
+ <bean id="webdav_coursefolders" class="org.olat.course.CoursefolderWebDAVProvider" scope="prototype" />
+ <bean id="webdav_sharedfolders" class="org.olat.modules.sharedfolder.SharedFolderWebDAVProvider" scope="prototype" >
<!--
Optional configuration: specify shared folder that should be visible to normal users.
By default, shared folders are only mounted for shared folder owners (read/write). By
@@ -38,15 +45,9 @@
</list>
</property>
-->
- </bean>
- <bean id="webdav_groupfolders" class="org.olat.group.GroupfoldersWebDAVProvider" scope="prototype">
- <property name="collaborationManager" ref="collaborationManager" />
- </bean>
- <!-- bean id="webdav_calendars" class="org.olat.calendar.CalendarWebDAVProvider" scope="prototype" / -->
- <!-- comment out following line to enable webdav-provider for static/themes folder, only accessible by administrators -->
- <!-- bean id="webdav_themes" class="org.olat.util.themes.ThemesWebDAVProvider" scope="prototype" /-->
- </list>
- </property>
+ </bean>
+ <bean id="webdav_groupfolders" class="org.olat.group.GroupfoldersWebDAVProvider" scope="prototype">
+ <property name="collaborationManager" ref="collaborationManager" />
</bean>
</beans>
\ No newline at end of file