diff options
| author |   Christopher Lott (cl778h) <clott@research.att.com> | 2017-07-07 07:21:10 -0400 |
|---|---|---|
| committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-07-07 07:22:13 -0400 |
| commit | 3e7145fc12ed8475ba10bb2a3c63004d41aa42bc (patch) | |
| tree | c205d84c80e4786708caa705683a56de37c5ed2d /ecomp-sdk/epsdk-analytics | |
| parent | 952895873b6179857c6773086a4d2b55f086bd61 (diff) | |
[PORTAL-25] Role Centralization
Bump EP SDK version to 1.3.0-SNAPSHOT
Support Role Centralization & Common Set of Roles across All ONAP On-Boarded Applications
Change-Id: Icfc1bbfddaf2c7c7176b4cf7bb7017d853c63100
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-analytics')
4 files changed, 4 insertions, 21 deletions
diff --git a/ecomp-sdk/epsdk-analytics/README.md b/ecomp-sdk/epsdk-analytics/README.md index 5fd6d23d..89094655 100644 --- a/ecomp-sdk/epsdk-analytics/README.md +++ b/ecomp-sdk/epsdk-analytics/README.md @@ -11,6 +11,6 @@ features including charts, maps and reports ("Raptor"). Version 1.1.0 - [Portal-7] Improvements added as part of the rebasing process - +- [PORTAL-17] Remove jfree related items Version 1.0.0 - Initial release diff --git a/ecomp-sdk/epsdk-analytics/pom.xml b/ecomp-sdk/epsdk-analytics/pom.xml index 057e4a08..4f612f90 100644 --- a/ecomp-sdk/epsdk-analytics/pom.xml +++ b/ecomp-sdk/epsdk-analytics/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.openecomp.ecompsdkos</groupId> <artifactId>epsdk-project</artifactId> - <version>1.1.0</version> + <version>1.3.0-SNAPSHOT</version> </parent> <!-- GroupId is inherited from parent --> diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/Globals.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/Globals.java index 77487dfa..008789fc 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/Globals.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/Globals.java @@ -111,8 +111,6 @@ public class Globals extends org.openecomp.portalsdk.analytics.RaptorObject { private static String sheet_name = "Raptor Reports"; - private static String jFreeVersion = AppConstants.JFV_0911; - private static boolean allowSQLBasedReports = true; // whether to allow // SQL-based report // definition (security @@ -478,8 +476,6 @@ public class Globals extends org.openecomp.portalsdk.analytics.RaptorObject { systemName = nvls(raptorProperties.getProperty("system_name"), "MSA Databank"); baseTitle = nvls(raptorProperties.getProperty("base_title"), "ANALYSIS"); - jFreeVersion = nvls(raptorProperties.getProperty("jfree_version"), - AppConstants.JFV_0911); allowSQLBasedReports = nvls( raptorProperties.getProperty("allow_sql_based_reports"), "yes") @@ -658,10 +654,6 @@ public class Globals extends org.openecomp.portalsdk.analytics.RaptorObject { return baseTitle; } - public static String getJFreeVersion() { - return jFreeVersion; - } - public static String getSystemName() { return systemName; } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/util/AppConstants.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/util/AppConstants.java index c7a8d76f..f37d6fb7 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/util/AppConstants.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/util/AppConstants.java @@ -390,13 +390,9 @@ public class AppConstants { public final static String GT_FLEX_TIME_CHARTS = "FlexTimeChart"; // Non-standard chart types - public final static String GT_MTD_BAR = "MTDBarChart"; - - // JFree latest version only chart type - public final static String GT_METER = "MeterChart"; - + public final static String GT_STACK_BAR = "StackedBarChart"; - + public static Color GREEN_COLOR = new Color(0, 128, 0); // chart filter @@ -583,11 +579,6 @@ public class AppConstants { public static final String OJ_JOINED = "JOINED"; // cur_table = // join_table (+) - // JFree versions - public static final String JFV_0911 = "0.9.11"; - - public static final String JFV_LATEST = "latest"; - // List of Available Total Functions public static final String TOTAL_SUM_ID = "SUM("; |