Child pages
  • Merging ADL's SampleRTE RI (2.0 Beta) code into tool code
Skip to end of metadata
Go to start of metadata

Merging a new version Reference Implementation code into Sakai implementation

Sample RTE_2.0 Beta code is released and so gives an opportunity to practice merging the new with the old. I'll blog that here....

  • installed the new RTE on a Windows machine
  • imported tbe Sample_RTE_2_0_B directory into subversion from the release's directory tree
  • checked it out again elsewhere and tried to merge the java source from the Sakai tool
    • from the root of the java source package structure (eg, parent of 'org'):
      merge command
      [ccjon@fubar src]$ svn merge --dry-run -r 2131:952 https://source.sakaiproject.org/contrib/scorm/runtime_tool/trunk/tool/src/java/main .
      
      dry-run results
      Skipped missing target: 'org/sakaiproject/tool/scorm/ScormPackage.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/model/CommentFromLMS.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/model/InitializableBean.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/service/SakaiScormSeqUtilities.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/service/SakaiScormTOC.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/service/SakaiSequencer.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/service/SakaiCMIServlet.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/service/ScormSeqUtilities.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/service/SakaiSequencingException.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/LogMethodInterceptor.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/LogAdvicePointcut.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/LoggerLogMethodMatcher.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/AfterProcessLaunchAdvice.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/LoggerClassFilter.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/Package.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/tag/PackageViewFramesetRenderer.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/tag/PackageViewFramesetTag.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/ScormRteTool.java'
      Skipped 'org/sakaiproject/tool/scorm/util/cover'
      Skipped missing target: 'org/sakaiproject/tool/scorm/util/MonitorUIWindow.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/client/ChoiceTreeBean.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/client/SakaiClientRTS.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/client/SakaiScormTreeNode.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/client/RunState.java'
      Skipped missing target: 'org/sakaiproject/tool/scorm/client/SakaiScormTreeNodeComparator.java'
       G   org/adl/parsers/dom/DOMTreeUtility.java
       G   org/adl/parsers/dom/ADLDOMParser.java
       G   org/adl/validator/RulesValidator.java
       G   org/adl/validator/metadata/MDValidator.java
      Skipped missing target: 'org/adl/validator/metadata/rules/md_activityRules.xml'
      Skipped missing target: 'org/adl/validator/metadata/rules/md_assetRules.xml'
      Skipped missing target: 'org/adl/validator/metadata/rules/md_contentorganizationRules.xml'
      Skipped missing target: 'org/adl/validator/metadata/rules/md_contentaggregationRules.xml'
      Skipped missing target: 'org/adl/validator/metadata/rules/md_scoRules.xml'
       G   org/adl/validator/ADLValidatorOutcome.java
       G   org/adl/validator/contentpackage/LaunchData.java
       G   org/adl/validator/contentpackage/ManifestHandler.java
       G   org/adl/validator/contentpackage/ManifestMap.java
       G   org/adl/validator/contentpackage/CPValidator.java
       G   org/adl/validator/contentpackage/MetadataData.java
      CU   org/adl/validator/contentpackage/rules/cp_resourceRules.xml
      CU   org/adl/validator/contentpackage/rules/cp_contentaggregationRules.xml
       G   org/adl/validator/contentpackage/XSDHandler.java
       G   org/adl/validator/sequence/ObjectiveMap.java
      UU   org/adl/validator/sequence/rules/sequenceRules.xml
       G   org/adl/validator/sequence/SequenceValidator.java
       G   org/adl/validator/ADLSCORMValidator.java
       G   org/adl/validator/DOMRulesCreator.java
       G   org/adl/api/ecmascript/APIErrorCodes.java
       G   org/adl/api/ecmascript/SCORM12APIInterface.java
       G   org/adl/api/ecmascript/SCORM13APIInterface.java
       G   org/adl/api/ecmascript/APIErrorManager.java
      Skipped missing target: 'org/adl/testsuite/util/VersionHandler.java'
      Skipped missing target: 'org/adl/testsuite/util/AuditorIndicator.java'
      Skipped missing target: 'org/adl/testsuite/util/CTSEnvironmentVariable.java'
      Skipped missing target: 'org/adl/testsuite/util/ConformanceLabel.java'
       G   org/adl/sequencer/SeqCondition.java
       G   org/adl/sequencer/ADLObjStatus.java
       G   org/adl/sequencer/ADLAuxiliaryResource.java
       G   org/adl/sequencer/SeqActivity.java
       G   org/adl/sequencer/ADLSeqUtilities.java
       G   org/adl/sequencer/SeqReportActivityStatus.java
       G   org/adl/sequencer/ADLTOC.java
       G   org/adl/sequencer/ADLDuration.java
      CG   org/adl/sequencer/SeqObjectiveTracking.java
       G   org/adl/sequencer/SeqNavigation.java
       G   org/adl/sequencer/SeqActivityTrackingAccess.java
       G   org/adl/sequencer/SeqConditionSet.java
       G   org/adl/sequencer/ADLSequencer.java
       G   org/adl/sequencer/ADLValidRequests.java
       G   org/adl/sequencer/SeqRollupRule.java
       G   org/adl/sequencer/SeqRule.java
       G   org/adl/sequencer/SeqObjectiveMap.java
       G   org/adl/sequencer/ADLTracking.java
       G   org/adl/sequencer/SeqObjective.java
       G   org/adl/sequencer/SeqActivityTree.java
       G   org/adl/sequencer/ADLSeqParser.java
       G   org/adl/sequencer/SeqActivityStateAccess.java
       G   org/adl/sequencer/SeqNavRequests.java
       G   org/adl/sequencer/SeqRollupRuleset.java
       G   org/adl/sequencer/ADLLaunch.java
       G   org/adl/sequencer/SeqRuleset.java
       G   org/adl/samplerte/server/UserProfile.java
       G   org/adl/samplerte/server/UserService.java
       G   org/adl/samplerte/server/LMSManifestHandler.java
       G   org/adl/samplerte/server/CourseService.java
       G   org/adl/samplerte/server/LMSCMIServletRequest.java
       G   org/adl/samplerte/server/ServletRequestTypes.java
       G   org/adl/samplerte/server/LMSUserAdmin.java
       G   org/adl/samplerte/server/LMSCourseAdmin.java
       G   org/adl/samplerte/server/LMSPackageHandler.java
       G   org/adl/samplerte/server/LMSCMIServletResponse.java
       G   org/adl/samplerte/server/LMSCMIServlet.java
       G   org/adl/samplerte/server/CourseData.java
       G   org/adl/samplerte/server/SCOData.java
       G   org/adl/samplerte/util/LMSDBHandler.java
       G   org/adl/samplerte/util/RTEFileHandler.java
       G   org/adl/samplerte/util/LMSDatabaseHandler.java
      Skipped missing target: 'org/adl/samplerte/client/ServletWriter.java'
       G   org/adl/samplerte/client/ServletProxy.java
       G   org/adl/samplerte/client/ClientRTS.java
       G   org/adl/datamodels/DMDelimiter.java
       G   org/adl/datamodels/DMTimeUtility.java
       G   org/adl/datamodels/nav/SCORM_2004_NAV_DMElement.java
       G   org/adl/datamodels/nav/SCORM_2004_NAV_DM.java
       G   org/adl/datamodels/DMTypeValidator.java
       G   org/adl/datamodels/DMRequest.java
       G   org/adl/datamodels/DMProcessingInfo.java
       G   org/adl/datamodels/DMElementDescriptor.java
       G   org/adl/datamodels/SCODataManager.java
       G   org/adl/datamodels/DMElement.java
       G   org/adl/datamodels/datatypes/DateTimeValidator.java
       G   org/adl/datamodels/datatypes/SPMRangeValidator.java
       G   org/adl/datamodels/datatypes/ResultValidator.java
       G   org/adl/datamodels/datatypes/InteractionValidator.java
       G   org/adl/datamodels/datatypes/URIValidator.java
       G   org/adl/datamodels/datatypes/RealRangeValidator.java
       G   org/adl/datamodels/datatypes/DurationValidator.java
       G   org/adl/datamodels/datatypes/InteractionTrunc.java
       G   org/adl/datamodels/datatypes/IntRangeValidator.java
       G   org/adl/datamodels/datatypes/VocabularyValidator.java
       G   org/adl/datamodels/datatypes/LangStringValidator.java
       G   org/adl/datamodels/DMInterface.java
       G   org/adl/datamodels/RequestDelimiter.java
       G   org/adl/datamodels/ieee/SCORM_2004_DMElement.java
       G   org/adl/datamodels/ieee/Version.java
       G   org/adl/datamodels/ieee/SCORM_2004_DM.java
       G   org/adl/datamodels/DMFactory.java
       G   org/adl/datamodels/DMErrorCodes.java
       G   org/adl/datamodels/Count.java
       G   org/adl/datamodels/Children.java
       G   org/adl/datamodels/RequestToken.java
       G   org/adl/datamodels/DataModel.java
       G   org/adl/datamodels/DMDelimiterDescriptor.java
       G   org/adl/util/MessageCollection.java
       G   org/adl/util/zip/UnZipHandler.java
      Skipped missing target: 'org/adl/util/Message.java'
       G   org/adl/util/MessageType.java
       G   org/adl/util/debug/DebugIndicator.java
       G   org/adl/util/debug/LogConfig.java
       G   org/adl/util/debug/ADLSimpleFormatter.java
       G   org/adl/util/EnvironmentVariable.java
       G   org/adl/util/support/SupportVerifier.java
       G   org/adl/util/MessageBox.java
      Skipped missing target: 'edu/ucdavis/sakai/util/HttpRequestLoggerFilter.java'
      
  • No labels