Renamed GRs to: Geoportal-DataEntry-Configs and
Geoportal-DataViewer-Configs
This commit is contained in:
parent
486c40668e
commit
bd116cbf46
|
@ -46,7 +46,7 @@ public class GNADataEntryConfigProfileReader {
|
||||||
|
|
||||||
private static final String RESOURCE_PROFILE_BODY = "/Resource/Profile/Body";
|
private static final String RESOURCE_PROFILE_BODY = "/Resource/Profile/Body";
|
||||||
public static final String SECONDARY_TYPE = "ApplicationProfile";
|
public static final String SECONDARY_TYPE = "ApplicationProfile";
|
||||||
public static final String GENERIC_RESOURCE_NAME = "GNA-DataEntry-Configs";
|
public static final String GENERIC_RESOURCE_NAME = "Geoportal-DataEntry-Configs";
|
||||||
|
|
||||||
private static final String PATH_TO_PERMISSIONS_PATH = RESOURCE_PROFILE_BODY + "/permssions_for_role";
|
private static final String PATH_TO_PERMISSIONS_PATH = RESOURCE_PROFILE_BODY + "/permssions_for_role";
|
||||||
private static final String PATH_TO_ITEM_FIELDS_CONFIG = RESOURCE_PROFILE_BODY + "/item_fields_config";
|
private static final String PATH_TO_ITEM_FIELDS_CONFIG = RESOURCE_PROFILE_BODY + "/item_fields_config";
|
||||||
|
|
|
@ -45,7 +45,7 @@ public class GNADataViewerConfigProfileReader {
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public static final String SECONDARY_TYPE = "ApplicationProfile";
|
public static final String SECONDARY_TYPE = "ApplicationProfile";
|
||||||
public static final String WORKSPACE_EXPLORER_APP_NAME = "GeoNa-Viewer-Profile";
|
public static final String GENERIC_RESOURCE_NAME = "Geoportal-DataViewer-Configs";
|
||||||
private static final String PATH_TO_ITEM_FIELDS_CONFIG = RESOURCE_PROFILE_BODY + "/item_fields_config";
|
private static final String PATH_TO_ITEM_FIELDS_CONFIG = RESOURCE_PROFILE_BODY + "/item_fields_config";
|
||||||
|
|
||||||
private static Logger LOG = LoggerFactory.getLogger(GNADataViewerConfigProfileReader.class);
|
private static Logger LOG = LoggerFactory.getLogger(GNADataViewerConfigProfileReader.class);
|
||||||
|
@ -159,7 +159,7 @@ public class GNADataViewerConfigProfileReader {
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LOG.error("Error while trying to read the " + SECONDARY_TYPE + " with SecondaryType "
|
LOG.error("Error while trying to read the " + SECONDARY_TYPE + " with SecondaryType "
|
||||||
+ WORKSPACE_EXPLORER_APP_NAME + " from scope " + scope, e);
|
+ GENERIC_RESOURCE_NAME + " from scope " + scope, e);
|
||||||
return null;
|
return null;
|
||||||
} finally {
|
} finally {
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ public class TestGNACommon {
|
||||||
private static String CONTEXT = "/gcube/devsec/devVRE";
|
private static String CONTEXT = "/gcube/devsec/devVRE";
|
||||||
private static String USERNAME = "francesco.mangiacrapa";
|
private static String USERNAME = "francesco.mangiacrapa";
|
||||||
|
|
||||||
@Before
|
//@Before
|
||||||
public void init() {
|
public void init() {
|
||||||
ScopeProvider.instance.set(CONTEXT);
|
ScopeProvider.instance.set(CONTEXT);
|
||||||
SecurityTokenProvider.instance.set(TOKEN);
|
SecurityTokenProvider.instance.set(TOKEN);
|
||||||
|
@ -92,9 +92,9 @@ public class TestGNACommon {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
// @Test
|
||||||
public void readGNDataEntryConfigsFromIS() throws Exception {
|
public void readGNDataEntryConfigsFromIS() throws Exception {
|
||||||
|
|
||||||
Thread thread = new Thread() {
|
Thread thread = new Thread() {
|
||||||
public void run() {
|
public void run() {
|
||||||
geoCommon();
|
geoCommon();
|
||||||
|
@ -106,11 +106,11 @@ public class TestGNACommon {
|
||||||
geoCommon();
|
geoCommon();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
thread.run();
|
thread.run();
|
||||||
thread2.run();
|
thread2.run();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void geoCommon() {
|
private void geoCommon() {
|
||||||
GeoportalCommon r = new GeoportalCommon();
|
GeoportalCommon r = new GeoportalCommon();
|
||||||
try {
|
try {
|
||||||
|
@ -139,8 +139,7 @@ public class TestGNACommon {
|
||||||
GeoportalCommon r = new GeoportalCommon();
|
GeoportalCommon r = new GeoportalCommon();
|
||||||
try {
|
try {
|
||||||
ScopeProvider.instance.set(CONTEXT);
|
ScopeProvider.instance.set(CONTEXT);
|
||||||
GNADataViewerConfigProfile configurations = r
|
GNADataViewerConfigProfile configurations = r.readGNADataViewerConfig(null);
|
||||||
.readGNADataViewerConfig(null);
|
|
||||||
|
|
||||||
System.out.println("Map layers are:");
|
System.out.println("Map layers are:");
|
||||||
System.out.println(configurations.getMapLayers());
|
System.out.println(configurations.getMapLayers());
|
||||||
|
|
Loading…
Reference in New Issue