clean MR codebase

Issue-ID: DMAAP-1199
Change-Id: Ieff7939b02a8987b6101dd1c0ec886b474f1fa82
Signed-off-by: sunil.unnava <sunil.unnava@att.com>

diff --git a/ajsc-shared-config/etc/aft.properties b/ajsc-shared-config/etc/aft.properties
deleted file mode 100644 (file)
index e46c976..0000000
--- a/ajsc-shared-config/etc/aft.properties
+++ /dev/null
@@ -1,37 +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.
-#  
-###############################################################################
-# EEM: $Header: file:///opt/app/workload/d124csi1m1/cfengine_depot/mirror/1.0/cfengine/csi/cg03/release/1504/m2e/csi-shared-config/94.0.64/etc/aft.properties 118444 2015-05-19 07:59:38Z dh2924 $ID$
-# Flow test 319
-# The DEFAULT setup for this file is for deployment to soa cloud node which will use the "bundleconfig/etc/spm2.jks" location
-# For Testing Locally, you can set the system property, csiEnable=true, found within bundleconfig-local/etc/sysprops/sys-props.properties
-# and switch com.att.aft.keyStore and com.att.aft.trustStore values commented out below to "ajsc-shared-config/etc/spm2.jks"
-
-com.att.aft.discovery.client.environment=AFTUAT
-com.att.aft.discovery.client.latitude=35.318900
-com.att.aft.discovery.client.longitude=-80.762200
-com.att.aft.alias=fusionbus
-#com.att.aft.keyStore=ajsc-shared-config/etc/spm2.jks
-com.att.aft.keyStore=bundleconfig/etc/spm2.jks
-com.att.aft.keyStorePassword=<password>
-#com.att.aft.trustStore=ajsc-shared-config/etc/spm2.jks
-com.att.aft.trustStore=bundleconfig/etc/spm2.jks
-com.att.aft.trustStorePassword=<password>

