aboutsummaryrefslogtreecommitdiffstats
path: root/appc-sdc-listener
diff options
context:
space:
mode:
authorPatrick Brady <pb071s@att.com>2017-12-13 11:09:30 -0800
committerPatrick Brady <pb071s@att.com>2017-12-13 11:09:41 -0800
commit0756759f39e125b02d63b4e93de83b3c6b13beea (patch)
tree274e9830e522007c590ace136a57efaa806e19d5 /appc-sdc-listener
parentcb81f75d84c1df021730341cd61ed650adc7ba3a (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-sdc-listener')
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/pom.xml24
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/ArtifactProcessor.java4
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/ArtifactStorageService.java12
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/Constants.java2
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/DependencyModelGenerator.java16
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/AbstractArtifactProcessor.java24
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ArtifactProcessorFactory.java8
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ConfigArtifactProcessor.java14
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/LicenseArtifactProcessor.java10
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ToscaCsarArtifactProcessor.java16
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/ArtifactType.java2
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/Resource.java2
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/SDCArtifact.java2
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/SDCReference.java2
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/Vnfc.java2
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/ProviderOperations.java4
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/ProviderResponse.java2
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcCallback.java8
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcConfig.java2
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcListener.java6
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/Util.java4
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml6
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/org/openecomp/appc/default.properties4
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/artifacts/impl/TestArtifactProcessor.java6
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/artifacts/impl/TestLicenseArtifactProcessor.java12
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcCallbackTest.java16
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcListenerTest.java2
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcTestObjects.java4
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcTestUtils.java2
-rw-r--r--appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/TestRun.java2
-rw-r--r--appc-sdc-listener/appc-sdc-listener-features/pom.xml4
-rw-r--r--appc-sdc-listener/appc-sdc-listener-features/src/main/resources/features.xml4
-rw-r--r--appc-sdc-listener/appc-sdc-listener-installer/pom.xml8
-rw-r--r--appc-sdc-listener/appc-yang-generator/pom.xml2
-rw-r--r--appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/YANGGenerator.java4
-rw-r--r--appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/exception/YANGGenerationException.java2
-rw-r--r--appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/impl/YANGGeneratorFactory.java4
-rw-r--r--appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/impl/YANGGeneratorImpl.java12
-rw-r--r--appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/objects/Leaf.java2
-rw-r--r--appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/type/YangTypes.java2
-rw-r--r--appc-sdc-listener/appc-yang-generator/src/main/resources/templates/YangTemplate.vm2
-rw-r--r--appc-sdc-listener/appc-yang-generator/src/test/java/org/openecomp/appc/TestYANGGenerator.java8
-rw-r--r--appc-sdc-listener/appc-yang-generator/src/test/resources/yang/expectedYang.yang2
-rw-r--r--appc-sdc-listener/pom.xml2
44 files changed, 139 insertions, 139 deletions
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml b/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml
index 96930efec..2e61b7010 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml
@@ -27,7 +27,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<parent>
<artifactId>appc-sdc-listener</artifactId>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<version>1.3.0-SNAPSHOT</version>
</parent>
@@ -76,13 +76,13 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
</dependency>
<dependency>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-message-adapter-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-message-adapter-factory</artifactId>
<version>${project.version}</version>
</dependency>
@@ -94,7 +94,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
</dependency>
<dependency>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-common</artifactId>
<version>${project.version}</version>
</dependency>
@@ -135,7 +135,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
</dependency>
<dependency>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-license-manager-api</artifactId>
<!-- <version>${project.version}</version> -->
<version>${project.version}</version>
@@ -170,7 +170,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
</dependency>
<dependency>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-dg-dependency-model</artifactId>
<version>${project.version}</version>
</dependency>
@@ -180,7 +180,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<version>${jackson-yaml-version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-dg-domain-model-lib</artifactId>
<version>${project.version}</version>
</dependency>
@@ -232,12 +232,12 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-SymbolicName>org.openecomp.appc.sdc.listener</Bundle-SymbolicName>
- <!--Bundle-Activator>org.openecomp.appc.sdc.listener.AppcSdcListenerActivator</Bundle-Activator -->
- <Export-Package>org.openecomp.appc.sdc.listener</Export-Package>
+ <Bundle-SymbolicName>org.onap.appc.sdc.listener</Bundle-SymbolicName>
+ <!--Bundle-Activator>org.onap.appc.sdc.listener.AppcSdcListenerActivator</Bundle-Activator -->
+ <Export-Package>org.onap.appc.sdc.listener</Export-Package>
<Import-Package>
- org.openecomp.appc.licmgr,
- org.openecomp.appc.adapter.messaging.*,
+ org.onap.appc.licmgr,
+ org.onap.appc.adapter.messaging.*,
com.att.eelf.*,
*;resolution:=optional
</Import-Package>
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/ArtifactProcessor.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/ArtifactProcessor.java
index c0f52206f..12b6373f7 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/ArtifactProcessor.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/ArtifactProcessor.java
@@ -22,9 +22,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.artifacts;
+package org.onap.appc.sdc.artifacts;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
/**
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/ArtifactStorageService.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/ArtifactStorageService.java
index db4da9fef..044fbd187 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/ArtifactStorageService.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/ArtifactStorageService.java
@@ -22,15 +22,15 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.artifacts.helper;
+package org.onap.appc.sdc.artifacts.helper;
import org.apache.commons.lang.StringUtils;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-import org.openecomp.appc.sdc.artifacts.object.SDCReference;
+import org.onap.appc.sdc.artifacts.object.SDCReference;
import org.onap.ccsdk.sli.core.dblib.DbLibService;
-import org.openecomp.appc.sdc.artifacts.object.SDCArtifact;
+import org.onap.appc.sdc.artifacts.object.SDCArtifact;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
@@ -39,8 +39,8 @@ import javax.sql.rowset.CachedRowSet;
import java.sql.SQLException;
import java.util.ArrayList;
-import static org.openecomp.appc.sdc.artifacts.helper.Constants.COMMA;
-import static org.openecomp.appc.sdc.artifacts.helper.Constants.AND;
+import static org.onap.appc.sdc.artifacts.helper.Constants.COMMA;
+import static org.onap.appc.sdc.artifacts.helper.Constants.AND;
/**
* Provides methods for storing sdc artifacts into app-c database
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/Constants.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/Constants.java
index 4970a739e..eacfb5db6 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/Constants.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/Constants.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.artifacts.helper;
+package org.onap.appc.sdc.artifacts.helper;
/**
* Constants required in SDC listener module
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/DependencyModelGenerator.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/DependencyModelGenerator.java
index 0f8065a30..295ee47c8 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/DependencyModelGenerator.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/DependencyModelGenerator.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.artifacts.helper;
+package org.onap.appc.sdc.artifacts.helper;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
@@ -31,11 +31,11 @@ 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.openecomp.appc.dg.dependencymanager.helper.DependencyModelParser;
-import org.openecomp.appc.dg.objects.Node;
-import org.openecomp.appc.dg.objects.VnfcDependencyModel;
-import org.openecomp.appc.domainmodel.Vnfc;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.dg.dependencymanager.helper.DependencyModelParser;
+import org.onap.appc.dg.objects.Node;
+import org.onap.appc.dg.objects.VnfcDependencyModel;
+import org.onap.appc.domainmodel.Vnfc;
+import org.onap.appc.exceptions.APPCException;
import java.util.ArrayList;
import java.util.List;
@@ -62,10 +62,10 @@ public class DependencyModelGenerator {
if (vnfcDependencyModel != null && !vnfcDependencyModel.getDependencies().isEmpty()) {
logger.debug(String.format("Dependency Model generated : %s ", vnfcDependencyModel.toString()));
- List<org.openecomp.appc.sdc.artifacts.object.Vnfc> vnfcs = new ArrayList<>();
+ List<org.onap.appc.sdc.artifacts.object.Vnfc> vnfcs = new ArrayList<>();
for (Node<Vnfc> node : vnfcDependencyModel.getDependencies()) {
- org.openecomp.appc.sdc.artifacts.object.Vnfc vnfc = new org.openecomp.appc.sdc.artifacts.object.Vnfc();
+ org.onap.appc.sdc.artifacts.object.Vnfc vnfc = new org.onap.appc.sdc.artifacts.object.Vnfc();
vnfc.setVnfcType(node.getChild().getVnfcType());
vnfc.setMandatory(node.getChild().isMandatory());
vnfc.setResilienceType(node.getChild().getResilienceType());
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/AbstractArtifactProcessor.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/AbstractArtifactProcessor.java
index 06bda8b2d..7438d3047 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/AbstractArtifactProcessor.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/AbstractArtifactProcessor.java
@@ -22,20 +22,20 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.artifacts.impl;
-
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.adapter.message.MessageDestination;
-import org.openecomp.appc.adapter.message.event.EventHeader;
-import org.openecomp.appc.adapter.message.event.EventMessage;
-import org.openecomp.appc.adapter.message.event.EventStatus;
-import org.openecomp.appc.sdc.listener.Util;
-import org.openecomp.appc.exceptions.APPCException;
+package org.onap.appc.sdc.artifacts.impl;
+
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.adapter.message.MessageDestination;
+import org.onap.appc.adapter.message.event.EventHeader;
+import org.onap.appc.adapter.message.event.EventMessage;
+import org.onap.appc.adapter.message.event.EventStatus;
+import org.onap.appc.sdc.listener.Util;
+import org.onap.appc.exceptions.APPCException;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-import org.openecomp.appc.sdc.artifacts.ArtifactProcessor;
-import org.openecomp.appc.sdc.artifacts.helper.ArtifactStorageService;
-import org.openecomp.appc.sdc.artifacts.object.SDCArtifact;
+import org.onap.appc.sdc.artifacts.ArtifactProcessor;
+import org.onap.appc.sdc.artifacts.helper.ArtifactStorageService;
+import org.onap.appc.sdc.artifacts.object.SDCArtifact;
import org.openecomp.sdc.api.IDistributionClient;
import org.openecomp.sdc.api.notification.IArtifactInfo;
import org.openecomp.sdc.api.notification.INotificationData;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ArtifactProcessorFactory.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ArtifactProcessorFactory.java
index ba01cbc24..293974b79 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ArtifactProcessorFactory.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ArtifactProcessorFactory.java
@@ -22,13 +22,13 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.artifacts.impl;
+package org.onap.appc.sdc.artifacts.impl;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.sdc.artifacts.ArtifactProcessor;
-import org.openecomp.appc.sdc.artifacts.object.ArtifactType;
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.sdc.artifacts.ArtifactProcessor;
+import org.onap.appc.sdc.artifacts.object.ArtifactType;
import org.openecomp.sdc.api.IDistributionClient;
import org.openecomp.sdc.api.notification.IArtifactInfo;
import org.openecomp.sdc.api.notification.INotificationData;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ConfigArtifactProcessor.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ConfigArtifactProcessor.java
index 3baca3574..41230ea30 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ConfigArtifactProcessor.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ConfigArtifactProcessor.java
@@ -22,16 +22,16 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.artifacts.impl;
+package org.onap.appc.sdc.artifacts.impl;
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.sdc.listener.ProviderOperations;
-import org.openecomp.appc.sdc.listener.ProviderResponse;
-import org.openecomp.appc.sdc.listener.Util;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.sdc.listener.ProviderOperations;
+import org.onap.appc.sdc.listener.ProviderResponse;
+import org.onap.appc.sdc.listener.Util;
+import org.onap.appc.exceptions.APPCException;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-import org.openecomp.appc.sdc.artifacts.object.SDCArtifact;
+import org.onap.appc.sdc.artifacts.object.SDCArtifact;
import org.openecomp.sdc.api.IDistributionClient;
import org.openecomp.sdc.api.notification.IArtifactInfo;
import org.openecomp.sdc.api.notification.INotificationData;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/LicenseArtifactProcessor.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/LicenseArtifactProcessor.java
index 21b32dc8e..fe5099785 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/LicenseArtifactProcessor.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/LicenseArtifactProcessor.java
@@ -22,15 +22,15 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.artifacts.impl;
+package org.onap.appc.sdc.artifacts.impl;
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.licmgr.Constants;
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.licmgr.Constants;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import org.apache.commons.lang.StringUtils;
-import org.openecomp.appc.sdc.artifacts.object.SDCArtifact;
+import org.onap.appc.sdc.artifacts.object.SDCArtifact;
import org.openecomp.sdc.api.IDistributionClient;
import org.openecomp.sdc.api.notification.IArtifactInfo;
import org.openecomp.sdc.api.notification.INotificationData;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ToscaCsarArtifactProcessor.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ToscaCsarArtifactProcessor.java
index ff3ee5509..e38188432 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ToscaCsarArtifactProcessor.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/impl/ToscaCsarArtifactProcessor.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.artifacts.impl;
+package org.onap.appc.sdc.artifacts.impl;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
@@ -30,13 +30,13 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import org.apache.commons.lang.StringUtils;
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.licmgr.Constants;
-import org.openecomp.appc.sdc.artifacts.helper.DependencyModelGenerator;
-import org.openecomp.appc.sdc.artifacts.object.Resource;
-import org.openecomp.appc.sdc.artifacts.object.SDCArtifact;
-import org.openecomp.appc.sdc.artifacts.object.SDCReference;
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.licmgr.Constants;
+import org.onap.appc.sdc.artifacts.helper.DependencyModelGenerator;
+import org.onap.appc.sdc.artifacts.object.Resource;
+import org.onap.appc.sdc.artifacts.object.SDCArtifact;
+import org.onap.appc.sdc.artifacts.object.SDCReference;
import org.openecomp.sdc.api.IDistributionClient;
import org.openecomp.sdc.api.notification.IArtifactInfo;
import org.openecomp.sdc.api.notification.INotificationData;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/ArtifactType.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/ArtifactType.java
index 1ff62385d..790ad2381 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/ArtifactType.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/ArtifactType.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.artifacts.object;
+package org.onap.appc.sdc.artifacts.object;
/**
* Enummration listing SDC artifact types
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/Resource.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/Resource.java
index 42716dc47..6ae441c18 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/Resource.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/Resource.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.artifacts.object;
+package org.onap.appc.sdc.artifacts.object;
public class Resource {
private String name;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/SDCArtifact.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/SDCArtifact.java
index 6cba5b2a2..d5376b570 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/SDCArtifact.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/SDCArtifact.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.artifacts.object;
+package org.onap.appc.sdc.artifacts.object;
/**
* POJO containing metadata about SDC artifact
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/SDCReference.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/SDCReference.java
index b9d630026..2ee6d7c85 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/SDCReference.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/SDCReference.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.artifacts.object;
+package org.onap.appc.sdc.artifacts.object;
public class SDCReference {
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/Vnfc.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/Vnfc.java
index 47d5f4516..3e0d3a749 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/Vnfc.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/object/Vnfc.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.artifacts.object;
+package org.onap.appc.sdc.artifacts.object;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/ProviderOperations.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/ProviderOperations.java
index c644930e4..fa8340ac7 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/ProviderOperations.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/ProviderOperations.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -61,7 +61,7 @@ import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.HTTP;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/ProviderResponse.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/ProviderResponse.java
index cc21cea0c..bf91332c5 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/ProviderResponse.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/ProviderResponse.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
public class ProviderResponse {
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcCallback.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcCallback.java
index 268a7f29a..8be458200 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcCallback.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcCallback.java
@@ -22,13 +22,13 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.sdc.artifacts.ArtifactProcessor;
-import org.openecomp.appc.sdc.artifacts.impl.ArtifactProcessorFactory;
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.sdc.artifacts.ArtifactProcessor;
+import org.onap.appc.sdc.artifacts.impl.ArtifactProcessorFactory;
import org.openecomp.sdc.api.IDistributionClient;
import org.openecomp.sdc.api.consumer.INotificationCallback;
import org.openecomp.sdc.api.notification.IArtifactInfo;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcConfig.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcConfig.java
index 37b32d9bf..86ba9e1f5 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcConfig.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcConfig.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcListener.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcListener.java
index dccc95841..b204a54f7 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcListener.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/SdcListener.java
@@ -22,12 +22,12 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-import org.openecomp.appc.configuration.Configuration;
-import org.openecomp.appc.configuration.ConfigurationFactory;
+import org.onap.appc.configuration.Configuration;
+import org.onap.appc.configuration.ConfigurationFactory;
import org.openecomp.sdc.api.IDistributionClient;
import org.openecomp.sdc.api.results.IDistributionClientResult;
import org.openecomp.sdc.impl.DistributionClientFactory;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/Util.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/Util.java
index 2dbb66e30..bc4b4a896 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/Util.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/listener/Util.java
@@ -22,12 +22,12 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
import org.openecomp.sdc.utils.DistributionStatusEnum;
import org.json.JSONException;
import org.json.JSONObject;
-import org.openecomp.appc.exceptions.APPCException;
+import org.onap.appc.exceptions.APPCException;
import org.openecomp.sdc.api.IDistributionClient;
import org.openecomp.sdc.api.consumer.IDistributionStatusMessage;
import org.openecomp.sdc.api.notification.IArtifactInfo;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 3f0eacc88..449211013 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -31,12 +31,12 @@
xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
- <bean id="SdcListener" class="org.openecomp.appc.sdc.listener.SdcListener" init-method="start" destroy-method="stop" scope="singleton" activation="eager">
+ <bean id="SdcListener" class="org.onap.appc.sdc.listener.SdcListener" init-method="start" destroy-method="stop" scope="singleton" activation="eager">
</bean>
<!--
- <bean id="SdcListenerBean" class="org.openecomp.appc.sdc.listener.impl.SdcListenerBean" init-method="start" destroy-method="stop" activation="eager" scope="singleton" />
- <service SdcListenerener" interfaorg.openecomp.appc.sdc.listener.SdcListenerner" ref="SdcListenerBean"/>
+ <bean id="SdcListenerBean" class="org.onap.appc.sdc.listener.impl.SdcListenerBean" init-method="start" destroy-method="stop" activation="eager" scope="singleton" />
+ <service SdcListenerener" interfaorg.onap.appc.sdc.listener.SdcListenerner" ref="SdcListenerBean"/>
-->
</blueprint>
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/org/openecomp/appc/default.properties
index 20cbbbcb0..f8c5e8e2e 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/org/openecomp/appc/default.properties
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/resources/org/openecomp/appc/default.properties
@@ -22,8 +22,8 @@
# ============LICENSE_END=========================================================
###
-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},.
# These SDC properties were provided by the SDC Op-So team
appc.sdc.keystore.path=etc/sdc-client.jks
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/artifacts/impl/TestArtifactProcessor.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/artifacts/impl/TestArtifactProcessor.java
index 50fcb663c..8253238e8 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/artifacts/impl/TestArtifactProcessor.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/artifacts/impl/TestArtifactProcessor.java
@@ -1,11 +1,11 @@
-package org.openecomp.appc.sdc.artifacts.impl;
+package org.onap.appc.sdc.artifacts.impl;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.sdc.artifacts.object.SDCArtifact;
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.sdc.artifacts.object.SDCArtifact;
import org.openecomp.sdc.api.IDistributionClient;
import org.openecomp.sdc.api.notification.IArtifactInfo;
import org.openecomp.sdc.api.notification.INotificationData;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/artifacts/impl/TestLicenseArtifactProcessor.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/artifacts/impl/TestLicenseArtifactProcessor.java
index 03aa92447..f4cbc6a74 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/artifacts/impl/TestLicenseArtifactProcessor.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/artifacts/impl/TestLicenseArtifactProcessor.java
@@ -1,14 +1,14 @@
-package org.openecomp.appc.sdc.artifacts.impl;
+package org.onap.appc.sdc.artifacts.impl;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Matchers;
import org.mockito.Mockito;
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.exceptions.APPCException;
-import org.openecomp.appc.sdc.artifacts.helper.ArtifactStorageService;
-import org.openecomp.appc.sdc.artifacts.object.SDCArtifact;
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.exceptions.APPCException;
+import org.onap.appc.sdc.artifacts.helper.ArtifactStorageService;
+import org.onap.appc.sdc.artifacts.object.SDCArtifact;
import org.openecomp.sdc.api.IDistributionClient;
import org.openecomp.sdc.api.notification.IArtifactInfo;
import org.openecomp.sdc.api.notification.INotificationData;
@@ -47,7 +47,7 @@ public class TestLicenseArtifactProcessor {
PowerMockito.doNothing().when(storageService).storeSDCArtifact(Matchers.anyObject());
}
- @Test(expected = org.openecomp.appc.exceptions.APPCException.class)
+ @Test(expected = org.onap.appc.exceptions.APPCException.class)
public void testProcessArtifactWithMissingData() throws APPCException {
SDCArtifact artifact=new SDCArtifact();
artifact.setResourceVersion("RESOURCE VERSION");
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcCallbackTest.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcCallbackTest.java
index 32b7f8d37..1333ac022 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcCallbackTest.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcCallbackTest.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
import org.junit.Assert;
@@ -31,13 +31,13 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Matchers;
import org.mockito.Mockito;
-import org.openecomp.appc.adapter.message.EventSender;
-import org.openecomp.appc.sdc.artifacts.helper.ArtifactStorageService;
-import org.openecomp.appc.sdc.artifacts.helper.DependencyModelGenerator;
-import org.openecomp.appc.sdc.artifacts.impl.ArtifactProcessorFactory;
-import org.openecomp.appc.sdc.artifacts.impl.ToscaCsarArtifactProcessor;
-import org.openecomp.appc.sdc.artifacts.object.SDCArtifact;
-import org.openecomp.appc.sdc.artifacts.object.SDCReference;
+import org.onap.appc.adapter.message.EventSender;
+import org.onap.appc.sdc.artifacts.helper.ArtifactStorageService;
+import org.onap.appc.sdc.artifacts.helper.DependencyModelGenerator;
+import org.onap.appc.sdc.artifacts.impl.ArtifactProcessorFactory;
+import org.onap.appc.sdc.artifacts.impl.ToscaCsarArtifactProcessor;
+import org.onap.appc.sdc.artifacts.object.SDCArtifact;
+import org.onap.appc.sdc.artifacts.object.SDCReference;
import org.openecomp.sdc.api.IDistributionClient;
import org.openecomp.sdc.api.consumer.INotificationCallback;
import org.openecomp.sdc.api.notification.IArtifactInfo;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcListenerTest.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcListenerTest.java
index 428aa8e86..7b60ce460 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcListenerTest.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcListenerTest.java
@@ -21,7 +21,7 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
import com.att.eelf.configuration.EELFLogger;
import org.junit.Assert;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcTestObjects.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcTestObjects.java
index 743468f3c..49c93d0a9 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcTestObjects.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcTestObjects.java
@@ -1,8 +1,8 @@
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
import org.junit.Assert;
import org.junit.Test;
-import org.openecomp.appc.sdc.artifacts.object.Vnfc;
+import org.onap.appc.sdc.artifacts.object.Vnfc;
public class SdcTestObjects {
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcTestUtils.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcTestUtils.java
index 62b96c0c4..7f2a01a7a 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcTestUtils.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/SdcTestUtils.java
@@ -1,4 +1,4 @@
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
import org.junit.Assert;
import org.junit.Test;
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/TestRun.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/TestRun.java
index 84337e471..4b673318c 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/TestRun.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/openecomp/appc/sdc/listener/TestRun.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.sdc.listener;
+package org.onap.appc.sdc.listener;
import org.junit.Test;
diff --git a/appc-sdc-listener/appc-sdc-listener-features/pom.xml b/appc-sdc-listener/appc-sdc-listener-features/pom.xml
index 278fd3784..7b7d91872 100644
--- a/appc-sdc-listener/appc-sdc-listener-features/pom.xml
+++ b/appc-sdc-listener/appc-sdc-listener-features/pom.xml
@@ -26,7 +26,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>appc-sdc-listener</artifactId>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>appc-sdc-listener-features</artifactId>
@@ -36,7 +36,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<dependencies>
<dependency>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-sdc-listener-bundle</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/appc-sdc-listener/appc-sdc-listener-features/src/main/resources/features.xml b/appc-sdc-listener/appc-sdc-listener-features/src/main/resources/features.xml
index 76a068ed7..7aae496e7 100644
--- a/appc-sdc-listener/appc-sdc-listener-features/src/main/resources/features.xml
+++ b/appc-sdc-listener/appc-sdc-listener-features/src/main/resources/features.xml
@@ -34,8 +34,8 @@
<feature name='appc-sdc-listener' description="sdc listener" version='${project.version}'>
<!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
<feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
- <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
- <bundle>mvn:org.openecomp.appc/appc-sdc-listener-bundle/${project.version}</bundle>
+ <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle>
+ <bundle>mvn:org.onap.appc/appc-sdc-listener-bundle/${project.version}</bundle>
</feature>
</features>
diff --git a/appc-sdc-listener/appc-sdc-listener-installer/pom.xml b/appc-sdc-listener/appc-sdc-listener-installer/pom.xml
index f63adb453..91d92b8aa 100644
--- a/appc-sdc-listener/appc-sdc-listener-installer/pom.xml
+++ b/appc-sdc-listener/appc-sdc-listener-installer/pom.xml
@@ -26,7 +26,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>appc-sdc-listener</artifactId>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<version>1.3.0-SNAPSHOT</version>
</parent>
<artifactId>appc-sdc-listener-installer</artifactId>
@@ -36,14 +36,14 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<properties>
<application.name>appc-sdc-listener</application.name>
<features.boot>appc-sdc-listener</features.boot>
- <features.repositories>mvn:org.openecomp.appc/appc-sdc-listener-features/${project.version}/xml/features</features.repositories>
+ <features.repositories>mvn:org.onap.appc/appc-sdc-listener-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-sdc-listener-features</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
@@ -57,7 +57,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
</dependency>
<dependency>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<artifactId>appc-sdc-listener-bundle</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/appc-sdc-listener/appc-yang-generator/pom.xml b/appc-sdc-listener/appc-yang-generator/pom.xml
index 9664973dc..413698ff9 100644
--- a/appc-sdc-listener/appc-yang-generator/pom.xml
+++ b/appc-sdc-listener/appc-yang-generator/pom.xml
@@ -28,7 +28,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>appc-sdc-listener</artifactId>
- <groupId>org.openecomp.appc</groupId>
+ <groupId>org.onap.appc</groupId>
<version>1.3.0-SNAPSHOT</version>
</parent>
diff --git a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/YANGGenerator.java b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/YANGGenerator.java
index 562c4abf2..e0ad22a54 100644
--- a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/YANGGenerator.java
+++ b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/YANGGenerator.java
@@ -22,9 +22,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.yang;
+package org.onap.appc.yang;
-import org.openecomp.appc.yang.exception.YANGGenerationException;
+import org.onap.appc.yang.exception.YANGGenerationException;
import java.io.OutputStream;
diff --git a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/exception/YANGGenerationException.java b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/exception/YANGGenerationException.java
index a37d6f685..690a2fda6 100644
--- a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/exception/YANGGenerationException.java
+++ b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/exception/YANGGenerationException.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.yang.exception;
+package org.onap.appc.yang.exception;
/**
* The Class YANGGenerationException.
diff --git a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/impl/YANGGeneratorFactory.java b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/impl/YANGGeneratorFactory.java
index 25d9b211a..fe278d412 100644
--- a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/impl/YANGGeneratorFactory.java
+++ b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/impl/YANGGeneratorFactory.java
@@ -22,9 +22,9 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.yang.impl;
+package org.onap.appc.yang.impl;
-import org.openecomp.appc.yang.YANGGenerator;
+import org.onap.appc.yang.YANGGenerator;
/**
* A factory for creating YANGGenerator objects.
diff --git a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/impl/YANGGeneratorImpl.java b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/impl/YANGGeneratorImpl.java
index 246563932..55ff41cbd 100644
--- a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/impl/YANGGeneratorImpl.java
+++ b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/impl/YANGGeneratorImpl.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.yang.impl;
+package org.onap.appc.yang.impl;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
@@ -35,10 +35,10 @@ import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl;
-import org.openecomp.appc.yang.YANGGenerator;
-import org.openecomp.appc.yang.exception.YANGGenerationException;
-import org.openecomp.appc.yang.objects.Leaf;
-import org.openecomp.appc.yang.type.YangTypes;
+import org.onap.appc.yang.YANGGenerator;
+import org.onap.appc.yang.exception.YANGGenerationException;
+import org.onap.appc.yang.objects.Leaf;
+import org.onap.appc.yang.type.YangTypes;
import org.openecomp.sdc.tosca.datatypes.model.NodeType;
import org.openecomp.sdc.tosca.datatypes.model.PropertyDefinition;
import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
@@ -59,7 +59,7 @@ public class YANGGeneratorImpl implements YANGGenerator {
/* (non-Javadoc)
- * @see org.openecomp.appc.yang.YANGGenerator#generateYANG(java.lang.String, java.lang.String, java.io.OutputStream)
+ * @see org.onap.appc.yang.YANGGenerator#generateYANG(java.lang.String, java.lang.String, java.io.OutputStream)
*/
@Override
public void generateYANG(String uniqueID, String tosca, OutputStream stream)
diff --git a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/objects/Leaf.java b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/objects/Leaf.java
index 013e31475..2ec66b680 100644
--- a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/objects/Leaf.java
+++ b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/objects/Leaf.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.yang.objects;
+package org.onap.appc.yang.objects;
public class Leaf {
private String name;
diff --git a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/type/YangTypes.java b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/type/YangTypes.java
index ca18c4311..97fb9973d 100644
--- a/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/type/YangTypes.java
+++ b/appc-sdc-listener/appc-yang-generator/src/main/java/org/openecomp/appc/yang/type/YangTypes.java
@@ -22,7 +22,7 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc.yang.type;
+package org.onap.appc.yang.type;
import java.util.Collections;
import java.util.HashMap;
diff --git a/appc-sdc-listener/appc-yang-generator/src/main/resources/templates/YangTemplate.vm b/appc-sdc-listener/appc-yang-generator/src/main/resources/templates/YangTemplate.vm
index ab608c5e1..45bef9d62 100644
--- a/appc-sdc-listener/appc-yang-generator/src/main/resources/templates/YangTemplate.vm
+++ b/appc-sdc-listener/appc-yang-generator/src/main/resources/templates/YangTemplate.vm
@@ -1,6 +1,6 @@
module $moduleName {
yang-version 1;
- namespace "org:openecomp:appc:vnf:$moduleName";
+ namespace "org:onap:appc:vnf:$moduleName";
prefix appc-vnf;
organization "Copyright 2017 AT&T Intellectual Property.";
diff --git a/appc-sdc-listener/appc-yang-generator/src/test/java/org/openecomp/appc/TestYANGGenerator.java b/appc-sdc-listener/appc-yang-generator/src/test/java/org/openecomp/appc/TestYANGGenerator.java
index a4487ac52..21130ee25 100644
--- a/appc-sdc-listener/appc-yang-generator/src/test/java/org/openecomp/appc/TestYANGGenerator.java
+++ b/appc-sdc-listener/appc-yang-generator/src/test/java/org/openecomp/appc/TestYANGGenerator.java
@@ -22,13 +22,13 @@
* ============LICENSE_END=========================================================
*/
-package org.openecomp.appc;
+package org.onap.appc;
import org.junit.*;
import org.junit.rules.TemporaryFolder;
-import org.openecomp.appc.yang.YANGGenerator;
-import org.openecomp.appc.yang.exception.YANGGenerationException;
-import org.openecomp.appc.yang.impl.YANGGeneratorFactory;
+import org.onap.appc.yang.YANGGenerator;
+import org.onap.appc.yang.exception.YANGGenerationException;
+import org.onap.appc.yang.impl.YANGGeneratorFactory;
import java.io.*;
diff --git a/appc-sdc-listener/appc-yang-generator/src/test/resources/yang/expectedYang.yang b/appc-sdc-listener/appc-yang-generator/src/test/resources/yang/expectedYang.yang
index 29c89182b..57aeacf53 100644
--- a/appc-sdc-listener/appc-yang-generator/src/test/resources/yang/expectedYang.yang
+++ b/appc-sdc-listener/appc-yang-generator/src/test/resources/yang/expectedYang.yang
@@ -24,7 +24,7 @@
module ATD456 {
yang-version 1;
- namespace "org:openecomp:appc:vnf:ATD456";
+ namespace "org:onap:appc:vnf:ATD456";
prefix appc-vnf;
organization "Copyright 2017 AT&T Intellectual Property.";
diff --git a/appc-sdc-listener/pom.xml b/appc-sdc-listener/pom.xml
index 7fb0d19a2..12f831730 100644
--- a/appc-sdc-listener/pom.xml
+++ b/appc-sdc-listener/pom.xml
@@ -25,7 +25,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<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/maven-v4_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>