From d9401cb78ec8c2dae8b17cc118ff9583ca40b4eb Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Mon, 7 Oct 2019 09:03:42 +0000
Subject: [PATCH] RStudio instances returned over https now

git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portlets/user/rstudio-wrapper-portlet@181940 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                    | 10 ++++----
 .project                                      | 11 +++++++++
 .../com.gwtplugins.gdt.eclipse.core.prefs     |  4 ++++
 .settings/org.eclipse.jdt.core.prefs          |  1 +
 .settings/org.eclipse.wst.common.component    |  2 +-
 ....eclipse.wst.common.project.facet.core.xml |  1 +
 .tern-project                                 | 23 +++++++++++++++++++
 distro/changelog.xml                          |  7 ++++++
 pom.xml                                       | 10 ++++----
 .../server/RStudioServiceImpl.java            |  4 ++++
 10 files changed, 63 insertions(+), 10 deletions(-)
 create mode 100644 .settings/com.gwtplugins.gdt.eclipse.core.prefs
 create mode 100644 .tern-project

diff --git a/.classpath b/.classpath
index 22a687f..2c48a08 100644
--- a/.classpath
+++ b/.classpath
@@ -1,30 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/rstudio-wrapper-portlet-1.3.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/rstudio-wrapper-portlet-1.3.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/rstudio-wrapper-portlet-1.3.0-SNAPSHOT/WEB-INF/classes" path="target/generated-sources/gwt">
+	<classpathentry kind="src" output="target/rstudio-wrapper-portlet-1.3.1-SNAPSHOT/WEB-INF/classes" path="target/generated-sources/gwt">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/rstudio-wrapper-portlet-1.3.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/rstudio-wrapper-portlet-1.3.1-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
@@ -39,5 +41,5 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/rstudio-wrapper-portlet-1.3.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/rstudio-wrapper-portlet-1.3.1-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.project b/.project
index fcaa210..63f1792 100644
--- a/.project
+++ b/.project
@@ -35,6 +35,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>com.gwtplugins.gdt.eclipse.core.webAppProjectValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.gwtplugins.gwt.eclipse.core.gwtProjectValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -50,5 +60,6 @@
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 		<nature>com.google.gwt.eclipse.core.gwtNature</nature>
 		<nature>com.liferay.ide.core.liferayNature</nature>
+		<nature>com.gwtplugins.gwt.eclipse.core.gwtNature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
new file mode 100644
index 0000000..a33d7f8
--- /dev/null
+++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+lastWarOutDir=/Users/massi/Documents/workspace/rstudio-wrapper-portlet/target/rstudio-wrapper-portlet-1.3.1-SNAPSHOT
+warSrcDir=src/main/webapp
+warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 443e085..8db228c 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -5,4 +5,5 @@ org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.7
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 18e58c6..77237b0 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="rstudio-wrapper-portlet-portlet">
+    <wb-module deploy-name="rstudio-wrapper-portlet">
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index 3fb44fe..c5b2895 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -6,4 +6,5 @@
   <installed facet="wst.jsdt.web" version="1.0"/>
   <installed facet="jst.jaxrs" version="2.0"/>
   <installed facet="liferay.portlet" version="6.2"/>
+  <installed facet="com.gwtplugins.gwt.facet" version="1.0"/>
 </faceted-project>
diff --git a/.tern-project b/.tern-project
new file mode 100644
index 0000000..d7fbf24
--- /dev/null
+++ b/.tern-project
@@ -0,0 +1,23 @@
+{
+  "plugins": {
+    "guess-types": {
+      
+    },
+    "outline": {
+      
+    },
+    "liferay": {
+      
+    },
+    "yui3": {
+      
+    },
+    "aui2.0.x": {
+      
+    }
+  },
+  "libs": [
+    "ecma5",
+    "browser"
+  ]
+}
\ No newline at end of file
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 2fc0c96..7ff88fa 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,11 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlet.user.rstudio-wrapper-portlet.1-3-1"
+		date="2019-10-07">
+		<Change>RStudio instances returned over https now
+		</Change>
+		<Change>Ported to Java8 and gwt 2.8.2
+		</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlet.user.rstudio-wrapper-portlet.1-3-0"
 		date="2017-02-21">
 		<Change>RStudio instance allocation takes into account the number of instance available in the given context and assign the RStudio instance balancing the load.
diff --git a/pom.xml b/pom.xml
index a66ffca..2e5d06b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,15 +12,15 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>rstudio-wrapper-portlet</artifactId>
 	<packaging>war</packaging>
-	<version>1.3.0-SNAPSHOT</version>
+	<version>1.3.1-SNAPSHOT</version>
 	<name>RStudio Wrapper Portlet</name>
 
 	<properties>
 		<!-- Convenience property to set the GWT version -->
-		<gwtVersion>2.7.0</gwtVersion>
+		<gwtVersion>2.8.2</gwtVersion>
 
-		<maven.compiler.source>1.7</maven.compiler.source>
-		<maven.compiler.target>1.7</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
@@ -125,7 +125,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>gwt-maven-plugin</artifactId>
-				<version>2.7.0</version>
+				<version>${gwtVersion}</version>
 				<executions>
 					<execution>
 						<goals>
diff --git a/src/main/java/org/gcube/portlets/user/rstudio_wrapper_portlet/server/RStudioServiceImpl.java b/src/main/java/org/gcube/portlets/user/rstudio_wrapper_portlet/server/RStudioServiceImpl.java
index 66fa692..c8b769c 100644
--- a/src/main/java/org/gcube/portlets/user/rstudio_wrapper_portlet/server/RStudioServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/rstudio_wrapper_portlet/server/RStudioServiceImpl.java
@@ -154,6 +154,10 @@ public class RStudioServiceImpl extends RemoteServiceServlet implements RStudioS
 			e.printStackTrace();
 		} 
 		_log.info("returning URL from rConnector = "+toReturn);
+		if (!toReturn.startsWith("https")) {
+			toReturn = toReturn.replace("http:", "https:");
+			_log.info("Changed URL from rConnector to support SSL: "+toReturn);
+		}
 		return toReturn;
 	}