diff --git a/ajsc-shared-config/etc/csm-config-app.properties b/ajsc-shared-config/etc/csm-config-app.properties
deleted file mode 100644 (file)
index 48ee7f6..0000000
--- a/ajsc-shared-config/etc/csm-config-app.properties
+++ /dev/null
@@ -1,206 +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.
-#  
-###############################################################################
-Global.ExtendedProperty.AuthoritativeServers=${ChangeMe_csm.acfshost}:${ChangeMe_csm.acfsport}
-
-#Possible working server for troubleshooting csm related items (used when testing/using invokeService or invokeAdapter components)
-#Global.ExtendedProperty.AuthoritativeServers=q399csi1a1.vci.att.com:27550
-#
-# The settings in this file control the behavior of the CSM Framework. 
-# The majority of the settings in this file adhere to the following
-# pattern:
-# 
-#  [EntityType].[EntityId].[PropertyName]=[PropertyValue]
-# 
-# Where:
-# 
-#  [EntityType]    Identifies the type of entity (service or
-#                  service group) that's being configured.
-#  [EntityId]      Identifies the individual entity.
-#  [PropertyName]  Identifies the property that is being set.
-#  [PropertyValue] Is the actual property value.
-# 
-# In the formatting sample above, the EntityType can be setto one of the
-# following values:
-# 
-#  * 'Service' if an individual service is being configured.
-#  * 'Group 'if a service group is being configured.
-# 
-# The reference to 'entity' in the above description is intentionally
-# generic.  The CSM Framework supports the configuration of individual
-# services as well as groups of services.  The type of entity that is
-# actually being configured is determined by the value of the
-# [EntityType] portion of the property.
-# 
-# There are two values for [EntityId] that have a special meaning within
-# the CSM Framework:
-# 
-# 
-# DefaultService - Identifies the default configuration for any service
-#     that is not explicitly configured elsewhere in this file.
-# 
-# DefaultServiceGroup - This identifies the entity that provides the
-#     default configuration for any service group that is not explicitly
-#     configured elsewhere in this file.
-# 
-# DO NOT use either of these as the identifier for any of your
-# application-specific services or service groups.
-# 
-# The CSM Framework treats all entity identifiers in a case-insensitive
-# manner.  The entity ids 'Service1' and 'SERVICE1' are equivalant.  All
-# properties with the same [EntityId] will be applied to the same
-# configuration.  The CSM Framework framework also treats property names
-# in a case-insensitive manner.  'MaxRequestCount' and 'MAXREQUESTCOUNT'
-# are considered equivalent within the CSM framework.
-# 
-# The following properties are supported by the CSM Framework.  Any
-# properties that are entity-specific will include the '[EntityId].'
-# prefix.
-# 
-# [EntityType].[EntityId].Enabled - Indicates if the entity is enabled
-#     or disabled by default.  The value of this property must be either
-#     'true' or 'false'.
-# 
-# [EntityType].[EntityId].MaxRequestCount - The maximum number of
-#     requests that can be running at any point in time.  Once this limit is
-#     reached, the service is considered  to be 'flooded', and subsequent
-#     requests are refused until the request count drops to the level
-#     specified by the RestartThreshold property.  Once the restart
-#     threshold is reached, the service will be 'restarted' based on the
-#     values of the 'RestartFrequency' and 'RestartIncrement' properties.
-#     The value of this property must be a numeric value.
-#     The default value for this property is 20.
-# 
-# [EntityType].[EntityId].MaxStalledRequestCount - the maximum number of
-#     'stalled' requests that are allowed before subsequent requests are
-#     refused
-#     The value of this property must be a numeric value.
-#     The default value for this property is 10.
-# 
-# [EntityType].[EntityId].RestartThreshold - the process count level at
-#     which requests will be allowed to proceed whenever a service becomes
-#     'flooded'.  This property is only used if the total process count
-#     reaches the level set by the 'MaxRequestCount' property.  Once that
-#     occurs, subsequent requests will be refused until the active request
-#     count drops to the level specified by this property.  Once the active
-#     request count drops to the level specified by this property, the
-#     service will be 'restarted' based on the values of the
-#     'RestartFrequency' and 'RestartIncrement' properties.  To cause the
-#     CSM framework to allow subsequent requests to proceed as soon as the
-#     active request count drops below level level set by the
-#     'MaxRequestCount' property, just set this property to either -1 or 1
-#     less than the value of the 'MaxRequestCount' property.
-#     The value of this property must be a numeric value.
-#     The default value for this property is -1.
-# 
-# [EntityType].[EntityId].RestartIncrement - This property, along with
-#     the 'RestartFrequency' property helps determine how quickly the active
-#     request count will rise to the 'maximum request count' whenever a
-#     service is 'restarted' after becoming 'flooded'. The
-#     'RestartFrequency' property determines how frequenty the permissable
-#     number of active requests will be increased.  This property determines
-#     how much the permissible number of active requests will increase by
-#     whenever it is raised.  If this property is set to a positive value,
-#     then the 'RestartFrequency' property must also be set to a positive
-#     value.  If this property is set to 0, then the 'RestartFrequency'
-#     property must also be set to 0.  In other words, either both
-#     properties are 0 or both properties are greater than 0.  When both
-#     properties are set to 0, then the permissable number of active
-#     requests immediately rises back up to the maximum request count once
-#     it has droppedback down to the 'restart threshold'.  When both
-#     properties are greater than 0, then the permissable number of active
-#     requests gradually rises to the maximum request count.
-#     The value of this property must be a numeric value greater than or equal to 0.
-#     The default value for this property is 0.
-# 
-# [EntityType].[EntityId].RestartFrequency - This property, along with
-#     the 'RestartIncrement' property helps determine how quickly the active
-#     request count will rise to the 'maximum request count' whenever a
-#     service is 'restarted' after becoming 'flooded'. The
-#     'RestartIncrement' property determines how quickly the permissable
-#     number of active requests will be increased.  This property determines
-#     how frequently  that increase will occur.  If this property is set to
-#     a positive value, then the 'RestartIncrement' property must also be
-#     set to a positive value.  If this property is set to 0, then the
-#     'RestartIncrement' property must also be set to 0.  In other words,
-#     either both properties are 0 or both properties are greater than 0. 
-#     When both properties are set to 0, then the permissable number of
-#     active requests immediately rises back up to the maximum request count
-#     once it has droppedback down to the 'restart threshold'.  When both
-#     properties are greater than 0, then the permissable number of active
-#     requests gradually rises to the maximum request count.
-#     The value of this property must be a numeric value greater than or equal to 0.
-#     The default value for this property is 0.
-# 
-# [EntityType].[EntityId].ServiceGroupId - This property is only
-#     relevant for entities that are configured as services (i.e. the
-#     [EntityType] portion of the property is set to 'Service').  When the
-#     'ServiceGroupId' property is set to a non-blank value, the behavior of
-#     the service is controled by the configuration of the corresponding
-#     service group.  There is no default value for this property.
-# 
-# [EntityType].[EntityId].Timeout - the timeout, in milliseconds, for
-#     each process that is controlled by this configuration.  Once the
-#     duration of a process exceeds this value, the process will be
-#     considered to have entered a 'stalled' state.  The default value for
-#     this property is 10000.
-# 
-# FrameworkEnabled: - This is the one property that is not specific to a
-#     single entity.  This property determines whether the entire CSM
-#     Framework is enabled or disabled.  When disabled, the CSM Framework
-#     does not track any process counts.  All requests to access a service
-#     are allowed, regardless of the current level of activity.  The value
-#     of this property must be either 'true' or 'false'.
-# 
-
-#
-# Enables the CSM Framework so that it can manage interactions with external
-# services and/or resources.  To disable the CSM Framework, simply set
-# this property to false.
-#
-FrameworkEnabled=true
-
-#
-# These are the default settings for any service that is no explicitly configured
-# below.  A few things to note about this configuration:
-#  1) The "Enabled" property is not explicitly set.  Instead, we are relying
-#     on the default value of 'true'.
-#  2) The Timeout and Type properties are also not explicitly set.  Again, we
-#     are relying on the default values for these properties.
-#  
-Service.DefaultService.Enabled=true
-Service.DefaultService.MaxRequestCount=30
-Service.DefaultService.MaxStalledRequestCount=20
-Service.DefaultService.Timeout=30000
-Service.DefaultService.RestartThreshold=-1
-Service.DefaultService.AutoPurgeAfter=150000
-
-
-#
-# These are the default settings for any service group that is referenced in 
-# a service configuration but not configured below.
-# 
-# Currently CSI does not use any service group configurations!
-#
-#Group.DefaultGroup.MaxRequestCount=-1
-#Group.DefaultGroup.MaxStalledRequestCount=-1
-#Group.DefaultGroup.RestartThreshold=-1
-#Group.DefaultGroup.Timeout=-1

