[Ils-source] r1308 - in branches/1.6: . sql src/com/resolutions/ils/data webapp webapp/WEB-INF/lib webapp/api/courseattempt/get webapp/examples
scribe at crosswire.org
scribe at crosswire.org
Tue Apr 21 16:50:31 MST 2015
Author: scribe
Date: 2015-04-21 16:50:31 -0700 (Tue, 21 Apr 2015)
New Revision: 1308
Added:
branches/1.6/sql/cleandeletedgroups.properties
branches/1.6/webapp/examples/
branches/1.6/webapp/examples/testapi.jsp
branches/1.6/webapp/examples/testapiembed.jsp
branches/1.6/webapp/examples/testapijavascript.jsp
branches/1.6/webapp/examples/testapilaunch.jsp
branches/1.6/webapp/examples/testapilaunch.php
Removed:
branches/1.6/webapp/examples/testapi.jsp
branches/1.6/webapp/examples/testapiembed.jsp
branches/1.6/webapp/examples/testapijavascript.jsp
branches/1.6/webapp/examples/testapilaunch.jsp
branches/1.6/webapp/examples/testapilaunch.php
branches/1.6/webapp/testapi.jsp
branches/1.6/webapp/testapiembed.jsp
branches/1.6/webapp/testapilaunch.jsp
branches/1.6/webapp/testapilaunch.php
Modified:
branches/1.6/
branches/1.6/src/com/resolutions/ils/data/Group.java
branches/1.6/webapp/WEB-INF/lib/ils.jar
branches/1.6/webapp/admin_profile.jsp
branches/1.6/webapp/api/courseattempt/get/index.jsp
branches/1.6/webapp/report_pending_summary.jsp
Log:
Merged r1306 and r1307
added script to clean up assignments left over when a group is deleted. Newer versions of the ils clean this up programmatically.
Remove case sensitivity to group sorting
sorted groups in admin profile
fixed login check on courseattempt/get
renamed Members to User on report pending summary
moved testapi files into an examples folder
Property changes on: branches/1.6
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:796-1303
+ /trunk:796-1303,1306-1307
Copied: branches/1.6/sql/cleandeletedgroups.properties (from rev 1306, trunk/sql/cleandeletedgroups.properties)
===================================================================
--- branches/1.6/sql/cleandeletedgroups.properties (rev 0)
+++ branches/1.6/sql/cleandeletedgroups.properties 2015-04-21 23:50:31 UTC (rev 1308)
@@ -0,0 +1,8 @@
+Category=Database Maintenance
+Name=Clean Deleted Groups
+Description=This script removes all assignments left hanging from deleted groups
+Requires=CompanyID
+
+SQL=delete from usergroup where ilsgroupid in (select t1.ilsgroupid from USERGROUP t1 left join ILSGROUP t2 on t1.ILSGROUPID=t2.ILSGROUPID where t2.ILSGROUPID is null)
+SQL2=delete from coursegroup where ilsgroupid in (select t1.ilsgroupid from COURSEGROUP t1 left join ILSGROUP t2 on t1.ILSGROUPID=t2.ILSGROUPID where t2.ILSGROUPID is null)
+SQL3=delete from managergroup where ilsgroupid in (select t1.ilsgroupid from MANAGERGROUP t1 left join ILSGROUP t2 on t1.ILSGROUPID=t2.ILSGROUPID where t2.ILSGROUPID is null)
Modified: branches/1.6/src/com/resolutions/ils/data/Group.java
===================================================================
--- branches/1.6/src/com/resolutions/ils/data/Group.java 2015-04-21 23:08:08 UTC (rev 1307)
+++ branches/1.6/src/com/resolutions/ils/data/Group.java 2015-04-21 23:50:31 UTC (rev 1308)
@@ -231,6 +231,6 @@
}
public int compareTo(Group other) {
- return getGroupName().compareTo(other.getGroupName());
+ return getGroupName().toUpperCase().compareTo(other.getGroupName().toUpperCase());
}
}
Modified: branches/1.6/webapp/WEB-INF/lib/ils.jar
===================================================================
(Binary files differ)
Modified: branches/1.6/webapp/admin_profile.jsp
===================================================================
--- branches/1.6/webapp/admin_profile.jsp 2015-04-21 23:08:08 UTC (rev 1307)
+++ branches/1.6/webapp/admin_profile.jsp 2015-04-21 23:50:31 UTC (rev 1308)
@@ -608,7 +608,9 @@
if (currentLocations == null) currentLocations = new Vector<Integer>();
if (requestedLocations != null) currentLocations.addAll(requestedLocations);
- for (Group location : locations) {
+ PriorityQueue<Group> sortedLocationsAll = new PriorityQueue<Group>(locations);
+ while (sortedLocationsAll.size() > 0) {
+ Group location = sortedLocationsAll.poll();
%>
<option value="<%=location.getGroupID()%>" <%=currentLocations.contains(location.getGroupID())?"selected=\"selected\"":""%>><%=HTTPUtils.canonize(location.getGroupName())%></option>
<%
Modified: branches/1.6/webapp/api/courseattempt/get/index.jsp
===================================================================
--- branches/1.6/webapp/api/courseattempt/get/index.jsp 2015-04-21 23:08:08 UTC (rev 1307)
+++ branches/1.6/webapp/api/courseattempt/get/index.jsp 2015-04-21 23:50:31 UTC (rev 1308)
@@ -31,17 +31,20 @@
if (co != null) session.setAttribute("co", co);
co = (String) session.getAttribute("co");
Company company = Company.getCompany((co != null) ? Integer.parseInt(co):1);
+ ILSSession ilsSession = (ILSSession)session.getAttribute("ilsSession");
boolean apiEnabled = "on".equals(Utils.getSysConfig(session.getServletContext(), company.getCompanyID()).getProperty("APIEnable", "off"));
- if (!apiEnabled) {
+ if (!apiEnabled && ilsSession == null) {
out.print("<error message=\"API not enabled in system management settings.\" />");
return;
}
//-----------------------
- ILSSession ilsSession = null;
String userID = request.getParameter("ILSUSER");
String userPw = request.getParameter("ILSPASSWD");
- ilsSession = ILSSession.login(company.getCompanyName(), userID, userPw);
+ if (userID != null && userPw != null) {
+ ilsSession = ILSSession.login(company.getCompanyName(), userID, userPw);
+ }
+
if (ilsSession == null) {
out.print("<error message=\"Your iLS sign in information is not valid. Please try again.\" />");
return;
@@ -90,6 +93,7 @@
<table border="1">
<tr><td><b>startDateTime</b></td><td>the start of the date and time range for which to retrieve Course Attempt records, inclusive (yyyyMMddhhmm), e.g., 201201240000</td></tr>
<tr><td><b>endDateTime</b></td><td>(optional) the end of the date and time range for which to retrieve Course Attempt records, exclusive (yyyyMMddhhmm), e.g., 201201250000</td></tr>
+<tr><td><b>profileID</b></td><td>(optional) restrict results to a single user</td></tr>
<tr><td><b>ILSUSER</b></td><td>ILS Login Credentials. Used to validate this API request.</td></tr>
<tr><td><b>ILSPASSWD</b></td><td>ILS Login Credentials. Used to validate this API request.</td></tr>
<table>
Deleted: branches/1.6/webapp/examples/testapi.jsp
===================================================================
--- trunk/webapp/examples/testapi.jsp 2015-04-21 23:08:08 UTC (rev 1307)
+++ branches/1.6/webapp/examples/testapi.jsp 2015-04-21 23:50:31 UTC (rev 1308)
@@ -1,78 +0,0 @@
-<%@ page
- language="java"
- contentType="text/html;charset=utf-8"
-%>
-
-<%@ page import="java.net.Authenticator"%>
-<%@ page import="java.net.PasswordAuthentication"%>
-<%@ page import="java.net.URL"%>
-<%@ page import="java.net.URLConnection"%>
-<%@ page import="java.net.URLEncoder"%>
-<%@ page import="java.io.DataOutputStream"%>
-<%@ page import="java.io.BufferedReader"%>
-<%@ page import="java.io.InputStreamReader"%>
-
-<%
-%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>iLS API ECHO Test</title>
-</head>
-
-<body>
-
-<%
- URL url = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/api/utils/echo/");
-
- // Set the default authenticator to use our API username and password
- Authenticator.setDefault(new Authenticator() {
- protected PasswordAuthentication getPasswordAuthentication() {
- return new PasswordAuthentication("apiloginid", "apiloginpassword".toCharArray());
- }
- });
-
- URLConnection urlConn = url.openConnection();
- urlConn.setDoInput(true);
- urlConn.setDoOutput(true);
- urlConn.setUseCaches(false);
- urlConn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
- DataOutputStream outStream = new DataOutputStream(urlConn.getOutputStream());
-
- StringBuffer content = new StringBuffer();
-
- // What iLS login to use for this transaction
- content.append("ILSUSER=").append(URLEncoder.encode("admin", "UTF-8"));
- content.append("&ILSPASSWD=").append(URLEncoder.encode("adminpw", "UTF-8"));
-
- // What iLS login the student will use, e.g., LNAME+SUBSTR(FNAME,1,1)+DOB [DOB format is mmddyyyy]
- content.append("&USERPRNUM=").append(URLEncoder.encode("Smith" + "J" + "01011980", "UTF-8"));
- content.append("&USERPRPASSWD=").append(URLEncoder.encode("changeme", "UTF-8"));
-
- // Whatever the ASP uses for its person id
- content.append("&USERDATA=").append(URLEncoder.encode("Smith" + "J" + "01011980", "UTF-8"));
-
- // user info
- content.append("&USERPRFNAME=").append(URLEncoder.encode("John", "UTF-8"));
- content.append("&USERPRLNAME=").append(URLEncoder.encode("Smith", "UTF-8"));
- content.append("&USERPREMAIL=").append(URLEncoder.encode("jsmith at airport.com", "UTF-8"));
-
- outStream.writeBytes(content.toString());
- outStream.flush();
- outStream.close();
-
- BufferedReader rd = new BufferedReader(new InputStreamReader(urlConn.getInputStream()));
-
- StringBuffer responseBuffer = new StringBuffer();
- String line;
- while ((line = rd.readLine()) != null) {
- responseBuffer.append(line + "\n");
- }
- outStream.close();
- rd.close();
-%>
-
-<%= responseBuffer %>
-
-</body>
-</html>
Copied: branches/1.6/webapp/examples/testapi.jsp (from rev 1307, trunk/webapp/examples/testapi.jsp)
===================================================================
--- branches/1.6/webapp/examples/testapi.jsp (rev 0)
+++ branches/1.6/webapp/examples/testapi.jsp 2015-04-21 23:50:31 UTC (rev 1308)
@@ -0,0 +1,78 @@
+<%@ page
+ language="java"
+ contentType="text/html;charset=utf-8"
+%>
+
+<%@ page import="java.net.Authenticator"%>
+<%@ page import="java.net.PasswordAuthentication"%>
+<%@ page import="java.net.URL"%>
+<%@ page import="java.net.URLConnection"%>
+<%@ page import="java.net.URLEncoder"%>
+<%@ page import="java.io.DataOutputStream"%>
+<%@ page import="java.io.BufferedReader"%>
+<%@ page import="java.io.InputStreamReader"%>
+
+<%
+%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<title>iLS API ECHO Test</title>
+</head>
+
+<body>
+
+<%
+ URL url = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/api/utils/echo/");
+
+ // Set the default authenticator to use our API username and password
+ Authenticator.setDefault(new Authenticator() {
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication("apiloginid", "apiloginpassword".toCharArray());
+ }
+ });
+
+ URLConnection urlConn = url.openConnection();
+ urlConn.setDoInput(true);
+ urlConn.setDoOutput(true);
+ urlConn.setUseCaches(false);
+ urlConn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+ DataOutputStream outStream = new DataOutputStream(urlConn.getOutputStream());
+
+ StringBuffer content = new StringBuffer();
+
+ // What iLS login to use for this transaction
+ content.append("ILSUSER=").append(URLEncoder.encode("admin", "UTF-8"));
+ content.append("&ILSPASSWD=").append(URLEncoder.encode("adminpw", "UTF-8"));
+
+ // What iLS login the student will use, e.g., LNAME+SUBSTR(FNAME,1,1)+DOB [DOB format is mmddyyyy]
+ content.append("&USERPRNUM=").append(URLEncoder.encode("Smith" + "J" + "01011980", "UTF-8"));
+ content.append("&USERPRPASSWD=").append(URLEncoder.encode("changeme", "UTF-8"));
+
+ // Whatever the ASP uses for its person id
+ content.append("&USERDATA=").append(URLEncoder.encode("Smith" + "J" + "01011980", "UTF-8"));
+
+ // user info
+ content.append("&USERPRFNAME=").append(URLEncoder.encode("John", "UTF-8"));
+ content.append("&USERPRLNAME=").append(URLEncoder.encode("Smith", "UTF-8"));
+ content.append("&USERPREMAIL=").append(URLEncoder.encode("jsmith at airport.com", "UTF-8"));
+
+ outStream.writeBytes(content.toString());
+ outStream.flush();
+ outStream.close();
+
+ BufferedReader rd = new BufferedReader(new InputStreamReader(urlConn.getInputStream()));
+
+ StringBuffer responseBuffer = new StringBuffer();
+ String line;
+ while ((line = rd.readLine()) != null) {
+ responseBuffer.append(line + "\n");
+ }
+ outStream.close();
+ rd.close();
+%>
+
+<%= responseBuffer %>
+
+</body>
+</html>
Deleted: branches/1.6/webapp/examples/testapiembed.jsp
===================================================================
--- trunk/webapp/examples/testapiembed.jsp 2015-04-21 23:08:08 UTC (rev 1307)
+++ branches/1.6/webapp/examples/testapiembed.jsp 2015-04-21 23:50:31 UTC (rev 1308)
@@ -1,72 +0,0 @@
-<%@ page
- language="java"
- contentType="text/html;charset=utf-8"
-%>
-
-<%@ page import="java.net.Authenticator"%>
-<%@ page import="java.net.PasswordAuthentication"%>
-<%@ page import="java.net.URL"%>
-<%@ page import="java.net.URLConnection"%>
-<%@ page import="java.net.URLEncoder"%>
-<%@ page import="java.io.DataOutputStream"%>
-<%@ page import="java.io.BufferedReader"%>
-<%@ page import="java.io.InputStreamReader"%>
-
-<%
- String user = "user1";
- String pw = "changeme";
- URL url = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/api/session/login/");
- URL url2 = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/api/session/launch/");
- URL launchPoint = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/employee.jsp");
-
- // Set the default authenticator to use our API username and password
- Authenticator.setDefault(new Authenticator() {
- protected PasswordAuthentication getPasswordAuthentication() {
- return new PasswordAuthentication("apiloginid", "apiloginpassword".toCharArray());
- }
- });
-
- URLConnection urlConn = url.openConnection();
- urlConn.setDoInput(true);
- urlConn.setDoOutput(true);
- urlConn.setUseCaches(false);
- urlConn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
- DataOutputStream outStream = new DataOutputStream(urlConn.getOutputStream());
-
- StringBuffer content = new StringBuffer();
-
- // What iLS login to use for this transaction
- content.append("ILSUSER=").append(URLEncoder.encode(user, "UTF-8"));
- content.append("&ILSPASSWD=").append(URLEncoder.encode(pw, "UTF-8"));
-
-
- outStream.writeBytes(content.toString());
- outStream.flush();
- outStream.close();
-
- BufferedReader rd = new BufferedReader(new InputStreamReader(urlConn.getInputStream()));
-
- StringBuffer responseBuffer = new StringBuffer();
- String line;
- while ((line = rd.readLine()) != null) {
- if (responseBuffer.length() > 0) responseBuffer.append("\n");
- responseBuffer.append(line);
- }
- outStream.close();
- rd.close();
- String uuid = responseBuffer.toString();
- if (uuid.length() != 36 || uuid.charAt(8) != '-') {
- out.println(responseBuffer);
- return;
- }
-%>
-<html>
-<head>
-</head>
-<body>
-this is an embedded example, below should be the employee page for user: <%= user %>"
-<iframe src="<%=url2%>?uuid=<%=uuid%>&launchPoint=<%=URLEncoder.encode(launchPoint.toString(), "UTF-8")%>" width="100%" height="300">
- <p>Your browser does not support iframes.</p>
-</iframe>
-</body>
-</html>
Copied: branches/1.6/webapp/examples/testapiembed.jsp (from rev 1307, trunk/webapp/examples/testapiembed.jsp)
===================================================================
--- branches/1.6/webapp/examples/testapiembed.jsp (rev 0)
+++ branches/1.6/webapp/examples/testapiembed.jsp 2015-04-21 23:50:31 UTC (rev 1308)
@@ -0,0 +1,72 @@
+<%@ page
+ language="java"
+ contentType="text/html;charset=utf-8"
+%>
+
+<%@ page import="java.net.Authenticator"%>
+<%@ page import="java.net.PasswordAuthentication"%>
+<%@ page import="java.net.URL"%>
+<%@ page import="java.net.URLConnection"%>
+<%@ page import="java.net.URLEncoder"%>
+<%@ page import="java.io.DataOutputStream"%>
+<%@ page import="java.io.BufferedReader"%>
+<%@ page import="java.io.InputStreamReader"%>
+
+<%
+ String user = "user1";
+ String pw = "changeme";
+ URL url = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/api/session/login/");
+ URL url2 = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/api/session/launch/");
+ URL launchPoint = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/employee.jsp");
+
+ // Set the default authenticator to use our API username and password
+ Authenticator.setDefault(new Authenticator() {
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication("apiloginid", "apiloginpassword".toCharArray());
+ }
+ });
+
+ URLConnection urlConn = url.openConnection();
+ urlConn.setDoInput(true);
+ urlConn.setDoOutput(true);
+ urlConn.setUseCaches(false);
+ urlConn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+ DataOutputStream outStream = new DataOutputStream(urlConn.getOutputStream());
+
+ StringBuffer content = new StringBuffer();
+
+ // What iLS login to use for this transaction
+ content.append("ILSUSER=").append(URLEncoder.encode(user, "UTF-8"));
+ content.append("&ILSPASSWD=").append(URLEncoder.encode(pw, "UTF-8"));
+
+
+ outStream.writeBytes(content.toString());
+ outStream.flush();
+ outStream.close();
+
+ BufferedReader rd = new BufferedReader(new InputStreamReader(urlConn.getInputStream()));
+
+ StringBuffer responseBuffer = new StringBuffer();
+ String line;
+ while ((line = rd.readLine()) != null) {
+ if (responseBuffer.length() > 0) responseBuffer.append("\n");
+ responseBuffer.append(line);
+ }
+ outStream.close();
+ rd.close();
+ String uuid = responseBuffer.toString();
+ if (uuid.length() != 36 || uuid.charAt(8) != '-') {
+ out.println(responseBuffer);
+ return;
+ }
+%>
+<html>
+<head>
+</head>
+<body>
+this is an embedded example, below should be the employee page for user: <%= user %>"
+<iframe src="<%=url2%>?uuid=<%=uuid%>&launchPoint=<%=URLEncoder.encode(launchPoint.toString(), "UTF-8")%>" width="100%" height="300">
+ <p>Your browser does not support iframes.</p>
+</iframe>
+</body>
+</html>
Deleted: branches/1.6/webapp/examples/testapijavascript.jsp
===================================================================
--- trunk/webapp/examples/testapijavascript.jsp 2015-04-21 23:08:08 UTC (rev 1307)
+++ branches/1.6/webapp/examples/testapijavascript.jsp 2015-04-21 23:50:31 UTC (rev 1308)
@@ -1,46 +0,0 @@
-<%@ page language="java" contentType="text/html;charset=utf-8" %>
-<%@ page import="java.net.URL"%>
-<%
- URL url = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/api/utils/echo/");
-%>
-<html>
-<head>
-<script type="text/javascript" src="crosswire.js"></script>
-
-<script type="text/javascript">
-<!--
-var serverURL='<%=url%>';
-//var serverURL='http://216.119.104.185:8081/api/utils/echo/';
-
-function onsuccess(data) {
- document.getElementById('result').innerHTML = data;
-}
-
-function onfail(data) {
- document.getElementById('result').innerHTML = 'FAILURE: '+data;
-}
-
-function postToServer() {
- paramName1 = document.getElementById('paramName1').value;
- paramValue1 = document.getElementById('paramValue1').value;
- paramName2 = document.getElementById('paramName2').value;
- paramValue2 = document.getElementById('paramValue2').value;
- params = paramName1+'='+paramValue1+'&'+paramName2+'='+paramValue2;
- sendCommandsToServerViaIFrame(serverURL, params, onsuccess, onfail);
-}
-
--->
-</script>
-</head>
-<body>
-<form>
-<table>
-<tr><td><input id="paramName1" name="paramName1" value="param1"/></td><td><input id="paramValue1" name="paramValue1" value="value1"/></td></tr>
-<tr><td><input id="paramName2" name="paramName2" value="param2"/></td><td><input id="paramValue2" name="paramValue2" value="value2"/></td></tr>
-</table>
-<button type="button" onclick="postToServer()">Post</button>
-</form>
-<h2>Result</h2>
-<p id="result"></p>
-</body>
-</html>
Copied: branches/1.6/webapp/examples/testapijavascript.jsp (from rev 1307, trunk/webapp/examples/testapijavascript.jsp)
===================================================================
--- branches/1.6/webapp/examples/testapijavascript.jsp (rev 0)
+++ branches/1.6/webapp/examples/testapijavascript.jsp 2015-04-21 23:50:31 UTC (rev 1308)
@@ -0,0 +1,46 @@
+<%@ page language="java" contentType="text/html;charset=utf-8" %>
+<%@ page import="java.net.URL"%>
+<%
+ URL url = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/api/utils/echo/");
+%>
+<html>
+<head>
+<script type="text/javascript" src="crosswire.js"></script>
+
+<script type="text/javascript">
+<!--
+var serverURL='<%=url%>';
+//var serverURL='http://216.119.104.185:8081/api/utils/echo/';
+
+function onsuccess(data) {
+ document.getElementById('result').innerHTML = data;
+}
+
+function onfail(data) {
+ document.getElementById('result').innerHTML = 'FAILURE: '+data;
+}
+
+function postToServer() {
+ paramName1 = document.getElementById('paramName1').value;
+ paramValue1 = document.getElementById('paramValue1').value;
+ paramName2 = document.getElementById('paramName2').value;
+ paramValue2 = document.getElementById('paramValue2').value;
+ params = paramName1+'='+paramValue1+'&'+paramName2+'='+paramValue2;
+ sendCommandsToServerViaIFrame(serverURL, params, onsuccess, onfail);
+}
+
+-->
+</script>
+</head>
+<body>
+<form>
+<table>
+<tr><td><input id="paramName1" name="paramName1" value="param1"/></td><td><input id="paramValue1" name="paramValue1" value="value1"/></td></tr>
+<tr><td><input id="paramName2" name="paramName2" value="param2"/></td><td><input id="paramValue2" name="paramValue2" value="value2"/></td></tr>
+</table>
+<button type="button" onclick="postToServer()">Post</button>
+</form>
+<h2>Result</h2>
+<p id="result"></p>
+</body>
+</html>
Deleted: branches/1.6/webapp/examples/testapilaunch.jsp
===================================================================
--- trunk/webapp/examples/testapilaunch.jsp 2015-04-21 23:08:08 UTC (rev 1307)
+++ branches/1.6/webapp/examples/testapilaunch.jsp 2015-04-21 23:50:31 UTC (rev 1308)
@@ -1,58 +0,0 @@
-<%@ page
- language="java"
- contentType="text/html;charset=utf-8"
-%>
-
-<%@ page import="java.net.Authenticator"%>
-<%@ page import="java.net.PasswordAuthentication"%>
-<%@ page import="java.net.URL"%>
-<%@ page import="java.net.URLConnection"%>
-<%@ page import="java.net.URLEncoder"%>
-<%@ page import="java.io.DataOutputStream"%>
-<%@ page import="java.io.BufferedReader"%>
-<%@ page import="java.io.InputStreamReader"%>
-
-<%
- URL url = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/api/session/login/index.jsp");
- URL url2 = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/api/session/launch/index.jsp");
- URL launchPoint = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/employee.jsp");
-
- // Set the default authenticator to use our API username and password
- Authenticator.setDefault(new Authenticator() {
- protected PasswordAuthentication getPasswordAuthentication() {
- return new PasswordAuthentication("apiloginid", "apiloginpassword".toCharArray());
- }
- });
-
- URLConnection urlConn = url.openConnection();
- urlConn.setDoInput(true);
- urlConn.setDoOutput(true);
- urlConn.setUseCaches(false);
- urlConn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
- DataOutputStream outStream = new DataOutputStream(urlConn.getOutputStream());
-
- StringBuffer content = new StringBuffer();
-
- // What iLS login to use for this transaction
- content.append("ILSUSER=").append(URLEncoder.encode("user1", "UTF-8"));
- content.append("&ILSPASSWD=").append(URLEncoder.encode("changeme", "UTF-8"));
-
-
- outStream.writeBytes(content.toString());
- outStream.flush();
- outStream.close();
-
- BufferedReader rd = new BufferedReader(new InputStreamReader(urlConn.getInputStream()));
-
- StringBuffer responseBuffer = new StringBuffer();
- String line;
- while ((line = rd.readLine()) != null) {
- if (responseBuffer.length() > 0) responseBuffer.append("\n");
- responseBuffer.append(line);
- }
- outStream.close();
- rd.close();
-%>
-<html><head>
-<meta http-equiv="Refresh" content="0;URL=<%=url2%>?uuid=<%=responseBuffer%>&launchPoint=<%=launchPoint%>">
-</head></html>
Copied: branches/1.6/webapp/examples/testapilaunch.jsp (from rev 1307, trunk/webapp/examples/testapilaunch.jsp)
===================================================================
--- branches/1.6/webapp/examples/testapilaunch.jsp (rev 0)
+++ branches/1.6/webapp/examples/testapilaunch.jsp 2015-04-21 23:50:31 UTC (rev 1308)
@@ -0,0 +1,58 @@
+<%@ page
+ language="java"
+ contentType="text/html;charset=utf-8"
+%>
+
+<%@ page import="java.net.Authenticator"%>
+<%@ page import="java.net.PasswordAuthentication"%>
+<%@ page import="java.net.URL"%>
+<%@ page import="java.net.URLConnection"%>
+<%@ page import="java.net.URLEncoder"%>
+<%@ page import="java.io.DataOutputStream"%>
+<%@ page import="java.io.BufferedReader"%>
+<%@ page import="java.io.InputStreamReader"%>
+
+<%
+ URL url = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/api/session/login/index.jsp");
+ URL url2 = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/api/session/launch/index.jsp");
+ URL launchPoint = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/employee.jsp");
+
+ // Set the default authenticator to use our API username and password
+ Authenticator.setDefault(new Authenticator() {
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication("apiloginid", "apiloginpassword".toCharArray());
+ }
+ });
+
+ URLConnection urlConn = url.openConnection();
+ urlConn.setDoInput(true);
+ urlConn.setDoOutput(true);
+ urlConn.setUseCaches(false);
+ urlConn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+ DataOutputStream outStream = new DataOutputStream(urlConn.getOutputStream());
+
+ StringBuffer content = new StringBuffer();
+
+ // What iLS login to use for this transaction
+ content.append("ILSUSER=").append(URLEncoder.encode("user1", "UTF-8"));
+ content.append("&ILSPASSWD=").append(URLEncoder.encode("changeme", "UTF-8"));
+
+
+ outStream.writeBytes(content.toString());
+ outStream.flush();
+ outStream.close();
+
+ BufferedReader rd = new BufferedReader(new InputStreamReader(urlConn.getInputStream()));
+
+ StringBuffer responseBuffer = new StringBuffer();
+ String line;
+ while ((line = rd.readLine()) != null) {
+ if (responseBuffer.length() > 0) responseBuffer.append("\n");
+ responseBuffer.append(line);
+ }
+ outStream.close();
+ rd.close();
+%>
+<html><head>
+<meta http-equiv="Refresh" content="0;URL=<%=url2%>?uuid=<%=responseBuffer%>&launchPoint=<%=launchPoint%>">
+</head></html>
Deleted: branches/1.6/webapp/examples/testapilaunch.php
===================================================================
--- trunk/webapp/examples/testapilaunch.php 2015-04-21 23:08:08 UTC (rev 1307)
+++ branches/1.6/webapp/examples/testapilaunch.php 2015-04-21 23:50:31 UTC (rev 1308)
@@ -1,36 +0,0 @@
-<?php
-require_once 'HTTP/Request2.php';
-
-$loginAPIURL = new HTTP_Request2('http://216.119.104.185:8081/api/session/login/index.jsp', HTTP_Request2::METHOD_POST);
-
-$launchAPIURL = 'http://216.119.104.185:8081/api/session/launch/index.jsp';
-$launchPoint = 'http://216.119.104.185:8081/employee.jsp';
-
-$loginAPIURL->addPostParameter('ILSUSER', 'user1');
-$loginAPIURL->addPostParameter('ILSPASSWD', 'changeme');
-
-try {
- $response = $loginAPIURL->send();
- if (200 == $response->getStatus()) {
- $loginToken = $response->getBody();
- // check if we're a UUID
- if (substr($loginToken, 8, 1) == '-' && substr($loginToken, 13, 1) == '-' && substr($loginToken, 18, 1) == '-') {
- echo '
-<html><head>
-<meta http-equiv="Refresh" content="0;URL=' . $launchAPIURL . '?uuid=' . $loginToken . '&launchPoint=' . $launchPoint . '">
-</head></html>
-';
- }
- else {
- echo 'Invalid Credentials (' . $loginToken . ')';
- }
- }
- else {
- echo 'Could not communicate with iLS (' . $response->getStatus() . ')';
- }
-} catch (HTTP_Request2_Exception $e) {
- echo 'Error: ' . $e->getMessage();
-}
-
-?>
-
Copied: branches/1.6/webapp/examples/testapilaunch.php (from rev 1307, trunk/webapp/examples/testapilaunch.php)
===================================================================
--- branches/1.6/webapp/examples/testapilaunch.php (rev 0)
+++ branches/1.6/webapp/examples/testapilaunch.php 2015-04-21 23:50:31 UTC (rev 1308)
@@ -0,0 +1,36 @@
+<?php
+require_once 'HTTP/Request2.php';
+
+$loginAPIURL = new HTTP_Request2('http://216.119.104.185:8081/api/session/login/index.jsp', HTTP_Request2::METHOD_POST);
+
+$launchAPIURL = 'http://216.119.104.185:8081/api/session/launch/index.jsp';
+$launchPoint = 'http://216.119.104.185:8081/employee.jsp';
+
+$loginAPIURL->addPostParameter('ILSUSER', 'user1');
+$loginAPIURL->addPostParameter('ILSPASSWD', 'changeme');
+
+try {
+ $response = $loginAPIURL->send();
+ if (200 == $response->getStatus()) {
+ $loginToken = $response->getBody();
+ // check if we're a UUID
+ if (substr($loginToken, 8, 1) == '-' && substr($loginToken, 13, 1) == '-' && substr($loginToken, 18, 1) == '-') {
+ echo '
+<html><head>
+<meta http-equiv="Refresh" content="0;URL=' . $launchAPIURL . '?uuid=' . $loginToken . '&launchPoint=' . $launchPoint . '">
+</head></html>
+';
+ }
+ else {
+ echo 'Invalid Credentials (' . $loginToken . ')';
+ }
+ }
+ else {
+ echo 'Could not communicate with iLS (' . $response->getStatus() . ')';
+ }
+} catch (HTTP_Request2_Exception $e) {
+ echo 'Error: ' . $e->getMessage();
+}
+
+?>
+
Modified: branches/1.6/webapp/report_pending_summary.jsp
===================================================================
--- branches/1.6/webapp/report_pending_summary.jsp 2015-04-21 23:08:08 UTC (rev 1307)
+++ branches/1.6/webapp/report_pending_summary.jsp 2015-04-21 23:50:31 UTC (rev 1308)
@@ -272,7 +272,7 @@
<% } else { %>
<t:t>Workgroup</t:t>
<% } %></a></th>
- <th><a href="report_pending_summary.jsp?sort=grpcount">Members</a></th>
+ <th><a href="report_pending_summary.jsp?sort=grpcount">Users</a></th>
<th><a href="report_pending_summary.jsp?sort=completed">Completed Courses</a></th>
<th><a href="report_pending_summary.jsp?sort=open">Open Courses</a></th>
<th><a href="report_pending_summary.jsp?sort=failed">Failed Courses</a></th>
@@ -287,7 +287,7 @@
<% } else { %>
<t:t>Workgroup</t:t>
<% }
- out.print(",Members,Completed Courses,Open Courses,Failed Courses,Last Course Completed\n");
+ out.print(",Users,Completed Courses,Open Courses,Failed Courses,Last Course Completed\n");
}
int begin = (noHTML) ? 0 : pageNum * 25;
int end = (noHTML) ? userProfiles.size() : begin + 25;
Deleted: branches/1.6/webapp/testapi.jsp
===================================================================
--- branches/1.6/webapp/testapi.jsp 2015-04-21 23:08:08 UTC (rev 1307)
+++ branches/1.6/webapp/testapi.jsp 2015-04-21 23:50:31 UTC (rev 1308)
@@ -1,78 +0,0 @@
-<%@ page
- language="java"
- contentType="text/html;charset=utf-8"
-%>
-
-<%@ page import="java.net.Authenticator"%>
-<%@ page import="java.net.PasswordAuthentication"%>
-<%@ page import="java.net.URL"%>
-<%@ page import="java.net.URLConnection"%>
-<%@ page import="java.net.URLEncoder"%>
-<%@ page import="java.io.DataOutputStream"%>
-<%@ page import="java.io.BufferedReader"%>
-<%@ page import="java.io.InputStreamReader"%>
-
-<%
-%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>iLS API ECHO Test</title>
-</head>
-
-<body>
-
-<%
- URL url = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/api/utils/echo/");
-
- // Set the default authenticator to use our API username and password
- Authenticator.setDefault(new Authenticator() {
- protected PasswordAuthentication getPasswordAuthentication() {
- return new PasswordAuthentication("apiloginid", "apiloginpassword".toCharArray());
- }
- });
-
- URLConnection urlConn = url.openConnection();
- urlConn.setDoInput(true);
- urlConn.setDoOutput(true);
- urlConn.setUseCaches(false);
- urlConn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
- DataOutputStream outStream = new DataOutputStream(urlConn.getOutputStream());
-
- StringBuffer content = new StringBuffer();
-
- // What iLS login to use for this transaction
- content.append("ILSUSER=").append(URLEncoder.encode("admin", "UTF-8"));
- content.append("&ILSPASSWD=").append(URLEncoder.encode("adminpw", "UTF-8"));
-
- // What iLS login the student will use, e.g., LNAME+SUBSTR(FNAME,1,1)+DOB [DOB format is mmddyyyy]
- content.append("&USERPRNUM=").append(URLEncoder.encode("Smith" + "J" + "01011980", "UTF-8"));
- content.append("&USERPRPASSWD=").append(URLEncoder.encode("changeme", "UTF-8"));
-
- // Whatever the ASP uses for its person id
- content.append("&USERDATA=").append(URLEncoder.encode("Smith" + "J" + "01011980", "UTF-8"));
-
- // user info
- content.append("&USERPRFNAME=").append(URLEncoder.encode("John", "UTF-8"));
- content.append("&USERPRLNAME=").append(URLEncoder.encode("Smith", "UTF-8"));
- content.append("&USERPREMAIL=").append(URLEncoder.encode("jsmith at airport.com", "UTF-8"));
-
- outStream.writeBytes(content.toString());
- outStream.flush();
- outStream.close();
-
- BufferedReader rd = new BufferedReader(new InputStreamReader(urlConn.getInputStream()));
-
- StringBuffer responseBuffer = new StringBuffer();
- String line;
- while ((line = rd.readLine()) != null) {
- responseBuffer.append(line + "\n");
- }
- outStream.close();
- rd.close();
-%>
-
-<%= responseBuffer %>
-
-</body>
-</html>
Deleted: branches/1.6/webapp/testapiembed.jsp
===================================================================
--- branches/1.6/webapp/testapiembed.jsp 2015-04-21 23:08:08 UTC (rev 1307)
+++ branches/1.6/webapp/testapiembed.jsp 2015-04-21 23:50:31 UTC (rev 1308)
@@ -1,72 +0,0 @@
-<%@ page
- language="java"
- contentType="text/html;charset=utf-8"
-%>
-
-<%@ page import="java.net.Authenticator"%>
-<%@ page import="java.net.PasswordAuthentication"%>
-<%@ page import="java.net.URL"%>
-<%@ page import="java.net.URLConnection"%>
-<%@ page import="java.net.URLEncoder"%>
-<%@ page import="java.io.DataOutputStream"%>
-<%@ page import="java.io.BufferedReader"%>
-<%@ page import="java.io.InputStreamReader"%>
-
-<%
- String user = "user1";
- String pw = "changeme";
- URL url = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/api/session/login/");
- URL url2 = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/api/session/launch/");
- URL launchPoint = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/employee.jsp");
-
- // Set the default authenticator to use our API username and password
- Authenticator.setDefault(new Authenticator() {
- protected PasswordAuthentication getPasswordAuthentication() {
- return new PasswordAuthentication("apiloginid", "apiloginpassword".toCharArray());
- }
- });
-
- URLConnection urlConn = url.openConnection();
- urlConn.setDoInput(true);
- urlConn.setDoOutput(true);
- urlConn.setUseCaches(false);
- urlConn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
- DataOutputStream outStream = new DataOutputStream(urlConn.getOutputStream());
-
- StringBuffer content = new StringBuffer();
-
- // What iLS login to use for this transaction
- content.append("ILSUSER=").append(URLEncoder.encode(user, "UTF-8"));
- content.append("&ILSPASSWD=").append(URLEncoder.encode(pw, "UTF-8"));
-
-
- outStream.writeBytes(content.toString());
- outStream.flush();
- outStream.close();
-
- BufferedReader rd = new BufferedReader(new InputStreamReader(urlConn.getInputStream()));
-
- StringBuffer responseBuffer = new StringBuffer();
- String line;
- while ((line = rd.readLine()) != null) {
- if (responseBuffer.length() > 0) responseBuffer.append("\n");
- responseBuffer.append(line);
- }
- outStream.close();
- rd.close();
- String uuid = responseBuffer.toString();
- if (uuid.length() != 36 || uuid.charAt(8) != '-') {
- out.println(responseBuffer);
- return;
- }
-%>
-<html>
-<head>
-</head>
-<body>
-this is an embedded example, below should be the employee page for user: <%= user %>"
-<iframe src="<%=url2%>?uuid=<%=uuid%>&launchPoint=<%=URLEncoder.encode(launchPoint.toString(), "UTF-8")%>" width="100%" height="300">
- <p>Your browser does not support iframes.</p>
-</iframe>
-</body>
-</html>
Deleted: branches/1.6/webapp/testapilaunch.jsp
===================================================================
--- branches/1.6/webapp/testapilaunch.jsp 2015-04-21 23:08:08 UTC (rev 1307)
+++ branches/1.6/webapp/testapilaunch.jsp 2015-04-21 23:50:31 UTC (rev 1308)
@@ -1,58 +0,0 @@
-<%@ page
- language="java"
- contentType="text/html;charset=utf-8"
-%>
-
-<%@ page import="java.net.Authenticator"%>
-<%@ page import="java.net.PasswordAuthentication"%>
-<%@ page import="java.net.URL"%>
-<%@ page import="java.net.URLConnection"%>
-<%@ page import="java.net.URLEncoder"%>
-<%@ page import="java.io.DataOutputStream"%>
-<%@ page import="java.io.BufferedReader"%>
-<%@ page import="java.io.InputStreamReader"%>
-
-<%
- URL url = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/api/session/login/index.jsp");
- URL url2 = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/api/session/launch/index.jsp");
- URL launchPoint = new URL(request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath() + "/employee.jsp");
-
- // Set the default authenticator to use our API username and password
- Authenticator.setDefault(new Authenticator() {
- protected PasswordAuthentication getPasswordAuthentication() {
- return new PasswordAuthentication("apiloginid", "apiloginpassword".toCharArray());
- }
- });
-
- URLConnection urlConn = url.openConnection();
- urlConn.setDoInput(true);
- urlConn.setDoOutput(true);
- urlConn.setUseCaches(false);
- urlConn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
- DataOutputStream outStream = new DataOutputStream(urlConn.getOutputStream());
-
- StringBuffer content = new StringBuffer();
-
- // What iLS login to use for this transaction
- content.append("ILSUSER=").append(URLEncoder.encode("user1", "UTF-8"));
- content.append("&ILSPASSWD=").append(URLEncoder.encode("changeme", "UTF-8"));
-
-
- outStream.writeBytes(content.toString());
- outStream.flush();
- outStream.close();
-
- BufferedReader rd = new BufferedReader(new InputStreamReader(urlConn.getInputStream()));
-
- StringBuffer responseBuffer = new StringBuffer();
- String line;
- while ((line = rd.readLine()) != null) {
- if (responseBuffer.length() > 0) responseBuffer.append("\n");
- responseBuffer.append(line);
- }
- outStream.close();
- rd.close();
-%>
-<html><head>
-<meta http-equiv="Refresh" content="0;URL=<%=url2%>?uuid=<%=responseBuffer%>&launchPoint=<%=launchPoint%>">
-</head></html>
Deleted: branches/1.6/webapp/testapilaunch.php
===================================================================
--- branches/1.6/webapp/testapilaunch.php 2015-04-21 23:08:08 UTC (rev 1307)
+++ branches/1.6/webapp/testapilaunch.php 2015-04-21 23:50:31 UTC (rev 1308)
@@ -1,36 +0,0 @@
-<?php
-require_once 'HTTP/Request2.php';
-
-$loginAPIURL = new HTTP_Request2('http://216.119.104.185:8081/api/session/login/index.jsp', HTTP_Request2::METHOD_POST);
-
-$launchAPIURL = 'http://216.119.104.185:8081/api/session/launch/index.jsp';
-$launchPoint = 'http://216.119.104.185:8081/employee.jsp';
-
-$loginAPIURL->addPostParameter('ILSUSER', 'user1');
-$loginAPIURL->addPostParameter('ILSPASSWD', 'changeme');
-
-try {
- $response = $loginAPIURL->send();
- if (200 == $response->getStatus()) {
- $loginToken = $response->getBody();
- // check if we're a UUID
- if (substr($loginToken, 8, 1) == '-' && substr($loginToken, 13, 1) == '-' && substr($loginToken, 18, 1) == '-') {
- echo '
-<html><head>
-<meta http-equiv="Refresh" content="0;URL=' . $launchAPIURL . '?uuid=' . $loginToken . '&launchPoint=' . $launchPoint . '">
-</head></html>
-';
- }
- else {
- echo 'Invalid Credentials (' . $loginToken . ')';
- }
- }
- else {
- echo 'Could not communicate with iLS (' . $response->getStatus() . ')';
- }
-} catch (HTTP_Request2_Exception $e) {
- echo 'Error: ' . $e->getMessage();
-}
-
-?>
-
More information about the Ils-source
mailing list