diff options
Diffstat (limited to 'appc-dispatcher/appc-workflow-management')
18 files changed, 90 insertions, 90 deletions
diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml index 92aa37bbe..14c9e2df9 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-workflow-management</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> @@ -17,12 +17,12 @@ <dependencies> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-data-access-lib</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>domain-model-lib</artifactId> <version>${project.version}</version> </dependency> @@ -36,7 +36,7 @@ <instructions> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package>org.openecomp.appc.dao.objects,org.openecomp.appc.workflow,org.openecomp.appc.workflow.helper,org.openecomp.appc.workflow.objects</Export-Package> + <Export-Package>org.onap.appc.dao.objects,org.onap.appc.workflow,org.onap.appc.workflow.helper,org.onap.appc.workflow.objects</Export-Package> <!--<Embed-Dependency>appc-common,eelf-core,logback-core,logback-classic,appc-data-access-lib,javax.json;scope=compile|runtime;inline=false</Embed-Dependency>--> <!--<Embed-Transitive>true</Embed-Transitive>--> <!--<Import-Package>!groovy.lang,!javax.*,!org.apache.log,!org.apache.log4j.*,!org.codehaus.jackson.*,!org.codehaus.jackson.map.*,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.codehaus.janino,!org.jasypt.*,!com.ibm.icu.*,!com.sun.faces.*,*</Import-Package>--> diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/WorkFlowManager.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/WorkFlowManager.java index 0342d6777..c0cb8f48e 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/WorkFlowManager.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/WorkFlowManager.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workflow; +package org.onap.appc.workflow; -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.workflow.objects.WorkflowExistsOutput; +import org.onap.appc.workflow.objects.WorkflowRequest; +import org.onap.appc.workflow.objects.WorkflowResponse; public interface WorkFlowManager { /** diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowExistsOutput.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowExistsOutput.java index c38ba97d4..37d33d286 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowExistsOutput.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowExistsOutput.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workflow.objects; +package org.onap.appc.workflow.objects; public class WorkflowExistsOutput { diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowRequest.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowRequest.java index 6e2b3b0ba..6cdbc7146 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowRequest.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowRequest.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workflow.objects; +package org.onap.appc.workflow.objects; -import org.openecomp.appc.domainmodel.lcm.RequestContext; -import org.openecomp.appc.domainmodel.lcm.ResponseContext; -import org.openecomp.appc.domainmodel.lcm.VNFContext; +import org.onap.appc.domainmodel.lcm.RequestContext; +import org.onap.appc.domainmodel.lcm.ResponseContext; +import org.onap.appc.domainmodel.lcm.VNFContext; public class WorkflowRequest { diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowResponse.java b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowResponse.java index a1d58f6ca..f8d2997c5 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowResponse.java +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/src/main/java/org/openecomp/appc/workflow/objects/WorkflowResponse.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.workflow.objects; +package org.onap.appc.workflow.objects; import java.util.Properties; -import org.openecomp.appc.domainmodel.lcm.ResponseContext; +import org.onap.appc.domainmodel.lcm.ResponseContext; public class WorkflowResponse { 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-workflow-management</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> @@ -33,22 +33,22 @@ <dependencies> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-common</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-data-access-lib</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-workflow-management-api</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-ranking-framework-lib</artifactId> <version>${project.version}</version> </dependency> @@ -70,10 +70,10 @@ <Bundle-Version>${project.version}</Bundle-Version> <Embed-Dependency>javax.json;scope=compile|runtime;inline=false</Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> - <Export-Service>org.openecomp.appc.workflow.WorkFlowManager</Export-Service> + <Export-Service>org.onap.appc.workflow.WorkFlowManager</Export-Service> <Import-Package> - 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 </Import-Package> </instructions> 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 @@ <reference id="svcLogicServiceRef" availability="mandatory" activation="eager" interface="org.onap.ccsdk.sli.core.sli.provider.SvcLogicService" /> - <bean id="workflowManagementBean" class="org.openecomp.appc.workflow.impl.WorkFlowManagerImpl" scope="singleton"> + <bean id="workflowManagementBean" class="org.onap.appc.workflow.impl.WorkFlowManagerImpl" scope="singleton"> <property name="svcLogicServiceRef" ref="svcLogicServiceRef" /> </bean> - <service id="workflowManagementService" interface="org.openecomp.appc.workflow.WorkFlowManager" ref="workflowManagementBean" /> + <service id="workflowManagementService" interface="org.onap.appc.workflow.WorkFlowManager" ref="workflowManagementBean" /> </blueprint> 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 diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/pom.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/pom.xml index b68268f36..5e27242ea 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/pom.xml +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <artifactId>appc-workflow-management</artifactId> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <version>1.3.0-SNAPSHOT</version> </parent> <name>appc-workflow-management-features</name> @@ -13,12 +13,12 @@ <dependencies> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-workflow-management-api</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-workflow-management-core</artifactId> <version>${project.version}</version> </dependency> diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/src/main/resources/features.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/src/main/resources/features.xml index a29e0b11d..227867acb 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/src/main/resources/features.xml +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/src/main/resources/features.xml @@ -29,11 +29,11 @@ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> <feature name='appc-workflow-management' description="application executor" version='${project.version}'> - <bundle dependency="true">mvn:org.openecomp.appc/appc-data-access-lib/${project.version}</bundle> + <bundle dependency="true">mvn:org.onap.appc/appc-data-access-lib/${project.version}</bundle> - <bundle>mvn:org.openecomp.appc/appc-workflow-management-api/${project.version}</bundle> - <bundle>mvn:org.openecomp.appc/appc-workflow-management-core/${project.version}</bundle> - <bundle start="true" dependency="true">mvn:org.openecomp.appc/appc-ranking-framework-lib/${project.version}</bundle> + <bundle>mvn:org.onap.appc/appc-workflow-management-api/${project.version}</bundle> + <bundle>mvn:org.onap.appc/appc-workflow-management-core/${project.version}</bundle> + <bundle start="true" dependency="true">mvn:org.onap.appc/appc-ranking-framework-lib/${project.version}</bundle> </feature> </features> diff --git a/appc-dispatcher/appc-workflow-management/pom.xml b/appc-dispatcher/appc-workflow-management/pom.xml index b843246c0..3b0f7564b 100644 --- a/appc-dispatcher/appc-workflow-management/pom.xml +++ b/appc-dispatcher/appc-workflow-management/pom.xml @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-dispatcher</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> |