[ec2-user@ip-10-4-1-6 tn8-previewer]$ git pull origin 1.1.0Realize Username for 'https://bitbucket.pearson.com': vshansu Password for 'https://vshansu@bitbucket.pearson.com': remote: Counting objects: 839, done. remote: Compressing objects: 100% (521/521), done. remote: Total 839 (delta 571), reused 540 (delta 318) Receiving objects: 100% (839/839), 1.68 MiB | 1.92 MiB/s, done. Resolving deltas: 100% (571/571), completed with 136 local objects. From https://bitbucket.pearson.com/scm/tnprev/tn8-previewer * branch 1.1.0Realize -> FETCH_HEAD Updating f828d3c..0165d79 Fast-forward app/controllers/Api.java | 124 +- app/controllers/ApiScoring.java | 27 +- app/controllers/ApiTN8.java | 175 +- app/controllers/Application.java | 17 +- app/controllers/Items.java | 2 + app/controllers/Tenants.java | 12 +- app/controllers/Testmaps.java | 35 +- app/controllers/Users.java | 12 +- app/jobs/ParseContentPackageJob.java | 1262 +- app/jobs/RenderPublishContentPackageJob.java | 2 +- app/jobs/TN8PublishCPJob.java | 56 +- app/jobs/TestmapCPFactoryJob.java | 2 +- app/models/ApiResponse.java | 7 +- app/models/AssessmentObject.java | 86 +- app/models/CPPublishJobTracker.java | 3 + app/models/ImportContentPackageJob.java | 1417 +- app/models/Item.java | 8 +- app/models/ItemFile.java | 4 +- app/models/ItemObject.java | 135 +- app/models/S3Blob.java | 7 +- app/models/TN8Environment.java | 29 +- app/models/TN8Environment_PublisherGroup.java | 11 +- app/models/TN8PublishLogEntry.java | 12 + app/models/TenantMember.java | 8 +- app/models/Testmap.java | 68 +- app/models/apip/Spoken.java | 10 + app/models/permissions/AclRole.java | 6 +- app/models/qti/ComplexSliderInteractionFactory.java | 5 +- app/models/qti/GapMatchInteractionFactory.java | 15 +- app/models/qti/HotTextInteractionFactory.java | 6 +- app/models/qti/ItemPlugin.java | 6 +- app/models/qti/MatchInteractionFactory.java | 57 +- app/models/qti/OrderInteractionFactory.java | 110 + app/models/qti/PortableInteractionFactory.java | 9 +- app/models/qti/QtiObject.java | 7 +- app/models/qti/TextEntryInteractionFactory.java | 40 +- app/qti/kt/customOperators/ScoreEssay.java | 49 +- app/utils/ApipAccessibilityHandler.java | 18 +- app/utils/ItemQtiFactory.java | 18 +- app/utils/ItemValidationUtils.java | 15 +- app/utils/PublishCPFactory.java | 2 +- app/utils/S3StorageManager.java | 20 +- app/utils/TestDefUtils.java | 6 +- app/views/Api/epenItemPreviewPage.html | 298 +- app/views/Api/epenItemShow.html | 303 +- app/views/Api/epenItemShowWithScoring.html | 122 +- app/views/Api/interactionPreviewPage.html | 122 +- app/views/Api/interactionShow.html | 122 +- app/views/Api/itemShow.html | 157 +- app/views/Api/itemShowIframeApi.html | 1316 ++ app/views/Api/showTestmap.html | 157 +- app/views/Items/show.html | 129 +- app/views/Items/showCollection.html | 137 +- app/views/Mails/sendLostPasswordEmail.html | 2 +- app/views/Mails/sendTenantInvitationExternal.html | 2 +- app/views/Mails/sendTenantInvitationInternal.html | 2 +- app/views/Mails/sendTestRegistrationEmail.html | 2 +- app/views/Tenants/addMembers.html | 15 + app/views/Tenants/show.html | 7 +- app/views/Testmaps/editPublishDestination.html | 17 +- app/views/Testmaps/listByTenant.html | 18 +- app/views/Testmaps/listByTenantPublisher.html | 18 +- app/views/Testmaps/preview.html | 157 +- app/views/Testmaps/previewItems.html | 142 +- app/views/js-includes/_itemBehaviors.js | 76 + app/views/js-includes/_scrp.js | 65 + app/views/login-register.html | 1 + app/views/main.html | 1 + app/views/main_chromeless_item.html | 34 + app/views/main_item.html | 2 + app/views/main_testnav.html | 1 + app/views/main_testnav_api.html | 1 + app/views/main_testnav_item.html | 1 + conf/application.conf | 2 +- conf/messages | 1 + conf/routes | 3 + lib/httpmime-4.3.jar | Bin 0 -> 37068 bytes lib/{qti4j-1.0.13.jar => qti4j-1.0.26.jar} | Bin 929159 -> 940731 bytes public/images/favicon.ico | Bin 1150 -> 0 bytes public/images/global/loader3.gif | Bin 0 -> 18120 bytes public/images/schoolnet/circle.png | Bin 0 -> 3640 bytes public/images/schoolnet/circledark.png | Bin 0 -> 3715 bytes public/javascripts/aimswebcontrollers-lib.js | 2 +- public/javascripts/app.js | 5 + public/javascripts/bootstrap-2.3.js | 131 +- public/javascripts/bootstrap-select.js | 171 +- public/javascripts/charts-plugin.js | 142 +- public/javascripts/compositegraph-lib.js | 6 +- public/javascripts/easeljs-0.6.0.min.js | 29 +- public/javascripts/equationeditor/equationeditor-lib.js | 2 +- public/javascripts/equationeditor/styles/basic-layout.xml | 9 +- public/javascripts/equationeditor/styles/basic-template.xml | 1003 +- public/javascripts/equationeditor/styles/basic.xml | 88 +- public/javascripts/equationeditor/styles/br-text-cbc.xml | 692 + public/javascripts/equationeditor/styles/br-text-gr1.xml | 516 + public/javascripts/equationeditor/styles/braille-key.xml | 17 +- public/javascripts/equationeditor/styles/braille-layout.xml | 7 +- public/javascripts/equationeditor/styles/braille-template.xml | 47 + public/javascripts/equationeditor/styles/braille-tooltips.xml | 1867 +++ public/javascripts/equationeditor/styles/braille.xml | 15 +- public/javascripts/equationeditor/styles/catalog.xml | 29 +- public/javascripts/equationeditor/styles/fill-in.xml | 201 +- public/javascripts/equationeditor/styles/full.xml | 1 + public/javascripts/equationeditor/styles/lang-es.xml | 116 +- public/javascripts/equationeditor/styles/multi-line-create.xml | 27 - public/javascripts/equationeditor/styles/numbers-template.xml | 1283 ++ public/javascripts/equationeditor/styles/numbers.xml | 37 + public/javascripts/equationeditor/styles/text.xml | 47 +- public/javascripts/functiongraph-lib.js | 17 +- public/javascripts/highcharts.js | 10 +- public/javascripts/jquery-1.7.2.min.js | 36 +- public/javascripts/jquery-ui-1.8.23.custom.min.js | 73 +- public/javascripts/jquery.jgrowl.min.js | 2 +- public/javascripts/jquery.nicescroll.min.js | 4 +- public/javascripts/jquery.pagedpassage.js | 296 +- public/javascripts/jquery.qtip2.min.js | 48 +- public/javascripts/jquery.textentryfilter.js | 15 +- public/javascripts/jquery.widget.barchartinteraction.js | 286 +- public/javascripts/jquery.widget.complexsliderinteraction.js | 191 +- public/javascripts/jquery.widget.drawinginteraction.js | 408 +- public/javascripts/jquery.widget.essayIndividualFeedbackHandler-realize.js | 5 + public/javascripts/jquery.widget.essayfeedback-prototype.js | 224 + public/javascripts/jquery.widget.essayfeedback-realize.js | 503 + public/javascripts/jquery.widget.exhibitswidget.js | 401 +- public/javascripts/jquery.widget.extendedTextInteractionRealize.js | 80 + public/javascripts/jquery.widget.gapmatchinteraction.js | 2 +- public/javascripts/jquery.widget.graphicgapmatchinteraction.js | 2 +- public/javascripts/jquery.widget.griddedresponse-sn.js | 190 + public/javascripts/jquery.widget.griddedresponse.js | 67 +- public/javascripts/jquery.widget.hotspotinteraction.js | 2 +- public/javascripts/jquery.widget.matchinteraction.js | 2 +- public/javascripts/jquery.widget.orderinteraction.js | 258 + public/javascripts/jquery.widget.recorder.min.js | 5536 ++++++- public/javascripts/jquery.widget.richtext.js | 6 +- public/javascripts/jquery.widget.tabbedpassage.js | 293 +- public/javascripts/local-jquery.js | 171 + public/javascripts/mathjax/jax/output/HTML-CSS/jax.js | 2 +- public/javascripts/numberline/numberline-lib.js | 6 +- public/javascripts/pointgraph-lib-1.0.js | 6 +- public/javascripts/prepresponsetimecontroller-lib.js | 221 + public/javascripts/raphael.hotspot.js | 540 +- public/javascripts/raphael.sketchpad.js | 2806 +++- public/javascripts/recorder/AudioRecordPlay.swf | Bin 0 -> 477290 bytes public/javascripts/recorder/audiorecorder.swf | Bin 5895 -> 525078 bytes public/javascripts/recorder/libvorbis.js | 37310 ++++++++++++++++++++++++++++++++++++++++++++++ public/javascripts/recorder/oggvorbisDecoder.js | 24 + public/javascripts/recorder/oggvorbisEncoder.js | 24 + public/javascripts/recorder/speex.min.js | 639 - public/javascripts/recorder/speexDecoder.js | 63 - public/javascripts/recorder/speexEncoder.js | 38 - public/javascripts/shapetransformation-lib.js | 6 +- public/javascripts/textextractor-lib.js | 17 +- public/javascripts/texthighlighter-lib.js | 6 +- public/javascripts/texttospeech-lib.js | 3173 +--- public/javascripts/tools/answereliminator-lib.js | 17 +- public/javascripts/tools/answermasking-lib.js | 6 +- public/javascripts/tools/calculatorToolbox-lib.js | 6 +- public/javascripts/tools/contrastcontroller-lib.js | 6 +- public/javascripts/tools/css/images/font/pearsoniconstn8-webfont.eot | Bin 8972 -> 9784 bytes public/javascripts/tools/css/images/font/pearsoniconstn8-webfont.svg | 6 +- public/javascripts/tools/css/images/font/pearsoniconstn8-webfont.ttf | Bin 8744 -> 9556 bytes public/javascripts/tools/css/images/font/pearsoniconstn8-webfont.woff | Bin 8820 -> 9632 bytes .../tools/css/images/{ruler_centimeter_removed.png => ruler_centimeter_removed_en.png} | Bin public/javascripts/tools/css/images/ruler_centimeter_removed_es.png | Bin 0 -> 3898 bytes public/javascripts/tools/css/images/{ruler_eighth_inches.png => ruler_eighth_inches_en.png} | Bin public/javascripts/tools/css/images/ruler_eighth_inches_es.png | Bin 0 -> 2824 bytes public/javascripts/tools/css/images/{ruler_millimeter.png => ruler_millimeter_en.png} | Bin public/javascripts/tools/css/images/ruler_millimeter_es.png | Bin 0 -> 3913 bytes public/javascripts/tools/css/images/{ruler_quarter_inches.png => ruler_quarter_inches_en.png} | Bin public/javascripts/tools/css/images/ruler_quarter_inches_es.png | Bin 0 -> 2791 bytes public/javascripts/tools/css/tools.css | 783 +- public/javascripts/tools/highlightertool-lib.js | 6 +- public/javascripts/tools/linereader-lib.js | 18 +- public/javascripts/tools/magnifier-lib.js | 10 +- public/javascripts/tools/notepad-lib.js | 6 +- public/javascripts/tools/ticalccontroller-lib.js | 6 +- public/javascripts/tools/toolcontroller-lib.js | 173 +- public/javascripts/zoomnumberline-lib.js | 6 +- public/stylesheets/acc.css | 38 +- public/stylesheets/contrasts/black.css | 81 +- public/stylesheets/contrasts/blue.css | 81 +- public/stylesheets/contrasts/cream.css | 81 +- public/stylesheets/contrasts/lblue.css | 81 +- public/stylesheets/contrasts/lmagenta.css | 81 +- public/stylesheets/contrasts/pgreen.css | 81 +- public/stylesheets/fonts/eeUBraille.ttf | Bin 0 -> 141784 bytes public/stylesheets/item.css | 582 +- public/stylesheets/tn.css | 103 +- 188 files changed, 59015 insertions(+), 11095 deletions(-) create mode 100644 app/models/qti/OrderInteractionFactory.java create mode 100644 app/views/Api/itemShowIframeApi.html create mode 100644 app/views/js-includes/_itemBehaviors.js create mode 100644 app/views/js-includes/_scrp.js create mode 100644 app/views/main_chromeless_item.html create mode 100644 lib/httpmime-4.3.jar rename lib/{qti4j-1.0.13.jar => qti4j-1.0.26.jar} (69%) delete mode 100644 public/images/favicon.ico create mode 100644 public/images/global/loader3.gif create mode 100644 public/images/schoolnet/circle.png create mode 100644 public/images/schoolnet/circledark.png create mode 100644 public/javascripts/equationeditor/styles/br-text-cbc.xml create mode 100644 public/javascripts/equationeditor/styles/br-text-gr1.xml create mode 100644 public/javascripts/equationeditor/styles/braille-tooltips.xml create mode 100644 public/javascripts/equationeditor/styles/numbers-template.xml create mode 100644 public/javascripts/equationeditor/styles/numbers.xml create mode 100644 public/javascripts/jquery.widget.essayIndividualFeedbackHandler-realize.js create mode 100644 public/javascripts/jquery.widget.essayfeedback-prototype.js create mode 100644 public/javascripts/jquery.widget.essayfeedback-realize.js create mode 100644 public/javascripts/jquery.widget.extendedTextInteractionRealize.js create mode 100644 public/javascripts/jquery.widget.griddedresponse-sn.js create mode 100644 public/javascripts/jquery.widget.orderinteraction.js create mode 100644 public/javascripts/local-jquery.js create mode 100644 public/javascripts/prepresponsetimecontroller-lib.js create mode 100644 public/javascripts/recorder/AudioRecordPlay.swf create mode 100644 public/javascripts/recorder/libvorbis.js create mode 100644 public/javascripts/recorder/oggvorbisDecoder.js create mode 100644 public/javascripts/recorder/oggvorbisEncoder.js delete mode 100644 public/javascripts/recorder/speex.min.js delete mode 100644 public/javascripts/recorder/speexDecoder.js delete mode 100644 public/javascripts/recorder/speexEncoder.js rename public/javascripts/tools/css/images/{ruler_centimeter_removed.png => ruler_centimeter_removed_en.png} (100%) create mode 100644 public/javascripts/tools/css/images/ruler_centimeter_removed_es.png rename public/javascripts/tools/css/images/{ruler_eighth_inches.png => ruler_eighth_inches_en.png} (100%) create mode 100644 public/javascripts/tools/css/images/ruler_eighth_inches_es.png rename public/javascripts/tools/css/images/{ruler_millimeter.png => ruler_millimeter_en.png} (100%) create mode 100644 public/javascripts/tools/css/images/ruler_millimeter_es.png rename public/javascripts/tools/css/images/{ruler_quarter_inches.png => ruler_quarter_inches_en.png} (100%) create mode 100644 public/javascripts/tools/css/images/ruler_quarter_inches_es.png create mode 100644 public/stylesheets/fonts/eeUBraille.ttf