FishEye: history OLAT/olat3/webapp/WEB-INF/src/org/olat/instantMessaging/InstantMessagingModule.java

Revision	Date	Message	Lines	Author	Branch
1.96	11 Feb 11	- checkstyle configuration ... ... [X] clean up according to the checkstyle rules - smoke test passed: mvn clean package install	+23 -16	Patrick Brunner	MAIN
1.95	11 Feb 11	- checkstyle configuration ... [X] formatting step only - smoke test passed: mvn clean package install	+57 -68	Patrick Brunner	MAIN
1.94	01 Jan 11	OLAT-5859: New impl. for deployement of demo courses on startup	+29 -17	schnider	MAIN
1.93	28 Dec 10	OLAT-6095: closing database connection when processing framework started event with database access	+46 -16	schnider	MAIN
1.92	26 Oct 10	OLAT-5928 fix wrongly triggered im-sync	+6 -5	rhaag	MAIN
1.91	01 Jul 10	OLAT-5531: System event when framework is started, improved version	+2 -2	schnider	MAIN
1.90	25 Jun 10	OLAT-5531: System event when framework is started	-1	schnider	MAIN
1.89	25 Jun 10	OLAT-5531: System event when framework is started	+29 -8	schnider	MAIN
1.88	25 Jun 10	clean up	-1	schnider	MAIN
1.87	17 Mar 10	unified interfaces for init and destroy methods. New interfaces are called initializable and destroyable and replace the OlatModule and ServiceLifecycle interfaces. Config of Spring context or annotation for init or destroy gets automatically checked by jUnit test.	+3 -2	schnider	MAIN
1.86	16 Mar 10	removed references to olat_config.xml	+2 -5	schnider	MAIN
1.85	15 Mar 10	config and startup refactoring to spring only	+40 -24	schnider	MAIN
1.84	05 Nov 09	Mazenization of HEAD olat3 and related submodules	+2 -2	amoran	MAIN
1.83	07 May 09	MERGE BRANCH 6.1.1-RC06 TO HEAD	+1 -1	guretzki	MAIN
1.82	10 Sep 08	OLAT-3466: changes for running service on only one node in a cluster	+17 -89	schnider	MAIN
1.81	02 Sep 08	olat-3377: fix broken hasAccount if account was not yet present, add check for pluginversion on server, allow manual reconnection of admin user	+2 -2	schnider	MAIN
1.80	01 Sep 08	OLAT-3422 Refactoring of guest user create process - lazy on demand and no more need to specify guest user attributes in olat_config.xml. Adding i18n jUnit tests	+2	gnaegi	MAIN
1.79	28 Aug 08	organise imports	-6	schnider	MAIN
1.78	25 Aug 08	OLAT-1796 Boilerplate: replaced "Copyright (c) 1999-200[0-9]" with "Copyright (c) since 2004"	+1 -1	Alexander Schneider	MAIN
1.77	25 Aug 08	olat-2878: no longer allow im connection task to access db	-11	schnider	MAIN
1.76	21 Aug 08	OLAT-2878: clean up olat IM stuff	+19 -17	schnider	MAIN
1.75	14 Aug 08	OLAT-3300: Fix clusterNOK by calling intermediateCommit in Module.init( ) methods instead of commit / sessionClose.	+1 -3	guretzki	MAIN
1.74	14 Aug 08	OLAT-2878: new IM junit tests	+6 -101	schnider	MAIN
1.73	12 Aug 08	OLAT-2878: smaller api, testing ability without olat	+31 -115	schnider	MAIN
1.72	04 Aug 08	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.	+35 -10	schnider	MAIN
1.71	22 Jul 08	OLAT-3330: temporary fix	+3 -7	schnider	MAIN
1.70	22 Jul 08	OLAT-3330: DB: Fix Nightly problem : Do not call commit in closeSession, add AssertException for un-committed db-session, fix AssertException by adding db.commit( ), db.closeSession( )	+3	guretzki	MAIN
1.69	27 Jun 08	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	+35	rhaag	MAIN
1.68	05 May 08	OLAT-3095: made synching with IM server in enrolment asynchronous and synching dependent of config settings in olat_config.xml	+7 -3	schnider	MAIN
1.67	23 Apr 08	OLAT-2725 XHTML compliance: image tags, br's, wrong form labels etc	+9 -9	gnaegi	MAIN
1.66	02 Apr 08	OLAT-2293: quartz scheduler integration now spring based - easier to use	+15 -29	schnider	MAIN
1.65	14 Feb 08	OLAT-2894: learning groups get synchronized with Instant Messaging server as well	+11 -24	schnider	MAIN
1.64	11 Feb 08	OLAT-2840: reenabled chat out of list with connected users as framework is now ready to handle polling events in second window	+12 -36	schnider	MAIN
1.63	21 Nov 07	MERGE BRANCH 5.2.x INTO HEAD (cg-part 5.2.3)	+25	guretzki	MAIN
1.62	07 Sep 07	MERGE 5.2.x Branch (5.2.1-RC01 Tag) to HEAD	+8 -3	Patrick Brunner	MAIN
1.61	28 Aug 07	olat-2433: as preparation for later merging: first merge branch 5_2_x to HEAD	+63 -1	fjost	MAIN
1.60	19 Jul 07	OLAT-2376:Archive group runtime data, delete lifecycle-entries after deleting resource, refactor UserManger-deletion code to UserDeletionManager.	+2 -3	guretzki	MAIN
1.59	28 Jun 07	olat-2143	+1 -1	schnider	MAIN
1.58	20 Jun 07	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.	+5 -5	fjost	MAIN
1.57	24 May 07	OLAT-2315:Work in progress, delete IM account when deleting a user.	+12 -1	guretzki	MAIN
1.56	10 May 07	OLAT-2143: first draft of new html IM client, to test toggle implementation in SmackInstantMessagingImpl	+3 -3	schnider	MAIN
1.55	23 Apr 07	clean up	-1	schnider	MAIN
1.54	19 Apr 07	OLAT-909: Extract DB interface, change to new hibernate query parser.	+4 -3	guretzki	MAIN
1.53	29 Sep 06	OLAT-1796 update to apache 2.0 license boiler plate	+20 -12	Patrick Brunner	MAIN
1.52	02 Aug 06	OLAT-860 adding manual synchronizing of buddy groups to instant messaging server	+34 -20	gnaegi	MAIN
1.51	21 Jun 06	olat-1509 moved org.olat.persistence to org.olat.core.commons.persistence	+1 -1	fjost	MAIN
1.50	20 Jun 06	OLAT-1509 refactoring: - moving org.olat.core.configuration.ConfigurationManager out of core to org.olat.configuration.ConfigurationManager - ConfigurationManager implements the new introduced ModuleLifeCycle... still some further refactoring needed to remove calls to OLATContext from inside ConfigurationManager! - the ConfigurationManager gets injected by spring - the instant messaging show how the "singleton" is fetched using the CoreSpringFactory.getBean(..) mehtod in contrast to the getInstance(..) variant. - OlatTestCase must be adpated not to use getInstance(..) and ConfigurationManager should then no longer provide access by means of getInstance(..) Alltogether this removes some more dependencies from the core to the outer webapp (OLAT)	+5 -2	Patrick Brunner	MAIN
1.49	15 May 06	OLAT-1463: updated smack IM lib	+53 -34	schnider	MAIN
1.48	10 May 06	olat-1509 moved imprefs to pkg o.o.instantMessaging	-1	fjost	MAIN
1.47	09 May 06	OLAT-1509 moved org.olat.util to org.olat.core.util	+1 -1	fjost	MAIN
1.46	09 May 06	olat-1509 moved Identiy to org.olat.core.id and OLATResourceable to org.olat.core.id	+1 -1	fjost	MAIN
1.45	08 May 06	OLAT-1509	+2 -2	Patrick Brunner	MAIN
1.44	08 May 06	OLAT-1509	+4 -4	Patrick Brunner	MAIN
1.43	05 Apr 06	header cleanup, license stuff has to be on top above package otherwise its included in javadoc every time!	+15 -11	schnider	MAIN
1.42	20 Dec 05	OLAT-1287: added new param to config flash client back ground color in olat_config.xml	+21 -4	schnider	MAIN
1.41	09 Aug 05	OLAT-854: jabber config applied to connected user list	+11 -1	schnider	MAIN
1.40	25 Jul 05	OLAT-901: fixes file not found in context other than olat and should make 'IM' flash client working easier in different environements.	+21 -7	schnider	MAIN
1.39	12 Apr 05	fix for Bug: 1456 und enhancement, dass user im status "nicht verfügbar" gar nicht mehr auf der liste erscheinen.	+2 -4	schnider	MAIN
1.38	08 Mar 05	formatting	+114 -117	fjost	MAIN
1.37	23 Feb 05	new AssertException when server enabled but server not running.	+40 -13	schnider	MAIN
1.36	14 Feb 05	comments	+3 -3	schnider	MAIN
1.35	09 Feb 05	implementing configuratino properties	+7 -10	gnaegi	MAIN
1.34	09 Feb 05	sync is false now	+3 -3	schnider	MAIN
1.33	07 Feb 05	cleaning up TODO's , adding more erro logging, comments	+5 -5	schnider	MAIN
1.32	07 Feb 05	handing null pointer until the methods are implemented	+13 -11	schnider	MAIN
1.31	07 Feb 05	instant messaging module need property to save to DB. Property manager extended for generic case of saving and retreaving a property from the DB	+13 -2	schnider	MAIN
1.30	03 Feb 05	string from oresHelper not suitable for jabber server, replaced by own method	+8 -8	schnider	MAIN
1.29	02 Feb 05	inial version of startup sync for buddygrops, not yet working, still NULL pointer	+12 -8	schnider	MAIN
1.28	02 Feb 05	inial version of startup sync for buddygrops	+20 -5	schnider	MAIN
1.27	02 Feb 05	cleaned up	+2 -5	schnider	MAIN
1.26	01 Feb 05	removed event stuff	+8 -5	schnider	MAIN
1.25	01 Feb 05	Collab enable/disable if in assessment	+2 -7	mike	MAIN
1.24	31 Jan 05	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	+101 -94	schnider	MAIN
1.23	26 Jan 05	refractoring of chatRoom stuff	+3 -3	schnider	MAIN
1.22	25 Jan 05	refractoring of instant messaging: Get rid of unnecessary config stuff in build.properties (please adjust to properties.default), auto disable of chat if entering course test.	+6 -61	schnider	MAIN
1.21	25 Jan 05	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	+20 -6	schnider	MAIN
1.20	24 Jan 05	refractoring of instant messaging	+7 -7	schnider	MAIN
1.19	20 Jan 05	refractoring of instant messaging, new wrapper class for IMClient (solves interator velocity issue)	+20 -3	schnider	MAIN
1.18	17 Jan 05	refractoring of account creation api	+28 -2	schnider	MAIN
1.17	17 Dec 04	additional comments	+6 -4	schnider	MAIN
1.16	16 Dec 04	cleaning up and flash stuff debuged: presence now works again, starting with jid chanches to chat clientmodus	+6 -3	schnider	MAIN
1.15	07 Dec 04	anwering in broswer to message works now as supposed	+3 -3	schnider	MAIN
1.14	06 Dec 04	creation of additional testusers undone because of error	+2 -26	schnider	MAIN
1.13	06 Dec 04	minor chanches and new testusers, that do not conflict with other testusers	+26 -2	schnider	MAIN
1.12	02 Dec 04	instant messaging integreated in header, can be desabled by build.properties setting instantmessaging.enable=false	+4 -6	schnider	MAIN
1.11	01 Dec 04	new config param to switch module on off	+5 -3	schnider	MAIN
1.10	01 Dec 04	new config param to switch module on off	+23 -2	schnider	MAIN
1.9	16 Nov 04	added more comment	+29 -3	schnider	MAIN
1.8	15 Nov 04	db issue solved, by adding manual close session (special case for modules stuff as they're startet by main and not inside servlet thread)	+4 -1	schnider	MAIN
1.7	15 Nov 04	file based account creation	+17	schnider	MAIN
1.6	15 Nov 04	file based account creation	+36 -24	schnider	MAIN
1.5	15 Nov 04	auto generation of test accounts	+62	schnider	MAIN
1.4	27 Oct 04	commented out loading of jivemessenger server	+1 -1	schnider	MAIN
1.3	27 Oct 04	minor changes and tests	+8	schnider	MAIN
1.2	19 Oct 04	added IMcontroller to test enviroement in olat	+48 -12	schnider	MAIN
1.1	19 Oct 04	Initial version of instant messaging module	+52	schnider	MAIN
1.49.18.1	22 Jun 06	Merge HEAD into Branch	+6 -3	leberle	OLAT-4_2_0-BPS-1553
1.43.4.3	22 May 06	OLAT-1233:Merge HEAD into branch-1233	+53 -34	guretzki	OLAT-4_2_0-UNIZH-1233
1.43.4.2	10 May 06	OLAT-1233: Merge HEAD into Branch	-1	guretzki	OLAT-4_2_0-UNIZH-1233
1.43.4.1	10 May 06	OLAT-1233: Merge HEAD into Branch	+8 -8	guretzki	OLAT-4_2_0-UNIZH-1233
1.42.8.1	06 Apr 06	merged head (with ajax, header cleanup)	+15 -11	guretzki	OLAT-4_2_0-UNIZH-1480
1.49.2.1	29 Jun 06	OLAT-1530: Merge HEAD into BRANCH-1530	+6 -3	Alexander Schneider	OLAT-4_2_0-UNIZH-1530
1.49.12.1	27 Jun 06	OLAT-1562: Merge HEAD into branch.	+6 -3	guretzki	OLAT-4_2_0-UNIZH-1562
1.48.4.1	15 May 06	OLAT-1463: updated smack IM lib	+53 -34	schnider	OLAT-4_2_0-UNIZH-903_2
1.49.4.1	21 Jul 06	merges from HEAD	+6 -3	gnaegi	OLAT-4_2_0-goodsolutions-1232
1.52.10.1	10 Oct 06	MERGE HEAD TO BRANCH 5.0.x prepare for 5.0.1	+20 -12	Patrick Brunner	OLAT-5_0_x-BRANCH
1.60.4.7	19 Nov 07	OLAT-2782: IM : Replace hard-coded polling time intervalls with olat_config.xml parameters.	+25	guretzki	OLAT-5_2_x-BRANCH
1.60.4.6	03 Sep 07	easier install process, generate IM testusers on server as well	+8 -3	schnider	OLAT-5_2_x-BRANCH
1.60.4.5	22 Aug 07	organise imports	-2	schnider	OLAT-5_2_x-BRANCH
1.60.4.4	21 Aug 07	non-jira make idle and poll time of IM changeable IdlePollTime => polling time if no chat is open ChatPollTime => polling time if a chat is open typically IdlePollTime > ChatPollTime this helps tuning the polling time related to number of users and server load.	+47	Patrick Brunner	OLAT-5_2_x-BRANCH
1.60.4.3	12 Aug 07	OLAT-2397 - separation of ImPreferences into "ImPreferences with setter/getters" and into "ImPrefsManager" for property creation and updating. - solves concurrnency problems.	+3 -1	Patrick Brunner	OLAT-5_2_x-BRANCH
1.60.4.2	06 Aug 07	OLAT-2492: auto away feature for chat	+14	schnider	OLAT-5_2_x-BRANCH
1.60.4.1	31 Jul 07	olat-2143: do not allow smack to reconnect automatically on server error	+1	schnider	OLAT-5_2_x-BRANCH
1.68.2.3	18 Nov 08	OLAT-3533: sync learning group property was only set when the sync block was activated but should be every time the module starts	+8 -9	schnider	OLAT-6_0_x-BRANCH
1.68.2.2	20 Aug 08	OLAT-1796 Boilerplate: replaced "Copyright (c) 1999-200[0-9]" with "Copyright (c) since 2004"	+1 -1	Alexander Schneider	OLAT-6_0_x-BRANCH
1.68.2.1	27 Jun 08	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	+35	rhaag	OLAT-6_0_x-BRANCH
1.82.10.1	18 Mar 09	OLAT-3240: User Deletion: Delete all user-data linke dropbox.returnbox, qtit-editor temp file and meta-file-data.	+1 -1	guretzki	OLAT-6_1_x-BRANCH
1.52.4.1	05 Oct 06	http://bugs.olat.org/jira/browse/OLAT-1595 OLAT-1595: Merge HEAD into BRANCH (work in progress)	+20 -12	ikroll	OLAT-HEAD-BPS-1595
1.53.8.3	06 Jan 08	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.	+96 -4	gnaegi	OLAT-HEAD-BPS-Prototype_CF
1.53.8.2	19 Jul 07	OLAT-2434 BPS-CF update branch to current HEAD development after fixing power search method and ajax user search	+2 -3	gnaegi	OLAT-HEAD-BPS-Prototype_CF
1.53.8.1	17 Jul 07	OLAT-2434 BPS-CF update old branch to current head development. has some errors in test classes	+22 -11	gnaegi	OLAT-HEAD-BPS-Prototype_CF
1.82.6.1	18 May 09	OLAT-3766 cpeditor: Update BRANCH from HEAD	+1 -1	gwassmann	OLAT-HEAD-FRENTIX-3766-CPEDITOR
1.82.14.1	10 Jun 09	OLAT-3946 podcast: merge from head and some other changes	+1 -1	gwassmann	OLAT-HEAD-FRENTIX-3946-Podcast
1.87.6.2	23 Nov 10	OLAT-5494 merge 7.1 head to epf-branch	+6 -5	rhaag	OLAT-HEAD-FRENTIX-5494-EPORTFOLIO
1.87.6.1	09 Sep 10	OLAT-5494: merge head to epf-branch: olat3	+28 -9	rhaag	OLAT-HEAD-FRENTIX-5494-EPORTFOLIO
1.51.2.2	03 Nov 06	Synchronyzing 1577 branch (glossary, scorm assessable, repo can reference) with HEAD	+20 -12	gnaegi	OLAT-HEAD-JGS-1577
1.51.2.1	14 Aug 06	Merging HEAD to branch	+34 -20	gnaegi	OLAT-HEAD-JGS-1577
1.58.2.1	02 Jul 07	First time merge MAIN HEAD to Branch OLAT-HEAD-UZH-2385, where common starting point is Root-OLAT-HEAD-UZH-2385	+1 -1	lavinia	OLAT-HEAD-UZH-2385
1.83.20.1	24 Sep 09	Mavenization - basic POM adaptations	+2 -2	amoran	OLAT-HEAD-UZH-4361
1.59.2.2	07 Sep 07	merge 5.2.1 from HEAD to 2433 tested locally	+8 -3	Patrick Brunner	OLAT-HEAD-UZH-OLAT_2433
1.59.2.1	30 Aug 07	olat-2433	+65 -4	fjost	OLAT-HEAD-UZH-OLAT_2433
1.62.2.1	23 Nov 07	OLAT-2725 merges from head, adjusting portal changes edit mode	+25	gnaegi	OLAT-HEAD-YAML-1725
1.82.4.1	28 May 09	OLAT-3674: merge head to branch	+1 -1	rhaag	OLAT-HEAD_FRENTIX-3674
1.53.12.1	14 Nov 06	OLAT-1835 organize imports & Separation core - lms	+4 -4	Patrick Brunner	OLAT-HEAD_UNIZH-1935
1.84.2.1	20 Jan 10	renaming of Manger to BasesecurityManager	+40 -24	schnider	tmpOLAT-HEAD-640-until-2010-03-10

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

Author:	Patrick Brunner
Revision:	1.96
Changeset:	MAIN:patrickb:20110211103207
Date:	11:32 11 February 2011 (15 months)
Tags:	CVS2HG_MIGRATION_FORMATTED

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

Author:	Patrick Brunner
Revision:	1.95
Changeset:	MAIN:patrickb:20110211100758
Date:	11:08 11 February 2011 (15 months)

OLAT-5859: New impl. for deployement of demo courses on startup

Author:	schnider
Revision:	1.94
Changeset:	MAIN:schnider:20110101201009
Date:	21:10 01 January 2011 (16 months)
Branch point for:	OLAT-7_1_x-BRANCH
Tags:	Root_OLAT-7_1_x-BRANCH OLAT-7_1_x-BRANCH$BP OLAT-7_1_0-RC01-20110207 CVS2HG_MIGRATION

OLAT-6095: closing database connection when processing framework started event with database access

Author:	schnider
Revision:	1.93
Changeset:	MAIN:schnider:20101228163733
Date:	17:37 28 December 2010 (16 months)

OLAT-5928 fix wrongly triggered im-sync

Author:	rhaag
Revision:	1.92
Changeset:	MAIN:rhaag:20101026093634
Date:	11:36 26 October 2010 (18 months)
Tags:	Root_OLAT-HEAD-FRENTIX-5494-EPORTFOLIO mergeHeadTo5494

OLAT-5531: System event when framework is started, improved version

Author:	schnider
Revision:	1.91
Changeset:	MAIN:schnider:20100701101920
Date:	12:19 01 July 2010 (22 months)
Branch point for:	OLAT-7_0_x-PUBLIC OLAT-7_1-Backbutton OLAT_FRENTIX_5907_BACKUP_RESTORE
Tags:	OLAT-7_1-Backbutton$BP Root_OLAT-7_1-Backbutton CODE-REVIEW-7-0 before-commit-translations-20100901 Root_OLAT-7_0_x-PUBLIC OLAT-7_0_x-PUBLIC$BP OLAT-7_0_0-PUBLIC-20100929 Root_OLAT_FRENTIX_5907_BACKUP_RESTORE OLAT_FRENTIX_5907_BACKUP_RESTORE$BP

OLAT-5531: System event when framework is started

Author:	schnider
Revision:	1.90
Changeset:	MAIN:schnider:20100625115809
Date:	13:58 25 June 2010 (22 months)

OLAT-5531: System event when framework is started

Author:	schnider
Revision:	1.89
Changeset:	MAIN:schnider:20100625114846
Date:	13:49 25 June 2010 (22 months)

clean up

Author:	schnider
Revision:	1.88
Changeset:	MAIN:schnider:20100625071116
Date:	9:15 25 June 2010 (22 months)

unified interfaces for init and destroy methods. New interfaces are called initializable and destroyable and replace the OlatModule and ServiceLifecycle interfaces. Config of Spring context or annotation for init or destroy gets automatically checked by jUnit test.

Author:	schnider
Revision:	1.87
Changeset:	MAIN:schnider:20100317173258
Date:	18:33 17 March 2010 (2 years and 2 months)
Branch point for:	OLAT-HEAD-FRENTIX-4057-RESTAPI OLAT-HEAD-FRENTIX-5494-EPORTFOLIO OLAT_6_4_0-BPS-Onyx_Integration
Tags:	Root_OLAT-HEAD-FRENTIX-4057-RESTAPI OLAT-HEAD-FRENTIX-4057-RESTAPI$BP OLAT_6_4_0-BPS-Onyx_Integration$BP Root_OLAT_6_4_0-BPS-Onyx_Integration OLAT-Reprio_7_0_0-MS02-20100528 OLAT-Reprio_7_0_0-MS02-20100604 OLAT-HEAD-FRENTIX-5494-EPORTFOLIO$BP

removed references to olat_config.xml

Author:	schnider
Revision:	1.86
Changeset:	MAIN:schnider:20100316181056
Date:	19:11 16 March 2010 (2 years and 2 months)

config and startup refactoring to spring only

Author:	schnider
Revision:	1.85
Changeset:	MAIN:schnider:20100315103445
Date:	11:34 15 March 2010 (2 years and 2 months)

Mazenization of HEAD olat3 and related submodules

Author:	amoran
Revision:	1.84
Changeset:	MAIN:amoran:20091105143804
Date:	15:41 05 November 2009 (2 years and 6 months)
Branch point for:	OLAT-6_3_0-PUBLIC OLAT-6_3_x-PATCHES tmpOLAT-HEAD-640-until-2010-03-10
Tags:	last_nightly last_stable OLAT_TF_20091202 Root_tmpOLAT-HEAD-640-until-2010-03-10 tmpOLAT-HEAD-640-until-2010-03-10$BP OLAT-6_3_0-RC01-20100104 OLAT-6_3_0-RC02-20010105 OLAT-6_3_0-RC03-20100107 OLAT-6_3_0-RC04-20100111 OLAT_6-3-0-RC05-20100112 OLAT_6-3-0-RC06-20100112 OLAT_6-3-0-RC07-20100113 OLAT_6-3-0-RC08-20100115 OLAT-6_3_0-RC09-20100115 OLAT-6_3_0-RC10-20100118 OLAT-6_3_0-RC11-20100118 OLAT-6_3_0-RC12-20100120 OLAT-6_3_0-RC13-20100120 OLAT-6_3_0-RC14-20100122 OLAT-6_3_0-RC15-20100126 OLAT-6_3_0-RC16-20100127 OLAT-6_3_0-RC17-20100128 OLAT-6_3_0-RC18-20100201 OLAT-6_3_0-RC19-20100202 OLAT-6_3_0-RC20-20100203 OLAT-6_3_0-RC21-20100205 OLAT-6_3_0-RC22-20100208 OLAT-6_3_0-RC23-20100209 OLAT-6_3_0-RC24-20100209 OLAT-6_3_x-PATCHES$BP OLAT-6_3_0-PUBLIC$BP OLAT-6_3_0-PUBLIC-RC01-20100309 OLAT-6_3_0-PUBLIC-RC02-20100310 OLAT-6_3_0-PUBLIC-RC03-20100311 OLAT-6_3_0-PUBLIC-RC04-20100315 OLAT-6_3_0-PUBLIC-RC05-20100315 OLAT-6_3_0-PUBLIC-RC06-20100316 OLAT-6_3_0-PUBLIC-20100317 OLAT-6_3_0-PUBLIC-20100323 OLAT-6_3_1-PUBLIC-20100330 OLAT-6_3_2-RC01-20100604 OLAT-6_3_2-RC02-20100609 OLAT-6_3_2-RC03-20100611 OLAT-6_3_2-RC04-20100611 OLAT-6_3_2-PUBLIC-20100618 OLAT-6_3_3-RC01-20100812 OLAT-6_3_3-RC02-20100812 OLAT-6_3_3-RC03-20100818 OLAT-6_3_3-RC04-20100823 OLAT-6_3_3-before-OLAT-5954-Patch

MERGE BRANCH 6.1.1-RC06 TO HEAD

Author:	guretzki
Revision:	1.83
Changeset:	MAIN:guretzki:20090507142137
Date:	16:26 07 May 2009 (3 years)
Branch point for:	OLAT-6_2-BPS-4072 OLAT-6_2-BPS-FEATURES-JUNE-2009 OLAT-6_2_0-BRANCH-UZH OLAT-6_2_x-BRANCH-PUBLIC OLAT-6_2_x-UZH-essassprj OLAT-HEAD-FRENTIX-4261-Scorm-Result OLAT-HEAD-UZH-2438 OLAT-HEAD-UZH-4057_REST_API OLAT-HEAD-UZH-4272 OLAT-HEAD-UZH-4353 OLAT-HEAD-UZH-4353-2 OLAT-HEAD-UZH-4361
Tags:	OLAT-HEAD-UZH-2438$BP Root_OLAT-6_2_x-UZH-matthai Root_OLAT-HEAD_FRENTIX-3674 Root_OLAT-HEAD-UZH-4057_REST_API OLAT-6_2-BPS-4072$BP OLAT-HEAD-FRENTIX-4261-Scorm-Result$BP OLAT-6_2_x-UZH-essassprj$BP Root_OLAT-HEAD-FRENTIX-4261-Scorm-Result Root_OLAT-6_2-BPS-4072 Root_OLAT-6_2_x-UZH-essassprj Root_OLAT-HEAD-FRENTIX-3766-CPEDITOR Root_OLAT-6_2-BPS-FEATURES-JUNE-2009 OLAT-6_2_0-MS01-20090622 mergeHeadTo3674 mergeHeadTo3766-CPEDITOR OLAT-6_2-BPS-FEATURES-JUNE-2009$BP Root_OLAT-HEAD-UZH-2438 OLAT-HEAD-UZH-4057_REST_API$BP Root_OLAT-HEAD-FRENTIX-3946-Podcast OLAT-6_2_0-BPS-ESAMO-24072009 OLAT-6_2_0-RC01-20090804 OLAT-6_2_0-RC05-20090811 OLAT-6_2_0-RC12-20090907 OLAT-6_2_0-RC03-20090806 Root_OLAT-6_2_0-BRANCH-UZH OLAT-6_2_x-BRANCH-PUBLIC$BP Root_OLAT-6_2_x-BRANCH-PUBLIC Root_OLAT-HEAD-UZH-4272 Root_OLAT-HEAD-UZH-4353 OLAT-HEAD-UZH-4353$BP OLAT-HEAD-UZH-4361$BP OLAT-6_2_0-RC06-20090813 OLAT-HEAD-UZH-4272$BP OLAT-6_2_0-RC13-20090915 Root_OLAT-HEAD-FRENTIX-4261-SCORMResults OLAT-6_2_0-RC11-20090904 OLAT-6_2_0-BRANCH-UZH$BP OLAT-6_2_0-RC04-20090810 OLAT-6_2_1-20091009 OLAT_6_2_0-RC09-20090831 OLAT-6_2_0-RC08-20090827 OLAT-6_2_0-BPS OLAT-6_2_0-RC07-20090826 OLAT-6_2_0-RC10-20090902 OLAT-6_2_0-RC02-20090805 mergeHeadTo3946-PODCAST OLAT-6_2_2-RC01-20091028 OLAT-HEAD-UZH-4353-2$BP Root_OLAT-HEAD-UZH-4353-2 last_stable_20091101 OLAT-6_2_2-PUBLIC-20091110

OLAT-3466: changes for running service on only one node in a cluster

Author:	schnider
Revision:	1.82
Changeset:	MAIN:schnider:20080910152531
Date:	17:26 10 September 2008 (3 years and 8 months)
Branch point for:	OLAT-6_1_x-BRANCH OLAT-6_2-BPS-FEATURES OLAT-HEAD-BPS-1229 OLAT-HEAD-FRENTIX-3766-CPEDITOR OLAT-HEAD-FRENTIX-3946-Podcast OLAT-HEAD-UZH-3892 OLAT-HEAD_FRENTIX-3674
Tags:	before-commit-OLAT-3601-separation-i18n-project OLAT-HEAD-BPS-1229$BP Root_OLAT-HEAD-BPS-1229 OLAT-HEAD_FRENTIX-3674$BP OLAT-6_1_0-RC01-20090108 OLAT-6_1_0-RC04-20090115 OLAT-6_1_0-RC02-20090112 OLAT-6_1_0-RC03-20090115 OLAT-HEAD-FRENTIX-3946-Podcast$BP OLAT-6_1_0-RC06-20090119 OLAT-6_1_0-RC05-20090119 OLAT-6_1_0-RC07-20090120 OLAT-6_1_0-RC26-20090211 OLAT-6_1_0-RC13-20090128 OLAT-HEAD-FRENTIX-3766-CPEDITOR$BP OLAT-6_1_0-RC19-20090129 OLAT-6_1_0-RC10-20090122 OLAT-6_1_0-RC15-20090129 OLAT-6_1_0-RC25-20090210 OLAT-6_1_0-RC16-20090129 OLAT-6_1_0-RC23-20090130 OLAT-6_1_0-RC11-20090123 OLAT-6_1_0-RC08-20090121 OLAT-6_1_0-RC14-20090128 OLAT-6_1_0-RC17-20090129 OLAT-6_1_0-RC09-20090122 OLAT-6_1_0-RC12-20090123 OLAT-6_1_0-RC24-20090209 OLAT-6_2-BPS-FEATURES$BP Root_OLAT-HEAD-UZH-3892 OLAT-6_1_0-RC27-20090223 OLAT-6_1_0-PUBLIC-20090312 OLAT-6_1_0-RC28-20090224 Root_OLAT-6_2-BPS-FEATURES Root_OLAT-6_1_x-BRANCH OLAT-6_1_x-BRANCH$BP OLAT-HEAD-UZH-3892$BP

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

Author:	schnider
Revision:	1.81
Changeset:	MAIN:schnider:20080902082515
Date:	10:25 02 September 2008 (3 years and 8 months)

OLAT-3422 Refactoring of guest user create process - lazy on demand and no more need to specify guest user attributes in olat_config.xml. Adding i18n jUnit tests

Author:	gnaegi
Revision:	1.80
Changeset:	MAIN:gnaegi:20080901174013
Date:	19:40 01 September 2008 (3 years and 8 months)

organise imports

Author:	schnider
Revision:	1.79
Changeset:	MAIN:schnider:20080828160209
Date:	18:02 28 August 2008 (3 years and 8 months)

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

Author:	Alexander Schneider
Revision:	1.78
Changeset:	MAIN:asch:20080825133332
Date:	15:33 25 August 2008 (3 years and 8 months)

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

Author:	schnider
Revision:	1.77
Changeset:	MAIN:schnider:20080825131426
Date:	15:14 25 August 2008 (3 years and 8 months)

OLAT-2878: clean up olat IM stuff

Author:	schnider
Revision:	1.76
Changeset:	MAIN:schnider:20080821140302
Date:	16:03 21 August 2008 (3 years and 9 months)

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

Author:	guretzki
Revision:	1.75
Changeset:	MAIN:guretzki:20080814130008
Date:	15:02 14 August 2008 (3 years and 9 months)

OLAT-2878: new IM junit tests

Author:	schnider
Revision:	1.74
Changeset:	MAIN:schnider:20080814084839
Date:	10:48 14 August 2008 (3 years and 9 months)

OLAT-2878: smaller api, testing ability without olat

Author:	schnider
Revision:	1.73
Changeset:	MAIN:schnider:20080812183839
Date:	20:38 12 August 2008 (3 years and 9 months)

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.

Author:	schnider
Revision:	1.72
Changeset:	MAIN:schnider:20080804181626
Date:	20:16 04 August 2008 (3 years and 9 months)

OLAT-3330: temporary fix

Author:	schnider
Revision:	1.71
Changeset:	MAIN:schnider:20080722091638
Date:	11:18 22 July 2008 (3 years and 9 months)
Tags:	mmw_i18n_2008_07_22 i18n_merged_2008_07_22

OLAT-3330: DB: Fix Nightly problem : Do not call commit in closeSession, add AssertException for un-committed db-session, fix AssertException by adding db.commit( ), db.closeSession( )

Author:	guretzki
Revision:	1.70
Changeset:	MAIN:guretzki:20080722075600
Date:	9:56 22 July 2008 (3 years and 9 months)

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

Author:	rhaag
Revision:	1.69
Changeset:	MAIN:rhaag:20080627153701
Date:	17:37 27 June 2008 (3 years and 10 months)

OLAT-3095: made synching with IM server in enrolment asynchronous and synching dependent of config settings in olat_config.xml

Author:	schnider
Revision:	1.68
Changeset:	MAIN:schnider:20080505135412
Date:	15:54 05 May 2008 (4 years)
Branch point for:	OLAT-6_0_x-BRANCH
Tags:	OLAT-6_0_x-BRANCH$BP Root_OLAT-6_0_x-BRANCH OLAT-6_0_0-PUBLIC-20080604 OLAT-6_0_1-RC01-20080619 OLAT-6_0_1-RC03-20080627 OLAT-6_0_1-RC02-20080623

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

Author:	gnaegi
Revision:	1.67
Changeset:	MAIN:gnaegi:20080423123531
Date:	14:36 23 April 2008 (4 years)

OLAT-2293: quartz scheduler integration now spring based - easier to use

Author:	schnider
Revision:	1.66
Changeset:	MAIN:schnider:20080402135052
Date:	15:51 02 April 2008 (4 years and 1 month)

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

Author:	schnider
Revision:	1.65
Changeset:	MAIN:schnider:20080214154908
Date:	16:49 14 February 2008 (4 years and 3 months)
Branch point for:	OLAT-HEAD-UZH-2771
Tags:	Root_OLAT-HEAD-UZH-2771 OLAT-HEAD-UZH-2771$BP

OLAT-2840: reenabled chat out of list with connected users as framework is now ready to handle polling events in second window

Author:	schnider
Revision:	1.64
Changeset:	MAIN:schnider:20080211135626
Date:	14:56 11 February 2008 (4 years and 3 months)

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

Author:	guretzki
Revision:	1.63
Changeset:	MAIN:guretzki:20071121133930
Date:	14:39 21 November 2007 (4 years and 6 months)
Tags:	Before-moving-i18n-and-content-to-core-20071127 before-merge-2725-YAML-to-HEAD mergeHeadTo2725 after-merge-cg-5_2_3_to_HEAD Root_OLAT-HEAD-YAML-1725 after-merge-gs-5_2_3_to_HEAD before-merge-2434-CF-to-HEAD mergeHeadToOLAT-HEAD-BPS-Prototype_CF after-merge-2725-YAML-to-HEAD

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

Author:	Patrick Brunner
Revision:	1.62
Changeset:	MAIN:patrickb:20070907114422
Date:	13:44 07 September 2007 (4 years and 8 months)
Branch point for:	OLAT-HEAD-YAML-1725
Tags:	Merged-5_2_1-RC01-Into-HEAD Merged-2433-Branch-Into-HEAD_5_2_1 before-merge-cg-5_2_3_to_HEAD OLAT-HEAD-YAML-1725$BP Before_merge_5_2_x_into_Head_20070924

olat-2433: as preparation for later merging: first merge branch 5_2_x to HEAD

Author:	fjost
Revision:	1.61
Changeset:	MAIN:fjost:20070828101608
Date:	12:18 28 August 2007 (4 years and 8 months)
Tags:	TMP-OLAT-5_2_0-TO-HEAD TMP-OLAT-5_2_0-TO-HEAD-2

OLAT-2376:Archive group runtime data, delete lifecycle-entries after deleting resource, refactor UserManger-deletion code to UserDeletionManager.

Author:	guretzki
Revision:	1.60
Changeset:	MAIN:guretzki:20070719134347
Date:	15:43 19 July 2007 (4 years and 10 months)
Branch point for:	OLAT-5_2_x-BRANCH OLAT-HEAD-2438
Tags:	OLAT-HEAD-2438$BP Root_OLAT-HEAD-2438 TMP-OLAT-5_2_0-RC03-04-LocalStrings TMP_PB_521_TO_HEAD Root_OLAT-HEAD-BPS-Prototype_CF OLAT-5_2_0-MS02-20070726 Root_OLAT-5_2_x-BRANCH TMP-OLAT-5_2_0-RC04-LocalStrings TMP-OLAT-5_2_0-RC02-LocalStrings OLAT-5_2_x-BRANCH$BP TMP-OLAT-5_2_0-RC01-LocalStrings

olat-2143

Author:	schnider
Revision:	1.59
Changeset:	MAIN:schnider:20070628182715
Date:	20:27 28 June 2007 (4 years and 10 months)
Branch point for:	OLAT-HEAD-UZH-OLAT_2433
Tags:	OLAT-5_2_0-MS02-20070702 OLAT-5_2_0-MS02-20070703 OLAT-5_2_0-MS02-20070709 OLAT-5_2_0-MS02-20070713 Temp_lavinia_1 Root_OLAT-HEAD-UZH-OLAT_2433 OLAT-HEAD-UZH-OLAT_2433$BP Temp_lavinia_2

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.

Author:	fjost
Revision:	1.58
Changeset:	MAIN:fjost:20070620115506
Date:	14:04 20 June 2007 (4 years and 11 months)
Branch point for:	OLAT-HEAD-UZH-2385
Tags:	OLAT-HEAD-UZH-2385$BP Root_OLAT-HEAD-UZH-2385 OLAT-5_2_0-MS02-20070626

OLAT-2315:Work in progress, delete IM account when deleting a user.

Author:	guretzki
Revision:	1.57
Changeset:	MAIN:guretzki:20070524075408
Date:	9:54 24 May 2007 (4 years and 11 months)
Tags:	MS01_050607170000 MS01_300507084500 MS01_130607122000

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

Author:	schnider
Revision:	1.56
Changeset:	MAIN:schnider:20070510163512
Date:	18:35 10 May 2007 (5 years)
Tags:	After-commit-of-OLAT-2320-bc-refactoring Before-commit-of-OLAT-2320-bc-refactoring MS01_150507114000

clean up

Author:	schnider
Revision:	1.55
Changeset:	MAIN:schnider:20070423164733
Date:	18:47 23 April 2007 (5 years)
Branch point for:	OLAT-2278-2
Tags:	Root_OLAT-2278-2 OLAT-2278-2$BP

OLAT-909: Extract DB interface, change to new hibernate query parser.

Author:	guretzki
Revision:	1.54
Changeset:	MAIN:guretzki:20070419121349
Date:	14:16 19 April 2007 (5 years and 1 month)
Branch point for:	OLAT-2278
Tags:	OLAT-2278$BP Root_OLAT-2278

OLAT-1796
update to apache 2.0 license boiler plate

Author:	Patrick Brunner
Revision:	1.53
Changeset:	MAIN:patrickb:20060929155111
Date:	17:51 29 September 2006 (5 years and 7 months)
Branch point for:	OLAT-1847 OLAT-5_0_y-BRANCH OLAT-5_0_y-UNIZH-1973 OLAT-5_1_0-BPS-1879 OLAT-5_1_0-BPS-1914 OLAT-5_1_x-BRANCH OLAT-HEAD-BPS-Prototype_CF OLAT-HEAD-FRENTIX-1979 OLAT-HEAD-JLS-1947 OLAT-HEAD-JLS-1947_2 OLAT-HEAD-JLS-1947_3 OLAT-HEAD-JLS-1973 OLAT-HEAD_UNIZH-1935 OLAT_5_1_-UZH-1983
Tags:	OLAT-5_0_1-FINAL-20061017 OLAT-5_0_2-GC-20061120 Root_OLAT-5_0_y-BRANCH OLAT-5_0_1-PUBLIC-20061019 OLAT-5_0_1-GM01-20061013 OLAT-5_0_2-FINAL-20061108 OLAT-5_1_0-BPS-1879$BP OLAT-5_0_y-BRANCH$BP OLAT-1847$BP OLAT-5_0_3-FINAL-20061218 OLAT-5_0_1-GM02-20061013 Root_OLAT-1847 merged_OLAT-5_0_x-BRANCH tmpBPS1595 MOVING-OLAT-5_0_y-BRANCH Root_OLAT-HEAD_UNIZH-1935 OLAT-HEAD-BPS-Prototype_CF-WorkCarsten Root_OLAT_5_1_-UZH-1983 OLAT-HEAD-JLS-1973$BP mergeHeadTo1577 Root_OLAT-5_1_0-BPS-1879 OLAT-HEAD-BPS-Prototype_CF$BP Root_OLAT-5_1_0-BPS-1914 OLAT-HEAD-JLS-1947$BP OLAT_5_1_-UZH-1983$BP OLAT-HEAD-JLS-1947_2$BP OLAT-HEAD-JLS-1947_3$BP MS01_291106233000 mergeHeadTo1879_1 Root_OLAT-HEAD-JLS-1947_2 Root_OLAT-HEAD-JLS-1973 Root_OLAT-HEAD-JLS-1947_3 TMP_OLAT-1935 OLAT-HEAD-FRENTIX-1979$BP Root_OLAT-HEAD-JLS-1947 OLAT-5_1_0-BPS-1914$BP TMP-OLAT-5_0_y-BRANCH mergeHEADto1914 Root_OLAT-HEAD-JGS-1577 OLAT-HEAD_UNIZH-1935$BP Root_OLAT-HEAD-FRENTIX-1979 OLAT-5-0-y-wiki MS02_211206181500 OLAT-5_0_y-UNIZH-1973$BP mergeHeadTo1879 mergeHeadTo1983 tmpMergeToHead1983_1 OLAT-5_1_2-PUBLIC-20070403 tmpMergeToHead1879pb OLAT-5_1_0-FINAL-20070228 tmp0FlexiFormOLAT-5_1_x-BRANCH OLAT-5_1_3-PUBLIC-20070507 OLAT-5_1_3-FINAL-20070423 OLAT-5_1_0-GM-20070227 temp-0-Guido OLAT-5_1_x-BRANCH$BP OLAT-5_1_1-FINAL-20070313 tmpMergeToHead1983_2 Root_OLAT-5_1_x-BRANCH tmpPbBrasato Ready_to_seperate Before_Core_Lms_sep After_Hibernate323_Migration

OLAT-860 adding manual synchronizing of buddy groups to instant messaging server

Author:	gnaegi
Revision:	1.52
Changeset:	MAIN:gnaegi:20060802112609
Date:	13:26 02 August 2006 (5 years and 9 months)
Branch point for:	OLAT-5_0_x-BRANCH OLAT-HEAD-BPS-1595 OLAT-HEAD-JGS-1677 OLAT-HEAD-JGS-1686 OLAT-HEAD-UNIZH-1508
Tags:	OLAT-HEAD-BPS-1595$BP OLAT-HEAD-UNIZH-1508$BP Root_OLAT-HEAD-BPS-1595 mergeHeadTo1508 Root_OLAT-HEAD-UNIZH-1508 Root_OLAT-HEAD-JGS-1677 OLAT-5_0_0-GM02-20060925 OLAT-5_0_0-FINAL-20060926 Root_OLAT-5_0_x-BRANCH OLAT-5_0_x-BRANCH$BP OLAT-HEAD-JGS-1677$BP OLAT-HEAD-JGS-1686$BP OLAT-5_0_0-GM-20060922 Root_OLAT-HEAD-JGS-1686

olat-1509 moved org.olat.persistence to org.olat.core.commons.persistence

Author:	fjost
Revision:	1.51
Changeset:	MAIN:fjost:20060621100159
Date:	12:02 21 June 2006 (5 years and 11 months)
Branch point for:	OLAT-4_2_0-BPS-1589 OLAT-HEAD-JGS-1577
Tags:	Root_OLAT-HEAD-JGS_UNIZH-1509_9 merge_tag_1232 OLAT-HEAD-JGS-1577$BP OLAT-HEAD-MERGE-BRANCH-UNIZH-1562 CB_as OLAT-4_2_0-BPS-1589$BP Root_OLAT-4_2_0-BPS-1589

OLAT-1509
refactoring:
- moving org.olat.core.configuration.ConfigurationManager out of core to org.olat.configuration.ConfigurationManager

- ConfigurationManager implements the new introduced ModuleLifeCycle... still some further refactoring needed to remove calls to OLATContext from inside ConfigurationManager!

- the ConfigurationManager gets injected by spring

- the instant messaging show how the "singleton" is fetched using the CoreSpringFactory.getBean(..) mehtod in contrast to the getInstance(..) variant.

- OlatTestCase must be adpated not to use getInstance(..) and ConfigurationManager should then no longer provide access by means of getInstance(..)

Alltogether this removes some more dependencies from the core to the outer webapp (OLAT)

Author:	Patrick Brunner
Revision:	1.50
Changeset:	MAIN:patrickb:20060620210650
Date:	23:06 20 June 2006 (5 years and 11 months)
Tags:	Root_OLAT-HEAD-JGS_UNIZH-1509_8

OLAT-1463: updated smack IM lib

Author:	schnider
Revision:	1.49
Changeset:	MAIN:schnider:20060515122101
Date:	14:21 15 May 2006 (6 years)
Branch point for:	OLAT-4_2_0-BPS-1252 OLAT-4_2_0-BPS-1553 OLAT-4_2_0-BPS-1557 OLAT-4_2_0-UNIZH-1530 OLAT-4_2_0-UNIZH-1562 OLAT-4_2_0-UNIZH-890 OLAT-4_2_0-goodsolutions-1232 OLAT-HEAD-JGS_UNIZH-1509_5 OLAT-HEAD-JGS_UNIZH-1509_pbwork
Tags:	OLAT-HEAD-JGS_UNIZH-1509_4 OLAT-4_2_0-goodsolutions-1232$BP MERGE_OLAT-JGS_UNIZH-1509_pbwork Root_OLAT-4_2_0-BPS-1557 OLAT-HEAD-JGS_UNIZH-1509_5$BP Root_OLAT-4_2_0-UNIZH-890 Root_OLAT-4_2_0-BPS-1252 Root_OLAT-HEAD-JGS_UNIZH-1509_pbwork OLAT-4_2_0-BPS-1553$BP OLAT-4_2_0-BPS-1557$BP OLAT-HEAD-START-BRANCH-UNIZH-1562 OLAT-4_2_0-UNIZH-890$BP Root_OLAT-4_2_0-goodsolutions-1232 Before-commit-of-OLAT-869 OLAT-HEAD-START-BRANCH-UNIZH-1530 OLAT-HEAD-JGS_UNIZH-1509_pbwork$BP OLAT-4_2_0-UNIZH-1562$BP Root_OLAT-4_2_0-BPS-1553 Root_OLAT-HEAD-JGS_UNIZH-1509_7 Root_OLAT-HEAD-JGS_UNIZH-1509_6 Root_OLAT-HEAD-JGS_UNIZH-1509_5 OLAT-4_2_0-UNIZH-1530$BP OLAT-4_2_0-BPS-1252$BP OLAT-HEAD-MERGE-BRANCH-UNIZH-1233

olat-1509 moved imprefs to pkg o.o.instantMessaging

Author:	fjost
Revision:	1.48
Changeset:	MAIN:fjost:20060510075505
Date:	9:55 10 May 2006 (6 years)
Branch point for:	OLAT-4_2_0-UNIZH-903_2 olat_4_1_2-goodsolutions-1509
Tags:	olat_4_1_2-goodsolutions-1509$BP OLAT-4_2_0-UNIZH-903_2$BP Root_OLAT-4_2_0-UNIZH-903_2 Root_olat_4_1_2-goodsolutions-1509

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

Author:	fjost
Revision:	1.47
Changeset:	MAIN:fjost:20060509155945
Date:	17:59 09 May 2006 (6 years)

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

Author:	fjost
Revision:	1.46
Changeset:	MAIN:fjost:20060509132552
Date:	15:25 09 May 2006 (6 years)

OLAT-1509

Author:	Patrick Brunner
Revision:	1.45
Changeset:	MAIN:patrickb:20060508121933
Date:	14:19 08 May 2006 (6 years)
Branch point for:	OLAT-4_2_0-UNIZH-903
Tags:	OLAT-HEAD-JGS_UNIZH-1509_3 Root_OLAT-4_2_0-UNIZH-903 OLAT-4_2_0-UNIZH-903$BP

OLAT-1509

Author:	Patrick Brunner
Revision:	1.44
Changeset:	MAIN:patrickb:20060508115154
Date:	13:51 08 May 2006 (6 years)

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

Author:	schnider
Revision:	1.43
Changeset:	MAIN:schnider:20060405162123
Date:	18:21 05 April 2006 (6 years and 1 month)
Branch point for:	OLAT-4_2_0-UNIZH-1233 olat_4_1_1-goodsolutions-1497
Tags:	olat_4_1_1-goodsolutions-1497$BP Root_olat_4_1_1-goodsolutions-1497 OLAT-4_2_0-UNIZH-1233$BP OLAT-HEAD-JGS_UNIZH-1509_2 OLAT-HEAD-JGS_UNIZH-1509_1 merge_tag_cg_24-04-06 OLAT-HEAD-START-BRANCH-UNIZH-1233

OLAT-1287: added new param to config flash client back ground color in olat_config.xml

Author:	schnider
Revision:	1.42
Changeset:	MAIN:schnider:20051220154855
Date:	16:48 20 December 2005 (6 years and 5 months)
Branch point for:	OLAT-4_1-GOODSOLUTIONS-1411 OLAT-4_1_1-GOODSOLUTIONS-1482 OLAT-4_1_2-BRANCH OLAT-4_2_0-UNIZH-1480 OLAT-HEAD_UNIZH-1320
Tags:	Root_OLAT-HEAD_UNIZH-1320 OLAT-HEAD_UNIZH-1320$BP OLAT-4_1_1-PUBLIC-20060323 OLAT-4_1_1-FINAL-20060320 OLAT-4_1_3-FINAL-20060515 OLAT-4_2_0-UNIZH-1480$BP OLAT-4_1_1-GOODSOLUTIONS-1482$BP OLAT-4_1-GOODSOLUTIONS-1411$BP OLAT-4_1_0-FINAL-20060306 OLAT-4_1_2-FINAL-20060406 OLAT-4_1_0-GoldenMaster-20060303 OLAT-4_1_2-PUBLIC-20060412 Root_OLAT-4_1_1-GOODSOLUTIONS-1482 OLAT-4_1_2-BRANCH$BP OLAT-4_1_4-FINAL-20060619

OLAT-854: jabber config applied to connected user list

Author:	schnider
Revision:	1.41
Changeset:	MAIN:schnider:20050809165334
Date:	18:53 09 August 2005 (6 years and 9 months)
Branch point for:	OLAT-4-0-x-BRANCH OLAT-4_0_2-BPS OLAT-4_0_2-BPS-1309 OLAT-4_0_2-BPS_UNIZH-1319 OLAT-4_0_2-ZAG
Tags:	OLAT-4_0_0-GoldenMaster-20050919 OLAT-4_0_0-PUBLIC-20050927 OLAT-4_0_2-PUBLIC-20051108 OLAT-4_0_2-FINAL-20051107 OLAT-MERGE-2-4_0_2-BPS-1309 OLAT-4-0-x-BRANCH$BP OLAT-4_0_2-BPS_UNIZH-1319$BP OLAT-MERGE-1-4_0_2-BPS-1309 OLAT-4_0_1-FINAL-20051017 OLAT-STOP-1288-BPS OLAT-4_0_2-ZAG$BP OLAT-MERGE-3-4_0_2-BPS-1309 OLAT-1253-html-editor-finished OLAT-4_0_2-BPS$BP OLAT-MERGE-3-4_0_2-BPS-1288 OLAT-4_0_2-BPS-1309$BP OLAT-START-1288-BPS OLAT-MERGE-5-4_0_2-BPS-1288 OLAT-MERGE-4-4_0_2-BPS-1288 OLAT-MERGE-2-4_0_2-BPS-1288

OLAT-901: fixes file not found in context other than olat and should make 'IM' flash client working easier in different environements.

Author:	schnider
Revision:	1.40
Changeset:	MAIN:schnider:20050725154000
Date:	17:40 25 July 2005 (6 years and 9 months)

fix for Bug: 1456 und enhancement, dass user im status "nicht verfügbar" gar nicht mehr auf der liste erscheinen.

Author:	schnider
Revision:	1.39
Changeset:	MAIN:schnider:20050412131542
Date:	15:15 12 April 2005 (7 years and 1 month)
Branch point for:	OLAT-3-2-x-BRANCH
Tags:	OLAT-3_2_0-PUBLIC-20050415 Root_OLAT-3-2-x-BRANCH OLAT-3-2-x-BRANCH$BP OLAT-3_2_1-FINAL-20050530

formatting

Author:	fjost
Revision:	1.38
Changeset:	MAIN:fjost:20050308135906
Date:	14:59 08 March 2005 (7 years and 2 months)
Tags:	OLAT-3_2_0-FINAL-20050322 OLAT-3_2_0-GoldenMaster2-20050318

new AssertException when server enabled but server not running.

Author:	schnider
Revision:	1.37
Changeset:	MAIN:schnider:20050223104605
Date:	11:46 23 February 2005 (7 years and 2 months)
Tags:	OLAT-3_2_0-GoldenMaster-20050304

comments

Author:	schnider
Revision:	1.36
Changeset:	MAIN:schnider:20050214174326
Date:	18:43 14 February 2005 (7 years and 3 months)

implementing configuratino properties

Author:	gnaegi
Revision:	1.35
Changeset:	MAIN:gnaegi:20050209171121
Date:	18:11 09 February 2005 (7 years and 3 months)

sync is false now

Author:	schnider
Revision:	1.34
Changeset:	MAIN:schnider:20050209100304
Date:	11:03 09 February 2005 (7 years and 3 months)

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

Author:	schnider
Revision:	1.33
Changeset:	MAIN:schnider:20050207160632
Date:	17:06 07 February 2005 (7 years and 3 months)

handing null pointer until the methods are implemented

Author:	schnider
Revision:	1.32
Changeset:	MAIN:schnider:20050207095533
Date:	10:55 07 February 2005 (7 years and 3 months)

instant messaging module need property to save to DB. Property manager extended for generic case of saving and retreaving a property from the DB

Author:	schnider
Revision:	1.31
Changeset:	MAIN:schnider:20050207093812
Date:	10:38 07 February 2005 (7 years and 3 months)

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

Author:	schnider
Revision:	1.30
Changeset:	MAIN:schnider:20050203121840
Date:	13:19 03 February 2005 (7 years and 3 months)

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

Author:	schnider
Revision:	1.29
Changeset:	MAIN:schnider:20050202150917
Date:	16:09 02 February 2005 (7 years and 3 months)

inial version of startup sync for buddygrops

Author:	schnider
Revision:	1.28
Changeset:	MAIN:schnider:20050202144003
Date:	15:40 02 February 2005 (7 years and 3 months)

cleaned up

Author:	schnider
Revision:	1.27
Changeset:	MAIN:schnider:20050202111600
Date:	12:16 02 February 2005 (7 years and 3 months)

removed event stuff

Author:	schnider
Revision:	1.26
Changeset:	MAIN:schnider:20050201193125
Date:	20:31 01 February 2005 (7 years and 3 months)

Collab enable/disable if in assessment

Author:	mike
Revision:	1.25
Changeset:	MAIN:mike:20050201161848
Date:	17:18 01 February 2005 (7 years and 3 months)

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

Author:	schnider
Revision:	1.24
Changeset:	MAIN:schnider:20050131135811
Date:	14:58 31 January 2005 (7 years and 3 months)

refractoring of chatRoom stuff

Author:	schnider
Revision:	1.23
Changeset:	MAIN:schnider:20050126171002
Date:	18:10 26 January 2005 (7 years and 3 months)

refractoring of instant messaging: Get rid of unnecessary config stuff in build.properties (please adjust to properties.default), auto disable of chat if entering course test.

Author:	schnider
Revision:	1.22
Changeset:	MAIN:schnider:20050125170749
Date:	18:07 25 January 2005 (7 years and 3 months)

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

Author:	schnider
Revision:	1.21
Changeset:	MAIN:schnider:20050125140151
Date:	15:01 25 January 2005 (7 years and 3 months)

refractoring of instant messaging

Author:	schnider
Revision:	1.20
Changeset:	MAIN:schnider:20050124172044
Date:	18:20 24 January 2005 (7 years and 3 months)

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

Author:	schnider
Revision:	1.19
Changeset:	MAIN:schnider:20050120162028
Date:	17:20 20 January 2005 (7 years and 4 months)

refractoring of account creation api

Author:	schnider
Revision:	1.18
Changeset:	MAIN:schnider:20050117174600
Date:	18:46 17 January 2005 (7 years and 4 months)

additional comments

Author:	schnider
Revision:	1.17
Changeset:	MAIN:schnider:20041217165720
Date:	17:57 17 December 2004 (7 years and 5 months)

cleaning up and flash stuff debuged: presence now works again, starting with jid chanches to chat clientmodus

Author:	schnider
Revision:	1.16
Changeset:	MAIN:schnider:20041216161306
Date:	17:13 16 December 2004 (7 years and 5 months)

anwering in broswer to message works now as supposed

Author:	schnider
Revision:	1.15
Changeset:	MAIN:schnider:20041207153510
Date:	16:35 07 December 2004 (7 years and 5 months)

creation of additional testusers undone because of error

Author:	schnider
Revision:	1.14
Changeset:	MAIN:schnider:20041206180753
Date:	19:07 06 December 2004 (7 years and 5 months)

minor chanches and new testusers, that do not conflict with other testusers

Author:	schnider
Revision:	1.13
Changeset:	MAIN:schnider:20041206175727
Date:	18:57 06 December 2004 (7 years and 5 months)

instant messaging integreated in header, can be desabled by build.properties setting instantmessaging.enable=false

Author:	schnider
Revision:	1.12
Changeset:	MAIN:schnider:20041202173617
Date:	18:36 02 December 2004 (7 years and 5 months)

new config param to switch module on off

Author:	schnider
Revision:	1.11
Changeset:	MAIN:schnider:20041201174504
Date:	18:45 01 December 2004 (7 years and 5 months)

new config param to switch module on off

Author:	schnider
Revision:	1.10
Changeset:	MAIN:schnider:20041201171916
Date:	18:19 01 December 2004 (7 years and 5 months)

added more comment

Author:	schnider
Revision:	1.9
Changeset:	MAIN:schnider:20041116175519
Date:	18:55 16 November 2004 (7 years and 6 months)

db issue solved, by adding manual close session (special case for modules stuff as they're startet by main and not inside servlet thread)

Author:	schnider
Revision:	1.8
Changeset:	MAIN:schnider:20041115151004
Date:	16:10 15 November 2004 (7 years and 6 months)

file based account creation

Author:	schnider
Revision:	1.7
Changeset:	MAIN:schnider:20041115124800
Date:	13:48 15 November 2004 (7 years and 6 months)

file based account creation

Author:	schnider
Revision:	1.6
Changeset:	MAIN:schnider:20041115124156
Date:	13:43 15 November 2004 (7 years and 6 months)

auto generation of test accounts

Author:	schnider
Revision:	1.5
Changeset:	MAIN:schnider:20041115113928
Date:	12:39 15 November 2004 (7 years and 6 months)

commented out loading of jivemessenger server

Author:	schnider
Revision:	1.4
Changeset:	MAIN:schnider:20041027204816
Date:	22:48 27 October 2004 (7 years and 6 months)

minor changes and tests

Author:	schnider
Revision:	1.3
Changeset:	MAIN:schnider:20041027193033
Date:	21:30 27 October 2004 (7 years and 6 months)

added IMcontroller to test enviroement in olat

Author:	schnider
Revision:	1.2
Changeset:	MAIN:schnider:20041019172352
Date:	19:23 19 October 2004 (7 years and 7 months)

Initial version of instant messaging module

Author:	schnider
Revision:	1.1
Changeset:	MAIN:schnider:20041018230256
Date:	1:02 19 October 2004 (7 years and 7 months)

new

Merge HEAD into Branch

Author:	leberle
Revision:	1.49.18.1
Changeset:	OLAT-4_2_0-BPS-1553:leberle:20060622160602
Date:	18:06 22 June 2006 (5 years and 10 months)
Tags:	OLAT-4_2_0-BPS-1553_1 OLAT-4_2_0-BPS-1553_2

OLAT-1233:Merge HEAD into branch-1233

Author:	guretzki
Revision:	1.43.4.3
Changeset:	OLAT-4_2_0-UNIZH-1233:guretzki:20060522163057
Date:	18:31 22 May 2006 (6 years)

OLAT-1233: Merge HEAD into Branch

Author:	guretzki
Revision:	1.43.4.2
Changeset:	OLAT-4_2_0-UNIZH-1233:guretzki:20060510085901
Date:	10:59 10 May 2006 (6 years)

OLAT-1233: Merge HEAD into Branch

Author:	guretzki
Revision:	1.43.4.1
Changeset:	OLAT-4_2_0-UNIZH-1233:guretzki:20060510075946
Date:	9:59 10 May 2006 (6 years)

merged head (with ajax, header cleanup)

Author:	guretzki
Revision:	1.42.8.1
Changeset:	OLAT-4_2_0-UNIZH-1480:guretzki:20060406160555
Date:	18:06 06 April 2006 (6 years and 1 month)

OLAT-1530: Merge HEAD into BRANCH-1530

Author:	Alexander Schneider
Revision:	1.49.2.1
Changeset:	OLAT-4_2_0-UNIZH-1530:asch:20060629092527
Date:	11:26 29 June 2006 (5 years and 10 months)

OLAT-1562: Merge HEAD into branch.

Author:	guretzki
Revision:	1.49.12.1
Changeset:	OLAT-4_2_0-UNIZH-1562:guretzki:20060627081249
Date:	10:13 27 June 2006 (5 years and 10 months)

OLAT-1463: updated smack IM lib

Author:	schnider
Revision:	1.48.4.1
Changeset:	OLAT-4_2_0-UNIZH-903_2:schnider:20060515120126
Date:	14:01 15 May 2006 (6 years)

merges from HEAD

Author:	gnaegi
Revision:	1.49.4.1
Changeset:	OLAT-4_2_0-goodsolutions-1232:gnaegi:20060721170930
Date:	19:09 21 July 2006 (5 years and 10 months)

MERGE HEAD TO BRANCH 5.0.x
prepare for 5.0.1

Author:	Patrick Brunner
Revision:	1.52.10.1
Changeset:	OLAT-5_0_x-BRANCH:patrickb:20061010165002
Date:	18:50 10 October 2006 (5 years and 7 months)
Tags:	mergeHeadTo1595 mergeOLAT-5_0_xTo1595

OLAT-2782: IM : Replace hard-coded polling time intervalls with olat_config.xml parameters.

Author:	guretzki
Revision:	1.60.4.7
Changeset:	OLAT-5_2_x-BRANCH:guretzki:20071119122658
Date:	13:26 19 November 2007 (4 years and 6 months)
Tags:	OLAT-5_2_3-FINAL-20071119 OLAT-5_2_3-PUBLIC-20071120 OLAT-5_2_4-FINAL-20080310 OLAT-5_2_4-RC01-20080228 OLAT-5_2_4-RC02-20080306

easier install process, generate IM testusers on server as well

Author:	schnider
Revision:	1.60.4.6
Changeset:	OLAT-5_2_x-BRANCH:schnider:20070903175003
Date:	19:50 03 September 2007 (4 years and 8 months)
Branch point for:	OLAT-5_2_x-BRANCH-2729
Tags:	OLAT-5_2_1-FINAL-20070911 OLAT-5_2_1-GoldenMaster-20070911 Merged-5_2_2-20070927-Into-HEAD OLAT-5_2_2-PUBLIC-20070913 OLAT-5_2_1-PUBLIC-20070912 Root_OLAT-5_2_x-BRANCH-2729 OLAT-5_2_x-BRANCH-2729$BP

organise imports

Author:	schnider
Revision:	1.60.4.5
Changeset:	OLAT-5_2_x-BRANCH:schnider:20070822081257
Date:	10:12 22 August 2007 (4 years and 9 months)
Tags:	OLAT-5_2_0-GoldenMaster-20070822 OLAT-5_2_0-FINAL-20070822

non-jira
make idle and poll time of IM changeable

IdlePollTime => polling time if no chat is open
ChatPollTime => polling time if a chat is open

typically IdlePollTime > ChatPollTime

this helps tuning the polling time related to number of users and server load.

Author:	Patrick Brunner
Revision:	1.60.4.4
Changeset:	OLAT-5_2_x-BRANCH:patrickb:20070821211145
Date:	23:11 21 August 2007 (4 years and 9 months)

OLAT-2397
- separation of ImPreferences into "ImPreferences with setter/getters" and into "ImPrefsManager" for property creation and updating.
- solves concurrnency problems.

Author:	Patrick Brunner
Revision:	1.60.4.3
Changeset:	OLAT-5_2_x-BRANCH:patrickb:20070812201201
Date:	22:12 12 August 2007 (4 years and 9 months)

OLAT-2492: auto away feature for chat

Author:	schnider
Revision:	1.60.4.2
Changeset:	OLAT-5_2_x-BRANCH:schnider:20070806080235
Date:	10:02 06 August 2007 (4 years and 9 months)

olat-2143: do not allow smack to reconnect automatically on server error

Author:	schnider
Revision:	1.60.4.1
Changeset:	OLAT-5_2_x-BRANCH:schnider:20070731080756
Date:	10:07 31 July 2007 (4 years and 9 months)

OLAT-3533: sync learning group property was only set when the sync block was activated but should be every time the module starts

Author:	schnider
Revision:	1.68.2.3
Changeset:	OLAT-6_0_x-BRANCH:schnider:20081118095113
Date:	10:51 18 November 2008 (3 years and 6 months)
Tags:	OLAT-6_0_6-PUBLIC-20081120 OLAT-6_0_7-FINAL-20081201 OLAT-6_0_7-RC01-20081126 OLAT-6_0_7-PUBLIC-20081203

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

Author:	Alexander Schneider
Revision:	1.68.2.2
Changeset:	OLAT-6_0_x-BRANCH:asch:20080820123632
Date:	14:36 20 August 2008 (3 years and 9 months)
Tags:	OLAT-6_0_3-PUBLIC-20080820 OLAT-6_0_4-RC04-20080908 OLAT-6_0_5-RC02-20080925 OLAT-6_0_4-FINAL-20080909 OLAT-6_0_6-FINAL-20081117 OLAT-6_0_5-FINAL-20081010 OLAT-6_0_5-FINAL-20081008 OLAT-6_0_4-RC03-20080908 OLAT-6_0_5-RC01-20080924 OLAT-6_0_5-RC03-20081003 OLAT-6_0_5-RC04-20081006 OLAT-6_0_4-RC02-20080904 OLAT-6_0_4-RC01-20080902

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

Author:	rhaag
Revision:	1.68.2.1
Changeset:	OLAT-6_0_x-BRANCH:rhaag:20080627133110
Date:	15:31 27 June 2008 (3 years and 10 months)
Branch point for:	OLAT-6_0_1-MAINTENANCE
Tags:	OLAT-6_0_3-RC01-20080731 OLAT-6_0_2-MAINTENANCE-20080723 before_merge_HEAD_emergency_into_6_0_x_BRANCH OLAT-6_0_1-RC05-20080708 OLAT-6_0_1-RC04-20080703 OLAT-6_0_1-FINAL-20080714 OLAT-6_0_1-GM-20080711 OLAT-6_0_3-MERGE_TO_HEAD OLAT-6_0_3_CR02-20080805 OLAT-6_0_1-RC06-20080710 OLAT-6_0_1-MAINTENANCE$BP OLAT-6_0_3-FINAL-20080812 OLAT-6_0_3-FINAL-20080819

OLAT-3240: User Deletion: Delete all user-data linke dropbox.returnbox, qtit-editor temp file and meta-file-data.

Author:	guretzki
Revision:	1.82.10.1
Changeset:	OLAT-6_1_x-BRANCH:guretzki:20090318153029
Date:	16:35 18 March 2009 (3 years and 2 months)
Tags:	OLAT-6_1_1-RC04-20090428 OLAT-6_1_1-RC06-20090430 OLAT-6_1_1-PUBLIC-20090513 OLAT-6_1_1-RC01-20090406 OLAT-6_1_1-RC02-20090409 OLAT-6_1_1-RC05-20090429 OLAT-6_1_1-RC03-20090416

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

Author:	ikroll
Revision:	1.52.4.1
Changeset:	OLAT-HEAD-BPS-1595:ikroll:20061005081214
Date:	10:12 05 October 2006 (5 years and 7 months)
Tags:	beforeMerge-BPS-1595

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.

Author:	gnaegi
Revision:	1.53.8.3
Changeset:	OLAT-HEAD-BPS-Prototype_CF:gnaegi:20080106182601
Date:	19:27 06 January 2008 (4 years and 4 months)

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

Author:	gnaegi
Revision:	1.53.8.2
Changeset:	OLAT-HEAD-BPS-Prototype_CF:gnaegi:20070719170825
Date:	19:08 19 July 2007 (4 years and 10 months)

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

Author:	gnaegi
Revision:	1.53.8.1
Changeset:	OLAT-HEAD-BPS-Prototype_CF:gnaegi:20070717135926
Date:	15:59 17 July 2007 (4 years and 10 months)

OLAT-3766 cpeditor: Update BRANCH from HEAD

Author:	gwassmann
Revision:	1.82.6.1
Changeset:	OLAT-HEAD-FRENTIX-3766-CPEDITOR:gwassmann:20090518135813
Date:	16:00 18 May 2009 (3 years)

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

Author:	gwassmann
Revision:	1.82.14.1
Changeset:	OLAT-HEAD-FRENTIX-3946-Podcast:gwassmann:20090610100935
Date:	12:09 10 June 2009 (2 years and 11 months)
Tags:	mergePodcast3946ToHead

OLAT-5494 merge 7.1 head to epf-branch

Author:	rhaag
Revision:	1.87.6.2
Changeset:	OLAT-HEAD-FRENTIX-5494-EPORTFOLIO:rhaag:20101123094402
Date:	10:44 23 November 2010 (17 months)

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

Author:	rhaag
Revision:	1.87.6.1
Changeset:	OLAT-HEAD-FRENTIX-5494-EPORTFOLIO:rhaag:20100909143517
Date:	16:35 09 September 2010 (20 months)

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

Author:	gnaegi
Revision:	1.51.2.2
Changeset:	OLAT-HEAD-JGS-1577:gnaegi:20061103100306
Date:	11:03 03 November 2006 (5 years and 6 months)

Merging HEAD to branch

Author:	gnaegi
Revision:	1.51.2.1
Changeset:	OLAT-HEAD-JGS-1577:gnaegi:20060814174027
Date:	19:40 14 August 2006 (5 years and 9 months)

First time merge MAIN HEAD to Branch OLAT-HEAD-UZH-2385, where common starting point is Root-OLAT-HEAD-UZH-2385

Author:	lavinia
Revision:	1.58.2.1
Changeset:	OLAT-HEAD-UZH-2385:lavinia:20070702112504
Date:	13:32 02 July 2007 (4 years and 10 months)

Mavenization - basic POM adaptations

Author:	amoran
Revision:	1.83.20.1
Changeset:	OLAT-HEAD-UZH-4361:amoran:20090924065452
Date:	8:54 24 September 2009 (2 years and 7 months)

merge 5.2.1 from HEAD to 2433
tested locally

Author:	Patrick Brunner
Revision:	1.59.2.2
Changeset:	OLAT-HEAD-UZH-OLAT_2433:patrickb:20070907195137
Date:	21:51 07 September 2007 (4 years and 8 months)

olat-2433

Author:	fjost
Revision:	1.59.2.1
Changeset:	OLAT-HEAD-UZH-OLAT_2433:fjost:20070830143014
Date:	16:31 30 August 2007 (4 years and 8 months)
Tags:	before-merge-5_2_1-to-2433

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

Author:	gnaegi
Revision:	1.62.2.1
Changeset:	OLAT-HEAD-YAML-1725:gnaegi:20071123174825
Date:	18:48 23 November 2007 (4 years and 5 months)

OLAT-3674: merge head to branch

Author:	rhaag
Revision:	1.82.4.1
Changeset:	OLAT-HEAD_FRENTIX-3674:rhaag:20090528140628
Date:	16:07 28 May 2009 (2 years and 11 months)

OLAT-1835
organize imports
&
Separation core - lms

Author:	Patrick Brunner
Revision:	1.53.12.1
Changeset:	OLAT-HEAD_UNIZH-1935:patrickb:20061114150611
Date:	16:06 14 November 2006 (5 years and 6 months)

renaming of Manger to BasesecurityManager

Author:	schnider
Revision:	1.84.2.1
Changeset:	tmpOLAT-HEAD-640-until-2010-03-10:schnider:20100120164321
Date:	17:48 20 January 2010 (2 years and 4 months)
Branch point for:	OLAT-6_4_0-BPS-Incubation
Tags:	tmp-OLAT-HEAD-640-1 Root_OLAT-6_4_0-BPS-Incubation OLAT-6_4_0-BPS-Incubation$BP