diff options
author | Leonard, Mark (ml401d) <ml401d@att.com> | 2018-03-21 18:40:41 +0000 |
---|---|---|
committer | Mark Leonard <mark.j.leonard@gmail.com> | 2018-03-28 13:50:51 +0100 |
commit | 66b3afa06776e9944ad515206d281d67747c9770 (patch) | |
tree | 427098937879fe09ae4fc3af4ae004359a60212a /bundleconfig-local | |
parent | 161f5a7d9b900ae34a4886d7f7fb01ea496f71eb (diff) |
Incorporate the ECOMP SDC Artefact Generator code
Remove the Maven dependency on openecomp-sdc-artifact-generator-core,
because this is not maintained in the ONAP source code repositories.
The functionality provided by the SDC Artifact Generator is replaced
with equivalent code that depends on the SDC-TOSCA parsing library,
without introducing any backwards-compatibility breaks.
The intention is to make this Maven project more maintainable by
depending only the common ONAP libraries.
Change-Id: I01d78575d3b7c70a11e4c7989a021de3c0913a06
Issue-ID: AAI-943
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
Diffstat (limited to 'bundleconfig-local')
8 files changed, 10 insertions, 20 deletions
diff --git a/bundleconfig-local/README.txt b/bundleconfig-local/README.txt index 37f2670..b260008 100644 --- a/bundleconfig-local/README.txt +++ b/bundleconfig-local/README.txt @@ -1,2 +1 @@ -#Copyright (c) 2016 AT&T Intellectual Property. All rights reserved. The bundleconfig-local directory contains the necessary configuration files
\ No newline at end of file diff --git a/bundleconfig-local/RELEASE_NOTES.txt b/bundleconfig-local/RELEASE_NOTES.txt deleted file mode 100644 index 3cc5590..0000000 --- a/bundleconfig-local/RELEASE_NOTES.txt +++ /dev/null @@ -1,2 +0,0 @@ -#Copyright (c) 2016 AT&T Intellectual Property. All rights reserved. -Place Release Notes here to provide updated Release information
\ No newline at end of file diff --git a/bundleconfig-local/etc/appprops/AAFUserRoles.properties b/bundleconfig-local/etc/appprops/AAFUserRoles.properties index adb7a10..eea2b61 100644 --- a/bundleconfig-local/etc/appprops/AAFUserRoles.properties +++ b/bundleconfig-local/etc/appprops/AAFUserRoles.properties @@ -1,5 +1,3 @@ -#Copyright (c) 2016 AT&T Intellectual Property. All rights reserved. - #If using AAF for Role based authentication/authorization, define your routes/services which will utilize AAF. The AJSC will #read this file and protect the routes given with the AAF role defined. diff --git a/bundleconfig-local/etc/appprops/PostProcessorInterceptors.properties b/bundleconfig-local/etc/appprops/PostProcessorInterceptors.properties index 08ffefa..17b5036 100644 --- a/bundleconfig-local/etc/appprops/PostProcessorInterceptors.properties +++ b/bundleconfig-local/etc/appprops/PostProcessorInterceptors.properties @@ -1,3 +1,2 @@ -#Copyright (c) 2016 AT&T Intellectual Property. All rights reserved. #This properties file is for defining any PostProcessorInterceptors that have been created for your AJSC service. diff --git a/bundleconfig-local/etc/appprops/PreProcessorInterceptors.properties b/bundleconfig-local/etc/appprops/PreProcessorInterceptors.properties index 1383071..ddaefdd 100644 --- a/bundleconfig-local/etc/appprops/PreProcessorInterceptors.properties +++ b/bundleconfig-local/etc/appprops/PreProcessorInterceptors.properties @@ -1,4 +1,3 @@ -#Copyright (c) 2016 AT&T Intellectual Property. All rights reserved. #This properties file is for defining any PreProcessorInterceptors that have been created for your AJSC service. /**=com.att.ajsc.csi.restmethodmap.RestMethodMapInterceptor diff --git a/bundleconfig-local/etc/appprops/app-intercepts.properties b/bundleconfig-local/etc/appprops/app-intercepts.properties index 4dc09b9..a6ca85a 100644 --- a/bundleconfig-local/etc/appprops/app-intercepts.properties +++ b/bundleconfig-local/etc/appprops/app-intercepts.properties @@ -1,5 +1,3 @@ -#Copyright (c) 2016 AT&T Intellectual Property. All rights reserved. - #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. diff --git a/bundleconfig-local/etc/appprops/methodMapper.properties b/bundleconfig-local/etc/appprops/methodMapper.properties index 45ab671..af7da6e 100644 --- a/bundleconfig-local/etc/appprops/methodMapper.properties +++ b/bundleconfig-local/etc/appprops/methodMapper.properties @@ -1,5 +1,3 @@ -// -//Copyright (c) 2016 AT&T Intellectual Property. All rights reserved. // Json object holds the method mapping.Update the JSON object with the proper route to logical mapping based // on the example provided below : // "helloWorld" = Service Name diff --git a/bundleconfig-local/etc/sysprops/sys-props.properties b/bundleconfig-local/etc/sysprops/sys-props.properties index 36e9ff3..d8480b8 100644 --- a/bundleconfig-local/etc/sysprops/sys-props.properties +++ b/bundleconfig-local/etc/sysprops/sys-props.properties @@ -1,21 +1,22 @@ # ============LICENSE_START======================================================= # org.onap.aai # ================================================================================ -# Copyright © 2016-2018 AT&T Intellectual Property. All rights reserved. +# Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. +# Copyright © 2017-2018 European Software Marketing Ltd. # ================================================================================ # 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 -# + * +# 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========================================================= - + #This file is used for defining AJSC system properties for different configuration schemes and is necessary for the AJSC to run properly. #The sys-props.properties file is used for running locally. The template.sys-props.properties file will be used when deployed #to a SOA/CSI Cloud node. @@ -84,14 +85,14 @@ CAMEL_MAX_QUEUE_SIZE=1000 AFT_DME2_CONN_IDLE_TIMEOUTMS=5000 AJSC_ENV=SOACLOUD -SOACLOUD_NAMESPACE=com.att.ajsc +SOACLOUD_NAMESPACE= SOACLOUD_ENV_CONTEXT=DEV SOACLOUD_PROTOCOL=http SOACLOUD_ROUTE_OFFER=DEFAULT -AFT_LATITUDE=23.4 -AFT_LONGITUDE=33.6 -AFT_ENVIRONMENT=AFTUAT +AFT_LATITUDE= +AFT_LONGITUDE= +AFT_ENVIRONMENT= #Restlet Component Default Properties RESTLET_COMPONENT_CONTROLLER_DAEMON=true |