Merge branch 'master' into stkomarov-fixes

LICENSE.TXT

@@ -659,3 +659,13 @@ specific requirements.
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
 <http://www.gnu.org/licenses/>.
+
+EdX Inc. wishes to state, in clarification of the above license terms, that
+any public, independently available web service offered over the network and
+communicating with edX's copyrighted works by any form of inter-service
+communication, including but not limited to Remote Procedure Call (RPC)
+interfaces, is not a work based on our copyrighted work within the meaning
+of the license. "Corresponding Source" of this work, or works based on this
+work, as defined by the terms of this license do not include source code
+files for programs used solely to provide those public, independently
+available web services.

docs/analytics-module.ps

 %!PS-Adobe-3.0 EPSF-3.0
 %%Title: analytics-module.ps
 %%Creator: XCircuit v3.7 rev26
-%%CreationDate: Fri Apr 12 13:20:22 2013
+%%CreationDate: Thu Jul  4 13:15:40 2013
 %%Pages: 1
 %%BoundingBox: 68 68 664 640
 %%DocumentNeededResources: font Helvetica Helvetica-Bold Helvetica-Oblique 
@@ -202,14 +202,14 @@ endgate
 2.6000 setlinewidth 1840 371 translate
 
 1.000 1.000 0.000 scb
-496 1.000 -1648 592 -1648 80 -1168 80 -1168 592 4 polygon
+496 1.000 -1648 512 -1648 0 -1168 0 -1168 512 4 polygon
 0.690 0.878 0.902 scb
 496 1.000 -560 1056 -560 -96 -1104 -96 -1104 1056 4 polygon
 0.678 1.000 0.184 scb
 496 1.000 -480 784 -480 -16 -80 -16 -80 784 4 polygon
 sce
 0 1.000 -560 1056 -560 -96 -1104 -96 -1104 1056 4 polygon
-0 1.000 -1648 592 -1648 80 -1168 80 -1168 592 4 polygon
+0 1.000 -1648 512 -1648 0 -1168 0 -1168 512 4 polygon
 0 1.000 -480 784 -480 -16 -80 -16 -80 784 4 polygon
 1.000 0 -784 -80 generic::arrow
 1.000 90 -1008 16 generic::arrow
@@ -244,11 +244,11 @@ sce
 0 1.000 -896 336 -896 240 -640 240 -640 336 4 polygon
 1.000 0 -784 96 generic::arrowhead
 1.000 0 -752 592 generic::arrowhead
