Merge pull request #21 from qbicsoftware/hotfix/fix_vaadin_issue

Hotfix/fix vaadin issue

Author: wow-such-code

pom.xml

@@ -6,10 +6,10 @@
 	<parent>
 		<groupId>life.qbic</groupId>
 		<artifactId>portlet-parent-pom</artifactId>
-		<version>3.1.0</version>
+		<version>3.1.4</version>
 	</parent>
 	<artifactId>user-db-portlet</artifactId>
-	<version>1.8.1</version>
+	<version>1.8.2</version>
 	<name>User Database Portlet</name>
 	<url>http://github.com/qbicsoftware/user-db-portlet</url>
 	<packaging>war</packaging>
@@ -56,17 +56,17 @@
 		<dependency>
 			<groupId>life.qbic</groupId>
 			<artifactId>portal-utils-lib</artifactId>
-			<version>2.2.1</version>
+			<version>1.6.0</version>
 		</dependency>
 		<dependency>
 			<groupId>life.qbic</groupId>
 			<artifactId>core-utils-lib</artifactId>
-			<version>1.7.0</version>
+			<version>1.7.1</version>
 		</dependency>
 		<dependency>
 			<groupId>life.qbic</groupId>
 			<artifactId>openbis-client-lib</artifactId>
-			<version>1.4.0</version>
+			<version>1.4.1</version>
 		</dependency>
 		<dependency>
 			<groupId>life.qbic</groupId>

src/main/java/life/qbic/portal/portlet/UserDBPortletUI.java

@@ -88,7 +88,6 @@ protected Layout getPortletContent(final VaadinRequest request) {
     boolean success = true;
     manager = ConfigurationManagerFactory.getInstance();
     tmpFolder = manager.getTmpFolder();
-
     if (PortalUtils.isLiferayPortlet()) {
       // read in the configuration file
 
@@ -109,9 +108,9 @@ protected Layout getPortletContent(final VaadinRequest request) {
     // establish connection to the OpenBIS API
     try {
       logger.debug("trying to connect to openbis");
-
+      final String openbisURL = manager.getDataSourceUrl() + "/openbis/openbis";
       this.openbis = new OpenBisClient(manager.getDataSourceUser(), manager.getDataSourcePassword(),
-          manager.getDataSourceUrl());
+          openbisURL);
       this.openbis.login();
     } catch (Exception e) {
       success = false;