diff options
| author |   Patrick Brady <pb071s@att.com> | 2017-12-13 11:09:30 -0800 |
|---|---|---|
| committer | Patrick Brady <pb071s@att.com> | 2017-12-13 11:09:41 -0800 |
| commit | 0756759f39e125b02d63b4e93de83b3c6b13beea (patch) | |
| tree | 274e9830e522007c590ace136a57efaa806e19d5 /appc-oam | |
| parent | cb81f75d84c1df021730341cd61ed650adc7ba3a (diff) | |
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 <pb071s@att.com>
Issue-ID: APPC-13
Diffstat (limited to 'appc-oam')
43 files changed, 311 insertions, 311 deletions
diff --git a/appc-oam/appc-oam-bundle/pom.xml b/appc-oam/appc-oam-bundle/pom.xml index 91904b8c7..51deba758 100644 --- a/appc-oam/appc-oam-bundle/pom.xml +++ b/appc-oam/appc-oam-bundle/pom.xml @@ -6,7 +6,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <artifactId>appc-oam</artifactId> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <version>1.3.0-SNAPSHOT</version> </parent> <artifactId>appc-oam-bundle</artifactId> @@ -20,16 +20,16 @@ <configuration> <instructions> <Export-Package>org.opendaylight.controller.config.yang.config.sample_oam.impl</Export-Package> - <Export-Package>org.openecomp.appc.oam</Export-Package> + <Export-Package>org.onap.appc.oam</Export-Package> <Import-Package> - org.openecomp.appc.i18n, - org.openecomp.appc.logging, - org.openecomp.appc.util, + org.onap.appc.i18n, + org.onap.appc.logging, + org.onap.appc.util, com.att.eelf.configuration, com.att.eelf.i18n, - org.openecomp.appc.adapter.messaging.*, - org.openecomp.appc.adapter.message.*, - org.openecomp.appc.adapter.factory.*, + org.onap.appc.adapter.messaging.*, + org.onap.appc.adapter.message.*, + org.onap.appc.adapter.factory.*, *;resolution:=optional </Import-Package> <Embed-Dependency> @@ -143,38 +143,38 @@ <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-oam-model</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-metric-bundle</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-request-handler-api</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-lifecycle-management-api</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-lifecycle-management-core</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>state-machine-lib</artifactId> <version>${project.version}</version> </dependency> @@ -249,19 +249,19 @@ <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-message-adapter-api</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-message-adapter-factory</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-dmaap-adapter-bundle</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModule.java b/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModule.java index d44a9ba49..c978e3a45 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModule.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModule.java @@ -22,16 +22,16 @@ * ============LICENSE_END========================================================= */ -package org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.impl.rev170303; +package org.opendaylight.yang.gen.v1.org.onap.appc.oam.impl.rev170303; -import org.openecomp.appc.oam.AppcOam; +import org.onap.appc.oam.AppcOam; -public class AppcOamModule extends org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.impl.rev170303.AbstractAppcOamModule { +public class AppcOamModule extends org.opendaylight.yang.gen.v1.org.onap.appc.oam.impl.rev170303.AbstractAppcOamModule { public AppcOamModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { super(identifier, dependencyResolver); } - public AppcOamModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.impl.rev170303.AppcOamModule oldModule, java.lang.AutoCloseable oldInstance) { + public AppcOamModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.org.onap.appc.oam.impl.rev170303.AppcOamModule oldModule, java.lang.AutoCloseable oldInstance) { super(identifier, dependencyResolver, oldModule, oldInstance); } diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModuleFactory.java b/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModuleFactory.java index 66fdad3c4..6913a68f0 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModuleFactory.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/appc/oam/impl/rev170303/AppcOamModuleFactory.java @@ -31,7 +31,7 @@ * * Do not modify this file unless it is present under src/main directory */ -package org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.impl.rev170303; -public class AppcOamModuleFactory extends org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.impl.rev170303.AbstractAppcOamModuleFactory { +package org.opendaylight.yang.gen.v1.org.onap.appc.oam.impl.rev170303; +public class AppcOamModuleFactory extends org.opendaylight.yang.gen.v1.org.onap.appc.oam.impl.rev170303.AbstractAppcOamModuleFactory { } diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/AppcOam.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/AppcOam.java index 7ad3b6201..97938339c 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/AppcOam.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/AppcOam.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam; +package org.onap.appc.oam; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -31,47 +31,47 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.AppcOamService; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.AppcState; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.GetAppcStateOutput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.GetAppcStateOutputBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.GetMetricsOutput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.GetMetricsOutputBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.MaintenanceModeInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.MaintenanceModeOutput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.MaintenanceModeOutputBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.RestartInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.RestartOutput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.RestartOutputBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartOutput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartOutputBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StopInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StopOutput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StopOutputBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.get.metrics.output.Metrics; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.get.metrics.output.MetricsBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.get.metrics.output.metrics.KpiValues; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.get.metrics.output.metrics.KpiValuesBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.AppcOamService; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.AppcState; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.GetAppcStateOutput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.GetAppcStateOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.GetMetricsOutput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.GetMetricsOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.MaintenanceModeInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.MaintenanceModeOutput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.MaintenanceModeOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.RestartInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.RestartOutput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.RestartOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartOutput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StopInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StopOutput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StopOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.get.metrics.output.Metrics; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.get.metrics.output.MetricsBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.get.metrics.output.metrics.KpiValues; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.get.metrics.output.metrics.KpiValuesBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.metricservice.MetricRegistry; -import org.openecomp.appc.metricservice.MetricService; -import org.openecomp.appc.metricservice.metric.Metric; -import org.openecomp.appc.oam.processor.OamMmodeProcessor; -import org.openecomp.appc.oam.processor.OamRestartProcessor; -import org.openecomp.appc.oam.processor.OamStartProcessor; -import org.openecomp.appc.oam.processor.OamStopProcessor; -import org.openecomp.appc.oam.util.AsyncTaskHelper; -import org.openecomp.appc.oam.util.ConfigurationHelper; -import org.openecomp.appc.oam.util.OperationHelper; -import org.openecomp.appc.oam.util.StateHelper; -import org.openecomp.appc.statemachine.impl.readers.AppcOamMetaDataReader.AppcOperation; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.i18n.Msg; +import org.onap.appc.metricservice.MetricRegistry; +import org.onap.appc.metricservice.MetricService; +import org.onap.appc.metricservice.metric.Metric; +import org.onap.appc.oam.processor.OamMmodeProcessor; +import org.onap.appc.oam.processor.OamRestartProcessor; +import org.onap.appc.oam.processor.OamStartProcessor; +import org.onap.appc.oam.processor.OamStopProcessor; +import org.onap.appc.oam.util.AsyncTaskHelper; +import org.onap.appc.oam.util.ConfigurationHelper; +import org.onap.appc.oam.util.OperationHelper; +import org.onap.appc.oam.util.StateHelper; +import org.onap.appc.statemachine.impl.readers.AppcOamMetaDataReader.AppcOperation; import java.util.ArrayList; import java.util.List; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/OAMCommandStatus.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/OAMCommandStatus.java index b8a4e3e86..294b9d2cf 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/OAMCommandStatus.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/OAMCommandStatus.java @@ -22,10 +22,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam; +package org.onap.appc.oam; -import org.openecomp.appc.executor.objects.Params; -import org.openecomp.appc.util.MessageFormatter; +import org.onap.appc.executor.objects.Params; +import org.onap.appc.util.MessageFormatter; import java.util.Map; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/Converter.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/Converter.java index a70d12042..152ffc9cc 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/Converter.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/Converter.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.messageadapter; +package org.onap.appc.oam.messageadapter; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; @@ -32,15 +32,15 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.MaintenanceModeOutputBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.RestartOutputBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartOutputBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StopOutputBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.MaintenanceModeOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.RestartOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StopOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status; import org.opendaylight.yangtools.concepts.Builder; import org.opendaylight.yangtools.yang.binding.DataContainer; -import org.openecomp.appc.oam.AppcOam; +import org.onap.appc.oam.AppcOam; import java.text.SimpleDateFormat; import java.util.TimeZone; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/DmaapOutgoingMessage.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/DmaapOutgoingMessage.java index 54887521d..25bf0cf8b 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/DmaapOutgoingMessage.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/DmaapOutgoingMessage.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.messageadapter; +package org.onap.appc.oam.messageadapter; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -30,7 +30,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * This class represents a message being sent out to DMaaP by APPC as async response. - * note the structure of this class must be adapted to the sync message sent to DMaaP represented in org.openecomp.appc.listener.LCM.domainmodel.DmaapOutgoingMessage + * note the structure of this class must be adapted to the sync message sent to DMaaP represented in org.onap.appc.listener.LCM.domainmodel.DmaapOutgoingMessage * */ @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/MessageAdapter.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/MessageAdapter.java index d93feabe4..91836cb40 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/MessageAdapter.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/MessageAdapter.java @@ -22,16 +22,16 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.messageadapter; +package org.onap.appc.oam.messageadapter; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.fasterxml.jackson.core.JsonProcessingException; import org.apache.commons.lang.ObjectUtils; -import org.openecomp.appc.adapter.message.MessageAdapterFactory; -import org.openecomp.appc.adapter.message.Producer; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; +import org.onap.appc.adapter.message.MessageAdapterFactory; +import org.onap.appc.adapter.message.Producer; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/OAMContext.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/OAMContext.java index 2d33388a0..3af395923 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/OAMContext.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/OAMContext.java @@ -22,15 +22,15 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.messageadapter; +package org.onap.appc.oam.messageadapter; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.*; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeaderBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status;import org.openecomp.appc.oam.AppcOam; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.*; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeaderBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status;import org.onap.appc.oam.AppcOam; public class OAMContext { diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseActionRunnable.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseActionRunnable.java index b118eb0d1..927334670 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseActionRunnable.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseActionRunnable.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.processor; +package org.onap.appc.oam.processor; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.oam.OAMCommandStatus; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.onap.appc.i18n.Msg; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.oam.OAMCommandStatus; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import java.util.HashMap; import java.util.Map; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseCommon.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseCommon.java index 0cfab98b4..93e79dd2f 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseCommon.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseCommon.java @@ -22,24 +22,24 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.processor; +package org.onap.appc.oam.processor; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.i18n.EELFResourceManager; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.StatusBuilder; -import org.openecomp.appc.exceptions.InvalidInputException; -import org.openecomp.appc.exceptions.InvalidStateException; -import org.openecomp.appc.executor.objects.Params; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.logging.LoggingConstants; -import org.openecomp.appc.logging.LoggingUtils; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.oam.OAMCommandStatus; -import org.openecomp.appc.oam.util.ConfigurationHelper; -import org.openecomp.appc.oam.util.OperationHelper; -import org.openecomp.appc.oam.util.StateHelper; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.StatusBuilder; +import org.onap.appc.exceptions.InvalidInputException; +import org.onap.appc.exceptions.InvalidStateException; +import org.onap.appc.executor.objects.Params; +import org.onap.appc.i18n.Msg; +import org.onap.appc.logging.LoggingConstants; +import org.onap.appc.logging.LoggingUtils; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.oam.OAMCommandStatus; +import org.onap.appc.oam.util.ConfigurationHelper; +import org.onap.appc.oam.util.OperationHelper; +import org.onap.appc.oam.util.StateHelper; import org.slf4j.MDC; import java.net.InetAddress; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseProcessor.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseProcessor.java index 41955e135..414b94605 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseProcessor.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseProcessor.java @@ -22,21 +22,21 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.processor; +package org.onap.appc.oam.processor; import com.att.eelf.configuration.EELFLogger; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.exceptions.InvalidInputException; -import org.openecomp.appc.exceptions.InvalidStateException; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.oam.OAMCommandStatus; -import org.openecomp.appc.oam.util.AsyncTaskHelper; -import org.openecomp.appc.oam.util.BundleHelper; -import org.openecomp.appc.oam.util.ConfigurationHelper; -import org.openecomp.appc.oam.util.OperationHelper; -import org.openecomp.appc.oam.util.StateHelper; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.exceptions.InvalidInputException; +import org.onap.appc.exceptions.InvalidStateException; +import org.onap.appc.i18n.Msg; +import org.onap.appc.oam.OAMCommandStatus; +import org.onap.appc.oam.util.AsyncTaskHelper; +import org.onap.appc.oam.util.BundleHelper; +import org.onap.appc.oam.util.ConfigurationHelper; +import org.onap.appc.oam.util.OperationHelper; +import org.onap.appc.oam.util.StateHelper; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import java.util.Date; import java.util.concurrent.Future; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamMmodeProcessor.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamMmodeProcessor.java index 6a0466022..23f9fd130 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamMmodeProcessor.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamMmodeProcessor.java @@ -22,22 +22,22 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.processor; +package org.onap.appc.oam.processor; import com.att.eelf.configuration.EELFLogger; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.exceptions.InvalidInputException; -import org.openecomp.appc.exceptions.InvalidStateException; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.oam.OAMCommandStatus; -import org.openecomp.appc.oam.util.AsyncTaskHelper; -import org.openecomp.appc.oam.util.ConfigurationHelper; -import org.openecomp.appc.oam.util.OperationHelper; -import org.openecomp.appc.oam.util.StateHelper; -import org.openecomp.appc.requesthandler.LCMStateManager; -import org.openecomp.appc.requesthandler.RequestHandler; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.exceptions.InvalidInputException; +import org.onap.appc.exceptions.InvalidStateException; +import org.onap.appc.i18n.Msg; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.oam.OAMCommandStatus; +import org.onap.appc.oam.util.AsyncTaskHelper; +import org.onap.appc.oam.util.ConfigurationHelper; +import org.onap.appc.oam.util.OperationHelper; +import org.onap.appc.oam.util.StateHelper; +import org.onap.appc.requesthandler.LCMStateManager; +import org.onap.appc.requesthandler.RequestHandler; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import java.util.concurrent.TimeoutException; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamRestartProcessor.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamRestartProcessor.java index 857578917..b23b4d2aa 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamRestartProcessor.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamRestartProcessor.java @@ -22,18 +22,18 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.processor; +package org.onap.appc.oam.processor; import com.att.eelf.configuration.EELFLogger; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.oam.util.AsyncTaskHelper; -import org.openecomp.appc.oam.util.ConfigurationHelper; -import org.openecomp.appc.oam.util.OperationHelper; -import org.openecomp.appc.oam.util.StateHelper; -import org.openecomp.appc.requesthandler.LCMStateManager; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.i18n.Msg; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.oam.util.AsyncTaskHelper; +import org.onap.appc.oam.util.ConfigurationHelper; +import org.onap.appc.oam.util.OperationHelper; +import org.onap.appc.oam.util.StateHelper; +import org.onap.appc.requesthandler.LCMStateManager; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; /** * Processor to handle restart OAM API. diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStartProcessor.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStartProcessor.java index 0d2f50513..2ca353244 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStartProcessor.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStartProcessor.java @@ -22,18 +22,18 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.processor; +package org.onap.appc.oam.processor; import com.att.eelf.configuration.EELFLogger; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.oam.util.AsyncTaskHelper; -import org.openecomp.appc.oam.util.ConfigurationHelper; -import org.openecomp.appc.oam.util.OperationHelper; -import org.openecomp.appc.oam.util.StateHelper; -import org.openecomp.appc.requesthandler.LCMStateManager; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.i18n.Msg; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.oam.util.AsyncTaskHelper; +import org.onap.appc.oam.util.ConfigurationHelper; +import org.onap.appc.oam.util.OperationHelper; +import org.onap.appc.oam.util.StateHelper; +import org.onap.appc.requesthandler.LCMStateManager; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; /** * Processor to handle start OAM API. diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStopProcessor.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStopProcessor.java index d8d88d319..8710e0f08 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStopProcessor.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStopProcessor.java @@ -22,17 +22,17 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.processor; +package org.onap.appc.oam.processor; import com.att.eelf.configuration.EELFLogger; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.oam.util.AsyncTaskHelper; -import org.openecomp.appc.oam.util.ConfigurationHelper; -import org.openecomp.appc.oam.util.OperationHelper; -import org.openecomp.appc.oam.util.StateHelper; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.i18n.Msg; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.oam.util.AsyncTaskHelper; +import org.onap.appc.oam.util.ConfigurationHelper; +import org.onap.appc.oam.util.OperationHelper; +import org.onap.appc.oam.util.StateHelper; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; /** * Processor to handle stop OAM API. diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/AsyncTaskHelper.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/AsyncTaskHelper.java index 9c344c14e..2f74bf5a9 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/AsyncTaskHelper.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/AsyncTaskHelper.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.util; +package org.onap.appc.oam.util; import com.att.eelf.configuration.EELFLogger; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.oam.processor.BaseActionRunnable; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.oam.processor.BaseActionRunnable; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import org.osgi.framework.Bundle; import org.osgi.framework.FrameworkUtil; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleFilter.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleFilter.java index 1e9f9b6a1..6dd98f165 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleFilter.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleFilter.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.util; +package org.onap.appc.oam.util; import org.osgi.framework.Bundle; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleHelper.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleHelper.java index 74159bd65..3a4602542 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleHelper.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleHelper.java @@ -22,14 +22,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.util; +package org.onap.appc.oam.util; import com.att.eelf.configuration.EELFLogger; import org.apache.commons.lang3.ArrayUtils; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.oam.processor.BaseCommon; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.oam.processor.BaseCommon; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/ConfigurationHelper.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/ConfigurationHelper.java index 25df3dfd9..3c5629f11 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/ConfigurationHelper.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/ConfigurationHelper.java @@ -22,13 +22,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.util; +package org.onap.appc.oam.util; import com.att.eelf.configuration.EELFLogger; import org.apache.commons.lang3.ArrayUtils; -import org.openecomp.appc.Constants; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; +import org.onap.appc.Constants; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; import java.util.concurrent.TimeUnit; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/OperationHelper.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/OperationHelper.java index 0b20104f4..9eec0b67b 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/OperationHelper.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/OperationHelper.java @@ -22,28 +22,28 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.util; +package org.onap.appc.oam.util; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.MaintenanceModeInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.RestartInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StopInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.common.header.Flags; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.exceptions.InvalidInputException; -import org.openecomp.appc.exceptions.InvalidStateException; -import org.openecomp.appc.lifecyclemanager.LifecycleManager; -import org.openecomp.appc.lifecyclemanager.objects.LifecycleException; -import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.oam.messageadapter.MessageAdapter; -import org.openecomp.appc.oam.messageadapter.OAMContext; -import org.openecomp.appc.statemachine.impl.readers.AppcOamMetaDataReader; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.MaintenanceModeInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.RestartInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StopInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.common.header.Flags; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.exceptions.InvalidInputException; +import org.onap.appc.exceptions.InvalidStateException; +import org.onap.appc.lifecyclemanager.LifecycleManager; +import org.onap.appc.lifecyclemanager.objects.LifecycleException; +import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.oam.messageadapter.MessageAdapter; +import org.onap.appc.oam.messageadapter.OAMContext; +import org.onap.appc.statemachine.impl.readers.AppcOamMetaDataReader; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/StateHelper.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/StateHelper.java index a9ccc26d0..871a07676 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/StateHelper.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/StateHelper.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.util; +package org.onap.appc.oam.util; import com.att.eelf.configuration.EELFLogger; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.AppcState; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.AppcState; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import org.osgi.framework.Bundle; import java.util.Map; diff --git a/appc-oam/appc-oam-bundle/src/main/resources/initial/appc-oam.xml b/appc-oam/appc-oam-bundle/src/main/resources/initial/appc-oam.xml index c544e83b2..f152888d9 100644 --- a/appc-oam/appc-oam-bundle/src/main/resources/initial/appc-oam.xml +++ b/appc-oam/appc-oam-bundle/src/main/resources/initial/appc-oam.xml @@ -32,7 +32,7 @@ <!-- This xmlns:prefix should match the namespace in the *-oam-impl.yang file The prefix: inside type should match the prefix of the yang file. --> - <type xmlns:prefix="org:openecomp:appc:oam:impl"> + <type xmlns:prefix="org:onap:appc:oam:impl"> prefix:appc-oam-impl </type> <name>appc-oam-impl</name> @@ -73,7 +73,7 @@ defined above are implied which is why we do not have define a required capability for the data broker, for example. --> <required-capabilities> - <capability>org:openecomp:appc:oam:impl?module=appc-oam-impl&revision=2017-03-03 + <capability>org:onap:appc:oam:impl?module=appc-oam-impl&revision=2017-03-03 </capability> </required-capabilities> diff --git a/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/default.properties index e9b78cc30..964040a18 100644 --- a/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/default.properties +++ b/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/default.properties @@ -38,16 +38,16 @@ # #-------------------------------------------------------------------------------------------- # The path and file used to load user-supplied configuration settings, if any -org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. -org.openecomp.appc.bootstrap.file=appc.properties +org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. +org.onap.appc.bootstrap.file=appc.properties appc.application.name=APPC # # The path to search for logging configuration document, and the name of the document # -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 # @@ -83,7 +83,7 @@ appc.OAM.AppcBundlesToNotStop=.*appc.oam.*\ ,appc-lifecycle-management-api\ ,appc-lifecycle-management-core\ ,appc-metric-bundle\ -,org.openecomp.appc.listener\ +,org.onap.appc.listener\ ,state-machine-lib appc.OAM.OtherBundlesToNotStop=app-cntrl-message-adapter-factory\ diff --git a/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/logback.xml b/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/logback.xml index 799a1d8df..0dffe75e0 100644 --- a/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/logback.xml +++ b/appc-oam/appc-oam-bundle/src/main/resources/org/openecomp/appc/logback.xml @@ -249,7 +249,7 @@ </encoder> </appender> - <logger name="org.openecomp.appc" level="DEBUG" additivity="false"> + <logger name="org.onap.appc" level="DEBUG" additivity="false"> <appender-ref ref="CommandExecutor" /> </logger> diff --git a/appc-oam/appc-oam-bundle/src/main/yang/appc-oam.yang b/appc-oam/appc-oam-bundle/src/main/yang/appc-oam.yang index a2c64497a..9f0a77f8d 100644 --- a/appc-oam/appc-oam-bundle/src/main/yang/appc-oam.yang +++ b/appc-oam/appc-oam-bundle/src/main/yang/appc-oam.yang @@ -25,7 +25,7 @@ module appc-oam-impl { yang-version 1; - namespace "org:openecomp:appc:oam:impl"; + namespace "org:onap:appc:oam:impl"; prefix "appc-oam-impl"; import config { prefix config; revision-date 2013-04-05; } diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/AppcOamTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/AppcOamTest.java index 5eb37af24..110198370 100644 --- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/AppcOamTest.java +++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/AppcOamTest.java @@ -22,32 +22,32 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam; +package org.onap.appc.oam; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.AppcState; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.GetAppcStateOutput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.MaintenanceModeInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.MaintenanceModeOutput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.RestartInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.RestartOutput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartOutput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StopInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StopOutput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.AppcState; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.GetAppcStateOutput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.MaintenanceModeInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.MaintenanceModeOutput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.RestartInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.RestartOutput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartOutput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StopInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StopOutput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status; import org.opendaylight.yangtools.yang.common.RpcResult; -import org.openecomp.appc.oam.processor.OamMmodeProcessor; -import org.openecomp.appc.oam.processor.OamRestartProcessor; -import org.openecomp.appc.oam.processor.OamStartProcessor; -import org.openecomp.appc.oam.processor.OamStopProcessor; -import org.openecomp.appc.oam.util.OperationHelper; -import org.openecomp.appc.oam.util.StateHelper; +import org.onap.appc.oam.processor.OamMmodeProcessor; +import org.onap.appc.oam.processor.OamRestartProcessor; +import org.onap.appc.oam.processor.OamStartProcessor; +import org.onap.appc.oam.processor.OamStopProcessor; +import org.onap.appc.oam.util.OperationHelper; +import org.onap.appc.oam.util.StateHelper; import org.osgi.framework.FrameworkUtil; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/OAMCommandStatusTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/OAMCommandStatusTest.java index c941f43dc..269c4f811 100644 --- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/OAMCommandStatusTest.java +++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/OAMCommandStatusTest.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam; +package org.onap.appc.oam; import org.junit.Assert; import org.junit.Test; -import org.openecomp.appc.executor.objects.Params; +import org.onap.appc.executor.objects.Params; import java.util.HashMap; import java.util.Map; diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/messageadapter/MessageAdapterTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/messageadapter/MessageAdapterTest.java index ff60923fb..d3ebfda51 100644 --- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/messageadapter/MessageAdapterTest.java +++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/messageadapter/MessageAdapterTest.java @@ -22,14 +22,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.messageadapter; +package org.onap.appc.oam.messageadapter; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.openecomp.appc.adapter.message.MessageAdapterFactory; -import org.openecomp.appc.adapter.message.Producer; +import org.onap.appc.adapter.message.MessageAdapterFactory; +import org.onap.appc.adapter.message.Producer; import org.mockito.Mockito; import org.osgi.framework.Bundle; diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseActionRunnableTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseActionRunnableTest.java index 07500f441..daf0f6e07 100644 --- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseActionRunnableTest.java +++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseActionRunnableTest.java @@ -22,23 +22,23 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.processor; +package org.onap.appc.oam.processor; import com.att.eelf.configuration.EELFLogger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.oam.OAMCommandStatus; -import org.openecomp.appc.oam.util.AsyncTaskHelper; -import org.openecomp.appc.oam.util.BundleHelper; -import org.openecomp.appc.oam.util.ConfigurationHelper; -import org.openecomp.appc.oam.util.OperationHelper; -import org.openecomp.appc.oam.util.StateHelper; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader; +import org.onap.appc.i18n.Msg; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.oam.OAMCommandStatus; +import org.onap.appc.oam.util.AsyncTaskHelper; +import org.onap.appc.oam.util.BundleHelper; +import org.onap.appc.oam.util.ConfigurationHelper; +import org.onap.appc.oam.util.OperationHelper; +import org.onap.appc.oam.util.StateHelper; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import org.powermock.reflect.Whitebox; import java.util.Date; diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseCommonTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseCommonTest.java index 3f51669f7..59bddb0e4 100644 --- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseCommonTest.java +++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseCommonTest.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.processor; +package org.onap.appc.oam.processor; import com.att.eelf.configuration.EELFLogger; import org.junit.Assert; @@ -30,16 +30,16 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status; -import org.openecomp.appc.exceptions.InvalidInputException; -import org.openecomp.appc.exceptions.InvalidStateException; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.oam.OAMCommandStatus; -import org.openecomp.appc.oam.util.ConfigurationHelper; -import org.openecomp.appc.oam.util.OperationHelper; -import org.openecomp.appc.oam.util.StateHelper; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status; +import org.onap.appc.exceptions.InvalidInputException; +import org.onap.appc.exceptions.InvalidStateException; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.oam.OAMCommandStatus; +import org.onap.appc.oam.util.ConfigurationHelper; +import org.onap.appc.oam.util.OperationHelper; +import org.onap.appc.oam.util.StateHelper; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseProcessorTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseProcessorTest.java index 0109adf36..6769352c6 100644 --- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseProcessorTest.java +++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/processor/BaseProcessorTest.java @@ -22,27 +22,27 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.processor; +package org.onap.appc.oam.processor; import com.att.eelf.configuration.EELFLogger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.exceptions.InvalidInputException; -import org.openecomp.appc.exceptions.InvalidStateException; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.oam.OAMCommandStatus; -import org.openecomp.appc.oam.util.AsyncTaskHelper; -import org.openecomp.appc.oam.util.ConfigurationHelper; -import org.openecomp.appc.oam.util.OperationHelper; -import org.openecomp.appc.oam.util.StateHelper; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.exceptions.InvalidInputException; +import org.onap.appc.exceptions.InvalidStateException; +import org.onap.appc.i18n.Msg; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.oam.OAMCommandStatus; +import org.onap.appc.oam.util.AsyncTaskHelper; +import org.onap.appc.oam.util.ConfigurationHelper; +import org.onap.appc.oam.util.OperationHelper; +import org.onap.appc.oam.util.StateHelper; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import org.powermock.reflect.Whitebox; import static org.mockito.Matchers.any; diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/AsyncTaskHelperTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/AsyncTaskHelperTest.java index f81938e30..ddeb99440 100644 --- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/AsyncTaskHelperTest.java +++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/AsyncTaskHelperTest.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.util; +package org.onap.appc.oam.util; import com.att.eelf.configuration.EELFLogger; import org.junit.After; @@ -31,8 +31,8 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import org.osgi.framework.Bundle; import org.osgi.framework.FrameworkUtil; import org.powermock.api.mockito.PowerMockito; diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/BundleHelperTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/BundleHelperTest.java index 878d15f39..433e87517 100644 --- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/BundleHelperTest.java +++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/BundleHelperTest.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.util; +package org.onap.appc.oam.util; import com.att.eelf.configuration.EELFLogger; import org.apache.commons.lang.ArrayUtils; @@ -31,10 +31,10 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/ConfigurationHelperTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/ConfigurationHelperTest.java index a489aa05e..348517b72 100644 --- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/ConfigurationHelperTest.java +++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/ConfigurationHelperTest.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.util; +package org.onap.appc.oam.util; import com.att.eelf.configuration.EELFLogger; import org.apache.commons.lang3.ArrayUtils; @@ -30,7 +30,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.openecomp.appc.configuration.Configuration; +import org.onap.appc.configuration.Configuration; import org.powermock.reflect.Whitebox; import static org.mockito.Mockito.mock; diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/OperationHelperTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/OperationHelperTest.java index e335ad830..77edd1701 100644 --- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/OperationHelperTest.java +++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/OperationHelperTest.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.util; +package org.onap.appc.oam.util; import org.junit.Assert; import org.junit.Before; @@ -31,20 +31,20 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.MaintenanceModeInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StopInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.common.header.Flags; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.exceptions.InvalidInputException; -import org.openecomp.appc.exceptions.InvalidStateException; -import org.openecomp.appc.lifecyclemanager.LifecycleManager; -import org.openecomp.appc.lifecyclemanager.objects.LifecycleException; -import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.statemachine.impl.readers.AppcOamMetaDataReader; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.MaintenanceModeInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StopInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.common.header.Flags; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.exceptions.InvalidInputException; +import org.onap.appc.exceptions.InvalidStateException; +import org.onap.appc.lifecyclemanager.LifecycleManager; +import org.onap.appc.lifecyclemanager.objects.LifecycleException; +import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.statemachine.impl.readers.AppcOamMetaDataReader; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; diff --git a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/StateHelperTest.java b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/StateHelperTest.java index 3dfb52bbe..9a3050e84 100644 --- a/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/StateHelperTest.java +++ b/appc-oam/appc-oam-bundle/src/test/java/org/openecomp/appc/oam/util/StateHelperTest.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.util; +package org.onap.appc.oam.util; import com.att.eelf.configuration.EELFLogger; import org.junit.Assert; @@ -30,8 +30,8 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.AppcState; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.AppcState; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import org.osgi.framework.Bundle; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; diff --git a/appc-oam/appc-oam-features/pom.xml b/appc-oam/appc-oam-features/pom.xml index 689616e17..6598cd68e 100644 --- a/appc-oam/appc-oam-features/pom.xml +++ b/appc-oam/appc-oam-features/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <artifactId>appc-oam</artifactId> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <version>1.3.0-SNAPSHOT</version> </parent> <name>appc-oam-features</name> @@ -13,13 +13,13 @@ <dependencies> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-oam-model</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-oam-bundle</artifactId> <classifier>config</classifier> <type>xml</type> @@ -27,7 +27,7 @@ </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-oam-bundle</artifactId> <version>${project.version}</version> </dependency> diff --git a/appc-oam/appc-oam-features/src/main/resources/features.xml b/appc-oam/appc-oam-features/src/main/resources/features.xml index 23dd2430e..69bb62a50 100644 --- a/appc-oam/appc-oam-features/src/main/resources/features.xml +++ b/appc-oam/appc-oam-features/src/main/resources/features.xml @@ -32,9 +32,9 @@ <feature name='appc-oam' description="appc oam module" version='${project.version}'> <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> - <bundle>mvn:org.openecomp.appc/appc-oam-model/${project.version}</bundle> - <bundle>mvn:org.openecomp.appc/appc-oam-bundle/${project.version}</bundle> - <configfile finalname="etc/opendaylight/karaf/201-appc-oam.xml">mvn:org.openecomp.appc/appc-oam-bundle/${project.version}/xml/config</configfile> + <bundle>mvn:org.onap.appc/appc-oam-model/${project.version}</bundle> + <bundle>mvn:org.onap.appc/appc-oam-bundle/${project.version}</bundle> + <configfile finalname="etc/opendaylight/karaf/201-appc-oam.xml">mvn:org.onap.appc/appc-oam-bundle/${project.version}/xml/config</configfile> </feature> </features> diff --git a/appc-oam/appc-oam-installer/pom.xml b/appc-oam/appc-oam-installer/pom.xml index 1e7fe1c46..f65879e80 100644 --- a/appc-oam/appc-oam-installer/pom.xml +++ b/appc-oam/appc-oam-installer/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <artifactId>appc-oam</artifactId> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <version>1.3.0-SNAPSHOT</version> </parent> @@ -14,14 +14,14 @@ <properties> <application.name>appc-oam</application.name> <features.boot>appc-oam</features.boot> - <features.repositories>mvn:org.openecomp.appc/appc-oam-features/${project.version}/xml/features</features.repositories> + <features.repositories>mvn:org.onap.appc/appc-oam-features/${project.version}/xml/features</features.repositories> <include.transitive.dependencies>false</include.transitive.dependencies> </properties> <dependencies> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-oam-features</artifactId> <version>${project.version}</version> <classifier>features</classifier> @@ -35,13 +35,13 @@ </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-oam-bundle</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-oam-bundle</artifactId> <version>${project.version}</version> <classifier>config</classifier> diff --git a/appc-oam/appc-oam-model/pom.xml b/appc-oam/appc-oam-model/pom.xml index 19e523e25..330be0a82 100644 --- a/appc-oam/appc-oam-model/pom.xml +++ b/appc-oam/appc-oam-model/pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <artifactId>appc-oam</artifactId> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <version>1.3.0-SNAPSHOT</version> </parent> <artifactId>appc-oam-model</artifactId> diff --git a/appc-oam/appc-oam-model/src/main/yang/appc-oam.yang b/appc-oam/appc-oam-model/src/main/yang/appc-oam.yang index 0984daeda..cc2d618fa 100644 --- a/appc-oam/appc-oam-model/src/main/yang/appc-oam.yang +++ b/appc-oam/appc-oam-model/src/main/yang/appc-oam.yang @@ -37,7 +37,7 @@ module appc-oam { yang-version 1; - namespace "org:openecomp:appc:oam"; + namespace "org:onap:appc:oam"; prefix appc-oam; organization "Copyright 2017 AT&T Intellectual Property."; diff --git a/appc-oam/pom.xml b/appc-oam/pom.xml index 4aca3d466..7b3119d35 100644 --- a/appc-oam/pom.xml +++ b/appc-oam/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</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> |