diff options
Diffstat (limited to 'asdctool/src/main')
| -rw-r--r-- | asdctool/src/main/java/org/openecomp/sdc/asdctool/configuration/ConfigurationUploader.java | 28 | ||||
| -rw-r--r-- | asdctool/src/main/resources/config/configuration.yaml | 1 |
2 files changed, 16 insertions, 13 deletions
diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/configuration/ConfigurationUploader.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/configuration/ConfigurationUploader.java index ac75dc8310..d115f9cbb0 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/configuration/ConfigurationUploader.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/configuration/ConfigurationUploader.java @@ -1,3 +1,19 @@ +/* + * Copyright © 2016-2018 AT&T + * + * 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. + */ + package org.openecomp.sdc.asdctool.configuration; import org.openecomp.sdc.be.config.ConfigurationManager; @@ -5,8 +21,6 @@ import org.openecomp.sdc.common.api.ConfigurationSource; import org.openecomp.sdc.common.impl.ExternalConfiguration; import org.openecomp.sdc.common.impl.FSConfigurationSource; -import java.io.File; - public class ConfigurationUploader { public static void uploadConfigurationFiles(String appConfigDir) { @@ -14,15 +28,5 @@ public class ConfigurationUploader { new ConfigurationManager(configurationSource); ExternalConfiguration.setAppVersion(ConfigurationManager.getConfigurationManager().getConfiguration().getAppVersion()); System.setProperty("config.home", appConfigDir); - System.setProperty("artifactgenerator.config", buildArtifactGeneratorPath(appConfigDir)); - } - - private static String buildArtifactGeneratorPath(String appConfigDir) { - StringBuilder artifactGeneratorPath = new StringBuilder(appConfigDir); - if(!appConfigDir.endsWith(File.separator)){ - artifactGeneratorPath.append(File.separator); - } - artifactGeneratorPath.append(ConfigurationManager.getConfigurationManager().getConfiguration().getArtifactGeneratorConfig()); - return artifactGeneratorPath.toString(); } } diff --git a/asdctool/src/main/resources/config/configuration.yaml b/asdctool/src/main/resources/config/configuration.yaml index 14fd1c5123..bf7ae524e0 100644 --- a/asdctool/src/main/resources/config/configuration.yaml +++ b/asdctool/src/main/resources/config/configuration.yaml @@ -29,7 +29,6 @@ minToscaConformanceLevel: 3.0 # These values are necessary for running upgrade migration 1710.0 process enableAutoHealing: false appVersion: 1.1.0 -artifactGeneratorConfig: Artifact-Generator.properties resourcesForUpgrade: 8.0: - org.openecomp.resource.cp.extCP |