From 0756759f39e125b02d63b4e93de83b3c6b13beea Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Wed, 13 Dec 2017 11:09:30 -0800 Subject: First part of onap rename This is the first commit of the rename. This commit changes refereces to org.openecomp.appc > org.onap.appc that occur within files. The package folder structure is not changed in this commit. Change-Id: Ic95d749eb99d8a6f4f2b9ee9b06eb41c5cfa7e1c Signed-off-by: Patrick Brady Issue-ID: APPC-13 --- .../appc-workflow-management-core/pom.xml | 16 ++++---- .../openecomp/appc/common/constant/Constants.java | 20 +++++----- .../appc/workflow/impl/WorkFlowManagerImpl.java | 44 +++++++++++----------- .../openecomp/appc/workflow/impl/WorkflowKey.java | 2 +- .../appc/workflow/impl/WorkflowResolver.java | 6 +-- .../workflow/impl/WorkflowResolverDataReader.java | 12 +++--- .../resources/OSGI-INF/blueprint/blueprint.xml | 4 +- .../org/openecomp/appc/default.properties | 6 +-- .../appc/workflow/TestWorkFlowManager.java | 8 ++-- .../org/openecomp/appc/default.properties | 16 ++++---- 10 files changed, 67 insertions(+), 67 deletions(-) (limited to 'appc-dispatcher/appc-workflow-management/appc-workflow-management-core') diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/pom.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/pom.xml index 1b4787667..51ab9f95c 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/pom.xml +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/pom.xml @@ -21,7 +21,7 @@ 4.0.0 - org.openecomp.appc + org.onap.appc appc-workflow-management 1.3.0-SNAPSHOT @@ -33,22 +33,22 @@ - org.openecomp.appc + org.onap.appc appc-common ${project.version} - org.openecomp.appc + org.onap.appc appc-data-access-lib ${project.version} - org.openecomp.appc + org.onap.appc appc-workflow-management-api ${project.version} - org.openecomp.appc + org.onap.appc appc-ranking-framework-lib ${project.version} @@ -70,10 +70,10 @@ ${project.version} javax.json;scope=compile|runtime;inline=false true - org.openecomp.appc.workflow.WorkFlowManager + org.onap.appc.workflow.WorkFlowManager - org.openecomp.appc.workflow,org.openecomp.appc.workflow.objects, org.openecomp.appc.configuration, - org.openecomp.appc.util,com.att.eelf.configuration, org.openecomp.appc.dao.util, + org.onap.appc.workflow,org.onap.appc.workflow.objects, org.onap.appc.configuration, + org.onap.appc.util,com.att.eelf.configuration, org.onap.appc.dao.util, *;resolution:=optional diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/common/constant/Constants.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/common/constant/Constants.java index d0c5990eb..ebac2d001 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/common/constant/Constants.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/common/constant/Constants.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.common.constant; +package org.onap.appc.common.constant; public class Constants { @@ -36,34 +36,34 @@ public class Constants { /** * The name of the property that contains the VM id value in the graph's context */ - public static final String VF_ID = "org.openecomp.appc.vfid"; + public static final String VF_ID = "org.onap.appc.vfid"; /** * The name of the property that contains the VF Type value in the graph's context */ - public static final String VF_TYPE = "org.openecomp.appc.vftype"; + public static final String VF_TYPE = "org.onap.appc.vftype"; /** * The name of the property that contains the service request id value in the graph's context */ - public static final String REQUEST_ID = "org.openecomp.appc.reqid"; + public static final String REQUEST_ID = "org.onap.appc.reqid"; /** * The name of the property that indicates which method of the IaaS adapter to call */ - public static final String ACTION = "org.openecomp.appc.action"; + public static final String ACTION = "org.onap.appc.action"; public static final String PAYLOAD = "payload"; - public static final String CONF_ID = "org.openecomp.appc.confid"; + public static final String CONF_ID = "org.onap.appc.confid"; - public static final String API_VERSION = "org.openecomp.appc.apiversion"; + public static final String API_VERSION = "org.onap.appc.apiversion"; - public static final String ORIGINATOR_ID = "org.openecomp.appc.originatorid"; + public static final String ORIGINATOR_ID = "org.onap.appc.originatorid"; - public static final String OBJECT_ID ="org.openecomp.appc.objectid"; + public static final String OBJECT_ID ="org.onap.appc.objectid"; - public static final String SUB_REQUEST_ID = "org.openecomp.appc.subrequestid"; + public static final String SUB_REQUEST_ID = "org.onap.appc.subrequestid"; public static final String ERROR_MESSAGE = "error-message"; diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkFlowManagerImpl.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkFlowManagerImpl.java index cbf7f975a..ceae5677c 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkFlowManagerImpl.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkFlowManagerImpl.java @@ -22,21 +22,21 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workflow.impl; +package org.onap.appc.workflow.impl; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.openecomp.appc.common.constant.Constants; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.domainmodel.lcm.RequestContext; -import org.openecomp.appc.domainmodel.lcm.ResponseContext; -import org.openecomp.appc.domainmodel.lcm.Status; -import org.openecomp.appc.util.ObjectMapper; -import org.openecomp.appc.workflow.WorkFlowManager; -import org.openecomp.appc.workflow.objects.WorkflowExistsOutput; -import org.openecomp.appc.workflow.objects.WorkflowRequest; -import org.openecomp.appc.workflow.objects.WorkflowResponse; +import org.onap.appc.common.constant.Constants; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.domainmodel.lcm.RequestContext; +import org.onap.appc.domainmodel.lcm.ResponseContext; +import org.onap.appc.domainmodel.lcm.Status; +import org.onap.appc.util.ObjectMapper; +import org.onap.appc.workflow.WorkFlowManager; +import org.onap.appc.workflow.objects.WorkflowExistsOutput; +import org.onap.appc.workflow.objects.WorkflowRequest; +import org.onap.appc.workflow.objects.WorkflowResponse; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import org.onap.ccsdk.sli.core.sli.SvcLogicException; @@ -55,7 +55,7 @@ public class WorkFlowManagerImpl implements WorkFlowManager{ private static final Configuration configuration = ConfigurationFactory.getConfiguration(); private final WorkflowResolver workflowResolver = new WorkflowResolver( - configuration.getIntegerProperty("org.openecomp.appc.workflow.resolver.refresh_interval", 300) + configuration.getIntegerProperty("org.onap.appc.workflow.resolver.refresh_interval", 300) ); public void setSvcLogicServiceRef(SvcLogicService svcLogic) { @@ -94,20 +94,20 @@ public class WorkFlowManagerImpl implements WorkFlowManager{ /* The following method call (populateDGContext) populates DG context with the request parameters to maintain backward compatibility with old DGs, - we are not altering the old way of passing (org.openecomp.appc.vnfId and so on..) + we are not altering the old way of passing (org.onap.appc.vnfId and so on..) This is still a temporary solution, the end solution should be agreed with all stakeholders and implemented. */ populateDGContext(workflowParams,workflowRequest); } else { - actionProperty = configuration.getProperty("org.openecomp.appc.workflow.action", String.valueOf(Constants.ACTION)); - requestIdProperty = configuration.getProperty("org.openecomp.appc.workflow.request.id", String.valueOf(Constants.REQUEST_ID)); - vfIdProperty = configuration.getProperty("org.openecomp.appc.workflow.vfid", String.valueOf(Constants.VF_ID)); - String payloadProperty = configuration.getProperty("org.openecomp.appc.workflow.payload", String.valueOf(Constants.PAYLOAD)); - String vfTypeProperty = configuration.getProperty("org.openecomp.appc.workflow.vftype", String.valueOf(Constants.VF_TYPE)); - String apiVerProperty = configuration.getProperty("org.openecomp.appc.workflow.apiVersion", String.valueOf(Constants.API_VERSION)); - String originatorIdProperty = configuration.getProperty("org.openecomp.appc.workflow.originatorId",Constants.ORIGINATOR_ID); - String subRequestId = configuration.getProperty("org.openecomp.appc.workflow.subRequestId",Constants.SUB_REQUEST_ID); + actionProperty = configuration.getProperty("org.onap.appc.workflow.action", String.valueOf(Constants.ACTION)); + requestIdProperty = configuration.getProperty("org.onap.appc.workflow.request.id", String.valueOf(Constants.REQUEST_ID)); + vfIdProperty = configuration.getProperty("org.onap.appc.workflow.vfid", String.valueOf(Constants.VF_ID)); + String payloadProperty = configuration.getProperty("org.onap.appc.workflow.payload", String.valueOf(Constants.PAYLOAD)); + String vfTypeProperty = configuration.getProperty("org.onap.appc.workflow.vftype", String.valueOf(Constants.VF_TYPE)); + String apiVerProperty = configuration.getProperty("org.onap.appc.workflow.apiVersion", String.valueOf(Constants.API_VERSION)); + String originatorIdProperty = configuration.getProperty("org.onap.appc.workflow.originatorId",Constants.ORIGINATOR_ID); + String subRequestId = configuration.getProperty("org.onap.appc.workflow.subRequestId",Constants.SUB_REQUEST_ID); workflowParams.put(actionProperty,workflowRequest.getRequestContext().getAction().name()); workflowParams.put(requestIdProperty, workflowRequest.getRequestContext().getCommonHeader().getRequestId()); diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowKey.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowKey.java index 79ac2ee66..d61628fc9 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowKey.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowKey.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workflow.impl; +package org.onap.appc.workflow.impl; class WorkflowKey { private final String name; diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolver.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolver.java index 51fd09b8b..1f4a5b406 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolver.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolver.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workflow.impl; +package org.onap.appc.workflow.impl; import java.util.concurrent.locks.ReentrantLock; -import org.openecomp.appc.rankingframework.RankedAttributesContext; -import org.openecomp.appc.rankingframework.RankedAttributesResolver; +import org.onap.appc.rankingframework.RankedAttributesContext; +import org.onap.appc.rankingframework.RankedAttributesResolver; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolverDataReader.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolverDataReader.java index 161240d93..9cb04c42a 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolverDataReader.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/java/org/openecomp/appc/workflow/impl/WorkflowResolverDataReader.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workflow.impl; +package org.onap.appc.workflow.impl; import java.sql.Connection; import java.sql.PreparedStatement; @@ -32,11 +32,11 @@ import java.util.Arrays; import java.util.Collection; import java.util.Iterator; -import org.openecomp.appc.dao.util.DBUtils; -import org.openecomp.appc.rankingframework.AbstractRankedAttributesResolverFactory; -import org.openecomp.appc.rankingframework.ConfigurationEntry; -import org.openecomp.appc.rankingframework.ConfigurationSet; -import org.openecomp.appc.rankingframework.RankedAttributesResolver; +import org.onap.appc.dao.util.DBUtils; +import org.onap.appc.rankingframework.AbstractRankedAttributesResolverFactory; +import org.onap.appc.rankingframework.ConfigurationEntry; +import org.onap.appc.rankingframework.ConfigurationSet; +import org.onap.appc.rankingframework.RankedAttributesResolver; class WorkflowResolverDataReader { diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 2bfd64f72..6da63d813 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -29,10 +29,10 @@ - + - + diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/org/openecomp/appc/default.properties b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/org/openecomp/appc/default.properties index 8ef6c917a..55249d0f9 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/org/openecomp/appc/default.properties +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/main/resources/org/openecomp/appc/default.properties @@ -24,8 +24,8 @@ # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded # to supply configuration options -org.openecomp.appc.bootstrap.file=appc.properties -org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. +org.onap.appc.bootstrap.file=appc.properties +org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. #Property below provided by appc.properties appc.LCM.provider.url=https://localhost:8443/restconf/operations/appc-provider-lcm @@ -39,5 +39,5 @@ appc.LCM.provider.pass=test # Tolerance interval (in seconds) between invalidation of DG resolver configuration -org.openecomp.appc.workflow.resolver.refresh_interval=300 +org.onap.appc.workflow.resolver.refresh_interval=300 diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/java/org/openecomp/appc/workflow/TestWorkFlowManager.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/java/org/openecomp/appc/workflow/TestWorkFlowManager.java index 41f19ce10..74828a5d2 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/java/org/openecomp/appc/workflow/TestWorkFlowManager.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/java/org/openecomp/appc/workflow/TestWorkFlowManager.java @@ -22,14 +22,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workflow; +package org.onap.appc.workflow; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.openecomp.appc.workflow.impl.WorkFlowManagerImpl; -import org.openecomp.appc.workflow.objects.WorkflowRequest; +import org.onap.appc.workflow.impl.WorkFlowManagerImpl; +import org.onap.appc.workflow.objects.WorkflowRequest; import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.onap.ccsdk.sli.core.sli.SvcLogicGraph; import org.onap.ccsdk.sli.core.sli.SvcLogicNode; @@ -177,7 +177,7 @@ public class TestWorkFlowManager { try { svcLogicConfigureNode.setAttribute("status", "success"); svcLogicOtherNode.setAttribute("status", "failure"); - svcLogicRootNode.setAttribute("test", "$org.openecomp.appc.action"); + svcLogicRootNode.setAttribute("test", "$org.onap.appc.action"); svcLogicRootNode.addOutcome("Configure", svcLogicConfigureNode); svcLogicRootNode.addOutcome("Other", svcLogicOtherNode); } catch (SvcLogicException e) { diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/resources/org/openecomp/appc/default.properties b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/resources/org/openecomp/appc/default.properties index 3c3789968..227a83753 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/resources/org/openecomp/appc/default.properties +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/src/test/resources/org/openecomp/appc/default.properties @@ -23,9 +23,9 @@ ### # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded to supply configuration options -#org.openecomp.appc.bootstrap.file=executor-test.properties -org.openecomp.appc.bootstrap.file=appc.properties -org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. +#org.onap.appc.bootstrap.file=executor-test.properties +org.onap.appc.bootstrap.file=appc.properties +org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. # @@ -72,12 +72,12 @@ org.openecomp.sdnc.sli.aai.param.physical.location.id=physical-location-id org.openecomp.sdnc.sli.aai.param.service.type=service-type -org.openecomp.appc.logging.path=${user.home},etc,../etc,. -org.openecomp.appc.logging.file=logback.xml +org.onap.appc.logging.path=${user.home},etc,../etc,. +org.onap.appc.logging.file=logback.xml -org.openecomp.appc.db.url.%s", schema), ""); -org.openecomp.appc.db.user.%s", schema), ""); -org.openecomp.appc.db.pass.%s", schema), ""); +org.onap.appc.db.url.%s", schema), ""); +org.onap.appc.db.user.%s", schema), ""); +org.onap.appc.db.pass.%s", schema), ""); #Property below provided by appc.properties appc.LCM.provider.url=https://localhost:8443/restconf/operations/appc-provider-lcm -- cgit 1.2.3-korg