diff --git a/bundleconfig-csi/etc/appprops/AAFUserRoles.properties b/bundleconfig-csi/etc/appprops/AAFUserRoles.properties
index fd9df83..18cd07d 100644 (file)
--- a/bundleconfig-csi/etc/appprops/AAFUserRoles.properties
+++ b/bundleconfig-csi/etc/appprops/AAFUserRoles.properties
@@ -23,11 +23,4 @@
 #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/jaxrs-services/jaxrsExample/echo/*=com.att.ajsc.myper|mymachine|manage
 
-#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-csi/etc/appprops/Introscope.properties b/bundleconfig-csi/etc/appprops/Introscope.properties
deleted file mode 100644 (file)
index 7dad321..0000000
--- a/bundleconfig-csi/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-csi/etc/appprops/app-intercepts.properties b/bundleconfig-csi/etc/appprops/app-intercepts.properties
index 6cbd8f5..5c38596 100644 (file)
--- a/bundleconfig-csi/etc/appprops/app-intercepts.properties
+++ b/bundleconfig-csi/etc/appprops/app-intercepts.properties
@@ -24,4 +24,3 @@
 #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-csi/etc/appprops/caet.properties b/bundleconfig-csi/etc/appprops/caet.properties
index 54305e4..0757a7f 100644 (file)
--- a/bundleconfig-csi/etc/appprops/caet.properties
+++ b/bundleconfig-csi/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-csi/etc/sysprops/sys-props.properties b/bundleconfig-csi/etc/sysprops/sys-props.properties
index 11fc0f1..d637204 100644 (file)
--- a/bundleconfig-csi/etc/sysprops/sys-props.properties
+++ b/bundleconfig-csi/etc/sysprops/sys-props.properties
@@ -97,7 +97,7 @@ AJSC_ENV=SOACLOUD
 AJSC_SERVICE_NAMESPACE=__module_ajsc_namespace_name__
 AJSC_SERVICE_VERSION=__module_ajsc_namespace_version__
 
