updated bom and removed snl dep
This commit is contained in:
parent
cc95dc5344
commit
6a7ac692e0
|
@ -1,12 +1,12 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="src" output="target/share-updates-2.8.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
<classpathentry kind="src" output="target/share-updates-3.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="optional" value="true"/>
|
<attribute name="optional" value="true"/>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry excluding="**" kind="src" output="target/share-updates-2.8.1-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
|
<classpathentry excluding="**" kind="src" output="target/share-updates-3.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
@ -34,5 +34,5 @@
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="output" path="target/share-updates-2.8.1-SNAPSHOT/WEB-INF/classes"/>
|
<classpathentry kind="output" path="target/share-updates-3.0.0-SNAPSHOT/WEB-INF/classes"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -1,37 +1,63 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
|
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<wb-module deploy-name="share-updates">
|
<wb-module deploy-name="share-updates">
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
|
<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="/" 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="/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="/target/generated-sources/gwt"/>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
|
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<dependent-module archiveName="social-util-library-1.7.3.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/social-util-library/social-util-library">
|
<dependent-module archiveName="social-util-library-1.7.3.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/social-util-library/social-util-library">
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<dependency-type>uses</dependency-type>
|
<dependency-type>uses</dependency-type>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</dependent-module>
|
</dependent-module>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<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="share-updates"/>
|
<property name="context-root" value="share-updates"/>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</wb-module>
|
</wb-module>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</project-modules>
|
</project-modules>
|
||||||
|
|
|
@ -4,6 +4,14 @@
|
||||||
All notable changes to this project will be documented in this file.
|
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).
|
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
|
## [v3.0.0-SNAPSHOT] - 2024-05-02
|
||||||
|
|
||||||
|
- removed cassandra 2 client
|
||||||
|
|
||||||
|
## [v2.9.0-SNAPSHOT] - 2023-07-21
|
||||||
|
|
||||||
|
- enlarge image preview in posts
|
||||||
|
|
||||||
## [v2.8.1] -2022-06-15
|
## [v2.8.1] -2022-06-15
|
||||||
|
|
||||||
- Fixed soem deps
|
- Fixed soem deps
|
||||||
|
|
28
pom.xml
28
pom.xml
|
@ -7,14 +7,14 @@
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>maven-parent</artifactId>
|
<artifactId>maven-parent</artifactId>
|
||||||
<groupId>org.gcube.tools</groupId>
|
<groupId>org.gcube.tools</groupId>
|
||||||
<version>1.1.0</version>
|
<version>1.2.0</version>
|
||||||
<relativePath />
|
<relativePath />
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>org.gcube.portlets.user</groupId>
|
<groupId>org.gcube.portlets.user</groupId>
|
||||||
<artifactId>share-updates</artifactId>
|
<artifactId>share-updates</artifactId>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<version>2.8.1</version>
|
<version>3.0.0-SNAPSHOT</version>
|
||||||
<name>gCube Share Updates Portlet</name>
|
<name>gCube Share Updates Portlet</name>
|
||||||
<description>
|
<description>
|
||||||
gCube Share Updates for exchanging updates with other users of VREs.
|
gCube Share Updates for exchanging updates with other users of VREs.
|
||||||
|
@ -41,7 +41,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.distribution</groupId>
|
<groupId>org.gcube.distribution</groupId>
|
||||||
<artifactId>maven-portal-bom</artifactId>
|
<artifactId>maven-portal-bom</artifactId>
|
||||||
<version>3.6.4</version>
|
<version>4.0.0-SNAPSHOT</version>
|
||||||
<type>pom</type>
|
<type>pom</type>
|
||||||
<scope>import</scope>
|
<scope>import</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
@ -81,12 +81,23 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.portal</groupId>
|
<groupId>org.gcube.portal</groupId>
|
||||||
<artifactId>social-networking-library</artifactId>
|
<artifactId>social-library-stubs</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.portal</groupId>
|
<groupId>org.gcube.social-networking</groupId>
|
||||||
<artifactId>notifications-common-library</artifactId>
|
<artifactId>social-service-client</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>org.gcube.portal</groupId>
|
||||||
|
<artifactId>social-networking-library</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.gcube.social-networking</groupId>
|
||||||
|
<artifactId>social-service-model</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -94,6 +105,11 @@
|
||||||
<artifactId>aslsocial</artifactId>
|
<artifactId>aslsocial</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.gcube.portal</groupId>
|
||||||
|
<artifactId>notifications-common-library</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.portlets.user</groupId>
|
<groupId>org.gcube.portlets.user</groupId>
|
||||||
<artifactId>gcube-widgets</artifactId>
|
<artifactId>gcube-widgets</artifactId>
|
||||||
|
|
|
@ -5,17 +5,17 @@
|
||||||
.image-preview {
|
.image-preview {
|
||||||
align: left;
|
align: left;
|
||||||
margin: 5px;
|
margin: 5px;
|
||||||
display: inline;
|
display: block;
|
||||||
height: 40px;
|
width: 300px;
|
||||||
width: 40px;
|
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
float: left;
|
float: left;
|
||||||
|
border: 10px solid red;
|
||||||
}
|
}
|
||||||
|
|
||||||
.attach-result {
|
.attach-result {
|
||||||
margin-top: 5px;
|
margin-top: 5px;
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
display: inline-block;
|
display: block;
|
||||||
font-size: 10px;
|
font-size: 10px;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
@ -24,6 +24,7 @@
|
||||||
margin-left: 4px;
|
margin-left: 4px;
|
||||||
width: 10px;
|
width: 10px;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
|
border: 10px solid black;
|
||||||
}
|
}
|
||||||
|
|
||||||
.label-style {
|
.label-style {
|
||||||
|
|
|
@ -1,18 +1,21 @@
|
||||||
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
|
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
|
||||||
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
|
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
|
||||||
xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:b="urn:import:com.github.gwtbootstrap.client.ui"
|
xmlns:g="urn:import:com.google.gwt.user.client.ui"
|
||||||
|
xmlns:b="urn:import:com.github.gwtbootstrap.client.ui"
|
||||||
xmlns:m="urn:import:org.gcube.portlets.user.shareupdates.client.view">
|
xmlns:m="urn:import:org.gcube.portlets.user.shareupdates.client.view">
|
||||||
<ui:style>
|
<ui:style>
|
||||||
.important {
|
.important {
|
||||||
font-weight: bold;
|
font-weight: 400;
|
||||||
}
|
}
|
||||||
</ui:style>
|
</ui:style>
|
||||||
|
|
||||||
<g:HTMLPanel>
|
<g:HTMLPanel>
|
||||||
|
|
||||||
|
<div width="300px;" align="middle">
|
||||||
|
<m:ImageSwitcher ui:field="switcher"></m:ImageSwitcher>
|
||||||
|
</div>
|
||||||
<table class="link-previewer">
|
<table class="link-previewer">
|
||||||
<tr>
|
<tr>
|
||||||
<td width="60px;" align="middle">
|
|
||||||
<m:ImageSwitcher ui:field="switcher"></m:ImageSwitcher>
|
|
||||||
</td>
|
|
||||||
<td width="100%" valign="TOP">
|
<td width="100%" valign="TOP">
|
||||||
<div class="link-title">
|
<div class="link-title">
|
||||||
<g:HTML styleName="" ui:field="titleArea" />
|
<g:HTML styleName="" ui:field="titleArea" />
|
||||||
|
@ -23,8 +26,8 @@
|
||||||
<div class="link-desc">
|
<div class="link-desc">
|
||||||
<g:HTML styleName="" ui:field="descText" />
|
<g:HTML styleName="" ui:field="descText" />
|
||||||
<div class="hide-description">
|
<div class="hide-description">
|
||||||
<b:CheckBox ui:field="hideImageCheckBox">Hide Image</b:CheckBox>
|
<b:CheckBox ui:field="hideImageCheckBox">Hide Image</b:CheckBox>
|
||||||
<b:CheckBox ui:field="hideCheckBox">Hide Description</b:CheckBox>
|
<b:CheckBox ui:field="hideCheckBox">Hide Description</b:CheckBox>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
|
|
|
@ -58,6 +58,7 @@ public class FilePreviewer {
|
||||||
private static final String PDF_DEFAULT_IMAGE = "default/pdf.png";
|
private static final String PDF_DEFAULT_IMAGE = "default/pdf.png";
|
||||||
private static final String GENERICFILE_DEFAULT_IMAGE = "default/default_generic.png";
|
private static final String GENERICFILE_DEFAULT_IMAGE = "default/default_generic.png";
|
||||||
private static final String UPLOAD_LOCATION_LOCAL = System.getProperty("java.io.tmpdir");
|
private static final String UPLOAD_LOCATION_LOCAL = System.getProperty("java.io.tmpdir");
|
||||||
|
private final static int PREVIEW_IMAGE_WIDTH_PX = 300;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* these are the extension for which I have an icon image preview
|
* these are the extension for which I have an icon image preview
|
||||||
|
@ -109,8 +110,8 @@ public class FilePreviewer {
|
||||||
int width = (int) page.getBBox().getWidth();
|
int width = (int) page.getBBox().getWidth();
|
||||||
int height = (int) page.getBBox().getHeight();
|
int height = (int) page.getBBox().getHeight();
|
||||||
|
|
||||||
int scaledWidth = width/8;
|
int scaledWidth = width/4;
|
||||||
int scaledHeight = height/8;
|
int scaledHeight = height/4;
|
||||||
|
|
||||||
// create the image
|
// create the image
|
||||||
Rectangle rect = new Rectangle(0, 0, width, height);
|
Rectangle rect = new Rectangle(0, 0, width, height);
|
||||||
|
@ -165,7 +166,7 @@ public class FilePreviewer {
|
||||||
|
|
||||||
// write
|
// write
|
||||||
Thumbnails.fromImages(Arrays.asList(bufferedImage))
|
Thumbnails.fromImages(Arrays.asList(bufferedImage))
|
||||||
.width(80)
|
.width(PREVIEW_IMAGE_WIDTH_PX)
|
||||||
.outputFormat("jpg")
|
.outputFormat("jpg")
|
||||||
.toOutputStream(out);
|
.toOutputStream(out);
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
<set-property name="bootstrap.responsiveDesign" value="true" />
|
<set-property name="bootstrap.responsiveDesign" value="true" />
|
||||||
|
|
||||||
<!-- To Comment out -->
|
<!-- To Comment out -->
|
||||||
<!-- <set-property name="user.agent" value="safari,gecko1_8,ie10" /> -->
|
<set-property name="user.agent" value="safari,gecko1_8" />
|
||||||
|
|
||||||
<!-- Other module inherits -->
|
<!-- Other module inherits -->
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue