Compare commits
9 Commits
Author | SHA1 | Date |
---|---|---|
Massimiliano Assante | 1ef4a03b19 | |
Massimiliano Assante | ab1b38b118 | |
Massimiliano Assante | 72dd25f37d | |
Massimiliano Assante | e4550200a4 | |
Massimiliano Assante | e1b6646647 | |
Massimiliano Assante | 6e2592004b | |
Massimiliano Assante | 2ed469c066 | |
Massimiliano Assante | 17cc7b2784 | |
Massimiliano Assante | 3794c10fee |
|
@ -13,15 +13,15 @@
|
|||
</classpathentry>
|
||||
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
|
||||
<attributes>
|
||||
<attribute name="test" value="true"/>
|
||||
<attribute name="optional" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
<attribute name="test" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
<attribute name="test" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
|
||||
|
@ -36,8 +36,9 @@
|
|||
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
|
||||
<attributes>
|
||||
<attribute name="module" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
|
|
|
@ -1,11 +1,51 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
|
||||
<wb-module deploy-name="news-feed">
|
||||
|
||||
|
||||
|
||||
|
||||
<wb-module deploy-name="news-feed">
|
||||
|
||||
|
||||
|
||||
|
||||
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
|
||||
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
|
||||
|
||||
|
||||
|
||||
|
||||
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
||||
|
||||
|
||||
|
||||
|
||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
|
||||
|
||||
|
||||
|
||||
|
||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
|
||||
|
||||
|
||||
|
||||
|
||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
|
||||
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
|
||||
|
||||
|
||||
|
||||
|
||||
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
|
||||
|
||||
|
||||
|
||||
|
||||
<property name="context-root" value="news-feed"/>
|
||||
</wb-module>
|
||||
|
||||
|
||||
|
||||
|
||||
</wb-module>
|
||||
|
||||
|
||||
|
||||
|
||||
</project-modules>
|
||||
|
|
|
@ -1,17 +0,0 @@
|
|||
{
|
||||
"plugins": {
|
||||
"aui": {
|
||||
|
||||
},
|
||||
"liferay": {
|
||||
|
||||
},
|
||||
"yui": {
|
||||
|
||||
}
|
||||
},
|
||||
"libs": [
|
||||
"ecma5",
|
||||
"browser"
|
||||
]
|
||||
}
|
|
@ -0,0 +1,149 @@
|
|||
|
||||
# Changelog for News Feed Portlet
|
||||
|
||||
All notable changes to this project will be documented in this file.
|
||||
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
|
||||
|
||||
|
||||
## [v3.0.0] - 2023-12-15
|
||||
|
||||
- Feature #26194: News Feed portlet: remove elastic search client
|
||||
|
||||
## [v2.8.4] - 2022-05-15
|
||||
|
||||
- fixed changelog and README
|
||||
|
||||
## [v2.8.2] - 2019-09-22
|
||||
|
||||
- Feature: HTML markup is not only escaped as it was but also displayed as simple text
|
||||
|
||||
## [v2.8.1] - 2019-07-17
|
||||
|
||||
- Fixed Bug #17181, post editing leads to losing both formatting and mentions
|
||||
|
||||
## [v2.8.0] - 2019-05-22
|
||||
|
||||
- Fixed Bug #16724, Social networking: "See more" seems to reload a post with part of the old look and feel
|
||||
- Fixed Bug #16673, News Feed: comments with links between parenthesis not recognised
|
||||
|
||||
## [v2.7.2] - 2019-01-25
|
||||
|
||||
- Feature #16205: News Feed avoid refresh page when user is commenting<
|
||||
- Minor CSS fix for anchors links font size
|
||||
- Bug fix #16225 mentions and replies http links not working in some email notifications
|
||||
- Feature #16452, Revise posts look and feel
|
||||
|
||||
## [v2.6.0] - 2018-03-07
|
||||
|
||||
- Ported to GWT 2.8.2
|
||||
- Fix for Incident #11187 citing a people (with '@') in comments is not working anymore
|
||||
- Feature #11189: Social-Networking - citing a people (with '@') in comments loses the focus.
|
||||
- Feature #10192 allow to sort feeds per recent comments
|
||||
- Bug #7841 lack of blank space to separate the query term when hashtag is used
|
||||
- Support for ticket #11139<
|
||||
- Enhanced efficiency when retrieving mentioned users or groups in comments
|
||||
|
||||
## [v2.5.0] - 2017-11-13
|
||||
|
||||
- Fixes for Incident #10262: Cannot see who liked posts on VREs of Parthenos
|
||||
- Feature #10242: add comment taking up to 3 seconds sometime to be delivered in the UI now shows a loader
|
||||
- Ported to GWT 2.8.1
|
||||
|
||||
## [v2.3.0] - 2017-02-20
|
||||
|
||||
- Fixes for changes to the underneath common-notification-library
|
||||
- Minor css fix
|
||||
- Refactored to the new version of elastic search client's compliancy
|
||||
- Feature #7212, do not apologies if no posts are present and try to engage the user to post something.
|
||||
|
||||
## [v2.2.0] - 2016-12-02
|
||||
|
||||
- emoved asl session
|
||||
- Increased general performance and bugfixes
|
||||
- fetching of users list to mention in comments loaded on demand
|
||||
|
||||
## [v2.1.0] - 2016-10-29
|
||||
|
||||
- Support to show feeds related to user's statistics added
|
||||
- Fixed time for comments/posts: the year is present only if the comment/post was made before the current one
|
||||
|
||||
## [v2.0.0] - 2016-06-29
|
||||
|
||||
- Updated for Liferay 6.2.5
|
||||
|
||||
## [v1.13.1] - 2016-02-29
|
||||
|
||||
- Full-text search supported
|
||||
- Fix for Bug #246, editing changes comment "metadata" namely data
|
||||
- Multi-attachment supported
|
||||
- Image preview available
|
||||
|
||||
## [v1.10.0] - 2015-10-12
|
||||
|
||||
- Integrated workspace explorer widget and replace light tree
|
||||
- Fix for Bug #195, Post dates lack the year
|
||||
- Revised the way we shorten posts' text when this is very long, better heuristic used
|
||||
- Fixed bug #320, Users tagging does not work if @ is in the middle of already typed text, works for hashtags too
|
||||
- Revised mail notification message formatting, user text is now more clear and visible
|
||||
- Revised the way we provide back links for posts, removed assumption that News Feed is always present the default communitypage, good for single VRE portals support
|
||||
|
||||
## [v1.9.0] - 2015-04-27
|
||||
|
||||
- Integrated gwt-bootstrap and revised css
|
||||
- Ported to GWT 2.7.0
|
||||
|
||||
## [v1.8.0] - 2014-10-20
|
||||
|
||||
- Added support for hashtags
|
||||
- fixed see more problem with commercial ands (amps;) not being converted
|
||||
|
||||
## [v1.7.1] - 2014-06-04
|
||||
|
||||
- Fixed bug that was allowing to like posts even if the user had the session expired.
|
||||
- Added possibility to unlike alread liked posts
|
||||
|
||||
## [v1.6.4] - 2014-05-07
|
||||
|
||||
- Implemented the automatic scroll back in time for feeds (in VRE scope)
|
||||
- Added possibility to unlike alread liked posts
|
||||
- Added possibility to mention users in comments
|
||||
- Added default comment inputbox at the bottom of feed comments, if any
|
||||
- Added avatar replacement if user has no avatar
|
||||
- Fixed double notifications for post owner who commented his post
|
||||
- Fixed double notifications for post owner who liked his post
|
||||
- Fixed user referral problem when post was deleted
|
||||
- Added session checking popup
|
||||
- Fixed paste problem on replies
|
||||
- Preserve new lines in comments implemented
|
||||
- Moved to Java7
|
||||
|
||||
## [v1.4.0] - 2013-10-21
|
||||
|
||||
- Ported to GWT 2.5.1
|
||||
- Ported to Feather Weight Stack
|
||||
- Removed GCF Dependency
|
||||
- Fix for support Ticket #708
|
||||
- Fix for support Ticket #636
|
||||
|
||||
|
||||
## [v1.1.0] - 2013-07-08
|
||||
|
||||
- Open single post separately enhancement implemented #1818
|
||||
- links redirects correctly to user profiles
|
||||
|
||||
## [v1.0.0] - 2013-04-19
|
||||
|
||||
- Mavenized
|
||||
- Change>Smart Refresh Support Added #1539
|
||||
- Show HTTP URL in replies as HTML anchor links #1542
|
||||
- Replies on App Feed exception fixed #580 prod. support
|
||||
- Add Tag people in News Feed Portlet #1535
|
||||
- Notify people involved in post thread #1576
|
||||
- Scope Dependent News Feed #1561
|
||||
- Open single feed in new Window Support #1599
|
||||
|
||||
## [v0.1.0] - 2012-10-31
|
||||
|
||||
- First release
|
|
@ -0,0 +1,26 @@
|
|||
# Acknowledgments
|
||||
|
||||
The projects leading to this software have received funding from a series of European Union programmes including:
|
||||
|
||||
- the Sixth Framework Programme for Research and Technological Development
|
||||
- [DILIGENT](https://cordis.europa.eu/project/id/004260) (grant no. 004260).
|
||||
- the Seventh Framework Programme for research, technological development and demonstration
|
||||
- [D4Science](https://cordis.europa.eu/project/id/212488) (grant no. 212488);
|
||||
- [D4Science-II](https://cordis.europa.eu/project/id/239019) (grant no.239019);
|
||||
- [ENVRI](https://cordis.europa.eu/project/id/283465) (grant no. 283465);
|
||||
- [iMarine](https://cordis.europa.eu/project/id/283644) (grant no. 283644);
|
||||
- [EUBrazilOpenBio](https://cordis.europa.eu/project/id/288754) (grant no. 288754).
|
||||
- the H2020 research and innovation programme
|
||||
- [SoBigData](https://cordis.europa.eu/project/id/654024) (grant no. 654024);
|
||||
- [PARTHENOS](https://cordis.europa.eu/project/id/654119) (grant no. 654119);
|
||||
- [EGI-Engage](https://cordis.europa.eu/project/id/654142) (grant no. 654142);
|
||||
- [ENVRI PLUS](https://cordis.europa.eu/project/id/654182) (grant no. 654182);
|
||||
- [BlueBRIDGE](https://cordis.europa.eu/project/id/675680) (grant no. 675680);
|
||||
- [PerformFISH](https://cordis.europa.eu/project/id/727610) (grant no. 727610);
|
||||
- [AGINFRA PLUS](https://cordis.europa.eu/project/id/731001) (grant no. 731001);
|
||||
- [DESIRA](https://cordis.europa.eu/project/id/818194) (grant no. 818194);
|
||||
- [ARIADNEplus](https://cordis.europa.eu/project/id/823914) (grant no. 823914);
|
||||
- [RISIS 2](https://cordis.europa.eu/project/id/824091) (grant no. 824091);
|
||||
- [EOSC-Pillar](https://cordis.europa.eu/project/id/857650) (grant no. 857650);
|
||||
- [Blue Cloud](https://cordis.europa.eu/project/id/862409) (grant no. 862409);
|
||||
- [SoBigData-PlusPlus](https://cordis.europa.eu/project/id/871042) (grant no. 871042);
|
16
README.md
16
README.md
|
@ -20,30 +20,20 @@ See [Releases](https://code-repo.d4science.org/gCubeSystem/my-vres/releases).
|
|||
|
||||
## Authors
|
||||
|
||||
* **Massimiliano Assante** - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
|
||||
* **Costantino Perciante** - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
|
||||
* **Massimiliano Assante** ([ORCID](https://orcid.org/0000-0002-3761-1492)) - [ISTI-CNR Infrascience Group](https://www.isti.cnr.it/People/M.Assante)
|
||||
|
||||
## Maintainers
|
||||
|
||||
* **Massimiliano Assante** - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
|
||||
* **Massimiliano Assante** ([ORCID](https://orcid.org/0000-0002-3761-1492)) - [ISTI-CNR Infrascience Group](https://www.isti.cnr.it/People/M.Assante)
|
||||
|
||||
## License
|
||||
|
||||
This project is licensed under the EUPL V.1.1 License - see the [LICENSE.md](LICENSE.md) file for details.
|
||||
|
||||
|
||||
## About the gCube Framework
|
||||
This software is part of the [gCubeFramework](https://www.gcube-system.org/ "gCubeFramework"): an
|
||||
open-source software toolkit used for building and operating Hybrid Data
|
||||
Infrastructures enabling the dynamic deployment of Virtual Research Environments
|
||||
by favouring the realisation of reuse oriented policies.
|
||||
|
||||
The projects leading to this software have received funding from a series of European Union programmes including:
|
||||
|
||||
- the Sixth Framework Programme for Research and Technological Development
|
||||
- DILIGENT (grant no. 004260);
|
||||
- the Seventh Framework Programme for research, technological development and demonstration
|
||||
- D4Science (grant no. 212488), D4Science-II (grant no.239019), ENVRI (grant no. 283465), EUBrazilOpenBio (grant no. 288754), iMarine(grant no. 283644);
|
||||
- the H2020 research and innovation programme
|
||||
- BlueBRIDGE (grant no. 675680), EGIEngage (grant no. 654142), ENVRIplus (grant no. 654182), Parthenos (grant no. 654119), SoBigData (grant no. 654024),DESIRA (grant no. 818194), ARIADNEplus (grant no. 823914), RISIS2 (grant no. 824091), PerformFish (grant no. 727610), AGINFRAplus (grant no. 731001);
|
||||
|
||||
The projects leading to this software have received funding from a series of European Union programmes see [FUNDING.md](FUNDING.md)
|
234
changelog.xml
234
changelog.xml
|
@ -1,234 +0,0 @@
|
|||
<ReleaseNotes>
|
||||
<Changeset
|
||||
component="org.gcube.portlets-user.news-feed.2-8-2" date="2019-19-22">
|
||||
<Change>HTML markup is not only escaped as it was but also displayed as simple text</Change>
|
||||
<Change>Cleaned up code to remove print stack traces</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.portlets-user.news-feed.2-8-1" date="2019-07-17">
|
||||
<Change>Fixed Bug #17181, post editing leads to losing both formatting and mentions</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.portlets-user.news-feed.2-8-0" date="2019-05-22">
|
||||
<Change>Fixed Bug #16724, Social networking: "See more" seems to reload a
|
||||
post with part of the old look and feel</Change>
|
||||
<Change>Fixed Bug #16673, News Feed: comments with links between parenthesis
|
||||
not recognised</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.portlets-user.news-feed.2-7-2" date="2019-01-25">
|
||||
<Change>Feature #16205: News Feed avoid refresh page when user is
|
||||
commenting</Change>
|
||||
<Change>Minor CSS fix for anchors links font size</Change>
|
||||
<Change>Bug fix #16225 mentions and replies http links not working in
|
||||
some email notifications</Change>
|
||||
<Change>Feature #16452, Revise posts look and feel</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.portlets-user.news-feed.2-6-1" date="2018-04-12">
|
||||
<Change>Removed previous jquery js load script and useless deprecated
|
||||
pagebus
|
||||
</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.portlets-user.news-feed.2-6-0" date="2018-03-07">
|
||||
<Change>Ported to GWT 2.8.2</Change>
|
||||
<Change>Fix for Incident #11187 citing a people (with '@') in comments
|
||||
is not working anymore
|
||||
</Change>
|
||||
<Change>
|
||||
Feature #11189: Social-Networking - citing a people (with '@')
|
||||
in comments loses the focus.
|
||||
</Change>
|
||||
<Change>Feature #10192 allow to sort feeds per recent comments
|
||||
</Change>
|
||||
<Change>Bug #7841 lack of blank space to separate the query term when
|
||||
hashtag is used
|
||||
</Change>
|
||||
<Change>Support for ticket #11139</Change>
|
||||
<Change>Enhanced efficiency when retrieving mentioned users or groups
|
||||
in comments
|
||||
</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.portlets-user.news-feed.2-5-0" date="2017-11-13">
|
||||
<Change>fixes for Incident #10262: Cannot see who liked posts on VREs
|
||||
of Parthenos
|
||||
</Change>
|
||||
<Change>Feature #10242: add comment taking up to 3 seconds sometime to
|
||||
be delivered in the UI now shows a loader
|
||||
</Change>
|
||||
<Change>Ported to GWT 2.8.1</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.portlets-user.news-feed.2-3-0" date="2017-02-20">
|
||||
<Change>fixes for changes to the underneath
|
||||
common-notification-library
|
||||
</Change>
|
||||
<Change>Minor css fix </Change>
|
||||
<Change>Refactored to the new version of elastic search client's
|
||||
compliancy
|
||||
</Change>
|
||||
<Change>Feature #7212, do not apologies if no posts are present and
|
||||
try to engage the user to post something.
|
||||
</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.portlets-user.news-feed.2-2-0" date="2016-12-02">
|
||||
<Change>removed asl session</Change>
|
||||
<Change>Increased general performance and bugfixes</Change>
|
||||
<Change>fetching of users list to mention in comments loaded on demand
|
||||
</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.portlets-user.news-feed.2-1-0" date="2016-10-29">
|
||||
<Change>Support to show feeds related to user's statistics added
|
||||
</Change>
|
||||
<Change>Fixed time for comments/posts: the year is present only if the
|
||||
comment/post
|
||||
was made before the current one
|
||||
</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.portlets-user.news-feed.2-0-0" date="2016-06-29">
|
||||
<Change>Updated for Liferay 6.2.5</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.portlets-user.news-feed.1-13-1" date="2016-02-29">
|
||||
<Change>Full-text search supported</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.portlets-user.news-feed.1-13-0" date="2016-01-22">
|
||||
<Change>Multi-attachment supported</Change>
|
||||
<Change>Image preview available</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.portlets-user.newsfeed.1-12-0" date="2015-11-12">
|
||||
<Change>Fix for Bug #246, editing changes comment "metadata" namely
|
||||
data
|
||||
</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.portlets-user.newsfeed.1-11-0" date="2015-10-12">
|
||||
<Change>Integrated workspace explorer widget and replace light tree
|
||||
</Change>
|
||||
<Change>Fix for Bug #195, Post dates lack the year
|
||||
</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.portlets-user.newsfeed.1-10-0" date="2015-07-15">
|
||||
<Change>Revised the way we shorten posts' text when this is very long,
|
||||
better heuristic used
|
||||
</Change>
|
||||
<Change>Fixed bug #320, Users tagging does not work if @ is in the
|
||||
middle of already typed text, works for hashtags too
|
||||
</Change>
|
||||
<Change>Revised mail notification message formatting, user text is now
|
||||
more clear and visible
|
||||
</Change>
|
||||
<Change>Revised the way we provide back links for posts, removed
|
||||
assumption that News Feed is always present the default community
|
||||
page, good for single VRE portals support
|
||||
</Change>
|
||||
</Changeset>
|
||||
<Changeset component="org.gcube.portlets-user.newsfeed.1-9-0"
|
||||
date="2015-04-27">
|
||||
<Change>Integrated gwt-bootstrap and revised css</Change>
|
||||
<Change>Ported to GWT 2.7.0</Change>
|
||||
</Changeset>
|
||||
<Changeset component="org.gcube.portlets-user.newsfeed.1-8-2"
|
||||
date="2014-12-13">
|
||||
<Change>added ClientScopeHandler to help prevent the back button cache
|
||||
problem in Chrome and Firefox
|
||||
</Change>
|
||||
</Changeset>
|
||||
<Changeset component="org.gcube.portlets-user.newsfeed.1-8-1"
|
||||
date="2014-11-18">
|
||||
<Change>fixed see more problem with commercial ands (amps;) not being
|
||||
converted
|
||||
</Change>
|
||||
</Changeset>
|
||||
<Changeset component="org.gcube.portlets-user.newsfeed.1-8-0"
|
||||
date="2014-10-20">
|
||||
<Change>Added support for hashtags</Change>
|
||||
</Changeset>
|
||||
<Changeset component="org.gcube.portlets-user.newsfeed.1-7-1"
|
||||
date="2014-06-04">
|
||||
<Change>Fixed bug that was allowing to like posts even if the user had
|
||||
the session expired.
|
||||
</Change>
|
||||
</Changeset>
|
||||
<Changeset component="org.gcube.portlets-user.newsfeed.1-7-0"
|
||||
date="2014-06-04">
|
||||
<Change>
|
||||
Fixed bug loosing session when messaging user from the news
|
||||
feed
|
||||
</Change>
|
||||
</Changeset>
|
||||
<Changeset component="org.gcube.portlets-user.newsfeed.1-6-4"
|
||||
date="2014-05-07">
|
||||
<Change>Implemented the automatic scroll back in time for feeds (in
|
||||
VRE scope)
|
||||
</Change>
|
||||
<Change>Added possibility to unlike alread liked posts</Change>
|
||||
<Change>Added possibility to mention users in comments</Change>
|
||||
<Change>Added default comment inputbox at the bottom of feed comments,
|
||||
if any
|
||||
</Change>
|
||||
<Change>Added avatar replacement if user has no avatar</Change>
|
||||
<Change>Fixed double notifications for post owner who commented his
|
||||
post
|
||||
</Change>
|
||||
<Change>Fixed double notifications for post owner who liked his post
|
||||
</Change>
|
||||
<Change>Fixed user referral problem when post was deleted </Change>
|
||||
<Change>Added session checking popup</Change>
|
||||
<Change>Fixed paste problem on replies</Change>
|
||||
<Change>Preserve new lines in comments implemented</Change>
|
||||
</Changeset>
|
||||
<Changeset component="org.gcube.portlets-user.newsfeed.1-5-0"
|
||||
date="2014-02-13">
|
||||
<Change>Moved to Java7</Change>
|
||||
<Change>Added configuration file for VRE Labels</Change>
|
||||
</Changeset>
|
||||
<Changeset component="org.gcube.portlets-user.newsfeed.1-4-0"
|
||||
date="2013-10-21">
|
||||
<Change>Moved to GWT 2.5.1</Change>
|
||||
<Change>Ported to Feather Weight Stack</Change>
|
||||
<Change>Removed GCF Dependency</Change>
|
||||
<Change>Logging with sl4j Enabled</Change>
|
||||
</Changeset>
|
||||
<Changeset component="org.gcube.portlets-user.newsfeed.1-2-0"
|
||||
date="2013-07-08">
|
||||
<Change>Fix for support Ticket #708</Change>
|
||||
<Change>Fix for support Ticket #636</Change>
|
||||
</Changeset>
|
||||
<Changeset component="org.gcube.portlets-user.newsfeed.1-1-0"
|
||||
date="2013-07-08">
|
||||
<Change>Open single feed separately enhancement implemeented #1818
|
||||
</Change>
|
||||
<Change>links redirects correctly to user profiles</Change>
|
||||
</Changeset>
|
||||
<Changeset component="org.gcube.portlets-user.newsfeed.1-0-0"
|
||||
date="2013-04-19">
|
||||
<Change>Mavenized</Change>
|
||||
<Change>Smart Refresh Support Added #1539</Change>
|
||||
<Change>Show HTTP URL in replies as HTML anchor links #1542</Change>
|
||||
<Change>Replies on App Feed exception fixed #580 prod. support
|
||||
</Change>
|
||||
<Change>Add Tag people in News Feed Portlet #1535</Change>
|
||||
<Change>Notify people involved in post thread #1576</Change>
|
||||
<Change>Scope Dependent News Feed #1561</Change>
|
||||
<Change>Open single feed in new Window Support #1599</Change>
|
||||
</Changeset>
|
||||
<Changeset component="org.gcube.portlets-user.newsfeed.0-2-0"
|
||||
date="2013-03-11">
|
||||
<Change>User who favorite a post gets notified is someone comments on
|
||||
that post
|
||||
</Change>
|
||||
</Changeset>
|
||||
<Changeset component="org.gcube.portlets-user.newsfeed.0-1-0"
|
||||
date="2012-10-31">
|
||||
<Change>First Release</Change>
|
||||
</Changeset>
|
||||
</ReleaseNotes>
|
|
@ -1,31 +0,0 @@
|
|||
<assembly
|
||||
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
|
||||
<id>servicearchive</id>
|
||||
<formats>
|
||||
<format>tar.gz</format>
|
||||
</formats>
|
||||
<baseDirectory>/</baseDirectory>
|
||||
<fileSets>
|
||||
<fileSet>
|
||||
<directory>${distroDirectory}</directory>
|
||||
<outputDirectory>/</outputDirectory>
|
||||
<useDefaultExcludes>true</useDefaultExcludes>
|
||||
<includes>
|
||||
<include>README</include>
|
||||
<include>LICENSE</include>
|
||||
<include>changelog.xml</include>
|
||||
<include>profile.xml</include>
|
||||
</includes>
|
||||
<fileMode>755</fileMode>
|
||||
<filtered>true</filtered>
|
||||
</fileSet>
|
||||
</fileSets>
|
||||
<files>
|
||||
<file>
|
||||
<source>target/${build.finalName}.${project.packaging}</source>
|
||||
<outputDirectory>/${artifactId}</outputDirectory>
|
||||
</file>
|
||||
</files>
|
||||
</assembly>
|
|
@ -1,25 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<ID></ID>
|
||||
<Type>Service</Type>
|
||||
<Profile>
|
||||
<Description>${description}</Description>
|
||||
<Class>PortletUser</Class>
|
||||
<Name>${artifactId}</Name>
|
||||
<Version>${version}</Version>
|
||||
<Packages>
|
||||
<Software>
|
||||
<Name>${artifactId}</Name>
|
||||
<Version>${version}</Version>
|
||||
<MavenCoordinates>
|
||||
<groupId>${groupId}</groupId>
|
||||
<artifactId>${artifactId}</artifactId>
|
||||
<version>${version}</version>
|
||||
</MavenCoordinates>
|
||||
<Files>
|
||||
<File>target/${build.finalName}.war</File>
|
||||
</Files>
|
||||
</Software>
|
||||
</Packages>
|
||||
</Profile>
|
||||
</Resource>
|
181
pom.xml
181
pom.xml
|
@ -13,7 +13,7 @@
|
|||
<groupId>org.gcube.portlets.user</groupId>
|
||||
<artifactId>news-feed</artifactId>
|
||||
<packaging>war</packaging>
|
||||
<version>2.8.3</version>
|
||||
<version>3.0.0</version>
|
||||
|
||||
<name>gCube News Feed Portlet</name>
|
||||
<description>
|
||||
|
@ -28,10 +28,6 @@
|
|||
<properties>
|
||||
<!-- Convenience property to set the GWT version -->
|
||||
<gwtVersion>2.8.2</gwtVersion>
|
||||
<guavaVersion>18.0</guavaVersion>
|
||||
<distroDirectory>distro</distroDirectory>
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
|
||||
<liferay.version>6.2.5</liferay.version>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
|
@ -42,7 +38,7 @@
|
|||
<dependency>
|
||||
<groupId>org.gcube.distribution</groupId>
|
||||
<artifactId>maven-portal-bom</artifactId>
|
||||
<version>3.6.0</version>
|
||||
<version>3.7.0</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
|
@ -90,6 +86,57 @@
|
|||
<artifactId>xml-apis</artifactId>
|
||||
<version>1.4.01</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.portal</groupId>
|
||||
<artifactId>social-library-stubs</artifactId>
|
||||
<version>[1.0.0-SNAPSHOT, 2.0.0)</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.social-networking</groupId>
|
||||
<artifactId>social-service-client</artifactId>
|
||||
<version>[2.0.0-SNAPSHOT, 3.0.0)</version>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.gcube.portal</groupId>
|
||||
<artifactId>social-networking-library</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.socialnetworking</groupId>
|
||||
<artifactId>social-util-library</artifactId>
|
||||
<version>[1.7.2-SNAPSHOT,2.0.0-SNAPSHOT)</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>1.18.2</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.portlets.widgets</groupId>
|
||||
<artifactId>pickitem-widget</artifactId>
|
||||
<version>[2.0.0-SNAPSHOT, 3.0.0)</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.portlets.widgets</groupId>
|
||||
<artifactId>image-previewer-widget</artifactId>
|
||||
<version>[1.1.0-SNAPSHOT, 1.3.0-SNAPSHOT)</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.portal</groupId>
|
||||
<artifactId>notifications-common-library</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.portlets.widgets</groupId>
|
||||
<artifactId>user-selection-dialog</artifactId>
|
||||
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.portlets.user</groupId>
|
||||
<artifactId>gcube-widgets</artifactId>
|
||||
|
@ -133,111 +180,16 @@
|
|||
<groupId>com.google</groupId>
|
||||
<artifactId>gwt-jsonmaker</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.gcube.common</groupId>
|
||||
<artifactId>common-authorization</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.portal</groupId>
|
||||
<artifactId>social-networking-library</artifactId>
|
||||
<version>[1.16.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.netflix.astyanax</groupId>
|
||||
<artifactId>astyanax-core</artifactId>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>log4j-over-slf4j</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.netflix.astyanax</groupId>
|
||||
<artifactId>astyanax-thrift</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.netflix.astyanax</groupId>
|
||||
<artifactId>astyanax-cassandra</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.cassandra</groupId>
|
||||
<artifactId>cassandra-all</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.cassandra</groupId>
|
||||
<artifactId>cassandra-thrift</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.thrift</groupId>
|
||||
<artifactId>libthrift</artifactId>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<artifactId>commons-logging</artifactId>
|
||||
<groupId>commons-logging</groupId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.socialnetworking</groupId>
|
||||
<artifactId>social-util-library</artifactId>
|
||||
<version>[1.7.2-SNAPSHOT,2.0.0-SNAPSHOT)</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.socialnetworking</groupId>
|
||||
<artifactId>social-data-search-client</artifactId>
|
||||
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.portlets.widgets</groupId>
|
||||
<artifactId>pickitem-widget</artifactId>
|
||||
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.portlets.widgets</groupId>
|
||||
<artifactId>image-previewer-widget</artifactId>
|
||||
<version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.portal</groupId>
|
||||
<artifactId>notifications-common-library</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.portlets.widgets</groupId>
|
||||
<artifactId>user-selection-dialog</artifactId>
|
||||
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.core</groupId>
|
||||
<artifactId>common-scope-maps</artifactId>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<!-- Please note that the elasticsearch client needs a compress-lzf version
|
||||
>= 1.0.2 -->
|
||||
<dependency>
|
||||
<groupId>com.ning</groupId>
|
||||
<artifactId>compress-lzf</artifactId>
|
||||
<version>1.0.3</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>commons-validator</groupId>
|
||||
<artifactId>commons-validator</artifactId>
|
||||
|
@ -329,33 +281,6 @@
|
|||
<webappDirectory>${webappDirectory}</webappDirectory>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<configuration>
|
||||
<source>${maven.compiler.source}</source>
|
||||
<target>${maven.compiler.target}</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<!-- SA Plugin -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<configuration>
|
||||
<descriptors>
|
||||
<descriptor>${distroDirectory}/descriptor.xml</descriptor>
|
||||
</descriptors>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>servicearchive</id>
|
||||
<phase>install</phase>
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
|
|
|
@ -52,9 +52,8 @@ import org.gcube.portlets.user.newsfeed.shared.NewsConstants;
|
|||
import org.gcube.portlets.user.newsfeed.shared.OperationResult;
|
||||
import org.gcube.portlets.user.newsfeed.shared.UserSettings;
|
||||
import org.gcube.portlets.widgets.pickitem.shared.ItemBean;
|
||||
import org.gcube.social_networking.social_networking_client_library.FullTextSearchClient;
|
||||
import org.gcube.social_networking.socialutillibrary.Utils;
|
||||
import org.gcube.socialnetworking.social_data_search_client.ElasticSearchClient;
|
||||
import org.gcube.socialnetworking.social_data_search_client.ElasticSearchClientImpl;
|
||||
import org.gcube.socialnetworking.socialtoken.SocialMessageParser;
|
||||
import org.gcube.vomanagement.usermanagement.GroupManager;
|
||||
import org.gcube.vomanagement.usermanagement.RoleManager;
|
||||
|
@ -101,23 +100,12 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
|
|||
*/
|
||||
private DatabookStore store;
|
||||
|
||||
/**
|
||||
* Elasticsearch client
|
||||
*/
|
||||
private ElasticSearchClient escl;
|
||||
|
||||
|
||||
private final static int MAX_POSTS_NO = 30;
|
||||
|
||||
public void init() {
|
||||
store = new DBCassandraAstyanaxImpl();
|
||||
try {
|
||||
escl = new ElasticSearchClientImpl(null);
|
||||
_log.info("Elasticsearch connection created");
|
||||
} catch (Exception e) {
|
||||
escl = null;
|
||||
_log.error("Unable to create elasticsearch client connection!!!", e);
|
||||
}
|
||||
|
||||
APP_ID = this.getClass().getName();
|
||||
}
|
||||
|
||||
|
@ -345,11 +333,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
|
|||
@Override
|
||||
public ArrayList<EnhancedFeed> getPostsByQuery(String query, int from, int quantity) {
|
||||
|
||||
// TODO : check this error better
|
||||
if(escl == null){
|
||||
_log.warn("There is no connection to elasticsearch, sorry.");
|
||||
return null;
|
||||
}
|
||||
_log.debug("\n\n IN getPostsByQuery ");
|
||||
|
||||
PortalContext pContext = PortalContext.getConfiguration();
|
||||
String userName = pContext.getCurrentUser(getThreadLocalRequest()).getUsername();
|
||||
|
@ -384,11 +368,14 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
|
|||
vres.add(currentScope);
|
||||
}
|
||||
|
||||
FullTextSearchClient sClient = new FullTextSearchClient();
|
||||
List<EnhancedFeed> enhancedFeeds = sClient.search(query, from, quantity);
|
||||
|
||||
// query elastic search
|
||||
List<EnhancedFeed> enhancedFeeds = escl.search(query, vres, from, quantity);
|
||||
//escl.search(query, vres, from, quantity);
|
||||
|
||||
// retrieve the ids of liked posts by the user
|
||||
List<String> likedPosts = store.getAllLikedFeedIdsByUser(userName);
|
||||
List<String> likedPosts = store.getAllLikedPostIdsByUser(userName);
|
||||
|
||||
// update fields "liked" and "isuser"
|
||||
for (EnhancedFeed enhancedFeed : enhancedFeeds) {
|
||||
|
|
Loading…
Reference in New Issue