-SOACLOUD_NAMESPACE=com.att.ajsc
+SOACLOUD_NAMESPACE=org.onap.dmaap.mr
 SOACLOUD_ENV_CONTEXT=${ChangeMe_SOACLOUD_ENV_CONTEXT}
 SOACLOUD_PROTOCOL=https
 SOACLOUD_ROUTE_OFFER=${ChangeMe_SOACLOUD_ROUTE_OFFER}
@@ -130,11 +130,6 @@ JMS_LOGGER_AUDIT_QUEUE_BINDING=${ChangeMe_JMS_LOGGER_AUDIT_QUEUE_BINDING}
 JMS_LOGGER_PERF_QUEUE_BINDING=${ChangeMe_JMS_LOGGER_PERF_QUEUE_BINDING}
 
 #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
 
 logback.configurationFile=${ChangeMe_localBundlePath}/shared/etc/logback.xml
 

diff --git a/bundleconfig-csi/swm-var-ajsc.txt b/bundleconfig-csi/swm-var-ajsc.txt
index 7a39291..dbfb87e 100644 (file)
--- a/bundleconfig-csi/swm-var-ajsc.txt
+++ b/bundleconfig-csi/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

diff --git a/bundleconfig-local/etc/appprops/AAFUserRoles.properties b/bundleconfig-local/etc/appprops/AAFUserRoles.properties
index c2edd1a..2785461 100644 (file)
--- 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 (file)
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 (file)
--- 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 (file)
--- 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 (file)
--- 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=<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 (file)
--- 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=<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 (file)
--- 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

diff --git a/docs/offeredapis/api.rst b/docs/offeredapis/api.rst
index 0428850..ec89974 100644 (file)
--- a/docs/offeredapis/api.rst
+++ b/docs/offeredapis/api.rst
@@ -277,7 +277,7 @@ Sample Request:
 ===============
 
 +----------------------------------------------------------------------------------------------------+
-| GET  http://<hostname>:3904/events/com.att.dmaap.mr.sprint/mygroup/mycus                           |
+| GET  http://<hostname>:3904/events/org.onap.dmaap.mr.sprint/mygroup/mycus                           |
 |                                                                                                    |
 | Content-Type: application/json                                                                     |
 |                                                                                                    |
@@ -285,7 +285,7 @@ Sample Request:
 |                                                                                                    |
 |curl -u XXX@csp.abc.com:MRDmap2016$ -X GET -d 'MyfirstMessage'                                      |
 |                                                                                                    |
-|http://mrlocal00.dcae.proto.research.att.com:3904/events/com.att.ecomp_test.crm.preDeo/myG/C1       |
+|http://10.12.7.22:3904/events/com.att.ecomp_test.crm.preDeo/myG/C1       |
 |                                                                                                    |
 |[I am r sending first msg,I am R sending first msg]                                                 |
 +----------------------------------------------------------------------------------------------------+
@@ -448,9 +448,9 @@ Sample Request:
 ===============
 
 +-----------------------------------------------------------------------------------------------------------------------------------+
-| GET   http://<hostname>:3904/topic/com.att.dmaap.mr.testtopic                                                                     |
+| GET   http://<hostname>:3904/topic/org.onap.dmaap.mr.testtopic                                                                     |
 |       curl -u XXX@csp.abc.com:x$  -X                                                                                              |
