From 8537f3c5ee8bf3897404dff5442c6a10f4d1420d Mon Sep 17 00:00:00 2001 From: "sunil.unnava" Date: Fri, 10 May 2019 11:24:53 -0400 Subject: clean MR codebase Issue-ID: DMAAP-1199 Change-Id: Ieff7939b02a8987b6101dd1c0ec886b474f1fa82 Signed-off-by: sunil.unnava --- .../etc/appprops/AAFUserRoles.properties | 10 -------- .../etc/appprops/Introscope.properties | 29 ---------------------- .../etc/appprops/app-intercepts.properties | 3 --- bundleconfig-local/etc/appprops/caet.properties | 4 --- .../etc/sysprops/sys-props.properties | 8 +----- .../etc/sysprops/template.sys-props.properties | 14 +---------- bundleconfig-local/swm-var-ajsc.txt | 10 -------- 7 files changed, 2 insertions(+), 76 deletions(-) delete mode 100644 bundleconfig-local/etc/appprops/Introscope.properties (limited to 'bundleconfig-local') diff --git a/bundleconfig-local/etc/appprops/AAFUserRoles.properties b/bundleconfig-local/etc/appprops/AAFUserRoles.properties index c2edd1a..2785461 100644 --- a/bundleconfig-local/etc/appprops/AAFUserRoles.properties +++ b/bundleconfig-local/etc/appprops/AAFUserRoles.properties @@ -23,13 +23,3 @@ #read this file and protect the routes given with the AAF role defined. #For more information on AAF role based permissions, please contact AAF team. -#The following example would protect the JAXRS echo example service provided with the archetype. -#/services/${namespace}/v1/jaxrsExample/topics/**=com.att.ajsc.myper|mymachine|manage - -#com.att.ecomp_test.crm.mr.topic|:topic.com.att.ecomp_test.crm.preDemo|view - -#The following example would protect ALL AJSC services running within your project. -#/**=com.att.ajsc.myperm|mymachine|manage - -#The following example would protect ALL REST services utilizing the Camel restlet routes. -#/rest/**=com.att.ajsc.myperm|mymachine|manage diff --git a/bundleconfig-local/etc/appprops/Introscope.properties b/bundleconfig-local/etc/appprops/Introscope.properties deleted file mode 100644 index 7dad321..0000000 --- a/bundleconfig-local/etc/appprops/Introscope.properties +++ /dev/null @@ -1,29 +0,0 @@ -############################################################################### -# ============LICENSE_START======================================================= -# org.onap.dmaap -# ================================================================================ -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# 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. -# ============LICENSE_END========================================================= -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -############################################################################### -#CSI environment uses the Introscope java agent for monitoring services. The AJSC has provided an implementation class that -#provides basic information to the Introscope Enterprise Manager for each http request/response. - -introscopeEventClass=com.att.ajsc.introscope.IntroscopeEventNotifierImpl -serviceName=N/A -conversationId=N/A -uniqueID=N/A -userID=N/A diff --git a/bundleconfig-local/etc/appprops/app-intercepts.properties b/bundleconfig-local/etc/appprops/app-intercepts.properties index 6cbd8f5..fc09bb8 100644 --- a/bundleconfig-local/etc/appprops/app-intercepts.properties +++ b/bundleconfig-local/etc/appprops/app-intercepts.properties @@ -22,6 +22,3 @@ #This is where all your application intercept strategies must be configured. AJSC reads this property file and adds #the list of intercepts specified here to the camel context. This can be useful for accessing every exchange object transferred from/to #each endpoint in the request/response flow and can allow for more precise debugging and/or processing of the exchange. - -#e.g. -#intercepts=com.att.nsa.dmaap.JaxrsEchoService,packagename.class1name,packagename.class2name diff --git a/bundleconfig-local/etc/appprops/caet.properties b/bundleconfig-local/etc/appprops/caet.properties index 54305e4..0757a7f 100644 --- a/bundleconfig-local/etc/appprops/caet.properties +++ b/bundleconfig-local/etc/appprops/caet.properties @@ -19,7 +19,3 @@ # ECOMP is a trademark and service mark of AT&T Intellectual Property. # ############################################################################### -#caet_service=http://DME2RESOLVE/service=com.att.csid.CAET/version=3/envContext=TEST/routeOffer=TEST_CAET -#caet_service=http://DME2RESOLVE/service=com.att.csid.CAET/version=3/envContext=TEST/routeOffer=D3A_CAET -#caet_service=dme2://DME2RESOLVE/service=com.att.csid.CAET/version=4.0/envContext=TEST/routeOffer=TEST_CAET -caet_service=http://DME2RESOLVE/service=com.att.csid.CAET/version=4.0/envContext=TEST/routeOffer=TEST_CAET \ No newline at end of file diff --git a/bundleconfig-local/etc/sysprops/sys-props.properties b/bundleconfig-local/etc/sysprops/sys-props.properties index 3f89611..cfba8d0 100644 --- a/bundleconfig-local/etc/sysprops/sys-props.properties +++ b/bundleconfig-local/etc/sysprops/sys-props.properties @@ -66,12 +66,6 @@ JMS_BROKER=WMQ #Generate/Skip api docs isApiDoc=false -#JMS properties needed for CSI Logging -JMS_TIBCO_PROVIDER_URL=tcp://q34csi2c6.vci.att.com:15223 -JMS_LOGGER_USER_NAME=spm2 -JMS_LOGGER_PASSWORD= -JMS_LOGGER_AUDIT_QUEUE_BINDING=pub.m2e.audit.logger.queue -JMS_LOGGER_PERF_QUEUE_BINDING=log.csi.performance02 #WMQ connectivity JMS_WMQ_PROVIDER_URL=aftdsc://AFTUAT/34.07/-84.28 @@ -115,7 +109,7 @@ ssf_filemonitor_threadpool_size=10 AFT_DME2_CONN_IDLE_TIMEOUTMS=5000 AJSC_ENV=SOACLOUD -SOACLOUD_NAMESPACE=com.att.acsi.saat.dt.dmaap.dev +SOACLOUD_NAMESPACE=org.onap.dmaap.dev SOACLOUD_ENV_CONTEXT=TEST SOACLOUD_PROTOCOL=http SOACLOUD_ROUTE_OFFER=DEFAULT diff --git a/bundleconfig-local/etc/sysprops/template.sys-props.properties b/bundleconfig-local/etc/sysprops/template.sys-props.properties index 8061bd4..0df5d0d 100644 --- a/bundleconfig-local/etc/sysprops/template.sys-props.properties +++ b/bundleconfig-local/etc/sysprops/template.sys-props.properties @@ -61,19 +61,7 @@ isApiDoc=__API_DOC__ #Configure JMS Queue (WMQ/TIBCO) JMS_BROKER=WMQ -#JMS properties needed for CSI Logging -JMS_TIBCO_PROVIDER_URL=tcp://q34csi2c6.vci.att.com:15223 -JMS_LOGGER_USER_NAME=spm2 -JMS_LOGGER_PASSWORD= -JMS_LOGGER_AUDIT_QUEUE_BINDING=pub.m2e.audit.logger.queue -JMS_LOGGER_PERF_QUEUE_BINDING=log.csi.performance02 - -#WMQ connectivity -JMS_WMQ_PROVIDER_URL=aftdsc://AFTUAT/34.07/-84.28 -JMS_WMQ_CONNECTION_FACTORY_NAME=aftdsc://AFTUAT/?service=CSILOG,version=1.0,bindingType=fusionBus,envContext=Q,Q30A=YES -JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME=com.att.aft.jms.FusionCtxFactory -JMS_WMQ_AUDIT_DESTINATION_NAME=queue:///CSILOGQL.M2E.DASHBOARD01.NOT.Q30A -JMS_WMQ_PERF_DESTINATION_NAME=queue:///CSILOGQL.M2E.PERFORMANCE01.NOT.Q30A + #CSI related variables for CSM framework csm.hostname=d1a-m2e-q112m2e1.edc.cingular.net diff --git a/bundleconfig-local/swm-var-ajsc.txt b/bundleconfig-local/swm-var-ajsc.txt index 7a39291..dbfb87e 100644 --- a/bundleconfig-local/swm-var-ajsc.txt +++ b/bundleconfig-local/swm-var-ajsc.txt @@ -2,13 +2,3 @@ #for dev teams to override the default SWM node variables. The examples given are meant to be just that: EXAMPLES. Please, #REMOVE/DELETE/ADD/MODIFY these values for YOUR SWM package based on the needs of your project. - -#MAX_HEAP_SIZE[com.att.csid:CommonProvisioningServices-E911Address,*,*,N,]=512m -#PRE_JVM_ARGS[com.att.csid:CommonProvisioningServices-E911Address,*,*,N,]=-Xss256k -#AJSC_CONF_HOME[com.att.csid:CommonProvisioningServices-E911Address,*,*,N,]=$INSTALL_ROOT/apps/m2e/$AFTSWM_ACTION_ARTIFACT_GROUP/$AFTSWM_ACTION_ARTIFACT_NAME/$AFTSWM_ACTION_NEW_VERSION_MAJOR.$AFTSWM_ACTION_NEW_VERSION_MINOR -#MIN_HEAP_SIZE[com.att.csid:CommonProvisioningServices-E911Address,*,*,N,]=512m -#INTROSCOPE_AGENTPROFILE[com.att.csid:CommonProvisioningServices-E911Address,*,*,N,]=$INSTALL_ROOT/apps/m2e/$AFTSWM_ACTION_ARTIFACT_GROUP/$AFTSWM_ACTION_ARTIFACT_NAME/$AFTSWM_ACTION_NEW_VERSION_MAJOR.$AFTSWM_ACTION_NEW_VERSION_MINOR/symlinks/link_introscope_agent_profile -#POST_JVM_ARGS[com.att.csid:CommonProvisioningServices-E911Address,*,*,N,]=-XX:NewRatio=1 -XX:SurvivorRatio=8 -XX:-UseBiasedLocking -XX:+DisableExplicitGC -XX:+UseParNewGC -XX:+CMSParallelRemarkEnabled -XX:ParallelGCThreads=12 -XX:+UseConcMarkSweepGC -#AJSC_SHARED_CONFIG[com.att.csid:CommonProvisioningServices-E911Address,*,*,N,]=$INSTALL_ROOT/apps/m2e/$AFTSWM_ACTION_ARTIFACT_GROUP/$AFTSWM_ACTION_ARTIFACT_NAME/$AFTSWM_ACTION_NEW_VERSION_MAJOR.$AFTSWM_ACTION_NEW_VERSION_MINOR/shared -#JAVA_HOME[com.att.csid:CommonProvisioningServices-E911Address,*,*,N,]=$INSTALL_ROOT/apps/m2e/$AFTSWM_ACTION_ARTIFACT_GROUP/$AFTSWM_ACTION_ARTIFACT_NAME/$AFTSWM_ACTION_NEW_VERSION_MAJOR.$AFTSWM_ACTION_NEW_VERSION_MINOR/symlinks/link_jre -#INTROSCOPE_LIB[com.att.csid:CommonProvisioningServices-E911Address,*,*,N,]=$INSTALL_ROOT/apps/m2e/$AFTSWM_ACTION_ARTIFACT_GROUP/$AFTSWM_ACTION_ARTIFACT_NAME/$AFTSWM_ACTION_NEW_VERSION_MAJOR.$AFTSWM_ACTION_NEW_VERSION_MINOR/symlinks/link_introscope_lib -- cgit 1.2.3-korg