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-dg-util/appc-dg-util-bundle | |
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-dg-util/appc-dg-util-bundle')
14 files changed, 51 insertions, 51 deletions
diff --git a/appc-dg-util/appc-dg-util-bundle/pom.xml b/appc-dg-util/appc-dg-util-bundle/pom.xml index 1a6ec8fe0..70e41c40a 100644 --- a/appc-dg-util/appc-dg-util-bundle/pom.xml +++ b/appc-dg-util/appc-dg-util-bundle/pom.xml @@ -3,7 +3,7 @@ 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-dg-util</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> @@ -19,7 +19,7 @@ <dependencies> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-common</artifactId> <version>${project.version}</version> </dependency> @@ -150,12 +150,12 @@ <artifactId>json</artifactId> </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-dmaap-adapter-bundle</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-netconf-adapter-bundle</artifactId> <version>1.3.0-SNAPSHOT</version> </dependency> @@ -190,17 +190,17 @@ <configuration> <instructions> <Bundle-SymbolicName>appc-dg-util</Bundle-SymbolicName> - <Bundle-Activator>org.openecomp.appc.dg.util.AppcDgUtilActivator</Bundle-Activator> - <Export-Package>org.openecomp.appc.dg.util.*</Export-Package> + <Bundle-Activator>org.onap.appc.dg.util.AppcDgUtilActivator</Bundle-Activator> + <Export-Package>org.onap.appc.dg.util.*</Export-Package> <Import-Package> - org.openecomp.appc.adapter.netconf, - org.openecomp.appc.adapter.netconf.dao, - org.openecomp.appc.adapter.netconf.util,com.att.eelf.*, - org.openecomp.appc.adapter.netconf.exception, - org.openecomp.appc.adapter.messaging.*, + org.onap.appc.adapter.netconf, + org.onap.appc.adapter.netconf.dao, + org.onap.appc.adapter.netconf.util,com.att.eelf.*, + org.onap.appc.adapter.netconf.exception, + org.onap.appc.adapter.messaging.*, org.onap.ccsdk.sli.core.sli.*, - org.openecomp.appc.exceptions, - org.openecomp.appc.i18n, + org.onap.appc.exceptions, + org.onap.appc.i18n, org.osgi.framework.*, org.slf4j.*, com.vmware.*, diff --git a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/AppcDgUtilActivator.java b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/AppcDgUtilActivator.java index 55c7cc0bf..486d475f4 100644 --- a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/AppcDgUtilActivator.java +++ b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/AppcDgUtilActivator.java @@ -40,7 +40,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.openecomp.appc.dg.util; +package org.onap.appc.dg.util; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; diff --git a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/ExecuteNodeAction.java b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/ExecuteNodeAction.java index 42735434c..38bc0955d 100644 --- a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/ExecuteNodeAction.java +++ b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/ExecuteNodeAction.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.util; +package org.onap.appc.dg.util; import java.util.Map; -import org.openecomp.appc.exceptions.APPCException; +import org.onap.appc.exceptions.APPCException; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; diff --git a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/InputParameterValidation.java b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/InputParameterValidation.java index 35955f13a..714e12a03 100644 --- a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/InputParameterValidation.java +++ b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/InputParameterValidation.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.util; +package org.onap.appc.dg.util; import java.util.Map; -import org.openecomp.appc.exceptions.APPCException; +import org.onap.appc.exceptions.APPCException; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; diff --git a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/UpgradeStubNode.java b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/UpgradeStubNode.java index 30bac0dd2..4f0a80f5a 100644 --- a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/UpgradeStubNode.java +++ b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/UpgradeStubNode.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.util; +package org.onap.appc.dg.util; import java.util.Map; -import org.openecomp.appc.exceptions.APPCException; +import org.onap.appc.exceptions.APPCException; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; diff --git a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/ExecuteNodeActionImpl.java b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/ExecuteNodeActionImpl.java index d80a80e44..b5dc40712 100644 --- a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/ExecuteNodeActionImpl.java +++ b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/ExecuteNodeActionImpl.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.util.impl; +package org.onap.appc.dg.util.impl; -import org.openecomp.appc.dg.util.ExecuteNodeAction; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.i18n.Msg; +import org.onap.appc.dg.util.ExecuteNodeAction; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.i18n.Msg; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.eelf.i18n.EELFResourceManager; diff --git a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/InputParameterValidationImpl.java b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/InputParameterValidationImpl.java index 5f1667176..5ea48bf44 100644 --- a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/InputParameterValidationImpl.java +++ b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/InputParameterValidationImpl.java @@ -22,15 +22,15 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.util.impl; +package org.onap.appc.dg.util.impl; import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.regex.Pattern; -import org.openecomp.appc.dg.util.InputParameterValidation; -import org.openecomp.appc.exceptions.APPCException; +import org.onap.appc.dg.util.InputParameterValidation; +import org.onap.appc.exceptions.APPCException; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; diff --git a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/UpgradeStubNodeImpl.java b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/UpgradeStubNodeImpl.java index d152203bc..a7e650e9f 100644 --- a/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/UpgradeStubNodeImpl.java +++ b/appc-dg-util/appc-dg-util-bundle/src/main/java/org/openecomp/appc/dg/util/impl/UpgradeStubNodeImpl.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.util.impl; +package org.onap.appc.dg.util.impl; import java.util.Map; -import org.openecomp.appc.dg.util.UpgradeStubNode; -import org.openecomp.appc.exceptions.APPCException; +import org.onap.appc.dg.util.UpgradeStubNode; +import org.onap.appc.exceptions.APPCException; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; diff --git a/appc-dg-util/appc-dg-util-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dg-util/appc-dg-util-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml index ec2e1b08c..ba507e945 100644 --- a/appc-dg-util/appc-dg-util-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/appc-dg-util/appc-dg-util-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -30,30 +30,30 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"> - <bean id="inputParameterValidationBean" class="org.openecomp.appc.dg.util.impl.InputParameterValidationImpl" scope="prototype" > + <bean id="inputParameterValidationBean" class="org.onap.appc.dg.util.impl.InputParameterValidationImpl" scope="prototype" > </bean> - <service id="inputParameterValidationService" interface="org.openecomp.appc.dg.util.InputParameterValidation" ref="inputParameterValidationBean"/> + <service id="inputParameterValidationService" interface="org.onap.appc.dg.util.InputParameterValidation" ref="inputParameterValidationBean"/> - <bean id="executeNodeActionBean" class="org.openecomp.appc.dg.util.impl.ExecuteNodeActionImpl" scope="prototype" > + <bean id="executeNodeActionBean" class="org.onap.appc.dg.util.impl.ExecuteNodeActionImpl" scope="prototype" > </bean> - <service id="executeNodeActionService" interface="org.openecomp.appc.dg.util.ExecuteNodeAction" ref="executeNodeActionBean"/> + <service id="executeNodeActionService" interface="org.onap.appc.dg.util.ExecuteNodeAction" ref="executeNodeActionBean"/> - <!--bean id="DCAEReporterPlugin" class="org.openecomp.appc.dg.util.impl.DCAEReporterPluginImpl" scope="prototype" > + <!--bean id="DCAEReporterPlugin" class="org.onap.appc.dg.util.impl.DCAEReporterPluginImpl" scope="prototype" > <property name="eventSender" ref="eventSenderServiceRef"/> </bean--> - <!--reference interface="org.openecomp.appc.adapter.messaging.dmaap.EventSender" id="eventSenderServiceRef"/--> - <!--service id = "DCAEReporterPluginService" interface="org.openecomp.appc.dg.util.DCAEReporterPlugin" ref="DCAEReporterPlugin"/--> + <!--reference interface="org.onap.appc.adapter.messaging.dmaap.EventSender" id="eventSenderServiceRef"/--> + <!--service id = "DCAEReporterPluginService" interface="org.onap.appc.dg.util.DCAEReporterPlugin" ref="DCAEReporterPlugin"/--> - <!--bean id="NetconfClientPlugin" class="org.openecomp.appc.dg.util.impl.NetconfClientPluginImpl" scope="prototype" ></bean--> - <!--service id = "NetconfClientService" interface="org.openecomp.appc.dg.util.NetconfClientPlugin" ref="NetconfClientPlugin"/--> + <!--bean id="NetconfClientPlugin" class="org.onap.appc.dg.util.impl.NetconfClientPluginImpl" scope="prototype" ></bean--> + <!--service id = "NetconfClientService" interface="org.onap.appc.dg.util.NetconfClientPlugin" ref="NetconfClientPlugin"/--> - <!--bean id="NetconfDBPlugin" class="org.openecomp.appc.dg.util.impl.NetconfDBPluginImpl" scope="prototype" ></bean--> - <!--service id = "NetconfDBService" interface="org.openecomp.appc.dg.util.NetconfDBPlugin" ref="NetconfDBPlugin"/--> + <!--bean id="NetconfDBPlugin" class="org.onap.appc.dg.util.impl.NetconfDBPluginImpl" scope="prototype" ></bean--> + <!--service id = "NetconfDBService" interface="org.onap.appc.dg.util.NetconfDBPlugin" ref="NetconfDBPlugin"/--> - <bean id="upgradeNode" class="org.openecomp.appc.dg.util.impl.UpgradeStubNodeImpl" scope="prototype"/> - <service id = "upgradeNodeService" interface="org.openecomp.appc.dg.util.UpgradeStubNode" ref="upgradeNode"/> + <bean id="upgradeNode" class="org.onap.appc.dg.util.impl.UpgradeStubNodeImpl" scope="prototype"/> + <service id = "upgradeNodeService" interface="org.onap.appc.dg.util.UpgradeStubNode" ref="upgradeNode"/> </blueprint> diff --git a/appc-dg-util/appc-dg-util-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-dg-util/appc-dg-util-bundle/src/main/resources/org/openecomp/appc/default.properties index a4f55e527..0185c72a9 100644 --- a/appc-dg-util/appc-dg-util-bundle/src/main/resources/org/openecomp/appc/default.properties +++ b/appc-dg-util/appc-dg-util-bundle/src/main/resources/org/openecomp/appc/default.properties @@ -24,6 +24,6 @@ # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded # to supply configuration options -org.openecomp.appc.bootstrap.file=appc.properties -org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. +org.onap.appc.bootstrap.file=appc.properties +org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. # diff --git a/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/AppcDgUtilActivatorTest.java b/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/AppcDgUtilActivatorTest.java index 4aec25004..066863bb8 100644 --- a/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/AppcDgUtilActivatorTest.java +++ b/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/AppcDgUtilActivatorTest.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.util; +package org.onap.appc.dg.util; import org.junit.Before; import org.junit.Test; diff --git a/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/ExecuteNodeActionImplTest.java b/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/ExecuteNodeActionImplTest.java index c1c107206..3280cb954 100644 --- a/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/ExecuteNodeActionImplTest.java +++ b/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/ExecuteNodeActionImplTest.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.util.impl; +package org.onap.appc.dg.util.impl; import com.att.eelf.configuration.EELFLogger; import org.junit.Before; @@ -33,7 +33,7 @@ import org.mockito.Spy; import org.onap.ccsdk.sli.adaptors.aai.AAIService; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicResource; -import org.openecomp.appc.exceptions.APPCException; +import org.onap.appc.exceptions.APPCException; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; diff --git a/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/InputParameterValidationImplTest.java b/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/InputParameterValidationImplTest.java index 23e1f52c5..405c1d92a 100644 --- a/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/InputParameterValidationImplTest.java +++ b/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/InputParameterValidationImplTest.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.util.impl; +package org.onap.appc.dg.util.impl; import org.junit.Assert; import org.junit.Before; diff --git a/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/UpgradeStubNodeImplTest.java b/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/UpgradeStubNodeImplTest.java index d652eb906..6eb732064 100644 --- a/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/UpgradeStubNodeImplTest.java +++ b/appc-dg-util/appc-dg-util-bundle/src/test/java/org/openecomp/appc/dg/util/impl/UpgradeStubNodeImplTest.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.util.impl; +package org.onap.appc.dg.util.impl; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import org.openecomp.appc.exceptions.APPCException; +import org.onap.appc.exceptions.APPCException; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.onap.ccsdk.sli.core.sli.SvcLogicResource; |