FishEye

- checkstyle configuration ... ... [X] clean up according to the checkstyle rules - smoke test passed: mvn clean package install

- checkstyle configuration ... [X] formatting step only - smoke test passed: mvn clean package install

OLAT-5941 added missing intermediate commit

OLAT-5941 o no more Chat switch in the list of CollabTools of groups with type=LearningGroup when instantMessaging.sync.learning.groups=false o sync groups (admin/IM) creates IM group for groups with type=LearningGroup when instantMessaging.sync.learning.groups=true and deletes IM group for groups with type=LearningGroup when instantMessaging.sync.learning.groups=false Have to try this out (sync) on NG after rebuild.

OLAT-5494: merge e-portfolio to HEAD

OLAT-5941 modified polling to slow down during user inactivity (mouse/keyboard) ... and several small corrections in IM

OLAT-5799: [merged from 630public branch] countConnectedUsers made more stable: catch RejectedExecutionException and issue a log.error, leaving the user count at the wrong figure for another 30 seconds. Avoids a RedScreen at DMZ/Login in case the Threadpool is full.

OLAT-5679: decouples synchrounous session count on IM server from login by an async call each 30s or upon request

config and startup refactoring to spring only

OLAT-4734: fix im sync error when using multiple-instance-mode

OLAT-3725: Set new owner(s) to one or more learning ressources in bulk process OLAT-3878: New role: administrator for learning ressourcen of home institution Merged both at same time due to dependencies

OLAT-3967: improvement for synchronisation between IM server and OLAT

do intermediatecommits more often

additional intermediatecommit added

log debug added

OLAT-3967: intermediate commits added

OLAT-3967: workaround added: catching exception and logging an error - does not represent a proper fix though!

OLAT-3803: filter external clients from user list

OLAT-3702: Short term fix to reduce overhead of courseChat system. In cluster mode users are no longer automatically logged into the course chat. They have to do this manually.

OLAT-3694: speed up list of all connected users by adding a cache

add intermediate commit when creating hundreds of new IM accounts

OLAT-3535: delete IM account on server when olat db is deleted (testing env.) before creating the same user account

OLAT-3535: fix nullpointer when no plugin is installed

OLAT-3535: more debug info

OLAT-3535: more debug info

OLAT-3535: make ready for multiple instances

remove sysouts

olat-3377: fix broken hasAccount if account was not yet present, add check for pluginversion on server, allow manual reconnection of admin user

OLAT-1796 Boilerplate: replaced "Copyright (c) 1999-200[0-9]" with "Copyright (c) since 2004"

olat-2878: no longer allow im connection task to access db

OLAT-2878: new IM junit tests

OLAT-3300: Fix clusterNOK by calling intermediateCommit in Module.init( ) methods instead of commit / sessionClose.

OLAT-2878: new IM junit tests

OLAT-2878: smaller IM api, testing ability without olat

OLAT-2878: smaller api, testing ability without olat

OLAT-2878: first version of new OLAT-Openfire communication service. The new version is based on the same protocol (XMPP) which is also used for the chat/groupchat stuff.

OLAT-3220: MERGED to HEAD: Change InstantMessaging to use one single jabber-server together with other OLAT-instances - allowing @ in usernames (needs to be configured) - see comments in build.properties / olat_config.xml

Clustering: Unify clustering tags o_cluster_ok and o_clusterok to o_clusterOK by:fj

merge with Branch 6.0

OLAT-3097: multiwindow chat for p2p chat and groupchat

OLAT-3097: sync access to method because each adding operation has it's own background thread which accesses the method concurrently

OLAT-2725 XHTML compliance: image tags, br's, wrong form labels etc

OLAT-2801: Only create buddy or learning groups on IM server if they contain participants

OLAT-2801: Only create buddy or learning groups on IM server if they contain participants

OLAT-2894: learning groups get synchronized with Instant Messaging server as well

OLAT-2840: remove unused config vars

MERGE BRANCH 5.2.x INTO HEAD (gs-part 5.2.3)

MERGE 5.2.x Branch (5.2.1-RC01 Tag) to HEAD

olat-2143: make sure all smack treads are closing on logout

OLAT-2428: removed flash based im stuff from head

