gCubeSystem
/
geoportal-data-entry-app
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed pom to include resources of kind *.csv

This commit is contained in:
Francesco Mangiacrapa 2021-11-26 16:48:13 +01:00
parent 6840535bc1
commit ee1e3d8309
6 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pom.xml
View File

@ -209,6 +209,22 @@
update them in DevMode -->
<outputDirectory>${webappDirectory}/WEB-INF/classes</outputDirectory>
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.csv</include>
</includes>
</resource>
<!-- <resource> -->
<!-- <directory>src/main/resources</directory> -->
<!-- <includes> -->
<!-- <include>**/*.*</include> -->
<!-- </includes> -->
<!-- </resource> -->
</resources>
<plugins>
<!-- GWT Maven Plugin -->

4
src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java
View File

@ -34,7 +34,7 @@ import org.gcube.portlets.user.geoportaldataentry.server.MongoServiceUtil.Conces
import org.gcube.portlets.user.geoportaldataentry.server.config.GNARoleRitghtsConfigReader;
import org.gcube.portlets.user.geoportaldataentry.shared.ACTION_ON_ITEM;
import org.gcube.portlets.user.geoportaldataentry.shared.CommitReport;
import org.gcube.portlets.user.geoportaldataentry.shared.GNAUserRightsConfigNotFoundException;
import org.gcube.portlets.user.geoportaldataentry.shared.GNAUserRightsConfigException;
import org.gcube.portlets.user.geoportaldataentry.shared.GcubeUserRole;
import org.gcube.portlets.user.geoportaldataentry.shared.GeoNaFormDataObject;
import org.gcube.portlets.user.geoportaldataentry.shared.GeonaISConfig;
@ -920,7 +920,7 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen
UserRights userRights = new UserRights(scope, toRoleRight);
LOG.info("returning: " + userRights);
return userRights;
} catch (UserRetrievalFault | GroupRetrievalFault | GNAUserRightsConfigNotFoundException e) {
} catch (UserRetrievalFault | GroupRetrievalFault | GNAUserRightsConfigException e) {
LOG.error("An error occurred during getMyRightsInTheContext: " + user, e);
Map<ACTION_ON_ITEM, OPERATION_TYPE> permissions = new HashMap<ACTION_ON_ITEM, RoleRights.OPERATION_TYPE>();

15
src/main/java/org/gcube/portlets/user/geoportaldataentry/server/config/GNARoleRitghtsConfigReader.java
View File

@ -9,7 +9,7 @@ import java.util.List;
import java.util.Map;
import org.gcube.portlets.user.geoportaldataentry.shared.ACTION_ON_ITEM;
import org.gcube.portlets.user.geoportaldataentry.shared.GNAUserRightsConfigNotFoundException;
import org.gcube.portlets.user.geoportaldataentry.shared.GNAUserRightsConfigException;
import org.gcube.portlets.user.geoportaldataentry.shared.GcubeUserRole;
import org.gcube.portlets.user.geoportaldataentry.shared.RoleRights;
import org.gcube.portlets.user.geoportaldataentry.shared.RoleRights.OPERATION_TYPE;
@ -37,11 +37,12 @@ public class GNARoleRitghtsConfigReader {
* Read user rights config.
*
* @return the list
* @throws GNAUserRightsConfigNotFoundException the GNA user rights config not
* @throws GNAUserRightsConfigException the GNA user rights config not
* found exception
*/
public static List<RoleRights> readRoleRightsConfig() throws GNAUserRightsConfigNotFoundException {
public static List<RoleRights> readRoleRightsConfig() throws GNAUserRightsConfigException {
LOG.debug("readRoleRightsConfig called");
File configurationFile = null;
try {
@ -131,9 +132,9 @@ public class GNARoleRitghtsConfigReader {
Log.info("Returning user rights config: " + listUserRights);
return listUserRights;
} catch (IOException e) {
LOG.error("An error occurred on reading the property file " + USER_RIGHTS_CONFIG_FILENAME, e);
throw new GNAUserRightsConfigNotFoundException("Error on reading the base layers. Is the file '"
} catch (Exception e) {
LOG.error("An error occurred on reading the configuration file " + USER_RIGHTS_CONFIG_FILENAME, e);
throw new GNAUserRightsConfigException("Error on reading the configuration file. Is the file '"
+ USER_RIGHTS_CONFIG_FILENAME + "' in the application path?");
} finally {

8
src/main/java/org/gcube/portlets/user/geoportaldataentry/shared/GNAUserRightsConfigException.java Normal file
View File

@ -0,0 +1,8 @@
package org.gcube.portlets.user.geoportaldataentry.shared;
@SuppressWarnings("serial")
public class GNAUserRightsConfigException extends Exception {
public GNAUserRightsConfigException(String message) {
super(message);
}
}

8
src/main/java/org/gcube/portlets/user/geoportaldataentry/shared/GNAUserRightsConfigNotFoundException.java
View File

@ -1,8 +0,0 @@
package org.gcube.portlets.user.geoportaldataentry.shared;
@SuppressWarnings("serial")
public class GNAUserRightsConfigNotFoundException extends Exception {
public GNAUserRightsConfigNotFoundException(String message) {
super(message);
}
}

14
src/test/java/org/gcube/portlets/user/geoportaldataentry/client/TestClass.java
View File

@ -21,20 +21,6 @@ public class TestClass {
private static String CONTEXT = "/gcube/devsec/devVRE";
private static String USERNAME = "francesco.mangiacrapa";
// LocalDateTime ldt = ConvertToServiceModel.toLocalDateTime("2020-10-01 10:20");
// System.out.println(ldt.toString());
//
// String latitudine = "-899.2986";
// // System.out.println(latitudine.matches("^[-]?(180(\\.0+)?|((1[0-7]\\d)|([1-9]?\\d))(\\.\\d+)?)$"));
//
// String longitude = "0";
// System.out.println(longitude.matches("\\s*[-+]?(180(\\.0+)?|((1[0-7]\\d)|([1-9]?\\d))(\\.\\d+)?)$"));
//
// GeoportalDataEntryServiceImpl g = new GeoportalDataEntryServiceImpl();
// g.getLinksFor("", ConstantsGeoPortalDataEntryApp.RECORD_TYPE.CONCESSIONE.toString());
// getListOfConcessioni();
//@Before
public void init() {
ScopeProvider.instance.set(CONTEXT);