git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/branches/data-analysis/RConnector/2.1@146364 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
2dc8b8c41a
commit
8d29e5f8ea
|
@ -1,6 +1,9 @@
|
||||||
<ReleaseNotes>
|
<ReleaseNotes>
|
||||||
|
<Changeset component="org.gcube.data-analysis.r-connector.2.1.2" date="2017-03-27">
|
||||||
|
<Change>add user script is executed also when configfile.csv is not present</Change>
|
||||||
|
</Changeset>
|
||||||
<Changeset component="org.gcube.data-analysis.r-connector.2.1.2" date="2017-02-22">
|
<Changeset component="org.gcube.data-analysis.r-connector.2.1.2" date="2017-02-22">
|
||||||
<Change>porting to tabular-data-cl 2.0.0</Change>
|
<Change>porting to tabualr-data-cl 2.0.0</Change>
|
||||||
</Changeset>
|
</Changeset>
|
||||||
<Changeset component="org.gcube.data-analysis.r-connector.2.1.0" date="2016-10-03">
|
<Changeset component="org.gcube.data-analysis.r-connector.2.1.0" date="2016-10-03">
|
||||||
<Change>porting to smartgears 2.0</Change>
|
<Change>porting to smartgears 2.0</Change>
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -3,7 +3,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.gcube.data.analysis</groupId>
|
<groupId>org.gcube.data.analysis</groupId>
|
||||||
<artifactId>r-connector</artifactId>
|
<artifactId>r-connector</artifactId>
|
||||||
<version>2.1.2-SNAPSHOT</version>
|
<version>2.1.3-SNAPSHOT</version>
|
||||||
<name>RConnector</name>
|
<name>RConnector</name>
|
||||||
<description>makes R available in the infrastructure</description>
|
<description>makes R available in the infrastructure</description>
|
||||||
|
|
||||||
|
|
|
@ -22,12 +22,12 @@ public class ConfigFileWriter {
|
||||||
usersHome=usersHome+"/";
|
usersHome=usersHome+"/";
|
||||||
File userDir = new File(usersHome+login);
|
File userDir = new File(usersHome+login);
|
||||||
File configFile= new File(userDir, fileName);
|
File configFile= new File(userDir, fileName);
|
||||||
checkDirectory(userDir, login, scriptToExecute);
|
checkDirectory(userDir, login, scriptToExecute, configFile);
|
||||||
return writeFile(info, configFile);
|
return writeFile(info, configFile);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void checkDirectory(File userDir, String login, String scriptToExecute){
|
private void checkDirectory(File userDir, String login, String scriptToExecute, File configFile){
|
||||||
if ((!userDir.isDirectory() || !userDir.exists()))
|
if ((!userDir.isDirectory() || !userDir.exists()) || !configFile.exists() )
|
||||||
executeCommandLine(scriptToExecute,login);
|
executeCommandLine(scriptToExecute,login);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,6 @@ public class DisconnectResource {
|
||||||
@Produces(MediaType.TEXT_HTML)
|
@Produces(MediaType.TEXT_HTML)
|
||||||
public Response disconnect(@Context HttpServletRequest req) {
|
public Response disconnect(@Context HttpServletRequest req) {
|
||||||
log.info("disconnect called ");
|
log.info("disconnect called ");
|
||||||
new Throwable().printStackTrace();
|
|
||||||
String rStudioServerAddress = context==null?"":context.getInitParameter("rStudioAddress");
|
String rStudioServerAddress = context==null?"":context.getInitParameter("rStudioAddress");
|
||||||
log.info(rStudioServerAddress);
|
log.info(rStudioServerAddress);
|
||||||
try{
|
try{
|
||||||
|
|
Loading…
Reference in New Issue