-(Read replicas) {/Helvetica cf} 2 21 0 1.000 -1408 432 label
-(of LMS databases) {/Helvetica cf} 2 21 0 1.000 -1424 384 label
-(Read replicas) {/Helvetica cf} 2 21 0 1.000 -1408 256 label
-(of other module's) {/Helvetica cf} 2 21 0 1.000 -1408 208 label
-(databases) {/Helvetica cf} 2 21 0 1.000 -1408 160 label
+(Read replicas) {/Helvetica cf} 2 21 0 1.000 -1408 352 label
+(of LMS databases) {/Helvetica cf} 2 21 0 1.000 -1424 304 label
+(Read replicas) {/Helvetica cf} 2 21 0 1.000 -1408 176 label
+(of other module's) {/Helvetica cf} 2 21 0 1.000 -1408 128 label
+(databases) {/Helvetica cf} 2 21 0 1.000 -1408 80 label
 (Discovery) {/Helvetica cf} 2 21 0 1.000 -768 896 label
 (Interface) {/Helvetica cf} 2 21 0 1.000 -768 848 label
 (SOA) {/Helvetica cf} 2 21 0 1.000 -944 1312 label
@@ -265,9 +265,9 @@ sce
 1 1.000 -896 736 -944 736 2 polygon
 1 1.000 -880 880 -944 880 2 polygon
 (Analytics Module) {/Helvetica-Bold cf} 2 21 0 1.000 -864 1008 label
-0 1.000 -1600 464 -1600 336 -1216 336 -1216 464 4 polygon
-(Queriable data sources) {/Helvetica-Bold cf} 2 21 0 1.000 -1408 544 label
-0 1.000 -1600 304 -1600 112 -1216 112 -1216 304 4 polygon
+0 1.000 -1600 384 -1600 256 -1216 256 -1216 384 4 polygon
+(Queriable data sources) {/Helvetica-Bold cf} 2 21 0 1.000 -1408 464 label
+0 1.000 -1600 224 -1600 32 -1216 32 -1216 224 4 polygon
 1.000 90 -1008 144 generic::arrow
 1.000 90 -944 288 generic::arrow
 1.000 90 -896 464 generic::arrow
@@ -277,13 +277,20 @@ sce
 1 1.000 -960 288 -1072 288 2 polygon
 1 1.000 -1024 144 -1072 144 2 polygon
 1 1.000 -944 912 -944 1088 2 polygon
-1 1.000 -1072 368 -1152 368 2 polygon
+1 1.000 -1072 80 -1152 80 2 polygon
 (User clickstream and other logged events) {/Helvetica cf} 2 21 0 1.000 -784 
 -160 label
 1.000 90 -560 688 generic::arrow
 -1.000 270 -560 656 generic::arrow
 1.000 90 -560 160 generic::arrow
 -1.000 270 -560 128 generic::arrow
+0.824 0.039 0.863 scb
+496 1.000 -1648 800 -1648 576 -1168 576 -1168 800 4 polygon
+sce
+224 1.000 -1648 800 -1648 576 -1168 576 -1168 800 4 polygon
+1 1.000 -1072 640 -1152 640 2 polygon
+(other modules) {/Helvetica-Bold cf} 2 21 0 1.000 -1424 672 label
+(Query interface to) {/Helvetica-Bold cf} 2 21 0 1.000 -1424 720 label
 pgsave restore showpage
 
 %%Trailer

docs/multilms.ps

 %!PS-Adobe-3.0 EPSF-3.0
-%%Title: multilms2.ps
+%%Title: multilms.ps
 %%Creator: XCircuit v3.7 rev26
-%%CreationDate: Sun Apr 14 07:54:41 2013
+%%CreationDate: Thu Jul  4 13:45:15 2013
 %%Pages: 1
-%%BoundingBox: 68 68 548 222
+%%BoundingBox: 68 68 614 228
 %%DocumentNeededResources: font Helvetica 
 %%EndComments
 %%BeginProlog
@@ -199,7 +199,7 @@ endgate
 %%PageOrientation: Portrait
 /pgsave save def bop
 1.0000 inchscale
-2.6000 setlinewidth 304 -26 translate
+2.6000 setlinewidth 304 -10 translate
 
 (Sakai) {/Helvetica cf} 2 16 0 1.000 -96 256 label
 (edX) {/Helvetica cf} 2 16 0 1.000 432 256 label
@@ -221,23 +221,29 @@ endgate
 (Data) {/Helvetica cf} 2 16 0 1.000 432 384 label
 (Module) {/Helvetica cf} 2 16 0 1.000 432 336 label
 0 1.000 416 432 416 320 576 320 576 432 4 polygon
-1.000 315 624 352 generic::arrow
-(Provides a common) {/Helvetica cf} 2 16 0 1.000 672 320 label
-(set of queries and ) {/Helvetica cf} 2 16 0 1.000 672 272 label
-(event properties) {/Helvetica cf} 2 16 0 1.000 672 224 label
+1.000 315 800 336 generic::arrow
+(Provides a common) {/Helvetica cf} 2 16 0 1.000 848 304 label
+(set of queries and ) {/Helvetica cf} 2 16 0 1.000 848 256 label
+(event properties) {/Helvetica cf} 2 16 0 1.000 848 208 label
 1 2.000 -112 448 576 448 2 polygon
 (IRT) {/Helvetica cf} 2 16 0 1.000 -80 480 label
 (Data Export) {/Helvetica cf} 2 16 0 1.000 352 480 label
 (Recommender) {/Helvetica cf} 2 16 0 1.000 -48 560 label
 0 1.000 -112 528 -112 464 16 464 16 528 4 polygon
 0 1.000 336 528 336 464 576 464 576 528 4 polygon
-1.000 225 624 528 generic::arrow
-(Build on a common set of ) {/Helvetica cf} 2 16 0 1.000 672 560 label
-(queries, event properties, ) {/Helvetica cf} 2 16 0 1.000 672 512 label
-(and database tables. ) {/Helvetica cf} 2 16 0 1.000 672 464 label
+1.000 225 800 512 generic::arrow
+(Build on a common set of ) {/Helvetica cf} 2 16 0 1.000 848 544 label
+(queries, event properties, ) {/Helvetica cf} 2 16 0 1.000 848 496 label
+(and database tables. ) {/Helvetica cf} 2 16 0 1.000 848 448 label
 0 1.000 32 528 32 464 320 464 320 528 4 polygon
 (Concept Map) {/Helvetica cf} 2 16 0 1.000 64 480 label
 0 1.000 320 608 320 544 -112 544 -112 608 4 polygon
+(Dummy) {/Helvetica cf} 2 16 0 1.000 608 384 label
+(Module) {/Helvetica cf} 2 16 0 1.000 608 336 label
+0 1.000 592 432 592 320 752 320 752 432 4 polygon
+1 2.000 64 448 752 448 2 polygon
+0 1.000 592 464 592 528 752 528 752 464 4 polygon
+(SNA) {/Helvetica cf} 2 16 0 1.000 624 480 label
 pgsave restore showpage
 
 %%Trailer

docs/system_structure.ps

 %!PS-Adobe-3.0 EPSF-3.0
 %%Title: system_structure.ps
 %%Creator: XCircuit v3.7 rev26
-%%CreationDate: Fri Apr 12 08:49:37 2013
+%%CreationDate: Thu Jul  4 13:17:17 2013
 %%Pages: 1
 %%BoundingBox: 68 68 632 460
 %%DocumentNeededResources: font Helvetica Times-Roman 
@@ -319,7 +319,6 @@ endgate
 1 1.000 400 896 400 896 336 912 464 912 spline
 1 1.000 400 704 400 704 336 720 464 720 spline
 1 1.000 400 928 400 928 464 912 336 912 spline
-(Mongo) {/Helvetica cf} 2 17 0 1.000 400 832 label
 1.000 90 288 816 generic::arrow
 1.000 270 256 816 generic::arrow
 (LMS Servers) {/Helvetica cf} 2 17 0 1.000 -832 576 label
@@ -375,6 +374,8 @@ endgate
 1.000 180 -576 192 generic::arrowhead
 1 1.000 -608 208 -608 432 2 polygon
 1 1.000 -576 208 -576 336 2 polygon
+(Data) {/Helvetica cf} 2 21 0 1.000 400 848 label
+(Stores) {/Helvetica cf} 2 21 0 1.000 400 784 label
 pgsave restore showpage
 
 %%Trailer