diff --git a/src/main/java/org/olat/core/commons/fullWebApp/LayoutMain3ColsController.java b/src/main/java/org/olat/core/commons/fullWebApp/LayoutMain3ColsController.java
index 0641879231f9d52aa926aaab247b760b3ccd5a6f..ab3d358144f8b24e3a50891e4619416dc7e9699e 100644
--- a/src/main/java/org/olat/core/commons/fullWebApp/LayoutMain3ColsController.java
+++ b/src/main/java/org/olat/core/commons/fullWebApp/LayoutMain3ColsController.java
@@ -145,7 +145,7 @@ public class LayoutMain3ColsController extends MainLayoutBasicController impleme
* column width settings
* @param defaultConfiguration The layout width configuration to be used
*/
- private LayoutMain3ColsController(UserRequest ureq, WindowControl wControl, Component col1, Component col2, Component col3,
+ public LayoutMain3ColsController(UserRequest ureq, WindowControl wControl, Component col1, Component col2, Component col3,
String layoutConfigKey, LayoutMain3ColsConfig defaultConfiguration) {
super(ureq, wControl);
layoutMainVC = createVelocityContainer("main_3cols");
diff --git a/src/main/java/org/olat/core/commons/services/scheduler/_spring/schedulerContext.xml b/src/main/java/org/olat/core/commons/services/scheduler/_spring/schedulerContext.xml
index d82429ad55f8374472f366eab059ddb7fea66b08..a32dc8bb97b701bc4079104f08804a1a843f4f96 100644
--- a/src/main/java/org/olat/core/commons/services/scheduler/_spring/schedulerContext.xml
+++ b/src/main/java/org/olat/core/commons/services/scheduler/_spring/schedulerContext.xml
@@ -78,7 +78,7 @@ How to add a new job:
<map>
<!-- either true or false -->
<!-- TODO:gs make configurable via olat.properties file -->
- <entry key="enabled" value="true" />
+ <entry key="enabled" value="false" />
<!-- List of dumping beans, key must end with 'Bean' -->
<entry key="ThreadAndControllerInfoBean" value="org.olat.admin.jmx.datasources:name=ThreadAndControllerInfo" />
<entry key="FilesInfoMBean" value="org.olat.core.commons.modules.bc:name=FilesInfoMBean" />
diff --git a/src/main/java/org/olat/core/commons/services/thumbnail/_spring/thumbnailserviceContext.xml b/src/main/java/org/olat/core/commons/services/thumbnail/_spring/thumbnailserviceContext.xml
index a95fb5e33969225a985e2e440aeb83dc795bffac..3bd4a99c5079d85499bf2b5d7a7edc8ecef5867c 100644
--- a/src/main/java/org/olat/core/commons/services/thumbnail/_spring/thumbnailserviceContext.xml
+++ b/src/main/java/org/olat/core/commons/services/thumbnail/_spring/thumbnailserviceContext.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ 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.xsd">
+
<!-- Define commenting and rating service implementation. Remove this bean if you don't want this service to be enabled at all -->
<bean id="thumbnailService" class="org.olat.core.commons.services.thumbnail.impl.ThumbnailServiceImpl">
<property name="thumbnailSPIes">
diff --git a/src/main/java/org/olat/core/gui/components/htmlheader/jscss/JSAndCSSComponent.java b/src/main/java/org/olat/core/gui/components/htmlheader/jscss/JSAndCSSComponent.java
index 9cce3fc7756d6a8de36fa3f089dccbc336d9f9c2..a726dbe1d01ad493920765efefc1f877b34caf6b 100644
--- a/src/main/java/org/olat/core/gui/components/htmlheader/jscss/JSAndCSSComponent.java
+++ b/src/main/java/org/olat/core/gui/components/htmlheader/jscss/JSAndCSSComponent.java
@@ -158,7 +158,7 @@ public class JSAndCSSComponent extends AbstractComponent {
for (String cssPath : cssPathNames) {
Integer index = cssPathNamesIndexes != null ? cssPathNamesIndexes.get(cssPath) : null;
if(index == null && baseClass == null) {
- jsadder.addStaticCSSPath(cssPath);
+ jsadder.addRequiredCSSPath(cssPath, false, 0);
} else {
jsadder.addRequiredCSSPath(cssPath, true, index);
}
diff --git a/src/main/java/org/olat/core/gui/control/generic/folder/OlatRootFolderTreeModel.java b/src/main/java/org/olat/core/gui/control/generic/folder/OlatRootFolderTreeModel.java
index 84029ac119a696f7c524abc5de5678799e1f7268..6be24da154063f0b1cc701c3472be30304462296 100644
--- a/src/main/java/org/olat/core/gui/control/generic/folder/OlatRootFolderTreeModel.java
+++ b/src/main/java/org/olat/core/gui/control/generic/folder/OlatRootFolderTreeModel.java
@@ -65,29 +65,25 @@ public class OlatRootFolderTreeModel extends GenericTreeModel {
private final MetaInfoFactory metaInfoFactory;
public OlatRootFolderTreeModel(OlatRootFolderImpl root) {
+ metaInfoFactory = CoreSpringFactory.getImpl(MetaInfoFactory.class);
setRootNode(createNode(root));
getRootNode().getChildCount();
- metaInfoFactory = CoreSpringFactory.getImpl(MetaInfoFactory.class);
- // fxdiff:
- //makeChildren(getRootNode(), root);
}
public OlatRootFolderTreeModel(OlatRootFolderImpl root, VFSItemFilter filter) {
this.filter = filter;
+ metaInfoFactory = CoreSpringFactory.getImpl(MetaInfoFactory.class);
setRootNode(createNode(root));
getRootNode().getChildCount();
- //makeChildren(getRootNode(), root);
- metaInfoFactory = CoreSpringFactory.getImpl(MetaInfoFactory.class);
}
public OlatRootFolderTreeModel(OlatRootFolderImpl root,
VFSItemFilter filter, Comparator<VFSItem> comparator) {
this.filter = filter;
this.comparator = comparator;
+ metaInfoFactory = CoreSpringFactory.getImpl(MetaInfoFactory.class);
setRootNode(createNode(root));
getRootNode().getChildCount();
- //makeChildren(getRootNode(), root);
- metaInfoFactory = CoreSpringFactory.getImpl(MetaInfoFactory.class);
}
/**
diff --git a/src/main/java/org/olat/core/util/vfs/version/VersionsFileManager.java b/src/main/java/org/olat/core/util/vfs/version/VersionsFileManager.java
index a6eded439165caf29fc2fd0a774bef9e482a0a3f..303733f3761a8a584f253d7de74aed7f8466239a 100644
--- a/src/main/java/org/olat/core/util/vfs/version/VersionsFileManager.java
+++ b/src/main/java/org/olat/core/util/vfs/version/VersionsFileManager.java
@@ -802,7 +802,7 @@ public class VersionsFileManager extends VersionsManager implements Initializabl
}
return null;
}
-
+
public File getCanonicalRootFile() {
if(rootFolder == null) {
rootFolder = new File(FolderConfig.getCanonicalRoot());
diff --git a/src/main/java/org/olat/course/assessment/EfficiencyStatementController.java b/src/main/java/org/olat/course/assessment/EfficiencyStatementController.java
index e4587586a944099d0d15d52866b37b001e9738d8..402471c58cbff5156696a299f693c2df9d163e3c 100644
--- a/src/main/java/org/olat/course/assessment/EfficiencyStatementController.java
+++ b/src/main/java/org/olat/course/assessment/EfficiencyStatementController.java
@@ -174,7 +174,7 @@ public class EfficiencyStatementController extends BasicController {
}
if(group != null) {
- userDataVC.contextPut("groupName", group.getName());
+ userDataVC.contextPut("groupName", StringHelper.escapeHtml(group.getName()));
if(links) {
groupLink = LinkFactory.createButton("group.link", userDataVC, this);
groupLink.setIconLeftCSS("o_icon o_icon_group");
diff --git a/src/main/java/org/olat/home/controllerCreators/_content/welcome.html b/src/main/java/org/olat/home/controllerCreators/_content/welcome.html
index a15c5bcc468fe2801961b164c0c989d2de9d8701..9c540461ae0d2ed3d0f4158e57b6e1a95ae78135 100644
--- a/src/main/java/org/olat/home/controllerCreators/_content/welcome.html
+++ b/src/main/java/org/olat/home/controllerCreators/_content/welcome.html
@@ -26,16 +26,15 @@
<script type="text/javascript">
/* <![CDATA[ */
function gotoSite(event) {
- var el = $("baks_home_launcher");
- var dim = Element.getDimensions(el);
- var pos = Element.positionedOffset(el);
+ var el = jQuery("#baks_home_launcher");
+ var pos = el.position();
var offsetLeft = pos.left;
var offsetTop = pos.top;
var i=0;
- for(var offsetParent = Element.getOffsetParent(el); offsetParent.id != 'o_body'; offsetParent = Element.getOffsetParent(offsetParent)) {
- var posn = Element.positionedOffset(offsetParent);
- if(offsetParent.id != "o_main_center" && offsetParent.id != "b_page") {//ie give it an offset which is the same as _content
+ for(var offsetParent = el.offsetParent(); offsetParent.attr('id') != 'b_body'; offsetParent = offsetParent.offsetParent()) {
+ var posn = offsetParent.position();
+ if(offsetParent.attr('id') != "b_col3" && offsetParent.attr('id') != "b_page") {//ie give it an offset which is the same as _content
offsetLeft += posn.left;
offsetTop += posn.top;
}
@@ -43,11 +42,11 @@ function gotoSite(event) {
}
//inner square is difficult
- var centerX = dim.width / 2;
- var centerY = dim.height / 2;
+ var centerX = el.width() / 2;
+ var centerY = el.height() / 2;
//shift 0,0 coordinate to center
- var px = Event.pointerX(event) - offsetLeft - centerX;
- var py = centerY - (Event.pointerY(event) - offsetTop);
+ var px = event.pageX - offsetLeft - centerX;
+ var py = centerY - (event.pageY - offsetTop);
//calculate the x position on the line x = -y + centerY;
var theoy = (centerY - 5) - Math.abs(px);
if(Math.abs(py) < theoy) {
@@ -68,13 +67,13 @@ function gotoSite(event) {
}
function launchSite(site) {
- var siteLinks = $$('li.' + site + ' a');
+ var siteLinks = jQuery('li.' + site + ' a');
if (siteLinks && siteLinks.length > 0) {
var siteLink = siteLinks[0];
if (o2cl()) {
var target = siteLink.target;
- if (target == 'oaa0') {
- $('oaa0').src=siteLink.href;
+ if (target === 'oaa0') {
+ jQuery('#oaa0').attr('src',siteLink.href);
} else {
document.location.href=siteLink.href;
}
diff --git a/src/main/java/org/olat/instantMessaging/groupchat/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/instantMessaging/groupchat/_i18n/LocalStrings_pl.properties
deleted file mode 100644
index 412ca2b1cdcd0ffc8dadcb5ca4f1896cffb9dbd4..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/instantMessaging/groupchat/_i18n/LocalStrings_pl.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-#Sun Dec 23 19:40:23 CET 2012
-chat.not.available.now=Czat jest tymczasowo niedost\u0119pny. Prosz\u0119 spr\u00F3bowa\u0107 p\u00F3\u017Aniej.
-click.to.join=Wejd\u017A do czatu kursu...
-close=Zamknij
-close.connections=Przerwij po\u0142\u0105czenia...
-course.chat.click.to.join=W czacie kursu mo\u017Cesz wysy\u0142a\u0107 i otrzymywa\u0107 wiadomo\u015Bci od pozosta\u0142ych uczestnik\u00F3w kursu.
-course.chat.intro=Tutaj mo\u017Cesz poczatowa\u0107 z u\u017Cytkownikami, kt\u00F3rzy w\u0142a\u015Bnie teraz ogl\u0105daj\u0105 ten kurs...<br />Jeste\u015B zalogowany anonimowo. Mo\u017Cesz jednak zdecydowa\u0107 czy chcesz u\u017Cy\u0107 swojej nazwy u\u017Cytkownika OLAT.
-course.groupchat=Pok\u00F3j\:
-coursechat.not.available=Czat tego kursu jest chwilowo niedost\u0119pny. Spr\u00F3buj p\u00F3\u017Aniej...
-coursechat.not.available.short=Komunikator jest niedost\u0119pny.
-groupchat.new.msg=Nowa wiadomo\u015B\u0107 w pokoju czata tego kursu\!
-groupchat.not.available=Czat jest niedost\u0119pny.
-groupchat.roster=Uczestnicy
-im.conference.maxi.intro=Tutaj mo\u017Cesz poczatowa\u0107 z uczestnikami tej grupy...
-im.conference.maxi.title=Pok\u00F3j
-im.conference.participants=W tej chwili nast\u0119puj\u0105cy u\u017Cytkownicy s\u0105 w pokoju czata\:
-im.refresh=Od\u015Bwie\u017C
-im.refresh.auto=Automatyczne od\u015Bwie\u017Canie jest aktywne.
-init.messaging=Init
-msg.send=Wy\u015Blij
-msg.send.error=Twoja wiadomo\u015B\u0107 nie zosta\u0142a wys\u0142ana.
-nobody=Nikt
-openChat=Skorzystaj z komunikatora
-participants.in.chat=kursant\u00F3w na czacie
-toogle.anonymous=Poka\u017C nazw\u0119 u\u017Cytkownika
-update.roster=Aktualizacja
diff --git a/src/main/java/org/olat/user/propertyhandlers/_spring/userPropertiesContext.xml b/src/main/java/org/olat/user/propertyhandlers/_spring/userPropertiesContext.xml
index c27a158b97241963526ee2f7ecf4aaa571b87112..1d590905a6b211f2af686d47aa4836549544dcd8 100644
--- a/src/main/java/org/olat/user/propertyhandlers/_spring/userPropertiesContext.xml
+++ b/src/main/java/org/olat/user/propertyhandlers/_spring/userPropertiesContext.xml
@@ -99,7 +99,6 @@
</property>
<property name="userViewReadOnlyProperties">
<set>
- <ref bean="userPropertyUserName" />
<ref bean="userPropertyUserName" />
<ref bean="userPropertyFirstName" />
<ref bean="userPropertyLastName" />
diff --git a/src/main/resources/database/mysql/alter_9_4_0_to_10_0_0.sql b/src/main/resources/database/mysql/alter_9_4_0_to_10_0_0.sql
index 6b3e9e65b398a0c0efe645b555094f2b53545e28..291e6a3552d9c8224f77214c5c33c86e84e424d3 100644
--- a/src/main/resources/database/mysql/alter_9_4_0_to_10_0_0.sql
+++ b/src/main/resources/database/mysql/alter_9_4_0_to_10_0_0.sql
@@ -21,6 +21,7 @@ create table o_repositoryentry_stats (
r_lastusage datetime not null,
primary key (id)
);
+alter table o_repositoryentry_stats ENGINE = InnoDB;
alter table o_repositoryentry add column fk_stats bigint;
alter table o_repositoryentry add column authors varchar(2048);
@@ -44,6 +45,7 @@ create table o_bs_group (
g_name varchar(36),
primary key (id)
);
+alter table o_bs_group ENGINE = InnoDB;
create table o_bs_group_member (
id bigint not null,
@@ -54,6 +56,7 @@ create table o_bs_group_member (
fk_identity_id bigint not null,
primary key (id)
);
+alter table o_bs_group_member ENGINE = InnoDB;
create table o_re_to_group (
id bigint not null,
@@ -63,6 +66,7 @@ create table o_re_to_group (
fk_entry_id bigint not null,
primary key (id)
);
+alter table o_re_to_group ENGINE = InnoDB;
create table o_bs_grant (
id bigint not null,
@@ -73,6 +77,7 @@ create table o_bs_grant (
fk_resource_id bigint not null,
primary key (id)
);
+alter table o_bs_grant ENGINE = InnoDB;
alter table o_bs_group_member add constraint member_identity_ctx foreign key (fk_identity_id) references o_bs_identity (id);
alter table o_bs_group_member add constraint member_group_ctx foreign key (fk_group_id) references o_bs_group (id);
diff --git a/src/main/resources/database/mysql/setupDatabase.sql b/src/main/resources/database/mysql/setupDatabase.sql
index d4c79994353d22000ca74dba8f7d6183953f6e85..5aba5651f2cc892b98ac3de282216c75a36c0240 100644
--- a/src/main/resources/database/mysql/setupDatabase.sql
+++ b/src/main/resources/database/mysql/setupDatabase.sql
@@ -1847,6 +1847,10 @@ alter table hibernate_unique_key ENGINE = InnoDB;
alter table o_forum ENGINE = InnoDB;
alter table o_property ENGINE = InnoDB;
alter table o_bs_secgroup ENGINE = InnoDB;
+alter table o_bs_group ENGINE = InnoDB;
+alter table o_bs_group_member ENGINE = InnoDB;
+alter table o_re_to_group ENGINE = InnoDB;
+alter table o_bs_grant ENGINE = InnoDB;
alter table o_repositoryentry_cycle ENGINE = InnoDB;
alter table o_lti_outcome ENGINE = InnoDB;
alter table o_user ENGINE = InnoDB;
@@ -1862,6 +1866,7 @@ alter table o_bs_policy ENGINE = InnoDB;
alter table o_bs_namedgroup ENGINE = InnoDB;
alter table o_bs_membership ENGINE = InnoDB;
alter table o_repositoryentry ENGINE = InnoDB;
+alter table o_repositoryentry_stats ENGINE = InnoDB;
alter table o_references ENGINE = InnoDB;
alter table o_gp_business ENGINE = InnoDB;
alter table o_gp_bgarea ENGINE = InnoDB;
@@ -1969,7 +1974,7 @@ create index member_to_grp_role_idx on o_bs_group_member (g_role);
alter table o_re_to_group add constraint re_to_group_group_ctx foreign key (fk_group_id) references o_bs_group (id);
alter table o_re_to_group add constraint re_to_group_re_ctx foreign key (fk_entry_id) references o_repositoryentry (repositoryentry_id);
--- alter table o_gp_business add constraint gp_to_group_business_ctx foreign key (fk_group_id) references o_bs_group (id);
+alter table o_gp_business add constraint gp_to_group_business_ctx foreign key (fk_group_id) references o_bs_group (id);
-- business group
alter table o_gp_business add constraint idx_bgp_rsrc foreign key (fk_resource) references o_olatresource (resource_id);
@@ -2058,7 +2063,7 @@ create index idx_re_lifecycle_extref_idx on o_repositoryentry (external_ref);
alter table o_repositoryentry add constraint idx_re_lifecycle_fk foreign key (fk_lifecycle) references o_repositoryentry_cycle(id);
create index idx_re_lifecycle_soft_idx on o_repositoryentry_cycle (r_softkey);
--- alter table o_repositoryentry add constraint repoentry_stats_ctx foreign key (fk_stats) references o_repositoryentry_stats (id);
+alter table o_repositoryentry add constraint repoentry_stats_ctx foreign key (fk_stats) references o_repositoryentry_stats (id);
-- access control
create index ac_offer_to_resource_idx on o_ac_offer (fk_resource_id);
diff --git a/src/test/resources/log4j.xml b/src/test/resources/log4j.xml
index d5b88bf26116e7d0a8d4627c29f34bb224993390..ca8bade1dcebfc25f52ed44792914d5825c2c1fe 100644
--- a/src/test/resources/log4j.xml
+++ b/src/test/resources/log4j.xml
@@ -32,5 +32,15 @@
<level value="FATAL"/>
<appender-ref ref="stdout"/>
</logger>
+ <!--
+ <logger name="org.hibernate.SQL">
+ <level value="debug" />
+ <appender-ref ref="stdout" />
+ </logger>
+ <logger name="org.hibernate.type.descriptor.sql.BasicBinder">
+ <level value="TRACE" />
+ <appender-ref ref="stdout" />
+ </logger>
+ -->
</log4j:configuration>