Activity lams/lams

LDEV-1134: Preview now lets the author select a branch to view, but the author can only do one branch. To view all branches, the author needs to run preview multiple times. Did some small refactoring to have only one piece of code that creates the branching mapping related to a group as we have many bits that need to do this (authoring, import, chosen branching in monitoring and now preview!)

- -7
- +8
./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
- History
- Source
- Diff
./src/java/.../authoring/ObjectExtractor.java
… 3 more files in changeset.

5:46 am

jliew

added shib servlets to web-security so that ShibLogin is invoked (and shib user created if necessary) before shib servlets have to add shib user to lesson class; refactored ShibExportPortfolioServlet to extend ShibLearnerServlet; moved xdoclet out of .java files because it doesn't work properly with a servlet extending another servlet

- -0
- +15
./conf/xdoclet/servlet-mappings.xml
- History
- Source
- Diff
./conf/xdoclet/servlet-mappings.xml
- -0
- +24
./conf/xdoclet/servlets.xml
- History
- Source
- Diff
./conf/xdoclet/servlets.xml
- -0
- +3
./conf/xdoclet/web-security.xml
- History
- Source
- Diff
./conf/xdoclet/web-security.xml
- -58
- +2
./src/java/org/lamsfoundation/lams/web/ShibExportPortfolioServlet.java
- History
- Source
- Diff
./src/java/.../ShibExportPortfolioServlet.java
- -9
- +24
./src/java/org/lamsfoundation/lams/web/ShibLearnerServlet.java
- History
- Source
- Diff
./src/java/org/.../web/ShibLearnerServlet.java
- -6
- +16
./src/java/org/lamsfoundation/lams/web/ShibMonitorServlet.java
- History
- Source
- Diff
./src/java/org/.../web/ShibMonitorServlet.java

3:40 am

jliew

add check for 'failed' parameter in request so that ShibLogin doesn't keep getting called when j_security_check login fails

- -2
- +7
./web/login.jsp
- History
- Source
- Diff
./web/login.jsp

3:39 am

jliew

fix logger class name

- -1
- +1
./src/java/org/lamsfoundation/lams/web/ShibExportPortfolioServlet.java
- History
- Source
- Diff
./src/java/.../ShibExportPortfolioServlet.java
- -1
- +1
./src/java/org/lamsfoundation/lams/web/ShibMonitorServlet.java
- History
- Source
- Diff
./src/java/org/.../web/ShibMonitorServlet.java

3:39 am

jliew

fix error text

- -2
- +2
./src/java/org/lamsfoundation/lams/web/HomeAction.java
- History
- Source
- Diff
./src/java/org/.../lams/web/HomeAction.java

8:40 am

jliew

add email to shib user

- -5
- +8
./src/java/org/lamsfoundation/lams/web/ShibLoginServlet.java
- History
- Source
- Diff
./src/java/org/.../web/ShibLoginServlet.java

6:08 am

jliew

