Index: lams_build/build_base.xml
===================================================================
diff -u -r47d555d1abf1b7ceca685f1a6186ff08fa2590bb -r8b8155cc92145959a0fd2fd2aef6689c68ddbc22
--- lams_build/build_base.xml (.../build_base.xml) (revision 47d555d1abf1b7ceca685f1a6186ff08fa2590bb)
+++ lams_build/build_base.xml (.../build_base.xml) (revision 8b8155cc92145959a0fd2fd2aef6689c68ddbc22)
@@ -170,6 +170,7 @@
destdir="${basedir}/build/classes/java">
+
${ant.project.name}: Copying additional non-Java resources
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -rce8ce53765e38b46bd112a5933089d51bac130de -r8b8155cc92145959a0fd2fd2aef6689c68ddbc22
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/util/HttpUrlConnectionUtil.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8b8155cc92145959a0fd2fd2aef6689c68ddbc22
--- lams_common/src/java/org/lamsfoundation/lams/util/HttpUrlConnectionUtil.java (.../HttpUrlConnectionUtil.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_common/src/java/org/lamsfoundation/lams/util/HttpUrlConnectionUtil.java (.../HttpUrlConnectionUtil.java) (revision 8b8155cc92145959a0fd2fd2aef6689c68ddbc22)
@@ -169,12 +169,10 @@
return cookieString.toString();
}
- private static HttpURLConnection getConnection(String urlToConnectTo) throws IOException {
+ public static HttpURLConnection getConnection(String urlToConnectTo) throws IOException {
URL url = new URL(urlToConnectTo);
HttpURLConnection con = null;
- if (urlToConnectTo.toLowerCase().startsWith("https")
- && urlToConnectTo.startsWith(Configuration.get(ConfigurationKeys.SERVER_URL))) {
-
+ if (urlToConnectTo.toLowerCase().startsWith("https")) {
if (!HttpUrlConnectionUtil.defaultTrustManagerSet) {
TrustManager defaultTrustManager = new X509TrustManager() {
@Override
Index: lams_tool_zoom/.classpath
===================================================================
diff -u -ra03d663fb89c9c0ebafef753314cc5da82f7aaa1 -r8b8155cc92145959a0fd2fd2aef6689c68ddbc22
--- lams_tool_zoom/.classpath (.../.classpath) (revision a03d663fb89c9c0ebafef753314cc5da82f7aaa1)
+++ lams_tool_zoom/.classpath (.../.classpath) (revision 8b8155cc92145959a0fd2fd2aef6689c68ddbc22)
@@ -1,7 +1,12 @@
-
+
+
+
+
+
+
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java
===================================================================
diff -u -r09afc481ffe35b4e50a902c00b4a7c155c3d61f1 -r8b8155cc92145959a0fd2fd2aef6689c68ddbc22
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java (.../ZoomService.java) (revision 09afc481ffe35b4e50a902c00b4a7c155c3d61f1)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java (.../ZoomService.java) (revision 8b8155cc92145959a0fd2fd2aef6689c68ddbc22)
@@ -29,7 +29,6 @@
import java.io.StringWriter;
import java.lang.reflect.Field;
import java.net.HttpURLConnection;
-import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -73,6 +72,7 @@
import org.lamsfoundation.lams.tool.zoom.util.ZoomException;
import org.lamsfoundation.lams.usermanagement.User;
import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.HttpUrlConnectionUtil;
import org.lamsfoundation.lams.util.JsonUtil;
import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -81,6 +81,7 @@
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
+import sun.net.www.protocol.https.HttpsURLConnectionImpl;
/**
* An implementation of the IZoomService interface.
@@ -303,7 +304,7 @@
// reset it to new toolContentId
zoom.setToolContentId(toolContentId);
- zoom.setCreateBy(new Long(newUserUid.longValue()));
+ zoom.setCreateBy(newUserUid.longValue());
zoom.setApi(null);
saveOrUpdateZoom(zoom);
@@ -745,8 +746,8 @@
private static HttpURLConnection getZoomConnection(String urlSuffix, String method, String body, ZoomApi api)
throws IOException {
- URL url = new URL(ZoomConstants.ZOOM_API_URL + urlSuffix);
- HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
+ HttpsURLConnection connection = (HttpsURLConnection) HttpUrlConnectionUtil
+ .getConnection(ZoomConstants.ZOOM_API_URL + urlSuffix);
connection.setRequestProperty("Authorization", "Bearer " + ZoomService.generateJWT(api));
switch (method) {
case "PATCH":
@@ -806,8 +807,8 @@
private static void setRequestMethod(HttpURLConnection connection, String method) {
try {
final Object target;
- if (connection instanceof HttpsURLConnection) {
- final Field delegate = HttpsURLConnection.class.getDeclaredField("delegate");
+ if (connection instanceof HttpsURLConnectionImpl) {
+ final Field delegate = HttpsURLConnectionImpl.class.getDeclaredField("delegate");
delegate.setAccessible(true);
target = delegate.get(connection);
} else {