From 62ee6ac597dc3e0576475f8a5eeebe66b59552f7 Mon Sep 17 00:00:00 2001
From: rhaag <none@none>
Date: Wed, 16 Mar 2011 16:26:27 +0100
Subject: [PATCH] project setup
---
olat3/.classpath | 1 -
olat3/.project | 21 +-
olat3/olat.local.properties | 121 +++++----
olat3_i18n/.classpath | 2 +-
olatcore/.classpath | 230 +++++++++---------
olatcore/.settings/org.eclipse.jdt.core.prefs | 15 +-
olatcore_i18n/.classpath | 2 +-
7 files changed, 227 insertions(+), 165 deletions(-)
diff --git a/olat3/.classpath b/olat3/.classpath
index 2267a26f3de..8fe662d0f97 100644
--- a/olat3/.classpath
+++ b/olat3/.classpath
@@ -131,7 +131,6 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry combineaccessrules="false" kind="src" path="/olatcore"/>
<classpathentry kind="src" output="olat/target/test-classes" path="webapp/WEB-INF/test/java"/>
<classpathentry kind="var" path="M2_REPO/org/apache/axis2/axis2/1.4.1/axis2-1.4.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/axiom/axiom-api/1.2.8/axiom-api-1.2.8.jar"/>
diff --git a/olat3/.project b/olat3/.project
index 1cb487aad55..4a9220ae433 100644
--- a/olat3/.project
+++ b/olat3/.project
@@ -3,7 +3,6 @@
<name>olat3</name>
<comment>Online Learning and Training Learning Management System</comment>
<projects>
- <project>olatcore</project>
</projects>
<buildSpec>
<buildCommand>
@@ -23,12 +22,28 @@
<link>
<name>corejava</name>
<type>2</type>
- <location>/home/matthai/workspace/olatcore/src/main/java</location>
+ <locationURI>LOC_MERCURIAL_BASE/olatcore/src/main/java</locationURI>
</link>
<link>
<name>coreresources</name>
<type>2</type>
- <location>/home/matthai/workspace/olatcore/src/main/resources</location>
+ <locationURI>LOC_MERCURIAL_BASE/olatcore/src/main/resources</locationURI>
+ </link>
+ <link>
+ <name>static</name>
+ <type>2</type>
+ <locationURI>LOC_MERCURIAL_BASE/olat3/webapp/static</locationURI>
+ </link>
+ <link>
+ <name>webapp/WEB-INF/src/olat.local.properties</name>
+ <type>1</type>
+ <locationURI>LOC_MERCURIAL_BASE/olat3/olat.local.properties</locationURI>
</link>
</linkedResources>
+ <variableList>
+ <variable>
+ <name>LOC_MERCURIAL_BASE</name>
+ <value>file:/Users/rhaag/workspace/OLAT-7.1.x/</value>
+ </variable>
+ </variableList>
</projectDescription>
diff --git a/olat3/olat.local.properties b/olat3/olat.local.properties
index 0bcbc0f95c2..3bd43db4af8 100644
--- a/olat3/olat.local.properties
+++ b/olat3/olat.local.properties
@@ -1,28 +1,4 @@
-
-################################################
-#
-# OLAT is configured by the placholder replacement mechanism from Spring Framework
-# Spring searches for two files:
-# -- serviceconfig/olat.properties and
-# -- classpath: olat.local.properties
-# The entries in the second file overwrite the default entries in the first file
-#
-# To overwrite the defaults create an empty olat.local.propeties file and place it
-# in /tomcat/lib (part of the classpath) or in the root of your olat classpath e.g. webapp/WEB-INF/classes
-# See olat admin panel (setup entry) for your running configuration
-# When you start OLAT with an empty olat.local.properties file for development reasons your userdata will be written to
-# java.io.tmpdir which is platform dependet (linux: /tmp). You can overwrite this location with a VM parameter -Djava.io.tmpdir=/home/user/data
-# to have userdata on a more convenient place.
-#
-# To ease the developer setup and in order to be able to run multiple olat-setups with a single tomcat, you can use a symlink like this:
-# ln -s <project.home>/olat.local.properties <project.home>/webapp/WEB-INF/src/olat.local.properties
-# So you can edit all your project specific settings right in the base folder of your olat3-project in the file olat.local.properties. The resource will
-# be copied to WEB-INF/classes by eclipse when you edit it within eclipse.
-#
-################################################
-
-
##########
#
# when you start OLAT with an empty olat.local.properties file it will start with an embedded hsqldb and
@@ -30,24 +6,87 @@
#
##########
+tomcat.id=2
+node.id=2
+generate.index.at.startup=false
+build.identifier=uzh71-devLocal
-##########
-#
-# samle config properties for mysql database and a custom userdata location set
-# (uncomment the properties if you like to use them)
-##########
+guidemo.enabled=true
+
+# runtime application data directory
+userdata.dir=/Users/rhaag/olatdata/uzh_71
+# name of the repository root
+folder.root=${userdata.dir}/bcroot
+# temporary workspace for the running application
+temp.dir=${userdata.dir}/tmp
+
+
+########################################################################
+# SMTP (mail) settings
+########################################################################
+
+# mail support can be disabled by leaving the following entry blank or
+# setting it to the keyword 'disabled' (without quotes!)
+smtp.host=speedy.frentix.com
+# if required by your local SMTP you may need to provide credentials
+smtp.user=
+smtp.pwd=
+fromemail=admin@frentix.com
+# set this email to a webmaster or admin mail address in your domain
+adminemail=roman.haag@frentix.com
+# set this email to a support mail address in your domain
+supportemail=roman.haag@frentix.com
+
+########################################################################
+# OLAT identity settings
+########################################################################
+
+# OLAT instance ID (effects a unqiue namesapce for addressable items)
+# ID should be no longer than 10 characters! This needs to be unique
+# amongst nodes within a cluster, if you are not clustering then you
+# can leave this value as is.
+instance.id=rholat
+
+########################################################################
+# Database settings
+########################################################################
+
+# supported vendors currently include "mysql" and "postgresql"
+db.vendor=mysql
+db.hibernate.ddl.auto=validate
+#db.hibernate.ddl.auto=update
+auto.upgrade.database=false
+
+# the name of the application database
+db.name=uzh71
+# the name of the OLAT database user
+db.user=uzh71
+# the password of the OLAT database user
+db.pass=uzh71
+# JDBC options (e.g., to set character channel behaviour etc.)
+db.jdbc.options=useUnicode=true&characterEncoding=UTF-8
+
+
+# only set this if you do not want unit tests to be performed during the build
+skip.unit.tests=true
+# set to false if you do not require special fonts
+unpack.fonts=false
+# for developers set to true - velocity pages are NOT cached
+olatcore.debug=true
+# for developers set to false - i18n files are not cached
+localization.cache=false
+user.generateTestUsers=false
+# When running in eclipse use "INFO, syslog, A1", for production use "INFO, syslog"
+log.rootCategory = INFO, syslog, A1
+# how to load the brasato "framework" - usually "jar" suffices but
+# for developers project sources are also possible e.g.,
+# e.g. C:/eclipse/workspace/olatcore/src/main/java/
+# or /home/myuser/workspaces/olatcore/src/main/java
+olatcore.src=/Users/rhaag/workspace/OLAT-7.1.x/olatcore/src/main/java
+# relative path to
+relpathto.src=../../../webapp/WEB-INF/src
-#db.name=olat
-#db.user=root
-#db.pass=****
-#db.vendor=mysql
-#db.database.dialect=org.hibernate.dialect.MySQL5Dialect
-#db.hibernate.ddl.auto=validate
+# if enabled then the IM Server must be running before OLAT is started!
+instantMessaging.enable=false
-#userdata.dir=/opt/olatdata
-#archive.dir=${userdata.dir}/archive
-#log.dir=${userdata.dir}/logs
-#upgrade.dir=${userdata.dir}/upgrades
-#folder.root=${userdata.dir}/bcroot
-#temp.dir=${userdata.dir}/tmp
\ No newline at end of file
diff --git a/olat3_i18n/.classpath b/olat3_i18n/.classpath
index ebab7d51f0c..f624b1bd04d 100644
--- a/olat3_i18n/.classpath
+++ b/olat3_i18n/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/olatcore/.classpath b/olatcore/.classpath
index e148fbc0e48..57b6860afc9 100644
--- a/olatcore/.classpath
+++ b/olatcore/.classpath
@@ -1,117 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4.3/mail-1.4.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/owaspantisamy/antisamy/1.3/antisamy-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm/3.1/asm-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/axiom/axiom-api/1.2.8/axiom-api-1.2.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/axiom/axiom-impl/1.2.8/axiom-impl-1.2.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/axis2/axis2/1.4.1/axis2-1.4.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.0/backport-util-concurrent-3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/batik/batik-css/1.6/batik-css-1.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/batik/batik-util/1.6/batik-util-1.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/c3p0/c3p0/0.9.1.2/c3p0-0.9.1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/codepoints/codepoints/1.0.3/codepoints-1.0.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0/commons-logging-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/cos/cos/05Nov2002/cos-05Nov2002.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.3.0/ehcache-1.3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/pdfbox/fontbox/1.4.0/fontbox-1.4.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/grizzly/grizzly-framework/1.9.8/grizzly-framework-1.9.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/grizzly/grizzly-http/1.9.8/grizzly-http-1.9.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/grizzly/grizzly-http-servlet/1.9.8/grizzly-http-servlet-1.9.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/grizzly/grizzly-portunif/1.9.8/grizzly-portunif-1.9.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/grizzly/grizzly-rcm/1.9.8/grizzly-rcm-1.9.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/grizzly/grizzly-servlet-webserver/1.9.8/grizzly-servlet-webserver-1.9.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/grizzly/grizzly-utils/1.9.8/grizzly-utils-1.9.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-c3p0/3.3.2.GA/hibernate-c3p0-3.3.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.2.GA/hibernate-core-3.3.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-jbosscache2/3.3.2.GA/hibernate-jbosscache2-3.3.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-jmx/3.3.2.GA/hibernate-jmx-3.3.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/2.0.0-rc8/hsqldb-2.0.0-rc8.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-core-asl/1.5.1/jackson-core-asl-1.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-jaxrs/1.5.1/jackson-jaxrs-1.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-mapper-asl/1.5.1/jackson-mapper-asl-1.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-xc/1.5.1/jackson-xc-1.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/de/java2html/java2html/5.0/java2html-5.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.12/jaxb-impl-2.1.12.jar"/>
- <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jazzlib/jazzlib/0.0.6/jazzlib-0.0.6-patched.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cache/jbosscache-core/3.1.0.GA/jbosscache-core-3.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/pdfbox/jempbox/1.4.0/jempbox-1.4.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-client/1.1.5.1/jersey-client-1.1.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-core/1.1.5.1/jersey-core-1.1.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-json/1.1.5.1/jersey-json-1.1.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/jersey/contribs/jersey-multipart/1.1.5.1/jersey-multipart-1.1.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-server/1.1.5.1/jersey-server-1.1.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/jersey/contribs/jersey-spring/1.1.5.1/jersey-spring-1.1.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-test-framework/1.1.5.1/jersey-test-framework-1.1.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/codehaus/jettison/jettison/1.1/jettison-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/neemsoft/jmep/unknown/jmep-unknown-patched.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/json/json/20080701/json-20080701.jar"/>
- <classpathentry kind="var" path="M2_REPO/net/sf/jsr107cache/jsr107cache/1.0/jsr107cache-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.5/junit-4.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/3.0.2/lucene-core-3.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jvnet/mimepull/1.4/mimepull-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mockito/mockito-all/1.8.1/mockito-all-1.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/tomcat/naming-resources/5.5.15/naming-resources-5.5.15.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/neethi/neethi/2.0.4/neethi-2.0.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.11/nekohtml-1.9.11.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/olat/testutils/olat-codepoints-full/olat-codepoints-full.jar/olat-codepoints-full-olat-codepoints-full.jar.jar"/>
- <classpathentry kind="var" path="M2_REPO/olat-extension-springtest/olat-extension-springtest/1.1/olat-extension-springtest-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/poi/ooxml-schemas/1.0/ooxml-schemas-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/oro/oro/2.0.8/oro-2.0.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/pdfbox/pdfbox/1.4.0/pdfbox-1.4.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi/3.5-FINAL/poi-3.5-FINAL.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi-ooxml/3.5-FINAL/poi-ooxml-3.5-FINAL.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi-scratchpad/3.5-FINAL/poi-scratchpad-3.5-FINAL.jar"/>
- <classpathentry kind="var" path="M2_REPO/quartz/quartz/1.5.2/quartz-1.5.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/radeox/radeox/1.0-b2/radeox-1.0-b2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/w3c/css/sac/1.3/sac-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/3.0.0.RELEASE/spring-aop-3.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-asm/3.0.0.RELEASE/spring-asm-3.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.0.0.RELEASE/spring-beans-3.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/3.0.0.RELEASE/spring-context-3.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context-support/3.0.0.RELEASE/spring-context-support-3.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.0.0.RELEASE/spring-core-3.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/3.0.0.RELEASE/spring-expression-3.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/3.0.0.RELEASE/spring-jdbc-3.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-orm/3.0.0.RELEASE/spring-orm-3.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-test/3.0.0.RELEASE/spring-test-3.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-tx/3.0.0.RELEASE/spring-tx-3.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/3.0.0.RELEASE/spring-web-3.0.0.RELEASE.jar"/>
- <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/velocity/velocity/1.6.2/velocity-1.6.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/woden/woden-api/1.0M8/woden-api-1.0M8.jar"/>
- <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.4/wstx-asl-3.2.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/xmlbeans/xmlbeans/2.3.0/xmlbeans-2.3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/schema/XmlSchema/1.4.2/XmlSchema-1.4.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4.3/mail-1.4.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/owaspantisamy/antisamy/1.3/antisamy-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/3.1/asm-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/axiom/axiom-api/1.2.8/axiom-api-1.2.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/axiom/axiom-impl/1.2.8/axiom-impl-1.2.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/axis2/axis2/1.4.1/axis2-1.4.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.0/backport-util-concurrent-3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/batik/batik-css/1.6/batik-css-1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/batik/batik-util/1.6/batik-util-1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/c3p0/c3p0/0.9.1.2/c3p0-0.9.1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/codepoints/codepoints/1.0.3/codepoints-1.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0/commons-logging-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cos/cos/05Nov2002/cos-05Nov2002.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.3.0/ehcache-1.3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/pdfbox/fontbox/1.4.0/fontbox-1.4.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/grizzly/grizzly-framework/1.9.8/grizzly-framework-1.9.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/grizzly/grizzly-http/1.9.8/grizzly-http-1.9.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/grizzly/grizzly-http-servlet/1.9.8/grizzly-http-servlet-1.9.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/grizzly/grizzly-portunif/1.9.8/grizzly-portunif-1.9.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/grizzly/grizzly-rcm/1.9.8/grizzly-rcm-1.9.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/grizzly/grizzly-servlet-webserver/1.9.8/grizzly-servlet-webserver-1.9.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/grizzly/grizzly-utils/1.9.8/grizzly-utils-1.9.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-c3p0/3.3.2.GA/hibernate-c3p0-3.3.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.2.GA/hibernate-core-3.3.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-jbosscache2/3.3.2.GA/hibernate-jbosscache2-3.3.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-jmx/3.3.2.GA/hibernate-jmx-3.3.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/2.0.0-rc8/hsqldb-2.0.0-rc8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-core-asl/1.5.1/jackson-core-asl-1.5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-jaxrs/1.5.1/jackson-jaxrs-1.5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-mapper-asl/1.5.1/jackson-mapper-asl-1.5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-xc/1.5.1/jackson-xc-1.5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/de/java2html/java2html/5.0/java2html-5.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.12/jaxb-impl-2.1.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1.1/jaxen-1.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jazzlib/jazzlib/0.0.6/jazzlib-0.0.6-patched.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.10.GA/jboss-common-core-2.2.10.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/cache/jbosscache-core/3.1.0.GA/jbosscache-core-3.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/pdfbox/jempbox/1.4.0/jempbox-1.4.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-client/1.1.5.1/jersey-client-1.1.5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-core/1.1.5.1/jersey-core-1.1.5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-json/1.1.5.1/jersey-json-1.1.5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/jersey/contribs/jersey-multipart/1.1.5.1/jersey-multipart-1.1.5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-server/1.1.5.1/jersey-server-1.1.5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/jersey/contribs/jersey-spring/1.1.5.1/jersey-spring-1.1.5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-test-framework/1.1.5.1/jersey-test-framework-1.1.5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/codehaus/jettison/jettison/1.1/jettison-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/neemsoft/jmep/unknown/jmep-unknown-patched.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/json/json/20080701/json-20080701.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/jsr107cache/jsr107cache/1.0/jsr107cache-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.5/junit-4.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/3.0.2/lucene-core-3.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jvnet/mimepull/1.4/mimepull-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mockito/mockito-all/1.8.1/mockito-all-1.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/tomcat/naming-resources/5.5.15/naming-resources-5.5.15.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/neethi/neethi/2.0.4/neethi-2.0.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.11/nekohtml-1.9.11.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/olat/testutils/olat-codepoints-full/olat-codepoints-full.jar/olat-codepoints-full-olat-codepoints-full.jar.jar"/>
+ <classpathentry kind="var" path="M2_REPO/olat-extension-springtest/olat-extension-springtest/1.1/olat-extension-springtest-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/poi/ooxml-schemas/1.0/ooxml-schemas-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/oro/oro/2.0.8/oro-2.0.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/pdfbox/pdfbox/1.4.0/pdfbox-1.4.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi/3.5-FINAL/poi-3.5-FINAL.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi-ooxml/3.5-FINAL/poi-ooxml-3.5-FINAL.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi-scratchpad/3.5-FINAL/poi-scratchpad-3.5-FINAL.jar"/>
+ <classpathentry kind="var" path="M2_REPO/quartz/quartz/1.5.2/quartz-1.5.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/radeox/radeox/1.0-b2/radeox-1.0-b2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/w3c/css/sac/1.3/sac-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/3.0.0.RELEASE/spring-aop-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-asm/3.0.0.RELEASE/spring-asm-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.0.0.RELEASE/spring-beans-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/3.0.0.RELEASE/spring-context-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context-support/3.0.0.RELEASE/spring-context-support-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.0.0.RELEASE/spring-core-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/3.0.0.RELEASE/spring-expression-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/3.0.0.RELEASE/spring-jdbc-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-orm/3.0.0.RELEASE/spring-orm-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-test/3.0.0.RELEASE/spring-test-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-tx/3.0.0.RELEASE/spring-tx-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/3.0.0.RELEASE/spring-web-3.0.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/velocity/velocity/1.6.2/velocity-1.6.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/woden/woden-api/1.0M8/woden-api-1.0M8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.4/wstx-asl-3.2.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/xmlbeans/xmlbeans/2.3.0/xmlbeans-2.3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ws/commons/schema/XmlSchema/1.4.2/XmlSchema-1.4.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3.1/xstream-1.3.1.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/olatcore/.settings/org.eclipse.jdt.core.prefs b/olatcore/.settings/org.eclipse.jdt.core.prefs
index c4ce14f5d1a..759bd78d949 100644
--- a/olatcore/.settings/org.eclipse.jdt.core.prefs
+++ b/olatcore/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,15 @@
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+#Wed Mar 16 14:47:59 CET 2011
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/olatcore_i18n/.classpath b/olatcore_i18n/.classpath
index ebab7d51f0c..f624b1bd04d 100644
--- a/olatcore_i18n/.classpath
+++ b/olatcore_i18n/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
--
GitLab