olat-2278 now not in branch anymore, but spring-ified in HEAD. Work: - rename olatresourceableeventcenter to olatsystembus - extract interface and let spring implement by di - created singleVM and Cluster version of the olat system bus - organize imports work still in progress for the cluster version, the standard version is ok.

OLAT-2143: html chat, html chat for OLAT group mode

OLAT-2143: html chat; working protoype

OLAT-2143: html chat; working protoype

OLAT-2143: first draft of new html IM client, to test toggle implementation in SmackInstantMessagingImpl

OLAT-1796 update to apache 2.0 license boiler plate

OLAT-1463: upgrade to latest smack lib to solve login delay. Upgrade needed lots of code change due to new handling of constants (enum types)

OLAT-869 finally --- Tracing refactoring is finished. --- please read to the end. -!!!- sorry for changing the method signature of the logXYZ methods, but I think it enhances readability -- this may give you some errors now. -!!!- Code from the sysinfocontroller is now available to public from Tracing -!!!- log messages generated by classes which are not triggered by user request, e.g. Module inits, servlet inits, print out now long list of "n/a" This is not nice, but o.k. from my point of view. - only blabliblupTest classes have remaining references to log4j.Logger - unified use of logDebug(..) it is now always surrounded with an IF to check if we really should string-concatenate (expensive op) and log debug. - logError, logWarn, logInfo, logDebug... everything goes through Tracing now. - classes no longer need to instantiate a logger, logging is now done by one line call with the calling.class as parameter. - log messages are bound to the logging class -> log shows which class is logging and not always that Tracing class is logging. thx for reading :-)

OLAT-869 work in progress of replacing all log4j.Logger references

olat-1509

OLAT-1509 moved org.olat.util to org.olat.core.util

olat-1509 moved Identiy to org.olat.core.id and OLATResourceable to org.olat.core.id

OLAT-1509 -move org.olat.gui -> org.olat.core.gui (except the portal which has some class references in xml stream) -adapted xx_config.xml files where some org.olat.gui.render.VelocityRender references were

header cleanup, license stuff has to be on top above package otherwise its included in javadoc every time!

olat-810: and format code

always supply windowcontrol to all controllers (various reasons: error tracing, extensions, preferences keys, ...)

OLAT-772: show online user list in sortable table. not yet fully finished

performance enhancements

OLAT-810: fix for bug

OLAT-624: fixed, groups get now renamed as well on the IM server.

- username must be lowercase since IM can only handle lowercase usernames.. - all necessary method calls that use the identity.name use now the lowercase name - btw: olat can handle only lowercase usernames corretly anyway, all db queries with find are not case sensitive!!

- changed from boolean modes to generic modes in conference toom controller configuration - mode mini (existed as boolean flag) - mode maxi (existed as boolean flag) - mode toolbox - course chat uses not new toolbox mode to generate the link - starting coursechat does now correctly start a new chat when chat not opened, else it just opens the chat in the existing window. http://bugzilla.olat.org/show_bug.cgi?id=1179

toggling offliners in 2 different translations, not yet finished version of toggling groups

formatting

fix: make shure every user that gets added to a buddygroup and syncd with IM server has an account on the IM server. Otherwise the users do not show up in the roster group

small changes

fixed possible concurrent access problems to clients map

initial message gets now passed to flash when anwsering chat

no longer -1 at connected user list, logged in user is couted as well

as jive only adds users to a group that already exist we have to make shure they are added.

cleaning up TODO's , adding more erro logging, comments

removing warnings clieaning up

fixed possible nullPointer ex. when message object is null

string from oresHelper not suitable for jabber server, replaced by own method

adding conferencing as collaboration tool http://bugzilla.olat.org/show_bug.cgi?id=1203

inial version of startup sync for buddygrops, not yet working, still NULL pointer

inial version of startup sync for buddygrops

fixed connected users should not be -1

corrected merging problems

removed event stuff

Collab enable/disable if in assessment

refractoring of instant messaging

synchonizing of buddygroups added to Interface implementation. Interface for buddygroup sync works for the case of adding users to a roster group. Synchronisation at startup does not yet work. jive messenger bug was fixed, ressources now get initial presence when serveral resources are connected simultanly

Disable IM in test mode.

*** empty log message ***

refractoring of chatRoom stuff

refractoring of conference room stuff

