gCubeSystem
/
social-networking-library
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated astyanax dependencies 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/social-networking-library@131390 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2016-09-15 13:54:48 +00:00
parent 350088cbd4
commit 06fab8b5f1
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -10,7 +10,7 @@
<groupId>org.gcube.portal</groupId> <groupId>org.gcube.portal</groupId>
<artifactId>social-networking-library</artifactId> <artifactId>social-networking-library</artifactId>
<version>1.13.0-SNAPSHOT</version> <version>1.14.0-SNAPSHOT</version>
<name>gCube Social Networking Library</name> <name>gCube Social Networking Library</name>
<description> <description>
The gCube Social Networking Library is the 'bridge' between your gCube Applications and the social networking facilities. The gCube Social Networking Library is the 'bridge' between your gCube Applications and the social networking facilities.

9
src/main/java/org/gcube/portal/databook/server/RunningCluster.java
View File

@ -60,7 +60,7 @@ public class RunningCluster implements Serializable {
private String keyspaceName; private String keyspaceName;
/** /**
* @ param infrastructureName could be null * @param infrastructureName could be null
* @return an instance of the RunningCluster * @return an instance of the RunningCluster
*/ */
public static synchronized RunningCluster getInstance(String infrastructureName) { public static synchronized RunningCluster getInstance(String infrastructureName) {
@ -103,11 +103,14 @@ public class RunningCluster implements Serializable {
*/ */
private List<ServiceEndpoint> getConfigurationFromIS(String infrastructureName) throws Exception { private List<ServiceEndpoint> getConfigurationFromIS(String infrastructureName) throws Exception {
PortalContext context = PortalContext.getConfiguration(); PortalContext context = PortalContext.getConfiguration();
_log.debug("getConfigurationFromIS infrastructureName="+infrastructureName );
String scope = "/"; String scope = "/";
if(infrastructureName != null && !infrastructureName.isEmpty()) if(infrastructureName != null && !infrastructureName.isEmpty())
scope += infrastructureName; scope += infrastructureName;
else else {
scope += context.getInfrastructureName(); scope = context.getInfrastructureName();
_log.debug("infrastrucute name is null, setting root scope=" + scope);
}
String currScope = ScopeProvider.instance.get(); String currScope = ScopeProvider.instance.get();
ScopeProvider.instance.set(scope); ScopeProvider.instance.set(scope);
SimpleQuery query = queryFor(ServiceEndpoint.class); SimpleQuery query = queryFor(ServiceEndpoint.class);