gCubeSystem
/
vre-deploy
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: gCubeSystem:Feature/26518
Branches Tags
gCubeSystem:master
gCubeSystem:Feature/27999
gCubeSystem:Feature/26518
gCubeSystem:r5.14.1
gCubeSystem:v4.5.0
gCubeSystem:r5.4.0
gCubeSystem:v4.4.0
gCubeSystem:r5.0.0
gCubeSystem:v4.3.1
gCubeSystem:r4.19.0
gCubeSystem:v4.3.0
..
compare: gCubeSystem:master
Branches Tags
gCubeSystem:Feature/27999
gCubeSystem:master
gCubeSystem:Feature/26518
gCubeSystem:r5.14.1
gCubeSystem:v4.5.0
gCubeSystem:r5.4.0
gCubeSystem:v4.4.0
gCubeSystem:r5.0.0
gCubeSystem:v4.3.1
gCubeSystem:r4.19.0
gCubeSystem:v4.3.0

2 Commits
Feature/26 ... master

Author SHA1 Message Date
Massimiliano Assante 19482ed9a3 updted bom 2024-09-26 15:22:28 +02:00
Alfredo Oliviero 8cac561e36 v4.6.0-SNAPSHOT. 
- maven-portal-bom 4.0.0-SNAPSHOT
- maven-parent 1.2.0

not working. missing social-networking-library version in maven-portal-bom 4.0.0-SNAPSHOT
 2024-09-24 11:19:07 +02:00
5 changed files with 51 additions and 24 deletions
Show Stats Expand all files Collapse all files

6
.classpath
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/vre-deploy-4.4.0/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/vre-deploy-4.6.0-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/vre-deploy-4.4.0/WEB-INF/classes" path="src/main/resources">
<classpathentry excluding="**" kind="src" output="target/vre-deploy-4.6.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
@ -41,5 +41,5 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/vre-deploy-4.4.0/WEB-INF/classes"/>
<classpathentry kind="output" path="target/vre-deploy-4.6.0-SNAPSHOT/WEB-INF/classes"/>
</classpath>

27
.settings/org.eclipse.wst.common.component
View File

@ -1,37 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="vre-deploy">
<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="/WEB-INF/classes" source-path="/src/main/resources"/>
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
<property name="context-root" value="vre-deploy"/>
</wb-module>
</project-modules>

6
CHANGELOG.md
View File

@ -4,10 +4,14 @@
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).
## [v4.6.0-SNAPSHOT]
- maven-portal-bom 4.0.0-SNAPSHOT
- maven-parent 1.2.0
## [v4.5.0] - 2022-03-08
- Feature #24402 increased waiting time between LR Site Creation and LR Site user assignments (manager, designer)
- Feature #26518 removed social networking library dependency
## [v4.4.0] - 2021-07-08

27
pom.xml
View File

@ -7,13 +7,13 @@
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.gcube.tools</groupId>
<version>1.1.0</version>
<version>1.2.0</version>
<relativePath />
</parent>
<groupId>org.gcube.portlets.admin</groupId>
<artifactId>vre-deploy</artifactId>
<packaging>war</packaging>
<version>4.5.0</version>
<version>4.6.0-SNAPSHOT</version>
<name>gCube VRE Deploy Wizard Portlet</name>
<description>
gCube VRE Deploy Wizard Portlet.
@ -40,7 +40,7 @@
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>maven-portal-bom</artifactId>
<version>3.6.4</version>
<version>4.0.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -69,6 +69,27 @@
<artifactId>aslsocial</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.portal</groupId>
<artifactId>social-library-stubs</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.social-networking</groupId>
<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>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>storagehub-client-library</artifactId>

9
src/main/java/org/gcube/portlets/admin/vredeployer/server/VREDeployerServiceImpl.java
View File

@ -556,13 +556,7 @@ public class VREDeployerServiceImpl extends RemoteServiceServlet implements Vre
log.info("--- CREATED LAYOUTS AND COMMUNITY OK, updating Calendar Application Profile.");
vreScope = new LiferayGroupManager().getInfrastructureScope(vreCreatedId);
String vreUrl = "/group/"+vreCreated.getGroupName().toLowerCase();
boolean calandarAppProfileUpdated = false;
try {
calandarAppProfileUpdated = updateApplicationProfile(CALENDAR_APPID, vreScope, vreUrl+"/calendar");
}
catch (Exception e) {
log.error("Something wrong in updateApplicationProfile for " + CALENDAR_APPID);
}
boolean newsFeedAppProfileUpdated = false;
try {
newsFeedAppProfileUpdated = updateApplicationProfile(NEWS_FEED_APPID, vreScope, vreUrl); //assumes it is deployed in the home of the VRE
@ -570,7 +564,6 @@ public class VREDeployerServiceImpl extends RemoteServiceServlet implements Vre
catch (Exception e) {
log.error("Something wrong in updateApplicationProfile for " + NEWS_FEED_APPID);
}
log.info("updateApplicationProfile for " + CALENDAR_APPID + "="+calandarAppProfileUpdated);
log.info("updateApplicationProfile for " + NEWS_FEED_APPID + "="+newsFeedAppProfileUpdated);
UserManager um = new LiferayUserManager();