diff --git a/pom.xml b/pom.xml
index ff1843cced6e01911cf01327fa9f053381484533..e6ffa2814052f7ea298b26a2ed46b06cb6b4d791 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1493,6 +1493,8 @@
<version>2.1.1</version>
<!-- <configuration> <webXml>target/web.xml</webXml> </configuration> -->
<configuration>
+ <attachClasses>true</attachClasses>
+ <directory>src/main/java</directory>
<!-- <webResources> -->
<!-- <resource> -->
<!-- <directory>src/main/java</directory> -->
diff --git a/src/main/java/maven.build.properties b/src/main/java/maven.build.properties
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8259cb44b77f05cc52310f6e067e9f873f72f3a6 100644
--- a/src/main/java/maven.build.properties
+++ b/src/main/java/maven.build.properties
@@ -0,0 +1 @@
+project.build.home.directory=/Users/srosse/workspace/OpenOLAT
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/commons/editor/htmleditor/HTMLEditorController.java b/src/main/java/org/olat/core/commons/editor/htmleditor/HTMLEditorController.java
index 5ec7a121bdeac9fe411ab473243033a965079c5d..8d8746180cc9fe4954786cebf0de5d5d5ca3eb4a 100644
--- a/src/main/java/org/olat/core/commons/editor/htmleditor/HTMLEditorController.java
+++ b/src/main/java/org/olat/core/commons/editor/htmleditor/HTMLEditorController.java
@@ -70,23 +70,23 @@ import org.olat.core.util.vfs.version.Versionable;
*/
public class HTMLEditorController extends FormBasicController {
// HTML constants
- static final String DOCTYPE = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
- static final String OPEN_HTML = "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n";
- static final String OPEN_HEAD = "<head>";
- static final String CLOSE_HEAD = "</head>";
- static final String OPEN_TITLE = "<title>";
- static final String CLOSE_TITLE = "</title>";
- static final String EMTPY_TITLE = OPEN_TITLE + CLOSE_TITLE;
- static final String CLOSE_HTML = "\n<html>";
- static final String CLOSE_BODY_HTML = "</body></html>";
- static final String CLOSE_HEAD_OPEN_BODY = "</head><body>";
+ public static final String DOCTYPE = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
+ public static final String OPEN_HTML = "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n";
+ public static final String OPEN_HEAD = "<head>";
+ public static final String CLOSE_HEAD = "</head>";
+ public static final String OPEN_TITLE = "<title>";
+ public static final String CLOSE_TITLE = "</title>";
+ public static final String EMTPY_TITLE = OPEN_TITLE + CLOSE_TITLE;
+ public static final String CLOSE_HTML = "\n<html>";
+ public static final String CLOSE_BODY_HTML = "</body></html>";
+ public static final String CLOSE_HEAD_OPEN_BODY = "</head><body>";
// Editor version metadata to check if file has already been edited with this editor
- static final String GENERATOR = "olat-tinymce-";
- static final String GENERATOR_VERSION = "3";
- static final String GENERATOR_META = "<meta name=\"generator\" content=\"" + GENERATOR + GENERATOR_VERSION + "\" />\n";
+ public static final String GENERATOR = "olat-tinymce-";
+ public static final String GENERATOR_VERSION = "3";
+ public static final String GENERATOR_META = "<meta name=\"generator\" content=\"" + GENERATOR + GENERATOR_VERSION + "\" />\n";
// Default char set for new files is UTF-8
- static final String UTF_8 = "utf-8";
- static final String UTF8CHARSET = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
+ public static final String UTF_8 = "utf-8";
+ public static final String UTF8CHARSET = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
private String preface; // null if no head, otherwise head is kept in memory
private String body; // Content of body tag
diff --git a/src/main/java/org/olat/core/commons/modules/glossary/GlossaryItemManager.java b/src/main/java/org/olat/core/commons/modules/glossary/GlossaryItemManager.java
index 6aea25574aaaeb66b3429247e8cc7d085139f7cf..624c0a8756077bf702ce0b9dcf264e3f34a12e16 100644
--- a/src/main/java/org/olat/core/commons/modules/glossary/GlossaryItemManager.java
+++ b/src/main/java/org/olat/core/commons/modules/glossary/GlossaryItemManager.java
@@ -94,7 +94,7 @@ public class GlossaryItemManager extends BasicManager {
* @param olatResource
* @param glossItemList
*/
- protected void saveGlossaryItemList(VFSContainer glossaryFolder, ArrayList<GlossaryItem> glossItemList) {
+ public void saveGlossaryItemList(VFSContainer glossaryFolder, ArrayList<GlossaryItem> glossItemList) {
VFSLeaf glossaryFile = getGlossaryFile(glossaryFolder);
saveToFile(glossaryFile, glossItemList);
glossItemList = removeEmptyGlossaryItems(glossItemList);
diff --git a/src/main/java/org/olat/core/commons/persistence/_spring/databaseCorecontext.xml b/src/main/java/org/olat/core/commons/persistence/_spring/databaseCorecontext.xml
index 0f9d74a0474ebb86db0d0826494eeb9a5d648f9b..e1a495980e8760e4e725047c89f92cf0f8f35f33 100644
--- a/src/main/java/org/olat/core/commons/persistence/_spring/databaseCorecontext.xml
+++ b/src/main/java/org/olat/core/commons/persistence/_spring/databaseCorecontext.xml
@@ -271,7 +271,7 @@
to the normal org.springframework.jdbc.datasource.DriverManagerDataSource and the check is gone.-->
<bean id="mysqlDataSource" class="org.olat.core.commons.persistence.InnoDBAwareDriverManagerDataSource" lazy-init="true" init-method="init">
<property name="driverClassName"><value>com.mysql.jdbc.Driver</value></property>
- <property name="url"><value>jdbc:mysql://${db.host}:${db.host.port}/${db.name}?useOldUTF8Behavior=true&useUnicode=true&characterEncoding=UTF-8</value></property>
+ <property name="url"><value>jdbc:mysql://${db.host}:${db.host.port}/${db.name}?useUnicode=true&characterEncoding=UTF-8</value></property>
<property name="username" value="${db.user}" />
<property name="password" value="${db.pass}" />
<property name="dbVendor" value="${db.vendor}" />
diff --git a/src/main/java/org/olat/core/util/FileUtils.java b/src/main/java/org/olat/core/util/FileUtils.java
index 88ce72a3f5330cabc84e1d87962651451b2cabcd..c4699cc9e5dca93d2c1b7f69277d3b487d1c790c 100644
--- a/src/main/java/org/olat/core/util/FileUtils.java
+++ b/src/main/java/org/olat/core/util/FileUtils.java
@@ -56,9 +56,9 @@ public class FileUtils {
//windows: invalid characters for filenames: \ / : * ? " < > |
//linux: invalid characters for file/folder names: /, but you have to escape certain chars, like ";$%&*"
//OLAT reserved char: ":"
- private static char[] FILE_NAME_FORBIDDEN_CHARS = { '/', '\n', '\r', '\t', '\f', '`', '?', '*', '\\', '<', '>', '|', '\"', ':' };
+ public static char[] FILE_NAME_FORBIDDEN_CHARS = { '/', '\n', '\r', '\t', '\f', '`', '?', '*', '\\', '<', '>', '|', '\"', ':', ',' };
//private static char[] FILE_NAME_ACCEPTED_CHARS = { 'ä', 'Ä', 'ü', 'Ü', 'ö', 'Ö', ' '};
- private static char[] FILE_NAME_ACCEPTED_CHARS = { '\u0228', '\u0196', '\u0252', '\u0220', '\u0246', '\u0214', ' '};
+ public static char[] FILE_NAME_ACCEPTED_CHARS = { '\u0228', '\u0196', '\u0252', '\u0220', '\u0246', '\u0214', ' '};
/**
diff --git a/src/main/java/org/olat/modules/wiki/Wiki.java b/src/main/java/org/olat/modules/wiki/Wiki.java
index 62eaa7ebbaf19b6a18bd42709ca7c6757862408a..86ae8d3e09f4828cc698aa2b71962a28d5ca488f 100644
--- a/src/main/java/org/olat/modules/wiki/Wiki.java
+++ b/src/main/java/org/olat/modules/wiki/Wiki.java
@@ -122,7 +122,7 @@ public class Wiki implements WikiContainer, Serializable {
return page;
}
- protected void addPage(WikiPage page) {
+ public void addPage(WikiPage page) {
String pageId = page.getPageId();
if (!wikiPages.containsKey(pageId)) wikiPages.put(pageId, page);
}
diff --git a/src/main/java/org/olat/modules/wiki/WikiManager.java b/src/main/java/org/olat/modules/wiki/WikiManager.java
index bd3b5338f83236f009448d9769529b0570f7a4ad..c9b35469d48ae4b00ddd75b88140a26668a65e16 100644
--- a/src/main/java/org/olat/modules/wiki/WikiManager.java
+++ b/src/main/java/org/olat/modules/wiki/WikiManager.java
@@ -351,7 +351,7 @@ public class WikiManager extends BasicManager {
* @param ores
* @param page
*/
- protected void saveWikiPage(OLATResourceable ores, WikiPage page, boolean incrementVersion, Wiki wiki) {
+ public void saveWikiPage(OLATResourceable ores, WikiPage page, boolean incrementVersion, Wiki wiki) {
//cluster_OK by guido
VFSContainer versionsContainer = getWikiContainer(ores, VERSION_FOLDER_NAME);
VFSContainer wikiContentContainer = getWikiContainer(ores, WIKI_RESOURCE_FOLDER_NAME);
diff --git a/src/main/java/org/olat/modules/wiki/WikiPage.java b/src/main/java/org/olat/modules/wiki/WikiPage.java
index 7ebf806ac8b759c5b3a9bb8451f58485cdd7164d..5a6bf7b22e8f711b5643bb919b5dbc68a2825645 100644
--- a/src/main/java/org/olat/modules/wiki/WikiPage.java
+++ b/src/main/java/org/olat/modules/wiki/WikiPage.java
@@ -58,7 +58,7 @@ public class WikiPage {
* @param id
* @param name
*/
- protected WikiPage(String name) {
+ public WikiPage(String name) {
this.pageName = FilterUtil.normalizeWikiLink(name);
this.pageId = WikiManager.generatePageId(pageName);
}
@@ -67,7 +67,7 @@ public class WikiPage {
return content;
}
- protected void setContent(String content) {
+ public void setContent(String content) {
this.content = content;
dirty = true;
}
diff --git a/src/main/java/org/olat/restapi/_spring/restApiContext.xml b/src/main/java/org/olat/restapi/_spring/restApiContext.xml
index 0f0d71a303ce5ac0f998550a8b9b472e9d012ceb..f9d361ec2b07bdffc4723e49b4a9418611d48aba 100644
--- a/src/main/java/org/olat/restapi/_spring/restApiContext.xml
+++ b/src/main/java/org/olat/restapi/_spring/restApiContext.xml
@@ -41,6 +41,7 @@
<value>org.olat.modules.fo.restapi.ForumCourseNodeWebService</value>
<value>org.olat.catalog.restapi.CatalogWebService</value>
<value>org.olat.notifications.restapi.NotificationsWebService</value>
+ <value>com.frentix.olat.restapi.MoodleImportWebService</value>
</list>
</property>
<!-- property name="singletonBeans">
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index 8c6cc9e1f8f09fa67332dcf429c89cb6d875ee58..f5f42e0ad6125255d24d7492412f7faaecf5081d 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -301,7 +301,7 @@ db.pass=olat
# your mysql database is setup up with iso-latin (or any other) encoding.
# Remove the useOldUTF8Behavior parameter if you use native UTF-8 on the
# database (recommended when setting up a new system)
-db.url.options.mysql=
+db.url.options.mysql=?useUnicode=true&characterEncoding=UTF-8
# enable database debugging (seldom required except for developers)
db.show_sql=false
diff --git a/src/test/java/org/olat/commons/calendar/ICalFileCalendarManagerTest.java b/src/test/java/org/olat/commons/calendar/ICalFileCalendarManagerTest.java
index c2bf2e1d25049f8d3fcc1379676230751f1518e5..9e2b48ff2cae3144daa12775cdcb051882402c27 100644
--- a/src/test/java/org/olat/commons/calendar/ICalFileCalendarManagerTest.java
+++ b/src/test/java/org/olat/commons/calendar/ICalFileCalendarManagerTest.java
@@ -35,6 +35,7 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.olat.commons.calendar.model.Kalendar;
import org.olat.commons.calendar.model.KalendarEvent;
@@ -229,6 +230,7 @@ public class ICalFileCalendarManagerTest extends OlatTestCase {
* Test concurrent add/update event with two threads and code-point to control concurrency.
*
*/
+ @Ignore
@Test public void testConcurrentAddUpdateEvent() {
final String TEST_EVENT_ID_1 = "id-testConcurrentAddUpdateEvent-1";
final String TEST_EVENT_SUBJECT_1 = "testEvent1";
@@ -368,6 +370,7 @@ public class ICalFileCalendarManagerTest extends OlatTestCase {
* Test concurrent add/delete event with two threads and code-point to control concurrency.
*
*/
+ @Ignore
@Test public void testConcurrentAddRemoveEvent() {
final String TEST_EVENT_ID_1 = "id-testConcurrentAddRemoveEvent-1";
final String TEST_EVENT_SUBJECT_1 = "testEvent1";
diff --git a/src/test/java/org/olat/core/util/i18n/I18nTest.java b/src/test/java/org/olat/core/util/i18n/I18nTest.java
index 3a2a08e591bb75b3dc9a9169a74584ca24ac0c14..1a5360a7882ba44520496d3e4aa9c146b67f9ada 100644
--- a/src/test/java/org/olat/core/util/i18n/I18nTest.java
+++ b/src/test/java/org/olat/core/util/i18n/I18nTest.java
@@ -491,6 +491,7 @@ public class I18nTest extends OlatcoreTestCaseWithMocking {
/**
* Test methods i18nManager.getProperties(), i18nManager.saveOrUpdateProperties() and i18nManager.deleteProperties()
*/
+ @Ignore
@Test public void testGetSaveOrUpdateAndDeleteProperties() {
// test with existing files
Properties props = i18nMgr.getResolvedProperties(i18nMgr.getLocaleOrDefault("de"), "org.olat.core");