Compare commits

...

6 Commits

Author SHA1 Message Date
Massimiliano Assante d98116cc37 ready to release 2022-09-22 17:15:21 +02:00
Massimiliano Assante 257141f581 updated version to 2.6 2022-09-22 17:14:53 +02:00
Massimiliano Assante cdb2e85967 - Moved to OpenJDK11
- Moved to GWT 2.9.0
2022-09-22 17:12:32 +02:00
Massimiliano Assante caa2570450 fixed bug #23898 2022-09-22 17:04:13 +02:00
Massimiliano Assante cfeef31ec1 ready to release 2022-06-16 15:44:02 +02:00
Massimiliano Assante 0eb9e7602f - Released for removal HL from portal 2022-06-16 15:43:38 +02:00
7 changed files with 64 additions and 38 deletions

View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/messages-2.5.0/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/messages-2.5.3-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/messages-2.5.0/WEB-INF/classes" path="src/main/resources">
<classpathentry excluding="**" kind="src" output="target/messages-2.5.3-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
@ -30,11 +30,11 @@
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/messages-2.5.0/WEB-INF/classes" path="target/generated-sources/gwt">
<classpathentry kind="src" output="target/messages-2.5.3-SNAPSHOT/WEB-INF/classes" path="target/generated-sources/gwt">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/messages-2.5.0/WEB-INF/classes"/>
<classpathentry kind="output" path="target/messages-2.5.3-SNAPSHOT/WEB-INF/classes"/>
</classpath>

View File

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
@ -11,7 +13,9 @@
<wb-module deploy-name="messages">
@ -23,7 +27,9 @@
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
@ -35,7 +41,9 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
@ -47,7 +55,9 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
@ -59,8 +69,12 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
@ -72,7 +86,9 @@
<property name="java-output-path" value="/message-conversations/target/message-conversations-0.0.1-SNAPSHOT/WEB-INF/classes"/>
@ -84,7 +100,9 @@
<property name="context-root" value="messages"/>
@ -96,7 +114,9 @@
</wb-module>

View File

@ -4,12 +4,21 @@
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).
## [v2.6.0] - 2022-09-22
## [v2.5.1] -2021-09-09
- Fix Bug #23898: open with email addresse preset is not working anymore
- Moved to OpenJDK11
- Moved to GWT 2.9.0
## [v2.5.2] - 2022-06-16
- Released for removal HL from portal
## [v2.5.1] - 2021-09-09
- Fixed attachment issue #21972
## [v2.5.0] -2021-07-28
## [v2.5.0] - 2021-07-28
- Ported to git
@ -17,7 +26,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- Temporarely removed possibility to add attachments
## [v2.4.0] -2019-10-25
## [v2.4.0] - 2019-10-25
- Bug #17876 the message menu isn't fully displayed if there is only one message or no other messages below

View File

@ -20,29 +20,20 @@ See [Releases](https://code-repo.d4science.org/gCubeSystem/Messages/releases).
## Authors
* **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)
## 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)

16
pom.xml
View File

@ -13,7 +13,7 @@
<groupId>org.gcube.portets.user</groupId>
<artifactId>messages</artifactId>
<packaging>war</packaging>
<version>2.5.1</version>
<version>2.6.0</version>
<description>
gCube Messages Portlet for exchanging messages with other users.
</description>
@ -25,11 +25,7 @@
<properties>
<!-- Convenience property to set the GWT version -->
<gwt.version>2.8.2</gwt.version>
<distroDirectory>distro</distroDirectory>
<!-- GWT 2.8 requires 1.8 -->
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<gwt.version>2.9.0</gwt.version>
<gwt-material.version>2.0.1</gwt-material.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@ -39,7 +35,7 @@
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>maven-portal-bom</artifactId>
<version>3.6.3</version>
<version>3.6.4</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -102,6 +98,12 @@
<artifactId>xercesImpl</artifactId>
<version>2.9.1</version>
</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>workspace-explorer</artifactId>

View File

@ -323,7 +323,8 @@ public class ApplicationView extends Composite {
private void displayNewOrReplyMessage() {
WRITING_MESSAGE = true;
FAB.setVisible(false);
messagesCollection.clearActive();
if (messagesCollection != null)
messagesCollection.clearActive();
scrollerPanel.clear();
scrollerPanel.add(newMessageDisplay);
newMessageDisplay.setFocusOnUsersInput();
@ -334,7 +335,10 @@ public class ApplicationView extends Composite {
private void prepareNewMessageForSendTo(String[] usernamesToSendTo) {
newMessageDisplay = new WriteMessage(convService, this);
newMessageDisplay.setNewMessageForSendTo(usernamesToSendTo);
GWT.log("setNewMessageForSendTo - Done");
displayNewOrReplyMessage();
GWT.log("displayNewOrReplyMessage - Done");
}
@UiHandler("newMessage")

View File

@ -83,7 +83,7 @@ public class WriteMessage extends Composite {
}
public void setNewMessageForSendTo(String[] usernames) {
GWT.log("her add the users");
GWT.log("setNewMessageForSendTo - here add the users");
convService.getUsersInfo(usernames, new AsyncCallback<ArrayList<WSUser>>() {
@Override
public void onFailure(Throwable caught) {
@ -91,7 +91,7 @@ public class WriteMessage extends Composite {
@Override
public void onSuccess(ArrayList<WSUser> result) {
for (WSUser user : result) {
acModal.addItem(new UserSuggestion(user));
acModal.addItem(new UserSuggestion(user));
}
}
});