Index: basiclti-blis/src/java/org/sakaiproject/blti/ServiceServlet.java
===================================================================
--- basiclti-blis/src/java/org/sakaiproject/blti/ServiceServlet.java (revision 130454)
+++ basiclti-blis/src/java/org/sakaiproject/blti/ServiceServlet.java (working copy)
@@ -582,7 +582,7 @@
if ( success ) {
Object result = ltiService.updateContentDao(contentKey,content, siteId);
if ( result instanceof String ) {
- M_log.warn("Setting update failed");
+ M_log.warn("Setting update failed: "+result);
doError(request, response, theMap, "setting.fail", "", null);
success = false;
}
Index: basiclti-impl/pom.xml
===================================================================
--- basiclti-impl/pom.xml (revision 130454)
+++ basiclti-impl/pom.xml (working copy)
@@ -72,6 +72,20 @@
hsqldb
test
+
+ oracle.jdbc.driver.OracleDriver
+ ojdbc6
+ 11.2.0.2.0
+ test
+
+
+ junit
+ junit
+ 4.5
+ jar
+ test
+
+
Index: basiclti-impl/src/java/org/sakaiproject/util/foorm/Foorm.java
===================================================================
--- basiclti-impl/src/java/org/sakaiproject/util/foorm/Foorm.java (revision 130454)
+++ basiclti-impl/src/java/org/sakaiproject/util/foorm/Foorm.java (working copy)
@@ -28,6 +28,7 @@
import java.util.Properties;
import java.util.logging.Logger;
+import java.lang.Number;
import java.sql.ResultSetMetaData;
/**
@@ -432,8 +433,6 @@
sb.append(getI18N(label, loader));
sb.append("\n");
int val = 0;
- if (value != null && value instanceof Integer)
- val = ((Integer) value).intValue();
if (value != null && value instanceof Number)
val = ((Number) value).intValue();
if (value != null && value instanceof String) {
@@ -1027,7 +1026,6 @@
continue;
Object dataField = getField(parms, field);
- // System.out.println("field="+field+" data="+dataField);
String sdf = null;
if (dataField instanceof String)
sdf = (String) dataField;
@@ -1066,9 +1064,9 @@
if (dataField == null) {
if (dataMap != null)
dataMap.put(field, null);
- } else if (dataField instanceof Integer) {
- if (dataMap != null)
- dataMap.put(field, dataField);
+ } else if (dataField instanceof Number) {
+ if (dataMap != null)
+ dataMap.put(field, ((Number) dataField).intValue());
} else {
try {
Integer ival = new Integer(sdf);
@@ -1535,11 +1533,9 @@
// to simplify casting
public static String getSuperType(String className)
{
- // System.out.println("Incoming="+className);
try {
Class c = Class.forName(className);
while ( c != null ) {
- // System.out.println("NNN="+c.getName());
if ( STRING_TYPE.equals(c.getName()) ) return STRING_TYPE;
if ( NUMBER_TYPE.equals(c.getName()) ) return NUMBER_TYPE;
c = c.getSuperclass();
Index: pom.xml
===================================================================
--- pom.xml (revision 130454)
+++ pom.xml (working copy)
@@ -175,6 +175,13 @@
commons-configuration
1.6
+
+ junit
+ junit
+ 4.5
+ jar
+ test
+