diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index bf08e59..c7b718e 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,9 @@
+
+ uses
+
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java b/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java
index 04a7013..af8e77e 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/client/panels/NewsFeedPanel.java
@@ -60,7 +60,6 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HasAlignment;
-import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HasVerticalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java b/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
index 89077be..ea0e99e 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
@@ -72,7 +72,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
private static final String SESSION_ADMIN_ATTR = "SESSION_ADMIN_ATTR";
private static final String USER_SETTINGS_ATTR = "USER_SETTINGS_ATTR";
-
+
/**
*
*/
@@ -99,15 +99,19 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
String user = (String) this.getThreadLocalRequest().getSession().getAttribute(ScopeHelper.USERNAME_ATTRIBUTE);
if (user == null) {
_log.warn("USER IS NULL setting testing user and Running OUTSIDE PORTAL");
- user = "test.user";
-// user = "massimiliano.assante";
-// SessionManager.getInstance().getASLSession(sessionID, user).setScope("/gcube/devsec/TestVREFolder2");
+ user = getDevelopmentUser();
+ //SessionManager.getInstance().getASLSession(sessionID, user).setScope("/gcube/devsec/TestVREFolder2");
}
else {
withinPortal = true;
}
return SessionManager.getInstance().getASLSession(sessionID, user);
}
+ public String getDevelopmentUser() {
+ String user = "test.user";
+ //user = "massimiliano.assante";
+ return user;
+ }
/**
* this is the first method called by the web app
*/
@@ -154,9 +158,18 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
* @return true
if it is, false
otherwise.
*/
private boolean isInfrastructureScope() {
- ScopeBean scope = new ScopeBean(getASLSession().getScope());
- return scope.is(Type.INFRASTRUCTURE);
+ boolean toReturn = false;
+ try {
+ ScopeBean scope = new ScopeBean(getASLSession().getScope());
+ toReturn = scope.is(Type.INFRASTRUCTURE);
+ return toReturn;
+ }
+ catch (NullPointerException e) {
+ _log.error("NullPointerException in isInfrastructureScope returning false");
+ return false;
+ }
}
+
@@ -337,7 +350,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
e.printStackTrace();
return null;
}
-
+
for (String key: feedsMap.keySet()) {
toMerge.add(feedsMap.get(key));
}
@@ -366,23 +379,23 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
_log.trace("Reading desc: " + feed.getDescription());
}
-// if (! onlyConnections) {
-// //User Own Feeds
-// ArrayList userFeeds = (ArrayList) store.getRecentFeedsByUser(userName, 10);
-// for (Feed feed : userFeeds)
-// feedsMap.put(feed.getKey(), feed);
-// // //Portal Feeds
-// ArrayList portalFeeds = (ArrayList) store.getAllPortalPrivacyLevelFeeds();
-// for (Feed feed : portalFeeds)
-// feedsMap.put(feed.getKey(), feed);
-// }
-// //UserFriends Feeds
-// ArrayList userFriendsIds = (ArrayList)store.getFriends(userName);
-// for (String userid : userFriendsIds) {
-// for (Feed feed : store.getRecentFeedsByUser(userid, 10)) {
-// feedsMap.put(feed.getKey(), feed);
-// }
-// }
+ // if (! onlyConnections) {
+ // //User Own Feeds
+ // ArrayList userFeeds = (ArrayList) store.getRecentFeedsByUser(userName, 10);
+ // for (Feed feed : userFeeds)
+ // feedsMap.put(feed.getKey(), feed);
+ // // //Portal Feeds
+ // ArrayList portalFeeds = (ArrayList) store.getAllPortalPrivacyLevelFeeds();
+ // for (Feed feed : portalFeeds)
+ // feedsMap.put(feed.getKey(), feed);
+ // }
+ // //UserFriends Feeds
+ // ArrayList userFriendsIds = (ArrayList)store.getFriends(userName);
+ // for (String userid : userFriendsIds) {
+ // for (Feed feed : store.getRecentFeedsByUser(userid, 10)) {
+ // feedsMap.put(feed.getKey(), feed);
+ // }
+ // }
for (String key: feedsMap.keySet()) {
toMerge.add(feedsMap.get(key));
}
diff --git a/src/main/webapp/NewsFeed.css b/src/main/webapp/NewsFeed.css
index 42d5db6..4cd6bf2 100644
--- a/src/main/webapp/NewsFeed.css
+++ b/src/main/webapp/NewsFeed.css
@@ -358,6 +358,7 @@ a.person-link:hover {
font-size: 14px;
line-height: 18px;
color: #333;
+ word-break:break-all;
}
.tweet-separator {
@@ -366,6 +367,7 @@ a.person-link:hover {
}
.tweet-actions {
+ width: 500px;
padding-top: 5px;
font-family: 'Lucida Grande', Verdana, 'Bitstream Vera Sans', Arial,
sans-serif;
diff --git a/src/test/java/org/gcube/portlets/user/newsfeed/client/GwtTestNewsFeed.java b/src/test/java/org/gcube/portlets/user/newsfeed/client/GwtTestNewsFeed.java
deleted file mode 100644
index 35718b6..0000000
--- a/src/test/java/org/gcube/portlets/user/newsfeed/client/GwtTestNewsFeed.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.gcube.portlets.user.newsfeed.client;
-
-import com.google.gwt.junit.client.GWTTestCase;
-
-/**
- * GWT JUnit integration tests must extend GWTTestCase.
- * Using "GwtTest*"
naming pattern exclude them from running with
- * surefire during the test phase.
- *
- * If you run the tests using the Maven command line, you will have to
- * navigate with your browser to a specific url given by Maven.
- * See http://mojo.codehaus.org/gwt-maven-plugin/user-guide/testing.html
- * for details.
- */
-public class GwtTestNewsFeed extends GWTTestCase {
-
- /**
- * Must refer to a valid module that sources this class.
- */
- public String getModuleName() {
- return "org.gcube.portlets.user.newsfeed.NewsFeedJUnit";
- }
-
- /**
- * Tests the FieldVerifier.
- */
- public void testFieldVerifier() {
-
- }
-
- /**
- * This test will send a request to the server using the greetServer method in
- * GreetingService and verify the response.
- */
- public void testGreetingService() {
- }
-
-
-}
diff --git a/src/test/java/org/gcube/portlets/user/newsfeed/test/TestForDeploy.java b/src/test/java/org/gcube/portlets/user/newsfeed/test/TestForDeploy.java
new file mode 100644
index 0000000..f68ecd2
--- /dev/null
+++ b/src/test/java/org/gcube/portlets/user/newsfeed/test/TestForDeploy.java
@@ -0,0 +1,19 @@
+package org.gcube.portlets.user.newsfeed.test;
+
+import static org.junit.Assert.*;
+
+import org.gcube.portlets.user.newsfeed.server.NewsServiceImpl;
+import org.junit.Test;
+
+public class TestForDeploy {
+
+ @Test
+ public void testUserIsTestUser() {
+ NewsServiceImpl serviceImpl = new NewsServiceImpl();
+ String username = serviceImpl.getDevelopmentUser();
+ System.out.println("username for deploy is: " + username);
+ assertTrue(username.compareTo("test.user") == 0);
+ System.out.println("Test OK!");
+ }
+
+}