From f7a81f4707c11eeea0de9eca8770d9de2b208e96 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Thu, 14 Feb 2013 14:56:36 +0000 Subject: [PATCH] git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@69264 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 36 +------------------ .../client/AppControllerExplorer.java | 28 +++++++-------- .../server/GWTWorkspaceServiceImpl.java | 16 ++++----- .../user/workspace/TestProperties.java | 29 +++++++++++++++ 4 files changed, 50 insertions(+), 59 deletions(-) create mode 100644 src/test/java/org/gcube/portlets/user/workspace/TestProperties.java diff --git a/pom.xml b/pom.xml index 36243eb..08fd98e 100644 --- a/pom.xml +++ b/pom.xml @@ -214,41 +214,7 @@ - - - org.codehaus.mojo - gwt-maven-plugin - - 2.4.0 - - - - com.google.gwt - gwt-user - ${gwtVersion} - - - com.google.gwt - gwt-dev - ${gwtVersion} - - - - - - prepare-package - - resources - compile - - - - - - - + diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java index c579572..2edb9b8 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java @@ -206,20 +206,20 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt public void onCreateSharedFolder(CreateSharedFolderEvent createSharedFolderEvent) { - rpcWorkspaceService.readFromApplicationProfile("aaa", "bbb", new AsyncCallback() { - - @Override - public void onFailure(Throwable caught) { - // TODO Auto-generated method stub - - } - - @Override - public void onSuccess(Void result) { - // TODO Auto-generated method stub - - } - }); +// rpcWorkspaceService.readFromApplicationProfile("aaa", "bbb", new AsyncCallback() { +// +// @Override +// public void onFailure(Throwable caught) { +// // TODO Auto-generated method stub +// +// } +// +// @Override +// public void onSuccess(Void result) { +// // TODO Auto-generated method stub +// +// } +// }); final FileModel sourceFileModel = createSharedFolderEvent.getFileSourceModel(); diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java index 6023559..92880d8 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java @@ -1,7 +1,9 @@ package org.gcube.portlets.user.workspace.server; -import java.io.FileOutputStream; +import java.io.BufferedInputStream; +import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStream; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -11,7 +13,6 @@ import java.util.concurrent.TimeUnit; import javax.servlet.ServletContext; import org.gcube.application.framework.core.session.ASLSession; -import org.gcube.applicationsupportlayer.social.SocialPortalBridge; import org.gcube.common.core.scope.GCUBEScope; import org.gcube.common.core.utils.logging.GCUBEClientLog; import org.gcube.portlets.user.homelibrary.home.exceptions.HomeNotFoundException; @@ -46,6 +47,7 @@ import org.gcube.portlets.user.workspace.client.workspace.GWTWorkspaceItem; import org.gcube.portlets.user.workspace.server.notifications.NotificationsProducer; import org.gcube.portlets.user.workspace.server.util.AllScope; import org.gcube.portlets.user.workspace.server.util.Util; +import org.gcube.portlets.user.workspace.shared.FieldVerifier; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -761,17 +763,11 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT Properties prop = new Properties(); try { - - ServletContext servletContext = getServletContext(); - - System.out.println("context-path: "+servletContext.getRealPath("")); - System.out.println("context-path th: "+this.getThreadLocalRequest().getContextPath()); - System.out.println("context-path cp: "+this.getServletContext().getContextPath()); - + InputStream in = (InputStream) FieldVerifier.class.getResourceAsStream("portletClassName.properties"); // load a properties file from class path, inside static method - prop.load(servletContext.getResourceAsStream("portletClassName.properties")); + prop.load(in); // get the property value and print it out System.out.println(prop.getProperty("idreport")); diff --git a/src/test/java/org/gcube/portlets/user/workspace/TestProperties.java b/src/test/java/org/gcube/portlets/user/workspace/TestProperties.java new file mode 100644 index 0000000..0156a15 --- /dev/null +++ b/src/test/java/org/gcube/portlets/user/workspace/TestProperties.java @@ -0,0 +1,29 @@ +package org.gcube.portlets.user.workspace; + +import java.io.IOException; +import java.util.Properties; + +import org.gcube.portlets.user.workspace.server.GWTWorkspaceServiceImpl; + +public class TestProperties { + + public static void main(String[] args) { + + Properties prop = new Properties(); + + try { + // load a properties file from class path, inside static method + prop.load(GWTWorkspaceServiceImpl.class.getClassLoader().getResourceAsStream("portletClassName.properties")); + + // get the property value and print it out + System.out.println(prop.getProperty("idreport")); + System.out.println(prop.getProperty("idtemplate")); + + + } catch (IOException ex) { + ex.printStackTrace(); + } + + } + +}