removing shib servlets from /servlet/* mapping; fix url for openFedExportPortfolio

- -1
- +1
./src/java/org/lamsfoundation/lams/web/ShibExportPortfolioServlet.java
- History
- Source
- Diff
./src/java/.../ShibExportPortfolioServlet.java
- -1
- +1
./src/java/org/lamsfoundation/lams/web/ShibLearnerServlet.java
- History
- Source
- Diff
./src/java/org/.../web/ShibLearnerServlet.java
- -1
- +1
./src/java/org/lamsfoundation/lams/web/ShibMonitorServlet.java
- History
- Source
- Diff
./src/java/org/.../web/ShibMonitorServlet.java
- -6
- +6
./web/includes/javascript/openUrls.js
- History
- Source
- Diff
./web/includes/javascript/openUrls.js

2:46 am

jliew

More
MAIN:jliew:20070724004617
deleted 1 file
MAIN

file ShibExportPortfolioServlet.java was initially added on branch shibboleth_2_0.

- -0
- +0
./src/java/org/lamsfoundation/lams/web/ShibExportPortfolioServlet.java
- History
- Source
./src/java/.../web/ShibExportPortfolioServlet.java

2:46 am

jliew

More
MAIN:jliew:20070724004617:1
deleted 1 file
MAIN

file ShibMonitorServlet.java was initially added on branch shibboleth_2_0.

- -0
- +0
./src/java/org/lamsfoundation/lams/web/ShibMonitorServlet.java
- History
- Source
./src/java/org/.../lams/web/ShibMonitorServlet.java

2:46 am

jliew

adding shibbolized links for monitoring and export portfolio

- -18
- +21
./src/java/org/lamsfoundation/lams/web/IndexAction.java
- History
- Source
- Diff
./src/java/org/.../lams/web/IndexAction.java
- -0
- +103
./src/java/org/lamsfoundation/lams/web/ShibExportPortfolioServlet.java
- History
- Source
- Diff
./src/java/.../ShibExportPortfolioServlet.java
- -2
- +2
./src/java/org/lamsfoundation/lams/web/ShibLearnerServlet.java
- History
- Source
- Diff
./src/java/org/.../web/ShibLearnerServlet.java
- -0
- +103
./src/java/org/lamsfoundation/lams/web/ShibMonitorServlet.java
- History
- Source
- Diff
./src/java/org/.../web/ShibMonitorServlet.java
- -1
- +54
./web/includes/javascript/openUrls.js
- History
- Source
- Diff
./web/includes/javascript/openUrls.js

7:40 am

jliew

remember to stop processing after sending a redirect! also check if user is a local user before updating roles from shib attributes.

- -2
- +9
./src/java/org/lamsfoundation/lams/web/ShibLoginServlet.java
- History
- Source
- Diff
./src/java/org/.../web/ShibLoginServlet.java

7:36 am

jliew

using hibernateFilter with ShibLoginServlet

- -0
- +5
./conf/xdoclet/filter-mappings.xml
- History
- Source
- Diff
./conf/xdoclet/filter-mappings.xml

9:06 am

jliew

various bugfixes

- -7
- +12
./src/java/org/lamsfoundation/lams/web/ShibLoginServlet.java
- History
- Source
- Diff
./src/java/org/.../web/ShibLoginServlet.java

4:58 am

jliew

added new shib attribute for the ServerURL of the origin LAMS server to help determine whether user is local or not; added roles for shib users in ShibLoginServlet

- -24
- +30
./src/java/org/lamsfoundation/lams/web/ShibLearnerServlet.java
- History
- Source
- Diff
./src/java/org/.../web/ShibLearnerServlet.java
- -47
- +132
./src/java/org/lamsfoundation/lams/web/ShibLoginServlet.java
- History
- Source
- Diff
./src/java/org/.../web/ShibLoginServlet.java
- -7
- +4
./web/includes/javascript/openUrls.js
- History
- Source
- Diff
./web/includes/javascript/openUrls.js
… 4 more files in changeset.

9:08 am

mseaton

More
MAIN:mseaton:20070719070815
changed 3 files
MAIN

use PI to set grouping for Branching Activity (group type)

- binary
./web/lams_authoring.swf
- History
- Source
- Diff
./web/lams_authoring.swf
- binary
./web/lams_authoring_library.swf
- History
- Source
- Diff
./web/lams_authoring_library.swf
… 1 more file in changeset.

6:41 am

mseaton

More
MAIN:mseaton:20070719044112
changed 4 files
MAIN

fix for toolbar enabling/disabling (alert)

- binary
./web/lams_authoring.swf
- History
- Source
- Diff
./web/lams_authoring.swf
- binary
./web/lams_authoring_library.swf
- History
- Source
- Diff
./web/lams_authoring_library.swf
… 2 more files in changeset.

5:45 am

mseaton

More
MAIN:mseaton:20070719034548
changed 6 files
MAIN

added stopAfterActivity (Activity) field

- binary
./web/lams_authoring.swf
- History
- Source
- Diff
./web/lams_authoring.swf
- binary
./web/lams_authoring_library.swf
- History
- Source
- Diff
./web/lams_authoring_library.swf
… 4 more files in changeset.

3:14 am

fmalikoff

More
MAIN:fmalikoff:20070719011447
changed 10 files
MAIN

LDEV-1134: Branching: Added stopAfterActivity flag to activity, which will allow us to "end" a lesson at the end of the activity. Authoring changes done.