gCubeSystem
/
rstudio-wrapper-portlet
15
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Massimiliano Assante 2019-10-07 09:03:42 +00:00
parent 63f7467d03
commit d9401cb78e
10 changed files with 63 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.classpath
View File

@ -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>

11
.project
View File

@ -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>

4
.settings/com.gwtplugins.gdt.eclipse.core.prefs Normal file
View File

@ -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

1
.settings/org.eclipse.jdt.core.prefs
View File

@ -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

2
.settings/org.eclipse.wst.common.component
View File

@ -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"/>

1
.settings/org.eclipse.wst.common.project.facet.core.xml
View File

@ -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>

23
.tern-project Normal file
View File

@ -0,0 +1,23 @@
{
"plugins": {
"guess-types": {
},
"outline": {
},
"liferay": {
},
"yui3": {
},
"aui2.0.x": {
}
},
"libs": [
"ecma5",
"browser"
]
}

7
distro/changelog.xml
View File

@ -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.

10
pom.xml
View File

@ -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>

4
src/main/java/org/gcube/portlets/user/rstudio_wrapper_portlet/server/RStudioServiceImpl.java
View File

@ -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;
}