diff options
Diffstat (limited to 'appc-lifecycle-management/appc-lifecycle-management-core')
6 files changed, 40 insertions, 40 deletions
diff --git a/appc-lifecycle-management/appc-lifecycle-management-core/pom.xml b/appc-lifecycle-management/appc-lifecycle-management-core/pom.xml index 460684507..82324efb6 100644 --- a/appc-lifecycle-management/appc-lifecycle-management-core/pom.xml +++ b/appc-lifecycle-management/appc-lifecycle-management-core/pom.xml @@ -20,7 +20,7 @@ --> <parent> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-lifecycle-management</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> @@ -34,12 +34,12 @@ <dependencies> <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>state-machine-lib</artifactId> <version>${project.version}</version> </dependency> @@ -59,9 +59,9 @@ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-Version>${project.version}</Bundle-Version> <Embed-Transitive>true</Embed-Transitive> - <Export-Service>org.openecomp.appc.lifecyclemanager.LifecycleManager</Export-Service> + <Export-Service>org.onap.appc.lifecyclemanager.LifecycleManager</Export-Service> <Import-Package> - org.openecomp.appc.lifecyclemanager.*, + org.onap.appc.lifecyclemanager.*, *;resolution:=optional </Import-Package> </instructions> diff --git a/appc-lifecycle-management/appc-lifecycle-management-core/src/main/java/org/openecomp/appc/lifecyclemanager/impl/LifecycleManagerImpl.java b/appc-lifecycle-management/appc-lifecycle-management-core/src/main/java/org/openecomp/appc/lifecyclemanager/impl/LifecycleManagerImpl.java index b7acf98ed..12c48b481 100644 --- a/appc-lifecycle-management/appc-lifecycle-management-core/src/main/java/org/openecomp/appc/lifecyclemanager/impl/LifecycleManagerImpl.java +++ b/appc-lifecycle-management/appc-lifecycle-management-core/src/main/java/org/openecomp/appc/lifecyclemanager/impl/LifecycleManagerImpl.java @@ -22,22 +22,22 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.lifecyclemanager.impl; +package org.onap.appc.lifecyclemanager.impl; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.eelf.i18n.EELFResourceManager; -import org.openecomp.appc.exceptions.InvalidInputException; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.lifecyclemanager.LifecycleManager; -import org.openecomp.appc.lifecyclemanager.objects.LifecycleException; -import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException; -import org.openecomp.appc.statemachine.StateMachine; -import org.openecomp.appc.statemachine.StateMetaDataReader; -import org.openecomp.appc.statemachine.impl.StateMachineFactory; -import org.openecomp.appc.statemachine.impl.readers.AppcOamMetaDataReader; -import org.openecomp.appc.statemachine.impl.readers.VnfMetaDataReader; -import org.openecomp.appc.statemachine.objects.*; +import org.onap.appc.exceptions.InvalidInputException; +import org.onap.appc.i18n.Msg; +import org.onap.appc.lifecyclemanager.LifecycleManager; +import org.onap.appc.lifecyclemanager.objects.LifecycleException; +import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException; +import org.onap.appc.statemachine.StateMachine; +import org.onap.appc.statemachine.StateMetaDataReader; +import org.onap.appc.statemachine.impl.StateMachineFactory; +import org.onap.appc.statemachine.impl.readers.AppcOamMetaDataReader; +import org.onap.appc.statemachine.impl.readers.VnfMetaDataReader; +import org.onap.appc.statemachine.objects.*; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/appc-lifecycle-management/appc-lifecycle-management-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-lifecycle-management/appc-lifecycle-management-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml index cea242f1f..bedf6e654 100644 --- a/appc-lifecycle-management/appc-lifecycle-management-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/appc-lifecycle-management/appc-lifecycle-management-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -26,9 +26,9 @@ <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" 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="lifecycleManagerBean" class="org.openecomp.appc.lifecyclemanager.impl.LifecycleManagerImpl" scope="singleton"> + <bean id="lifecycleManagerBean" class="org.onap.appc.lifecyclemanager.impl.LifecycleManagerImpl" scope="singleton"> </bean> - <service id="lcmService" interface="org.openecomp.appc.lifecyclemanager.LifecycleManager" ref="lifecycleManagerBean"/> + <service id="lcmService" interface="org.onap.appc.lifecyclemanager.LifecycleManager" ref="lifecycleManagerBean"/> </blueprint> diff --git a/appc-lifecycle-management/appc-lifecycle-management-core/src/main/resources/org/openecomp/appc/default.properties b/appc-lifecycle-management/appc-lifecycle-management-core/src/main/resources/org/openecomp/appc/default.properties index 99d728335..0c4de19aa 100644 --- a/appc-lifecycle-management/appc-lifecycle-management-core/src/main/resources/org/openecomp/appc/default.properties +++ b/appc-lifecycle-management/appc-lifecycle-management-core/src/main/resources/org/openecomp/appc/default.properties @@ -24,8 +24,8 @@ # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded # to supply configuration options -org.openecomp.appc.bootstrap.file=appc.properties -org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. +org.onap.appc.bootstrap.file=appc.properties +org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. #Property below provided by appc.properties appc.LCM.provider.url=https://localhost:8443/restconf/operations/appc-provider-lcm diff --git a/appc-lifecycle-management/appc-lifecycle-management-core/src/test/java/org/openecomp/appc/LifecycleManagerTest.java b/appc-lifecycle-management/appc-lifecycle-management-core/src/test/java/org/openecomp/appc/LifecycleManagerTest.java index 299c32546..07aef6cb3 100644 --- a/appc-lifecycle-management/appc-lifecycle-management-core/src/test/java/org/openecomp/appc/LifecycleManagerTest.java +++ b/appc-lifecycle-management/appc-lifecycle-management-core/src/test/java/org/openecomp/appc/LifecycleManagerTest.java @@ -22,22 +22,22 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc; +package org.onap.appc; import org.junit.Assert; import org.junit.Test; -import org.openecomp.appc.exceptions.InvalidInputException; -import org.openecomp.appc.lifecyclemanager.LifecycleManager; -import org.openecomp.appc.statemachine.StateMetaDataReader; -import org.openecomp.appc.lifecyclemanager.impl.LifecycleManagerImpl; -import org.openecomp.appc.lifecyclemanager.objects.LifecycleException; -import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException; -import org.openecomp.appc.statemachine.impl.readers.VnfMetaDataReader; -import org.openecomp.appc.statemachine.impl.readers.VnfMetaDataReader.VNFOperation; -import org.openecomp.appc.statemachine.objects.Event; -import org.openecomp.appc.statemachine.objects.State; -import org.openecomp.appc.statemachine.objects.StateMachineMetadata; -import org.openecomp.appc.statemachine.objects.Transition; +import org.onap.appc.exceptions.InvalidInputException; +import org.onap.appc.lifecyclemanager.LifecycleManager; +import org.onap.appc.statemachine.StateMetaDataReader; +import org.onap.appc.lifecyclemanager.impl.LifecycleManagerImpl; +import org.onap.appc.lifecyclemanager.objects.LifecycleException; +import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException; +import org.onap.appc.statemachine.impl.readers.VnfMetaDataReader; +import org.onap.appc.statemachine.impl.readers.VnfMetaDataReader.VNFOperation; +import org.onap.appc.statemachine.objects.Event; +import org.onap.appc.statemachine.objects.State; +import org.onap.appc.statemachine.objects.StateMachineMetadata; +import org.onap.appc.statemachine.objects.Transition; import java.util.*; diff --git a/appc-lifecycle-management/appc-lifecycle-management-core/src/test/java/org/openecomp/appc/OamLifeCycleManagerTest.java b/appc-lifecycle-management/appc-lifecycle-management-core/src/test/java/org/openecomp/appc/OamLifeCycleManagerTest.java index 0a89251d3..403a9f39e 100644 --- a/appc-lifecycle-management/appc-lifecycle-management-core/src/test/java/org/openecomp/appc/OamLifeCycleManagerTest.java +++ b/appc-lifecycle-management/appc-lifecycle-management-core/src/test/java/org/openecomp/appc/OamLifeCycleManagerTest.java @@ -22,18 +22,18 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc; +package org.onap.appc; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.openecomp.appc.lifecyclemanager.impl.LifecycleManagerImpl; -import org.openecomp.appc.lifecyclemanager.objects.LifecycleException; -import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException; -import org.openecomp.appc.statemachine.impl.readers.AppcOamMetaDataReader; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.onap.appc.lifecyclemanager.impl.LifecycleManagerImpl; +import org.onap.appc.lifecyclemanager.objects.LifecycleException; +import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException; +import org.onap.appc.statemachine.impl.readers.AppcOamMetaDataReader; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import java.util.Arrays; import java.util.List; |