NBLAST integration: nblast renamed to more generic OpenCPU

ddelpiano · ddelpiano · commit 9e33a1cdc3c4 · 2018-07-02T14:37:13.000+01:00
diff --git a/src/main/java/META-INF/spring/osgi-config.xml b/src/main/java/META-INF/spring/osgi-config.xml
@@ -32,10 +32,10 @@
 	<aop:scoped-proxy proxy-target-class="false"/>
 	</bean>
 	
-	<osgi:service id="nblastDataSourceExporter" ref="nblastDataSource"
+	<osgi:service id="OpenCPUDataSourceExporter" ref="opencpuDataSource"
 		interface="org.geppetto.core.datasources.IDataSourceService">
 	</osgi:service>
-	<bean id="nblastDataSource" scope="prototype" class="org.geppetto.datasources.nblast.NBLASTDataSourceService">
+	<bean id="opencpuDataSource" scope="prototype" class="org.geppetto.datasources.opencpu.OpenCPUDataSourceService">
 	<aop:scoped-proxy proxy-target-class="false"/>
 	</bean>
 	
diff --git a/src/main/java/org/geppetto/datasources/opencpu/OpenCPUDataSourceService.java b/src/main/java/org/geppetto/datasources/opencpu/OpenCPUDataSourceService.java
@@ -1,5 +1,5 @@
 
-package org.geppetto.datasources.nblast;
+package org.geppetto.datasources.opencpu;
 
 import org.geppetto.core.datasources.GeppettoDataSourceException;
 import org.geppetto.core.datasources.IQueryListener;
@@ -18,12 +18,12 @@
  *
  */
 
-public class NBLASTDataSourceService extends ADataSourceService
+public class OpenCPUDataSourceService extends ADataSourceService
 {
 
-	public NBLASTDataSourceService()
+	public OpenCPUDataSourceService()
 	{
-		super("/templates/NBLAST/queryTemplate.vm");
+		super("/templates/OpenCPU/queryTemplate.vm");
 	}
 
 
@@ -48,7 +48,7 @@ public IQueryResponseProcessor getQueryResponseProcessor()
 	{
 		if(queryResponseProcessor == null)
 		{
-			queryResponseProcessor = new NBLASTResponseProcessor();
+			queryResponseProcessor = new OpenCPUResponseProcessor();
 		}
 		return queryResponseProcessor;
 	}
diff --git a/src/main/java/org/geppetto/datasources/opencpu/OpenCPUResponseProcessor.java b/src/main/java/org/geppetto/datasources/opencpu/OpenCPUResponseProcessor.java
@@ -1,5 +1,5 @@
 
-package org.geppetto.datasources.nblast;
+package org.geppetto.datasources.opencpu;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -16,7 +16,7 @@
  * @author dariodelpiano
  *
  */
-public class NBLASTResponseProcessor implements IQueryResponseProcessor
+public class OpenCPUResponseProcessor implements IQueryResponseProcessor
 {
 
 	/*
diff --git a/src/main/resources/templates/OpenCPU/queryTemplate.vm b/src/main/resources/templates/OpenCPU/queryTemplate.vm

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`
`2`		`-package org.geppetto.datasources.nblast;`
	`2`	`+package org.geppetto.datasources.opencpu;`
`3`	`3`
`4`	`4`	`import org.geppetto.core.datasources.GeppettoDataSourceException;`
`5`	`5`	`import org.geppetto.core.datasources.IQueryListener;`
`@@ -18,12 +18,12 @@`
`18`	`18`	`*`
`19`	`19`	`*/`
`20`	`20`
`21`		`-public class NBLASTDataSourceService extends ADataSourceService`
	`21`	`+public class OpenCPUDataSourceService extends ADataSourceService`
`22`	`22`	`{`
`23`	`23`
`24`		`- public NBLASTDataSourceService()`
	`24`	`+ public OpenCPUDataSourceService()`
`25`	`25`	`{`
`26`		`- super("/templates/NBLAST/queryTemplate.vm");`
	`26`	`+ super("/templates/OpenCPU/queryTemplate.vm");`
`27`	`27`	`}`
`28`	`28`
`29`	`29`
`@@ -48,7 +48,7 @@ public IQueryResponseProcessor getQueryResponseProcessor()`
`48`	`48`	`{`
`49`	`49`	`if(queryResponseProcessor == null)`
`50`	`50`	`{`
`51`		`- queryResponseProcessor = new NBLASTResponseProcessor();`
	`51`	`+ queryResponseProcessor = new OpenCPUResponseProcessor();`
`52`	`52`	`}`
`53`	`53`	`return queryResponseProcessor;`
`54`	`54`	`}`