-| GET  http://mrlocal00.dcae.proto.research.att.com:3904/topics                                                                     |
+| GET  http://10.12.7.22:3904/topics                                                                     |
 |    {"topics": [                                                                                                                   |
 |    {"txenabled": true,"description": "This is a TestTopic","owner": "XXXX@csp.abc.com","topicName": "org.onap.dmaap.mr.Load9"|
 |    {"txenabled": false,"description": "", "owner": "", "topicName": "org.onap.dmaap.mr.Load1"                                |

diff --git a/pom.xml b/pom.xml
index c9287f3..24e21b4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 
        <groupId>org.onap.dmaap.messagerouter.messageservice</groupId>
        <artifactId>dmaapMR1</artifactId>
-       <version>1.1.14-SNAPSHOT</version>
+       <version>1.1.15-SNAPSHOT</version>
        <name>dmaap-messagerouter-messageservice</name>
        <description>Message Router - Restful interface built for kafka</description>
        <licenses>

diff --git a/src/main/config/caet.properties b/src/main/config/caet.properties
index 54305e4..0757a7f 100644 (file)
--- a/src/main/config/caet.properties
+++ b/src/main/config/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/src/main/java/org/onap/dmaap/filemonitor/ServicePropertiesListener.java b/src/main/java/org/onap/dmaap/filemonitor/ServicePropertiesListener.java
index 56cccca..6a4629c 100644 (file)
--- a/src/main/java/org/onap/dmaap/filemonitor/ServicePropertiesListener.java
+++ b/src/main/java/org/onap/dmaap/filemonitor/ServicePropertiesListener.java
@@ -23,7 +23,6 @@
 
 import java.io.File;
 
-//import com.att.ssf.filemonitor.FileChangedListener;
 /**
  * Class ServicePropertiesListener
  * @author rajashree.khare

diff --git a/src/main/scripts/cambria.sh b/src/main/scripts/cambria.sh
deleted file mode 100644 (file)
index f74aa7b..0000000
--- a/src/main/scripts/cambria.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-#  ============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.
-#  
-#*******************************************************************************
-
-# switched this from CAMBRIA_API_HOME, which should be declared in the env.
-# harmless to overwrite it here, but it's confusing to do so.
-BASE_DIR=`dirname "$0"`/..
-
-# use JAVA_HOME if provided
-if [ -n "${CAMBRIA_JAVA_HOME}" ]; then
-    JAVA=${CAMBRIA_JAVA_HOME}/bin/java
-elif [ -n "${JAVA_HOME}" ]; then
-    JAVA=${JAVA_HOME}/bin/java
-else
-    JAVA=java
-fi
-
-# use the logs dir set in environment, or the installation's logs dir if not set
-if [ -z "$CAMBRIA_LOGS_HOME" ]; then
-       CAMBRIA_LOGS_HOME=$BASE_DIR/logs
-fi
-
-mkdir -p ${CAMBRIA_LOGS_HOME}
-# run java. The classpath is the etc dir for config files, and the lib dir
-# for all the jars.
-#
-# don't pipe stdout/stderr to /dev/null here - some diagnostic info is available only there.
-# also don't assume the run is in the background. the caller should take care of that.
-#
-$JAVA -cp ${BASE_DIR}/etc:${BASE_DIR}/lib/* com.att.nsa.cambria.CambriaApiServer $* >${CAMBRIA_LOGS_HOME}/console.log 2>&1

diff --git a/src/main/scripts/cambriaJsonPublisher.sh b/src/main/scripts/cambriaJsonPublisher.sh
deleted file mode 100644 (file)
index 9dbc4c7..0000000
--- a/src/main/scripts/cambriaJsonPublisher.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-#*******************************************************************************
-#  ============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.
-#  
-#*******************************************************************************
-
-#
-#      act as a simple cambria publisher, requires wget
-#
-#      usage:
-#              cambriaPublisher <broker> <topic>
-#
-
-KEY=$3
-if [ "$3" == "" ]
-then
-       KEY=`hostname -f`
-fi
-
-while read LINE
-do
-       wget -q --header "Content-Type: application/json" --post-data="{ \"cambria.partition\":\"$KEY\", \"msg\":\"$LINE\" }" -O - $1/events/$2 >/dev/null
-done 
-

diff --git a/src/main/scripts/cambriaMonitor.sh b/src/main/scripts/cambriaMonitor.sh
deleted file mode 100644 (file)
index 0a8727c..0000000
--- a/src/main/scripts/cambriaMonitor.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-#*******************************************************************************
-#  ============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.
-#  
-#*******************************************************************************
-
-#
-#      act as a simple cambria consumer, requires wget
-#
-#      usage:
-#              cambriaMonitor <broker> <topic> <group> <id> <timeout>
-#
-
-while :
-do
-       wget -q -O - $1/events/$2/$3/$4?timeout=$5\&pretty=1
-       if [ $? -ne 0 ]
-       then
-               sleep 10
-       fi
-       echo
-done
-

diff --git a/src/main/scripts/cambriaMonitorWithAuth.sh b/src/main/scripts/cambriaMonitorWithAuth.sh
deleted file mode 100644 (file)
index 4ee2908..0000000
--- a/src/main/scripts/cambriaMonitorWithAuth.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-#*******************************************************************************
-#  ============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.
-#  
-#*******************************************************************************
-
-#
-#      act as a simple cambria consumer, requires wget
-#
-#      usage:
-#              cambriaMonitor <broker> <topic> <group> <id> <timeout>
-#
-
-while :
-do
-       DATE=`date`
-       SIGNATURE=`echo -n "$DATE" | openssl sha1 -hmac $CAMBRIA_APISECRET -binary | openssl base64`
-
-       wget -q --header "X-CambriaAuth: $CAMBRIA_APIKEY:$SIGNATURE" --header "X-CambriaDate: $DATE" -O - $1/events/$2/$3/$4?timeout=$5\&pretty=1
-       if [ $? -ne 0 ]
-       then
-               sleep 10
-       fi
-       echo
-done
-

diff --git a/src/main/scripts/cambriaSimpleTextPubWithAuth.sh b/src/main/scripts/cambriaSimpleTextPubWithAuth.sh
deleted file mode 100644 (file)
index 1623726..0000000
--- a/src/main/scripts/cambriaSimpleTextPubWithAuth.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-#*******************************************************************************
-#  ============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.
-#  
-#*******************************************************************************
-
-#
-#      act as a simple cambria publisher, requires wget
-#
-#      usage:
-#              cambriaPublisher <broker> <topic>
-#
-
-DATE=`date`
-SIGNATURE=`echo -n "$DATE" | openssl sha1 -hmac $CAMBRIA_APISECRET -binary | openssl base64`
-
-while read LINE
-do
-       wget -q --header "Content-Type: text/plain" --header "X-CambriaAuth: $CAMBRIA_APIKEY:$SIGNATURE" --header "X-CambriaDate: $DATE" --post-data="$LINE" -O - $1/events/$2 >/dev/null
-done 
-

diff --git a/src/main/scripts/cambriaSimpleTextPublisher.sh b/src/main/scripts/cambriaSimpleTextPublisher.sh
deleted file mode 100644 (file)
index 4aacd8a..0000000
--- a/src/main/scripts/cambriaSimpleTextPublisher.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-#*******************************************************************************
-#  ============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.
-#  
-#*******************************************************************************
-
-#
-#      act as a simple cambria publisher, requires wget
-#
-#      usage:
-#              cambriaPublisher <broker> <topic>
-#
-
-while read LINE
-do
-       wget -q --header "Content-Type: text/plain" --post-data="$LINE" -O - $1/events/$2 >/dev/null
-done 
-

diff --git a/src/main/scripts/cambriaTool.sh b/src/main/scripts/cambriaTool.sh
deleted file mode 100644 (file)
index a9d6e15..0000000
--- a/src/main/scripts/cambriaTool.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-#  ============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.
-#  
-#*******************************************************************************
-
-# switched this from CAMBRIA_API_HOME, which should be declared in the env.
-# harmless to overwrite it here, but it's confusing to do so.
-BASE_DIR=`dirname "$0"`/..
-
-# determin a path separator that works for this platform
-PATHSEP=":"
-case "$(uname -s)" in
-
-       Darwin)
-               ;;
-
-        Linux)
-               ;;
-
-        CYGWIN*|MINGW32*|MSYS*)
-               PATHSEP=";"
-               ;;
-
-       *)
-               ;;
-esac
-
-# use JAVA_HOME if provided
-if [ -n "${CAMBRIA_JAVA_HOME}" ]; then
-    JAVA=${CAMBRIA_JAVA_HOME}/bin/java
-elif [ -n "${JAVA_HOME}" ]; then
-    JAVA=${JAVA_HOME}/bin/java
-else
-    JAVA=java
-fi
-
-$JAVA -cp ${BASE_DIR}/etc${PATHSEP}${BASE_DIR}/lib/* com.att.nsa.cambria.tools.ConfigTool $*

diff --git a/src/main/scripts/swmpkgclean.sh b/src/main/scripts/swmpkgclean.sh
deleted file mode 100644 (file)
index 7e6bc51..0000000
--- a/src/main/scripts/swmpkgclean.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-#*******************************************************************************
-#  ============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.
-#  
-#*******************************************************************************
-
-# SWM can only store a finite amount of packages in its repository, so this script deletes the oldest package.
-# This script is run by Jenkins after the build is finished (post SWM upload).
-
-SWM_COMPONENT="com.att.nsa:msgrtr"
-
-SWM_PKGS=`/opt/app/swm/aftswmcli/bin/swmcli "component pkglist -c $SWM_COMPONENT -df -dh -dj -sui"`
-SWM_PKGS_COUNT=`echo "$SWM_PKGS" | wc -l`
-SWM_PKGS_OLDEST=`echo "$SWM_PKGS" | head -1`
-SWM_PKGS_MAX_COUNT=2
-
-if [ $SWM_PKGS_COUNT > $SWM_PKGS_MAX_COUNT ]
-then
-       SWM_PKG_OLDEST_VERSION=`echo $SWM_PKGS_OLDEST | awk '{print $2}'`
-
-       # Delete the oldest package for this component from the SWM repository
-       /opt/app/swm/aftswmcli/bin/swmcli "component pkgdelete -c $SWM_COMPONENT:$SWM_PKG_OLDEST_VERSION"
-else
-       echo "No need to clean up SWM, package count ($SWM_PKGS_COUNT) is below threshold ($SWM_PKGS_MAX_COUNT)"
-fi

diff --git a/src/main/swm/descriptor.xml b/src/main/swm/descriptor.xml
index d42cf1b..2ff49b4 100644 (file)
--- a/src/main/swm/descriptor.xml
+++ b/src/main/swm/descriptor.xml
@@ -266,7 +266,7 @@
                        required="false" />
                <variableDescription key="SOA_CLOUD_NAMESPACE"
                        description="the Namespace used for GRM service registrations"
-                       defaultValue="com.att.ajsc" required="false" />
+                       defaultValue="org.onap.dmaap" required="false" />
                <variableDescription key="AFT_SERVICE_ENV"
                        description="the AFT Servie Env found within CSI used for GRM service registrations (routeOffer)"
                        defaultValue="DEFAULT" required="false" />

diff --git a/src/main/swm/notes.txt b/src/main/swm/notes.txt
index 7c617d6..640343a 100644 (file)
--- a/src/main/swm/notes.txt
+++ b/src/main/swm/notes.txt
@@ -1,6 +1,6 @@
 # (c) 2012 AT&T Intellectual Property. All rights reserved.
 
-NOTES FOR com.att.nsa:dmaap - Version 0.0.1-SNAPSHOT
+NOTES FOR org.onap:dmaap - Version 0.0.1-SNAPSHOT
 =======================================================
 
 This package was created at ${maven.build.timestamp}.

diff --git a/version.properties b/version.properties
index c9b51c7..aabaad9 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 
 major=1
 minor=1
-patch=14
+patch=15
 
 base_version=${major}.${minor}.${patch}