refractoring of instant messaging: by chanching the server to "idmels3test" and setting the classname for the AccountCreation right, the new IM accouts get now successful created by olat

refractoring of instant messaging, new wrapper class for IMClient (solves interator velocity issue)

introduce olatimmodule with dynamic loading of im adapter (yet in olat.instantMessaging package)

refractoring of instant messaging

refractoring of instant messaging

refractoring of instant messaging, new methods in interface InstantMessaging, additional comments

refractoring of instant messaging, new methodes in interface InstantMessaging

refractoring of instant messaging, new interfaces for IM-API

refractoring of instant messaging, new interfaces for IM-API

OLAT-1557: merge HEAD into branch-1557

OLAT-1589: Login name mapper. Used for IM name mapping and allows arbitrary OLAT login name, because they will be mapped for IM usage. The default name mapping should not change the current OLAT behaviour (IMName = OLATLoginName.toLowerCase())

OLAT-1233: Merge HEAD into Branch

OLAT-1233: Merge HEAD into Branch

merged head (with ajax, header cleanup)

merge HEAD into BRANCH-1530

merges from HEAD

MERGE HEAD TO BRANCH 5.0.x prepare for 5.0.1

OLAT-2735: Escape "&" in course title for chat

OLAT-2683: No more warnings when a user had several sessions in OLAT and runned in the timout for auto logout

OLAT-1796 Boilerplate: replaced "Copyright (c) 1999-200[0-9]" with "Copyright (c) since 2004"

OLAT-3220: Change InstantMessaging to use one single jabber-server together with other OLAT-instances - allowing @ in usernames (needs to be configured) - see comments in build.properties / olat_config.xml

OLAT-3182: improvements in groupchatManager handling

OLAT-3097: multiwindow chat for p2p chat and groupchat

OLAT-3878

OLAT-5799: countConnectedUsers made more stable: catch RejectedExecutionException and issue a log.error, leaving the user count at the wrong figure for another 30 seconds. Avoids a RedScreen at DMZ/Login in case the Threadpool is full.

OLAT-5679: merge back to 6.3.x branch

head merged

http://bugs.olat.org/jira/browse/OLAT-1595 OLAT-1595: Merge HEAD into BRANCH (work in progress)

OLAT-2434 Merging HEAD to CF branch, adding database migration script. There are some classes I had to patch in the core to make this branch work, I will commit them directly to HEAD when merging the branch back to HEAD, so this branch will not compile out of the box.

OLAT-2434 BPS-CF update branch to current HEAD development after fixing power search method and ajax user search

OLAT-2434 BPS-CF update branch to current HEAD development after user delete state refactoring

OLAT-2434 BPS-CF update old branch to current head development. has some errors in test classes

OLAT-3766 cpeditor: changes after review including test cases

OLAT-3766 Merge from HEAD to IMS CP editor branch

OLAT-3946 update from HEAD

OLAT-3946 podcast: merge from head and some other changes

OLAT-5494: merge olat3 HEAD to Portfolio Branch

OLAT-5494: invitation without the standard home / group / repository sites but it's own specialized home (OLAT need 1 static static site at least)

OLAT-5494: merge HEAD to epf-branch

OLAT-5494: merge head to epf-branch: olat3

Synchronyzing 1577 branch (glossary, scorm assessable, repo can reference) with HEAD

Merging HEAD to branch

MERGE HEAD TO BRANCH 1508

OLAT-2385 - forth time merge MAIN HEAD with the OLAT-HEAD-UZH-2385 BRANCH (common base version is Temp_lavinia_1, merged with Temp_lavinia_2, where Temp_lavinia_2 is the latest tag on MAIN HEAD)

OLAT-2385 - third time merge MAIN HEAD with the OLAT-HEAD-UZH-2385 BRANCH (common base version is Temp_lavinia_2, merged with Temp_lavinia_1, where Temp_lavinia_1 is the latest tag on MAIN HEAD)

merge 5.2.1 from HEAD to 2433 tested locally

olat-2433

OLAT-2725 merges from head, adjusting portal changes edit mode

OLAT-3674: merge head to branch, befor final commit

OLAT-3674: merge head to branch

OLAT-3674: merge head to branch

OLAT-3674: merge head to branch

merge Head to branch, part1

merge Head to Branch

renaming of Manger to BasesecurityManager