From 6beb446925c967aca92f5513adf36c5db77c00d6 Mon Sep 17 00:00:00 2001 From: TATTAVARADA Date: Thu, 27 Apr 2017 07:53:18 -0400 Subject: [PORTAL-7] Rebase This rebasing includes common libraries and common overlays projects abstraction of components Change-Id: Ia1efa4deacdc5701e6205104ac021a6c80ed60ba Signed-off-by: st782s --- ecomp-sdk/sdk-app/src/main/resources/att-rules.drl | 16 - ecomp-sdk/sdk-app/src/main/resources/cache.ccf | 30 -- ecomp-sdk/sdk-app/src/main/resources/logback.xml | 370 --------------------- .../src/main/resources/mchange-log.properties | 23 -- .../sdk-app/src/main/resources/portal.properties | 69 ---- .../sdk-app/src/main/resources/state-rules.drl | 38 --- 6 files changed, 546 deletions(-) delete mode 100644 ecomp-sdk/sdk-app/src/main/resources/att-rules.drl delete mode 100644 ecomp-sdk/sdk-app/src/main/resources/cache.ccf delete mode 100644 ecomp-sdk/sdk-app/src/main/resources/logback.xml delete mode 100644 ecomp-sdk/sdk-app/src/main/resources/mchange-log.properties delete mode 100644 ecomp-sdk/sdk-app/src/main/resources/portal.properties delete mode 100644 ecomp-sdk/sdk-app/src/main/resources/state-rules.drl (limited to 'ecomp-sdk/sdk-app/src/main/resources') diff --git a/ecomp-sdk/sdk-app/src/main/resources/att-rules.drl b/ecomp-sdk/sdk-app/src/main/resources/att-rules.drl deleted file mode 100644 index e15c3fb1..00000000 --- a/ecomp-sdk/sdk-app/src/main/resources/att-rules.drl +++ /dev/null @@ -1,16 +0,0 @@ -package org.openecomp.portalsdk.core.drools; - - -rule "Drools NJ" -when -$droolsRuleService : DroolsRuleServiceImpl( state == "NJ" ) -then -$droolsRuleService.setResultsString("NJ state :" + " Garden State"); -end - -rule "Drools NY" -when -$droolsRuleService : DroolsRuleServiceImpl( state == "NY" ) -then -$droolsRuleService.setResultsString("NY state :" + " Empire State"); -end diff --git a/ecomp-sdk/sdk-app/src/main/resources/cache.ccf b/ecomp-sdk/sdk-app/src/main/resources/cache.ccf deleted file mode 100644 index d21404b0..00000000 --- a/ecomp-sdk/sdk-app/src/main/resources/cache.ccf +++ /dev/null @@ -1,30 +0,0 @@ -# DEFAULT CACHE REGION -jcs.default=DC -jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes -jcs.default.cacheattributes.MaxObjects=1000 -jcs.default.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache -jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes -jcs.default.elementattributes.IsEternal=true -jcs.default.elementattributes.IsSpool=true - - -# MEMORY SHRINKING CONFIGURATION (Commented) -#jcs.default.cacheattributes.UseMemoryShrinker=true -#jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600 -#jcs.default.cacheattributes.ShrinkerIntervalSeconds=60 -#jcs.default.cacheattributes.MaxSpoolPerRun=500 -#jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes -#jcs.default.elementattributes.IsEternal=false - - -# AUXILLARY CACHE CONFIGURATION -jcs.auxiliary.DC=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory -jcs.auxiliary.DC.attributes=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes -jcs.auxiliary.DC.attributes.DiskPath=/tmp - - -# PRE-DEFINED REGION FOR LOOKUP DATA -jcs.region.lookUpObjectCache=DC -jcs.region.lookUpObjectCache.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes -jcs.region.lookUpObjectCache.cacheattributes.MaxObjects=4000 -jcs.region.lookUpObjectCache.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache diff --git a/ecomp-sdk/sdk-app/src/main/resources/logback.xml b/ecomp-sdk/sdk-app/src/main/resources/logback.xml deleted file mode 100644 index 4f773ee2..00000000 --- a/ecomp-sdk/sdk-app/src/main/resources/logback.xml +++ /dev/null @@ -1,370 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${defaultLoggerPattern} - - - - - - - - - - - - ${logDirectory}/${generalLogName}.log - - - ${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip - - - 30 - 3GB - - - - ${applicationLoggerPattern} - - - - - - 256 - - true - - - - - - - - - - - - - - - - - - - ${logDirectory}/${auditLogName}.log - - - ${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip - - - 30 - 3GB - - - - ${auditLoggerPattern} - - - - 256 - - - - - ${logDirectory}/${metricsLogName}.log - - - ${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip - - - 30 - 3GB - - - - ${metricsLoggerPattern} - - - - - - 256 - - - - - ${logDirectory}/${errorLogName}.log - - - ${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.log.zip - - - 30 - 3GB - - - - ${errorLoggerPattern} - - - - - 256 - - - - - ${debugLogDirectory}/${debugLogName}.log - - - ${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip - - - 30 - 3GB - - - - ${defaultLoggerPattern} - - - - - 256 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ecomp-sdk/sdk-app/src/main/resources/mchange-log.properties b/ecomp-sdk/sdk-app/src/main/resources/mchange-log.properties deleted file mode 100644 index 77e260bb..00000000 --- a/ecomp-sdk/sdk-app/src/main/resources/mchange-log.properties +++ /dev/null @@ -1,23 +0,0 @@ -### -# ================================================================================ -# eCOMP Portal SDK -# ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ================================================================================ -### -# Direct the proprietary logger used by com.mchange.c3p0 to use slf4j - -com.mchange.v2.log.MLog=com.mchange.v2.log.FallbackMLog -com.mchange.v2.log.FallbackMLog.DEFAULT_CUTOFF_LEVEL=OFF diff --git a/ecomp-sdk/sdk-app/src/main/resources/portal.properties b/ecomp-sdk/sdk-app/src/main/resources/portal.properties deleted file mode 100644 index fb59dfbb..00000000 --- a/ecomp-sdk/sdk-app/src/main/resources/portal.properties +++ /dev/null @@ -1,69 +0,0 @@ -### -# ================================================================================ -# eCOMP Portal SDK -# ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ================================================================================ -### -# Properties read by ECOMP Framework library, ecompFW.jar - -########################################################################## -# The following properties should NOT be changed by partner applications. -########################################################################## - -portal.api.prefix = /api -max.idle.time = 5 -user.attribute.name = user_attribute - -testing=testing - -#Use REST API instead of UEB to fetch the functional menu data -use_rest_for_functional_menu=true - -########################################################################## -# The following properties MUST be changed by partner applications. -########################################################################## - -# Name of java class that implements the OnBoardingApiService interface. -portal.api.impl.class = org.openecomp.portalsdk.core.onboarding.client.OnBoardingApiServiceImpl - -# CSP Global Log On for single sign on -ecomp_redirect_url = http://todo_enter_portal_hostname:8080/ecompportal/login.htm - -# URL of the ECOMP Portal REST API - -ecomp_rest_url = TODO_Portal_URL - -# Applications do not need to run a UEB listener in 1610. -ueb_listeners_enable = false - -# UEB Configuration -# In release 1607, all 6 entries below were required. -# In release 1610, if key ueb_listeners_enable is set to false, -# then only the ueb_app_key is required. -# UEB servers -ueb_url_list = todo_ueb_url_list -# ECOMP Portal listens on this UEB topic -ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX-TEST-DEMETER -# Replace these 3 default values with the ones for your specific App, -# as shown on the on-boarding page on the ECOMP Portal web application. -ueb_app_key = ZOicEniw7BWDL1pM -ueb_app_secret = PJIsBErHfo2RGKzuu03CZKgV -ueb_app_mailbox_name = ECOMP-PORTAL-OUTBOX-TEST-32756 -# Consumer group name for UEB topic. -# Use the special tag '{UUID}' to generate a unique one for each sdk-app server. -ueb_app_consumer_group_name = {UUID} - -decryption_key = AGLDdG4D04BKm2IxIWEr8o== diff --git a/ecomp-sdk/sdk-app/src/main/resources/state-rules.drl b/ecomp-sdk/sdk-app/src/main/resources/state-rules.drl deleted file mode 100644 index 586ae6b7..00000000 --- a/ecomp-sdk/sdk-app/src/main/resources/state-rules.drl +++ /dev/null @@ -1,38 +0,0 @@ -package org.openecomp.portalsdk.core.drools; -global String age - -rule "Default" -when -$droolsRuleService : DroolsRuleServiceImpl( state != null ) -then -System.out.println($droolsRuleService.accessLabel() +" "+ $droolsRuleService.getState() +" state legal age is " + getDefaultIfNull(age)); -$droolsRuleService.setResultsString($droolsRuleService.getState()+" state legal age is " + getDefaultIfNull(age)); -end - -rule "Drools NJ" -when -$droolsRuleService : DroolsRuleServiceImpl( state == "NJ" ) -then -System.out.println($droolsRuleService.accessLabel() +" "+ "NJ state legal age is " + getDefaultIfNull(age)); -$droolsRuleService.setResultsString("NJ state legal age is " + getDefaultIfNull(age)); -end - -rule "Drools KY" -when -$droolsRuleService : DroolsRuleServiceImpl( state == "KY" ) -then -System.out.println($droolsRuleService.accessLabel() +" "+ "KY state legal age is " + getDefaultIfNull("20")); -$droolsRuleService.setResultsString("KY state legal age is " + getDefaultIfNull("20")); -end - -rule "Drools NY" -when -$droolsRuleService : DroolsRuleServiceImpl( state == "NY" ) -then -System.out.println($droolsRuleService.accessLabel() +" "+ "NY state legal age is " + getDefaultIfNull("21")); -$droolsRuleService.setResultsString("NY state legal age is " + getDefaultIfNull("21")); -end - -function String getDefaultIfNull(String age) { -return age == null ? "18" : age; -} \ No newline at end of file -- cgit 1.2.3-korg