Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[3961] magnoliamodules/trunk
|
From: <fg...@us...> - 2012-05-06 13:05:39
|
Revision: 3961
http://openutils.svn.sourceforge.net/openutils/?rev=3961&view=rev
Author: fgiust
Date: 2012-05-06 13:05:28 +0000 (Sun, 06 May 2012)
Log Message:
-----------
Merged revisions 3809-3812,3815-3816,3875-3877,3889-3890,3892,3952-3954,3958 via svnmerge from
https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/branches/magnolia44
........
r3809 | diego_schivo | 2012-03-16 11:58:18 +0100 (Fri, 16 Mar 2012) | 1 line
MEDIA-279 LockUtils
........
r3810 | diego_schivo | 2012-03-16 12:10:27 +0100 (Fri, 16 Mar 2012) | 1 line
MEDIA-279 ImageUtils
........
r3811 | diego_schivo | 2012-03-16 12:19:32 +0100 (Fri, 16 Mar 2012) | 1 line
MEDIA-279 MediaModule: maxConcurrentThreads
........
r3812 | diego_schivo | 2012-03-16 12:21:07 +0100 (Fri, 16 Mar 2012) | 1 line
MEDIA-279 MediaEl.module().getLocks().nextLock()
........
r3815 | diego_schivo | 2012-03-16 15:19:26 +0100 (Fri, 16 Mar 2012) | 1 line
MEDIA-278 The first tab is not displayed in a LayerDialogMVC
........
r3816 | diego_schivo | 2012-03-16 15:31:29 +0100 (Fri, 16 Mar 2012) | 1 line
MEDIA-278 The first tab is not displayed in a LayerDialogMVC
........
r3875 | carlocolombo | 2012-03-21 11:19:59 +0100 (Wed, 21 Mar 2012) | 1 line
renamed lms to mgnllms, path and references
........
r3876 | carlocolombo | 2012-03-21 11:29:16 +0100 (Wed, 21 Mar 2012) | 1 line
renamed lms to mgnlms
........
r3877 | carlocolombo | 2012-03-21 11:32:50 +0100 (Wed, 21 Mar 2012) | 1 line
renamed lms to mgnlms
........
r3889 | carlocolombo | 2012-03-21 17:47:52 +0100 (Wed, 21 Mar 2012) | 1 line
removed lms folders
........
r3890 | diego_schivo | 2012-03-27 09:57:02 +0200 (Tue, 27 Mar 2012) | 1 line
MESSAGES-17 Dropdown options may not contain the selected language
........
r3892 | fgiust | 2012-04-04 18:02:23 +0200 (Wed, 04 Apr 2012) | 1 line
CRIT-48 fix regression similar to CRIT-40
........
r3952 | carlocolombo | 2012-04-16 16:24:24 +0200 (Mon, 16 Apr 2012) | 3 lines
Mapped url starting with /scorm to lms repository (previously lms -> lms)
updated scormPlayerPage to use url2repositoryMapping to retrieve correct repository
update js to open page with mgnlRepository=scorm
........
r3953 | carlocolombo | 2012-04-19 16:31:49 +0200 (Thu, 19 Apr 2012) | 1 line
lms -> scorm
........
r3954 | diego_schivo | 2012-05-04 15:38:43 +0200 (Fri, 04 May 2012) | 1 line
CONTROLS-46 Grid control: combo column type showing labels instead of values
........
r3958 | fgiust | 2012-05-06 14:20:23 +0200 (Sun, 06 May 2012) | 1 line
MEDIA-285 remove usage of com.sun.image.codec.jpeg.JPEGCodec
........
Revision Links:
--------------
http://openutils.svn.sourceforge.net/openutils/?rev=3809&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3810&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3811&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3812&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3815&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3816&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3875&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3876&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3877&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3889&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3890&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3892&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3952&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3953&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3954&view=rev
http://openutils.svn.sourceforge.net/openutils/?rev=3958&view=rev
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
magnoliamodules/trunk/openutils-mgnllms/pom.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/CourseEventListener.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/EmptyCourseEventListener.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/configuration/LmsTypeConfiguration.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogFileCourse.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogMetadata.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/PreSaveDialogMVC.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/el/LmsElFunctions.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/exceptions/CourseException.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/gui/control/LmsDialogFile.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsBrowserConfiguration.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsJcrBrowserTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTree.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeConfiguration.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeMVCHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/LmsTypeHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/BaseTypeHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/CourseTypeHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/ScormTypeHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerActivitiesManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/ScormCMIManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/LearnerManagerWithMagnoliaUsers.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaLearnerActivitiesManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaScormCmiManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSConfigurationModuleManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LmsTypesManager.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormCmiPage.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/report/UserReportPage.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/report/UserReportPageAdmin.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/Helper.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/Objective.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/TrackingModel.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/report/UserReport.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/ExactContentFilter.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/samples/listeners/StudentLevelListener.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/CommonDataItemOrganization.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Dependency.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/File.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Item.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Manifest.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Metadata.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/ObjectFactory.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Organization.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Organizations.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Resource.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/Resources.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/CompletionThreshold.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/Data.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/Map.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/ObjectFactory.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/TimeLimitAction.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/cp/package-info.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/AuxiliaryResource.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/AuxiliaryResources.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ChildActivity.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ConditionCombination.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ConditionOperator.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ControlMode.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/DeliveryControls.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ExitConditionRule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ExitConditionRuleAction.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/LimitConditions.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/MapInfo.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ObjectFactory.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/Objective.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ObjectiveBase.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/ObjectiveMapping.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/Objectives.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PostConditionRule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PostConditionRuleAction.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PreConditionRule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PreConditionRuleAction.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/PrimaryObjective.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RandomTiming.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/Randomization.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupAction.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupActionEnum.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupConditions.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupRule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupRuleCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RollupRules.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleActionExitCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleActionPostCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleActionPreCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/RuleConditions.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/Sequencing.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/SequencingCollection.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/SequencingRule.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/SequencingRuleCondition.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/SequencingRules.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/imsss/package-info.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/HideLMSUI.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/NavigationInterface.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/ObjectFactory.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/Presentation.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/nav/package-info.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/package-info.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/ConstrainChoiceConsiderations.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/MapInfo.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/ObjectFactory.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/Objective.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/Objectives.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/RollupConsideration.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/RollupConsiderations.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/SeqObjective.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/SeqObjectives.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/model/seq/package-info.java
magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/scorm/utils/JaxbUtils.java
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/tags/playerUrl.tag
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.server.URI2RepositoryMapping.mappings.mgnllms.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/lms.js
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.html
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/net/sourceforge/openutils/mgnllms/pages/report/UserReportPage.html
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/net/sourceforge/openutils/mgnllms/pages/report/UserReportPageAdmin.html
magnoliamodules/trunk/openutils-mgnllms/src/test/java/net/sourceforge/openutils/mgnllms/TestJaxb.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/dialog/LayerDialog.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/magnolia/mgnllms.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/mgnllms/
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-nodetypes/mgnllms/
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/LockUtils.java
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/magnolia/lms.xml
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap/lms/
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-bootstrap-samples/lms/
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-nodetypes/lms/
magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-resources/lms/
Property Changed:
----------------
magnoliamodules/trunk/
magnoliamodules/trunk/openutils-mgnlmedia/
Property changes on: magnoliamodules/trunk
___________________________________________________________________
Modified: svnmerge-integrated
- /magnoliamodules/branches/magnolia44:1-3779
+ /magnoliamodules/branches/magnolia44:1-3807,3809-3812,3815-3892,3894,3899,3902,3904,3908,3912,3914-3960
Added: svn:mergeinfo
+ /magnoliamodules/branches/magnolia44:3809-3812,3815-3892,3952-3958
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -84,10 +84,29 @@
options.add("lazyRender: true");
options.add("listClass: 'x-combo-list-small'");
- column.put("editor", "new Ed(new "
- + ("true".equals(String.valueOf(colMap.get("pipe"))) ? "PipeComboBox" : "fm.ComboBox")
- + "({"
- + StringUtils.join(options, ",")
- + "}))");
+ if ("true".equals(String.valueOf(colMap.get("showLabel"))))
+ {
+ column.put(
+ "editor",
+ "(function() { window.gridComboColumnTypeTmp = new "
+ + ("true".equals(String.valueOf(colMap.get("pipe"))) ? "PipeComboBox" : "fm.ComboBox")
+ + "({"
+ + StringUtils.join(options, ",")
+ + "}); return new Ed(gridComboColumnTypeTmp); })()");
+ column.put("renderer", "(function(combo){"
+ + " return function(value){"
+ + " var record = combo.findRecord(combo.valueField, value);"
+ + " return record ? record.get(combo.displayField) : combo.valueNotFoundText;"
+ + " }"
+ + "})(window.gridComboColumnTypeTmp)");
+ }
+ else
+ {
+ column.put("editor", "new Ed(new "
+ + ("true".equals(String.valueOf(colMap.get("pipe"))) ? "PipeComboBox" : "fm.ComboBox")
+ + "({"
+ + StringUtils.join(options, ",")
+ + "}))");
+ }
}
}
Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml 2012-05-06 13:05:28 UTC (rev 3961)
@@ -4,7 +4,7 @@
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-parent</artifactId>
<relativePath>../openutils-parent</relativePath>
- <version>1.12</version>
+ <version>1.11</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -25,8 +25,8 @@
<url>http://jira.openmindlab.com/browse/SCORM</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnllms</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/magnoliamodules/trunk/openutils-mgnllms</developerConnection>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnllms</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnllms</developerConnection>
<url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnllms</url>
</scm>
<build>
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/CourseEventListener.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/CourseEventListener.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/CourseEventListener.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/EmptyCourseEventListener.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/EmptyCourseEventListener.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/listeners/EmptyCourseEventListener.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/configuration/LmsTypeConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/configuration/LmsTypeConfiguration.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/configuration/LmsTypeConfiguration.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogFileCourse.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogFileCourse.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogFileCourse.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogMetadata.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogMetadata.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/DialogMetadata.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/PreSaveDialogMVC.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/PreSaveDialogMVC.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/dialog/PreSaveDialogMVC.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/el/LmsElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/el/LmsElFunctions.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/el/LmsElFunctions.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/exceptions/CourseException.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/exceptions/CourseException.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/exceptions/CourseException.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/gui/control/LmsDialogFile.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/gui/control/LmsDialogFile.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/gui/control/LmsDialogFile.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsBrowserConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsBrowserConfiguration.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsBrowserConfiguration.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsJcrBrowserTreeConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsJcrBrowserTreeConfiguration.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsJcrBrowserTreeConfiguration.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTree.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTree.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTree.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeConfiguration.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeConfiguration.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeConfiguration.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -56,7 +56,7 @@
ContextMenuItem menuNewPage = new ContextMenuItem("newFolder");
menuNewPage.setLabel(msgs.get("tree.config.menu.newFolder")); //$NON-NLS-1$
- menuNewPage.setIcon(request.getContextPath() + "/.resources/lms/icons/folder16.gif"); //$NON-NLS-1$
+ menuNewPage.setIcon(request.getContextPath() + "/.resources/mgnllms/icons/folder16.gif"); //$NON-NLS-1$
menuNewPage.setOnclick(tree.getJavascriptTree()
+ ".createNode('" + LmsTypesManager.FOLDER.getSystemName() + "');"); //$NON-NLS-1$ //$NON-NLS-2$
menuNewPage.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotScormNode("
@@ -101,7 +101,7 @@
ContextMenuItem menuSimulate = new ContextMenuItem("simulate");
menuSimulate.setLabel(msgs.get("lms.menu.simulate")); //$NON-NLS-1$
- menuSimulate.setIcon(request.getContextPath() + "/.resources/lms/icons/browse16.gif"); //$NON-NLS-1$
+ menuSimulate.setIcon(request.getContextPath() + "/.resources/mgnllms/icons/browse16.gif"); //$NON-NLS-1$
menuSimulate.setOnclick("mgnl.lms.simulate(" + tree.getJavascriptTree() + ".selectedNode.id);");
menuSimulate.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotRoot("
+ tree.getJavascriptTree()
@@ -121,7 +121,7 @@
// ContextMenuItem menuUserReport = new ContextMenuItem("userReport");
// menuUserReport.setLabel(msgs.get("lms.menu.userreport")); //$NON-NLS-1$
- // menuUserReport.setIcon(request.getContextPath() + "/.resources/lms/icons/browse16.gif"); //$NON-NLS-1$
+ // menuUserReport.setIcon(request.getContextPath() + "/.resources/mgnllms/icons/browse16.gif"); //$NON-NLS-1$
// menuUserReport.setOnclick("mgnl.lms.userreport(" + tree.getJavascriptTree() + ".selectedNode.id);");
// menuUserReport.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotRoot("
// + tree.getJavascriptTree()
@@ -138,7 +138,7 @@
ContextMenuItem menuUserReportAdmin = new ContextMenuItem("userReportAdmin");
menuUserReportAdmin.setLabel(msgs.get("lms.menu.userreportadmin")); //$NON-NLS-1$
- menuUserReportAdmin.setIcon(request.getContextPath() + "/.resources/lms/icons/browse16.gif"); //$NON-NLS-1$
+ menuUserReportAdmin.setIcon(request.getContextPath() + "/.resources/mgnllms/icons/browse16.gif"); //$NON-NLS-1$
menuUserReportAdmin.setOnclick("mgnl.lms.userreportadmin(" + tree.getJavascriptTree() + ".selectedNode.id);");
menuUserReportAdmin.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotRoot("
+ tree.getJavascriptTree()
@@ -304,8 +304,8 @@
{
final Messages msgs = getMessages();
- tree.addItemType(LmsTypesManager.FOLDER.getSystemName(), "/.resources/lms/icons/folder16.gif");
- tree.addItemType(LmsTypesManager.COURSE.getSystemName(), "/.resources/lms/icons/course.gif");
+ tree.addItemType(LmsTypesManager.FOLDER.getSystemName(), "/.resources/mgnllms/icons/folder16.gif");
+ tree.addItemType(LmsTypesManager.COURSE.getSystemName(), "/.resources/mgnllms/icons/course.gif");
TreeColumn column0 = TreeColumn.createLabelColumn(tree, msgs.get("tree.lms.folders"), true);
column0.setWidth(4);
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeMVCHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeMVCHandler.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/tree/LmsModuleTreeMVCHandler.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -52,13 +52,13 @@
super.renderHeaderIncludes(html);
html.append("<script type=\"text/javascript\" src=\""
+ this.getRequest().getContextPath()
- + "/.resources/lms/js/lms.js\"><!-- --></script>");
+ + "/.resources/mgnllms/js/lms.js\"><!-- --></script>");
html.append("<script type=\"text/javascript\" src=\""
+ this.getRequest().getContextPath()
- + "/.resources/lms/js/conditions.js\"><!-- --></script>");
+ + "/.resources/mgnllms/js/conditions.js\"><!-- --></script>");
html.append("<link rel=\"stylesheet\" href=\""
+ this.getRequest().getContextPath()
- + "/.resources/lms/css/override.css\"><!-- --></script>");
+ + "/.resources/mgnllms/css/override.css\"><!-- --></script>");
}
/**
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/LmsTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/LmsTypeHandler.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/LmsTypeHandler.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/BaseTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/BaseTypeHandler.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/BaseTypeHandler.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/CourseTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/CourseTypeHandler.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/CourseTypeHandler.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/ScormTypeHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/ScormTypeHandler.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/types/impl/ScormTypeHandler.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/lms/uri/LmsURI2RepositoryMapping.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerActivitiesManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerActivitiesManager.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerActivitiesManager.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerManager.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/LearnerManager.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/ScormCMIManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/ScormCMIManager.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/ScormCMIManager.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/LearnerManagerWithMagnoliaUsers.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/LearnerManagerWithMagnoliaUsers.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/LearnerManagerWithMagnoliaUsers.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaLearnerActivitiesManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaLearnerActivitiesManager.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaLearnerActivitiesManager.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaScormCmiManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaScormCmiManager.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/managers/impl/MagnoliaScormCmiManager.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSConfigurationModuleManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSConfigurationModuleManager.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSConfigurationModuleManager.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModule.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModule.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LMSModuleVersionHandler.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LmsTypesManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LmsTypesManager.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/module/LmsTypesManager.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormCmiPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormCmiPage.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormCmiPage.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java 2012-05-06 12:39:22 UTC (rev 3960)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java 2012-05-06 13:05:28 UTC (rev 3961)
@@ -1,7 +1,7 @@
/**
*
* E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2012, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,10 +19,14 @@
package net.sourceforge.openutils.mgnllms.pages.lms;
+import info.magnolia.cms.beans.config.URI2RepositoryManager;
+import info.magnolia.cms.beans.config.URI2Reposi...
[truncated message content] |
