Skip to content
Snippets Groups Projects
Commit 7487c01a authored by Joël Krähemann's avatar Joël Krähemann
Browse files

replace All_Elements_Course with All_Elements_Course_Without_External_Content

parent 547705aa
No related branches found
No related tags found
No related merge requests found
File added
...@@ -42,7 +42,7 @@ public class FunctionalHtmlUtil { ...@@ -42,7 +42,7 @@ public class FunctionalHtmlUtil {
String currentText = html.substring(offset, nextOffset); String currentText = html.substring(offset, nextOffset);
if(!currentText.matches("^[\\s]+$")){ if(!currentText.matches("^[\\s]+$")){
textBuffer.append(currentText); textBuffer.append(currentText.trim());
if(insertNewlines && !currentText.endsWith("\n")){ if(insertNewlines && !currentText.endsWith("\n")){
textBuffer.append('\n'); textBuffer.append('\n');
......
...@@ -198,7 +198,7 @@ public class FunctionalVOUtil { ...@@ -198,7 +198,7 @@ public class FunctionalVOUtil {
* Imports the "All Elements Course" via REST. * Imports the "All Elements Course" via REST.
*/ */
public CourseVO importAllElementsCourse(URL deploymentUrl) throws URISyntaxException, IOException{ public CourseVO importAllElementsCourse(URL deploymentUrl) throws URISyntaxException, IOException{
return(importCourse(deploymentUrl, "/org/olat/course/All_Elements_Course.zip", "All_Elements_Course.zip", "All Elements Course", "All Elements Course")); return(importCourse(deploymentUrl, "/org/olat/course/All_Elements_Course_Without_External_Content.zip", "All_Elements_Course_Without_External_Content.zip", "All Elements Course Without External Content", "All Elements Course Without External Content"));
} }
/** /**
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<configuration> <configuration>
<property name="workDir">target/arquillianDeployments</property> <property name="workDir">target/arquillianDeployments</property>
<property name="catalinaHome">target/arq-apache-tomcat-7.0.27</property> <property name="catalinaHome">target/arq-apache-tomcat-7.0.27</property>
<property name="javaVmArguments">-Xmx512m -XX:MaxPermSize=128m</property> <property name="javaVmArguments">-XX:MaxPermSize=256m -Xmx2048m -Xms512m -Djava.awt.headless=true</property>
<!-- debugging arguments for javaVm: -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y --> <!-- debugging arguments for javaVm: -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y -->
</configuration> </configuration>
</container> </container>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment