Skip to content

Commit fa2b978

Browse files
masseb974masseb974
committed
Deleted funtionality GeoLayersManagement
1 parent 6250775 commit fa2b978

7 files changed

Lines changed: 1 addition & 26 deletions

File tree

‎knowage-common/src/main/java/it/eng/spagobi/commons/constants/CommunityFunctionalityConstants.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ public class CommunityFunctionalityConstants {
8888
public static final String FUNCTIONALITIES_MANAGEMENT = "FunctionalitiesManagement";
8989
public static final String FUNCTIONS_CATALOG_MANAGEMENT = "FunctionsCatalogManagement";
9090
public static final String FUNCTIONS_CATALOG_USAGE = "FunctionsCatalogUsage";
91-
public static final String GEO_LAYERS_MANAGEMENT = "GeoLayersManagement";
9291
/**
9392
* @deprecated Only used in it.eng.spagobi.commons.bo.UserProfile.getSchedulerUserFunctionalities()
9493
*/

‎knowage-core/src/main/java/it/eng/spagobi/mapcatalogue/service/LayerCRUD.java‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,13 @@
5353
import it.eng.spago.error.EMFUserError;
5454
import it.eng.spago.security.IEngUserProfile;
5555
import it.eng.spagobi.commons.bo.Role;
56-
import it.eng.spagobi.commons.constants.CommunityFunctionalityConstants;
5756
import it.eng.spagobi.commons.dao.DAOFactory;
5857
import it.eng.spagobi.commons.utilities.SpagoBIUtilities;
5958
import it.eng.spagobi.mapcatalogue.bo.GeoLayer;
6059
import it.eng.spagobi.mapcatalogue.dao.ISbiGeoLayersDAO;
6160
import it.eng.spagobi.mapcatalogue.serializer.GeoLayerJSONDeserializer;
6261
import it.eng.spagobi.mapcatalogue.serializer.GeoLayerJSONSerializer;
6362
import it.eng.spagobi.services.rest.annotations.ManageAuthorization;
64-
import it.eng.spagobi.services.rest.annotations.UserConstraint;
6563
import it.eng.spagobi.utilities.assertion.Assert;
6664
import it.eng.spagobi.utilities.exceptions.SpagoBIRuntimeException;
6765
import it.eng.spagobi.utilities.rest.RestUtilities;
@@ -77,7 +75,6 @@ public class LayerCRUD {
7775

7876
@GET
7977
@Produces(MediaType.APPLICATION_JSON + "; charset=UTF-8")
80-
@UserConstraint(functionalities = { CommunityFunctionalityConstants.GEO_LAYERS_MANAGEMENT })
8178
public String loadLayers(@Context HttpServletRequest req) throws JSONException, UnsupportedEncodingException {
8279
ISbiGeoLayersDAO dao = DAOFactory.getSbiGeoLayerDao();
8380
List<GeoLayer> layers = null;
@@ -111,7 +108,6 @@ public String loadLayers(@Context HttpServletRequest req) throws JSONException,
111108
@GET
112109
@Path("/getFilter")
113110
@Produces(MediaType.APPLICATION_JSON + "; charset=UTF-8")
114-
@UserConstraint(functionalities = { CommunityFunctionalityConstants.GEO_LAYERS_MANAGEMENT })
115111
public String getFilter(@Context HttpServletRequest req) throws JSONException {
116112
String layerLabel;
117113

@@ -151,7 +147,6 @@ public String getFilter(@Context HttpServletRequest req) throws JSONException {
151147
@Path("/getDownload")
152148
@Produces(MediaType.APPLICATION_JSON + "; charset=UTF-8")
153149
@Deprecated
154-
@UserConstraint(functionalities = { CommunityFunctionalityConstants.GEO_LAYERS_MANAGEMENT })
155150
public String getDownload(@Context HttpServletRequest req) throws JSONException {
156151
Object id = null;
157152
Integer layerId = null;
@@ -215,7 +210,6 @@ private String getData(int layerId, String typeWFS) {
215210
@GET
216211
@Path("/getroles")
217212
@Produces(MediaType.APPLICATION_JSON + "; charset=UTF-8")
218-
@UserConstraint(functionalities = { CommunityFunctionalityConstants.GEO_LAYERS_MANAGEMENT })
219213
public String getRoles(@Context HttpServletRequest req) throws JSONException, IOException {
220214
IEngUserProfile profile = (IEngUserProfile) req.getSession().getAttribute(IEngUserProfile.ENG_USER_PROFILE);
221215

@@ -251,7 +245,6 @@ public String getRoles(@Context HttpServletRequest req) throws JSONException, IO
251245
@GET
252246
@Path("/GetLayer")
253247
@Produces(MediaType.APPLICATION_JSON + "; charset=UTF-8")
254-
@UserConstraint(functionalities = { CommunityFunctionalityConstants.GEO_LAYERS_MANAGEMENT })
255248
public String getLayer(@Context HttpServletRequest req)
256249
throws EMFUserError, UnsupportedEncodingException, JSONException {
257250
Object id = null;
@@ -288,7 +281,6 @@ public String getLayer(@Context HttpServletRequest req)
288281
@POST
289282
@Path("/postitem")
290283
@Produces(MediaType.APPLICATION_JSON + "; charset=UTF-8")
291-
@UserConstraint(functionalities = { CommunityFunctionalityConstants.GEO_LAYERS_MANAGEMENT })
292284
public String postItem(@Context HttpServletRequest req) throws EMFUserError, JSONException {
293285

294286
JSONObject requestBodyJSON = null;
@@ -330,7 +322,6 @@ public String postItem(@Context HttpServletRequest req) throws EMFUserError, JSO
330322
@POST
331323
@Path("/deleteLayer")
332324
@Produces(MediaType.APPLICATION_JSON + "; charset=UTF-8")
333-
@UserConstraint(functionalities = { CommunityFunctionalityConstants.GEO_LAYERS_MANAGEMENT })
334325
public String deleteLayer(@Context HttpServletRequest req) throws JSONException {
335326
Object label = null;
336327
String layerLabel = null;
@@ -359,7 +350,6 @@ public String deleteLayer(@Context HttpServletRequest req) throws JSONException
359350

360351
@POST
361352
@Produces(MediaType.APPLICATION_JSON + "; charset=UTF-8")
362-
@UserConstraint(functionalities = { CommunityFunctionalityConstants.GEO_LAYERS_MANAGEMENT })
363353
public String saveLayer(@Context HttpServletRequest req) throws JSONException, EMFUserError, IOException {
364354
JSONObject requestBodyJSON = null;
365355
Integer id;
@@ -395,7 +385,6 @@ public String saveLayer(@Context HttpServletRequest req) throws JSONException, E
395385
@Path("/addData")
396386
@Consumes("multipart/form-data")
397387
@Produces(MediaType.TEXT_PLAIN)
398-
@UserConstraint(functionalities = { CommunityFunctionalityConstants.GEO_LAYERS_MANAGEMENT })
399388
public String saveLayer2(MultiPartBody input, @Context HttpServletRequest req) {
400389
JSONObject requestBodyJSON = null;
401390
Integer id;
@@ -429,7 +418,6 @@ public String saveLayer2(MultiPartBody input, @Context HttpServletRequest req) {
429418
@POST
430419
@Path("/deleterole")
431420
@Produces(MediaType.APPLICATION_JSON + "; charset=UTF-8")
432-
@UserConstraint(functionalities = { CommunityFunctionalityConstants.GEO_LAYERS_MANAGEMENT })
433421
public String deleteRole(@Context HttpServletRequest req) throws JSONException {
434422
JSONObject requestBodyJSON = null;
435423
Integer id_role = null;
@@ -459,7 +447,6 @@ public String deleteRole(@Context HttpServletRequest req) throws JSONException {
459447
@Path("/updateData")
460448
@Consumes("multipart/form-data")
461449
@Produces(MediaType.TEXT_PLAIN)
462-
@UserConstraint(functionalities = { CommunityFunctionalityConstants.GEO_LAYERS_MANAGEMENT })
463450
public String modifyLayerwithFile(MultiPartBody input, @Context HttpServletRequest req) {
464451
JSONObject requestBodyJSON = null;
465452

@@ -492,7 +479,6 @@ public String modifyLayerwithFile(MultiPartBody input, @Context HttpServletReque
492479

493480
@PUT
494481
@Produces(MediaType.APPLICATION_JSON + "; charset=UTF-8")
495-
@UserConstraint(functionalities = { CommunityFunctionalityConstants.GEO_LAYERS_MANAGEMENT })
496482
public String modifyLayer(@Context HttpServletRequest req)
497483
throws EMFUserError, JSONException, UnsupportedEncodingException {
498484
JSONObject requestBodyJSON = null;
@@ -523,7 +509,6 @@ public String modifyLayer(@Context HttpServletRequest req)
523509
@Path("/getLayerProperties")
524510
@Consumes("application/x-www-form-urlencoded")
525511
@Produces(MediaType.APPLICATION_JSON + "; charset=UTF-8")
526-
@UserConstraint(functionalities = { CommunityFunctionalityConstants.GEO_LAYERS_MANAGEMENT })
527512
public String getLayerProperties(@Context HttpServletRequest req, MultivaluedMap<String, String> form) {
528513

529514
String s = "[]";
@@ -592,7 +577,6 @@ private String getFileName(MultivaluedMap<String, String> header) {
592577
@POST
593578
@Path("/getLayerFromList")
594579
@Produces(MediaType.APPLICATION_JSON + "; charset=UTF-8")
595-
@UserConstraint(functionalities = { CommunityFunctionalityConstants.GEO_LAYERS_MANAGEMENT })
596580
public String getLayerFromList(@Context HttpServletRequest req)
597581
throws JSONException, EMFUserError, JsonGenerationException, JsonMappingException, IOException {
598582
ISbiGeoLayersDAO dao = DAOFactory.getSbiGeoLayerDao();

‎knowage/src/main/resources/it/eng/spagobi/commons/initializers/metadata/config/roleTypeUserFunctionalities.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,6 @@
233233
userFunctionality="MeasuresCatalogueManagement" roleType="MODEL_ADMIN" />
234234
<ROLE_TYPE_USER_FUNCTIONALITY
235235
userFunctionality="MeasuresCatalogueManagement" roleType="DEV_ROLE" />
236-
<ROLE_TYPE_USER_FUNCTIONALITY
237-
userFunctionality="GeoLayersManagement" roleType="ADMIN" />
238-
<ROLE_TYPE_USER_FUNCTIONALITY
239-
userFunctionality="GeoLayersManagement" roleType="DEV_ROLE" />
240236
<ROLE_TYPE_USER_FUNCTIONALITY
241237
userFunctionality="CreateCockpitFunctionality" roleType="ADMIN" />
242238
<ROLE_TYPE_USER_FUNCTIONALITY

‎knowage/src/main/resources/it/eng/spagobi/commons/initializers/metadata/config/userFunctionalities.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
<USER_FUNCTIONALITY productType="KnowageSI" name="MetaModelsCatalogueManagement" description="MetaModelsCatalogueManagement" />
3838
<USER_FUNCTIONALITY productType="KnowageSI" name="CreateCockpitFunctionality" description="CreateCockpitFunctionality" />
3939
<USER_FUNCTIONALITY productType="KnowageSI" name="CreateChartFunctionality" description="CreateChartFunctionality" />
40-
<USER_FUNCTIONALITY productType="KnowageSI" name="GeoLayersManagement" description="GeoLayersManagement" />
4140
<USER_FUNCTIONALITY productType="KnowageSI" name="ImagesManagement" description="ImagesManagement" />
4241
<USER_FUNCTIONALITY productType="KnowageSI" name="FederationDefinition" description="FederationDefinition" />
4342
<USER_FUNCTIONALITY productType="KnowageSI" name="CreateDatasetsAsFinalUser" description="CreateDatasetsAsFinalUser" />

‎knowage/src/main/webapp/WEB-INF/conf/webapp/static_menu.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
requiredFunctionality="MeasuresCatalogueManagement"
6565
to="${SPAGOBI_CONTEXT}/restful-services/publish?PUBLISHER=measuresCatalogue" />
6666
<ITEM id="4006" label="menu.LayersCatalogue"
67-
requiredFunctionality="GeoLayersManagement"
6867
to="/layers-management" />
6968
<ITEM id="4007" label="menu.glossary.technical"
7069
requiredFunctionality="ManageGlossaryTechnical"

‎knowage/src/main/webapp/WEB-INF/conf/webapp/technical_user_menu.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@
9292
functionality="MeasuresCatalogueManagement"
9393
url="${SPAGOBI_CONTEXT}/restful-services/publish?PUBLISHER=measuresCatalogue.jsp" />
9494
<ITEM title="#menu.LayersCatalogue"
95-
functionality="GeoLayersManagement"
9695
url="${SPAGOBI_CONTEXT}/restful-services/publish?PUBLISHER=layerCatalogue" />
9796
<ITEM title="#menu.glossary.business"
9897
functionality="ManageGlossaryBusiness"

‎knowageutils/src/main/java/it/eng/spagobi/commons/bo/UserProfile.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import static it.eng.spagobi.commons.constants.CommunityFunctionalityConstants.FEDERATION_DEFINITION;
5050
import static it.eng.spagobi.commons.constants.CommunityFunctionalityConstants.FUNCTIONALITIES_MANAGEMENT;
5151
import static it.eng.spagobi.commons.constants.CommunityFunctionalityConstants.FUNCTIONS_CATALOG_MANAGEMENT;
52-
import static it.eng.spagobi.commons.constants.CommunityFunctionalityConstants.GEO_LAYERS_MANAGEMENT;
5352
import static it.eng.spagobi.commons.constants.CommunityFunctionalityConstants.GIS_WEB_DESIGNER;
5453
import static it.eng.spagobi.commons.constants.CommunityFunctionalityConstants.HOTLINK_MANAGEMENT;
5554
import static it.eng.spagobi.commons.constants.CommunityFunctionalityConstants.IMAGES_MANAGEMENT;
@@ -249,7 +248,7 @@ private static List<String> getSchedulerUserFunctionalities() {
249248
DOCUMENT_METADATA_MANAGEMENT, DOCUMENT_MOVE_DOWN_STATE, DOCUMENT_MOVE_UP_STATE,
250249
DOCUMENT_STATE_MANAGEMENT, DOCUMENT_MANAGEMENT_TEST, DOCUMENT_MANAGEMENT_USER, DOMAIN_WRITE,
251250
EVENTS_MANAGEMENT, EXECUTE_CROSS_NAVIGATION, FEDERATION_DEFINITION, FUNCTIONALITIES_MANAGEMENT,
252-
FUNCTIONS_CATALOG_MANAGEMENT, GEO_LAYERS_MANAGEMENT, GIS_WEB_DESIGNER, HOTLINK_MANAGEMENT,
251+
FUNCTIONS_CATALOG_MANAGEMENT, GIS_WEB_DESIGNER, HOTLINK_MANAGEMENT,
253252
IMAGES_MANAGEMENT, KPI_MANAGEMENT, KPI_SCHEDULATION, LOVS_MANAGEMENT, LOVS_VIEW,
254253
MANAGE_CROSS_NAVIGATION, MAPCATALOGUE_MANAGEMENT, MENU_MANAGEMENT, META_MODEL_LIFECYCLE_MANAGEMENT,
255254
META_MODELS_CATALOGUE_MANAGEMENT, MODIFY_REFRESH, MANAGE_MULTISHEET_COCKPIT,

0 commit comments

Comments
 (0)