diff options
Diffstat (limited to 'appc-metric')
39 files changed, 122 insertions, 122 deletions
diff --git a/appc-metric/appc-metric-bundle/pom.xml b/appc-metric/appc-metric-bundle/pom.xml index b70f5949b..286941f5e 100644 --- a/appc-metric/appc-metric-bundle/pom.xml +++ b/appc-metric/appc-metric-bundle/pom.xml @@ -21,11 +21,11 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-metric</artifactId> <version>1.3.0-SNAPSHOT</version> </parent> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-metric-bundle</artifactId> <packaging>bundle</packaging> @@ -40,7 +40,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-common</artifactId> <version>${project.version}</version> </dependency> @@ -88,11 +88,11 @@ <instructions> <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-Version>${project.version}</Bundle-Version> - <Bundle-Activator>org.openecomp.appc.MetricActivator</Bundle-Activator> + <Bundle-Activator>org.onap.appc.MetricActivator</Bundle-Activator> <Embed-Dependency>appc-common,eelf-core,logback-core,logback-classic,appc-data-lib;scope=compile|runtime;inline=false</Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> - <Export-Service>org.openecomp.appc.metricservice.impl.MetricServiceImpl,org.openecomp.appc.metricservice.MetricService,org.openecomp.appc.metricservice.policy.*,org.openecomp.appc.metricservice.metric.*</Export-Service> - <Export-Package>org.openecomp.appc.metricservice,org.openecomp.appc.metricservice.impl,org.openecomp.appc.metricservice.policy,org.openecomp.appc.metricservice.publisher,org.openecomp.appc.metricservice.metric,org.apache.http</Export-Package> + <Export-Service>org.onap.appc.metricservice.impl.MetricServiceImpl,org.onap.appc.metricservice.MetricService,org.onap.appc.metricservice.policy.*,org.onap.appc.metricservice.metric.*</Export-Service> + <Export-Package>org.onap.appc.metricservice,org.onap.appc.metricservice.impl,org.onap.appc.metricservice.policy,org.onap.appc.metricservice.publisher,org.onap.appc.metricservice.metric,org.apache.http</Export-Package> <Import-Package>!groovy.lang,!javax.*,!org.apache.log,!org.apache.log4j.*,!org.codehaus.jackson.*,!org.codehaus.jackson.map.*,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.apache.commons.lang3,!org.codehaus.janino,!org.jasypt.*,!com.ibm.icu.*,!com.sun.faces.*,*;resolution:=optional</Import-Package> </instructions> </configuration> diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/MetricActivator.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/MetricActivator.java index 1df645844..40ff14827 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/MetricActivator.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/MetricActivator.java @@ -22,10 +22,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc; +package org.onap.appc; -import org.openecomp.appc.metricservice.MetricService; -import org.openecomp.appc.metricservice.impl.MetricServiceImpl; +import org.onap.appc.metricservice.MetricService; +import org.onap.appc.metricservice.impl.MetricServiceImpl; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import org.osgi.framework.BundleActivator; diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/MetricRegistry.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/MetricRegistry.java index 9a6e35f42..6e658ae47 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/MetricRegistry.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/MetricRegistry.java @@ -22,13 +22,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice; +package org.onap.appc.metricservice; -import org.openecomp.appc.metricservice.metric.Counter; -import org.openecomp.appc.metricservice.metric.Metric; -import org.openecomp.appc.metricservice.metric.MetricBuilderFactory; -import org.openecomp.appc.metricservice.policy.PolicyBuilderFactory; -import org.openecomp.appc.metricservice.policy.PublishingPolicy; +import org.onap.appc.metricservice.metric.Counter; +import org.onap.appc.metricservice.metric.Metric; +import org.onap.appc.metricservice.metric.MetricBuilderFactory; +import org.onap.appc.metricservice.policy.PolicyBuilderFactory; +import org.onap.appc.metricservice.policy.PublishingPolicy; /** * diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/MetricService.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/MetricService.java index 911265735..65ff72d97 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/MetricService.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/MetricService.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice; +package org.onap.appc.metricservice; import java.util.Map; diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/Publisher.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/Publisher.java index eeb6a8202..1d38e44c3 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/Publisher.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/Publisher.java @@ -22,9 +22,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice; +package org.onap.appc.metricservice; -import org.openecomp.appc.metricservice.metric.Metric; +import org.onap.appc.metricservice.metric.Metric; /** * Low-level logic of exposing metric values in certain way. There might be plenty of options such as logging, JMX, etc. diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/impl/MetricRegistryImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/impl/MetricRegistryImpl.java index a33ea33f9..ac2054151 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/impl/MetricRegistryImpl.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/impl/MetricRegistryImpl.java @@ -22,19 +22,19 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.impl; +package org.onap.appc.metricservice.impl; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.openecomp.appc.metricservice.MetricRegistry; -import org.openecomp.appc.metricservice.metric.Counter; -import org.openecomp.appc.metricservice.metric.Metric; -import org.openecomp.appc.metricservice.metric.MetricBuilderFactory; -import org.openecomp.appc.metricservice.metric.impl.MetricBuilderFactoryImpl; -import org.openecomp.appc.metricservice.policy.PolicyBuilderFactory; -import org.openecomp.appc.metricservice.policy.PublishingPolicy; -import org.openecomp.appc.metricservice.policy.impl.PolicyBuilderFactoryImpl; +import org.onap.appc.metricservice.MetricRegistry; +import org.onap.appc.metricservice.metric.Counter; +import org.onap.appc.metricservice.metric.Metric; +import org.onap.appc.metricservice.metric.MetricBuilderFactory; +import org.onap.appc.metricservice.metric.impl.MetricBuilderFactoryImpl; +import org.onap.appc.metricservice.policy.PolicyBuilderFactory; +import org.onap.appc.metricservice.policy.PublishingPolicy; +import org.onap.appc.metricservice.policy.impl.PolicyBuilderFactoryImpl; public class MetricRegistryImpl implements MetricRegistry { diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/impl/MetricServiceImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/impl/MetricServiceImpl.java index 97b257804..20f2d8d2e 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/impl/MetricServiceImpl.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/impl/MetricServiceImpl.java @@ -22,14 +22,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.impl; +package org.onap.appc.metricservice.impl; import java.util.Collections; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.openecomp.appc.metricservice.MetricRegistry; -import org.openecomp.appc.metricservice.MetricService; +import org.onap.appc.metricservice.MetricRegistry; +import org.onap.appc.metricservice.MetricService; public class MetricServiceImpl implements MetricService { diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/Counter.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/Counter.java index d99afc573..0b4d3e2d3 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/Counter.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/Counter.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.metric; +package org.onap.appc.metricservice.metric; public interface Counter extends Metric { diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DispatchingFunctionCounterBuilder.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DispatchingFunctionCounterBuilder.java index dd836f43c..bff07f627 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DispatchingFunctionCounterBuilder.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DispatchingFunctionCounterBuilder.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.metric; +package org.onap.appc.metricservice.metric; public interface DispatchingFunctionCounterBuilder { diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DispatchingFuntionMetric.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DispatchingFuntionMetric.java index 14e14180f..384875e9b 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DispatchingFuntionMetric.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DispatchingFuntionMetric.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.metric; +package org.onap.appc.metricservice.metric; public interface DispatchingFuntionMetric extends Metric { diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DmaapRequestCounterBuilder.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DmaapRequestCounterBuilder.java index 89ce7ef8f..efb23963f 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DmaapRequestCounterBuilder.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DmaapRequestCounterBuilder.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.metric; +package org.onap.appc.metricservice.metric; public interface DmaapRequestCounterBuilder { diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DmaapRequestCounterMetric.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DmaapRequestCounterMetric.java index 37eaca01c..522432631 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DmaapRequestCounterMetric.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/DmaapRequestCounterMetric.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.metric; +package org.onap.appc.metricservice.metric; public interface DmaapRequestCounterMetric extends Metric { diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/Metric.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/Metric.java index 4035f1e74..ce4297c88 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/Metric.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/Metric.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.metric; +package org.onap.appc.metricservice.metric; import java.util.HashMap; diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/MetricBuilderFactory.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/MetricBuilderFactory.java index e6d870458..5a35247d3 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/MetricBuilderFactory.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/MetricBuilderFactory.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.metric; +package org.onap.appc.metricservice.metric; public interface MetricBuilderFactory { diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/MetricType.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/MetricType.java index 659f7810c..3f8ec30a8 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/MetricType.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/MetricType.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.metric; +package org.onap.appc.metricservice.metric; /** * diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/PrimitiveCounter.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/PrimitiveCounter.java index 142bef112..a3fc2191f 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/PrimitiveCounter.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/PrimitiveCounter.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.metric; +package org.onap.appc.metricservice.metric; /** * diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/PrimitiveCounterBuilder.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/PrimitiveCounterBuilder.java index cb6c42996..ded5ecf47 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/PrimitiveCounterBuilder.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/PrimitiveCounterBuilder.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.metric; +package org.onap.appc.metricservice.metric; /** * diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DefaultPrimitiveCounter.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DefaultPrimitiveCounter.java index ce5a39629..4b1992986 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DefaultPrimitiveCounter.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DefaultPrimitiveCounter.java @@ -22,10 +22,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.metric.impl; +package org.onap.appc.metricservice.metric.impl; -import org.openecomp.appc.metricservice.metric.MetricType; -import org.openecomp.appc.metricservice.metric.PrimitiveCounter; +import org.onap.appc.metricservice.metric.MetricType; +import org.onap.appc.metricservice.metric.PrimitiveCounter; import java.text.SimpleDateFormat; import java.util.Calendar; diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DispatchingFunctionCounterBuilderImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DispatchingFunctionCounterBuilderImpl.java index 812326139..fd3b05ef7 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DispatchingFunctionCounterBuilderImpl.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DispatchingFunctionCounterBuilderImpl.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.metric.impl; +package org.onap.appc.metricservice.metric.impl; -import org.openecomp.appc.metricservice.metric.DispatchingFunctionCounterBuilder; -import org.openecomp.appc.metricservice.metric.DispatchingFuntionMetric; -import org.openecomp.appc.metricservice.metric.MetricType; +import org.onap.appc.metricservice.metric.DispatchingFunctionCounterBuilder; +import org.onap.appc.metricservice.metric.DispatchingFuntionMetric; +import org.onap.appc.metricservice.metric.MetricType; public class DispatchingFunctionCounterBuilderImpl implements DispatchingFunctionCounterBuilder { diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DispatchingFuntionMetricImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DispatchingFuntionMetricImpl.java index cff76adb4..a6487957f 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DispatchingFuntionMetricImpl.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DispatchingFuntionMetricImpl.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.metric.impl; +package org.onap.appc.metricservice.metric.impl; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -30,8 +30,8 @@ import java.util.HashMap; import java.util.TimeZone; import java.util.concurrent.atomic.AtomicLong; -import org.openecomp.appc.metricservice.metric.DispatchingFuntionMetric; -import org.openecomp.appc.metricservice.metric.MetricType; +import org.onap.appc.metricservice.metric.DispatchingFuntionMetric; +import org.onap.appc.metricservice.metric.MetricType; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DmaapRequestCounterBuilderImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DmaapRequestCounterBuilderImpl.java index 00fc1e32f..b5b53a810 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DmaapRequestCounterBuilderImpl.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DmaapRequestCounterBuilderImpl.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.metric.impl; +package org.onap.appc.metricservice.metric.impl; -import org.openecomp.appc.metricservice.metric.MetricType; -import org.openecomp.appc.metricservice.metric.DmaapRequestCounterBuilder; -import org.openecomp.appc.metricservice.metric.DmaapRequestCounterMetric; +import org.onap.appc.metricservice.metric.MetricType; +import org.onap.appc.metricservice.metric.DmaapRequestCounterBuilder; +import org.onap.appc.metricservice.metric.DmaapRequestCounterMetric; public class DmaapRequestCounterBuilderImpl implements DmaapRequestCounterBuilder { diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DmaapRequestCounterMetricImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DmaapRequestCounterMetricImpl.java index 3d85da5e3..dd1a6fc08 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DmaapRequestCounterMetricImpl.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/DmaapRequestCounterMetricImpl.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.metric.impl; +package org.onap.appc.metricservice.metric.impl; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -30,8 +30,8 @@ import java.util.HashMap; import java.util.TimeZone; import java.util.concurrent.atomic.AtomicLong; -import org.openecomp.appc.metricservice.metric.MetricType; -import org.openecomp.appc.metricservice.metric.DmaapRequestCounterMetric; +import org.onap.appc.metricservice.metric.MetricType; +import org.onap.appc.metricservice.metric.DmaapRequestCounterMetric; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/MetricBuilderFactoryImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/MetricBuilderFactoryImpl.java index 055e3fd45..0a45941d1 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/MetricBuilderFactoryImpl.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/MetricBuilderFactoryImpl.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.metric.impl; +package org.onap.appc.metricservice.metric.impl; -import org.openecomp.appc.metricservice.metric.DispatchingFunctionCounterBuilder; -import org.openecomp.appc.metricservice.metric.MetricBuilderFactory; -import org.openecomp.appc.metricservice.metric.PrimitiveCounterBuilder; -import org.openecomp.appc.metricservice.metric.DmaapRequestCounterBuilder; +import org.onap.appc.metricservice.metric.DispatchingFunctionCounterBuilder; +import org.onap.appc.metricservice.metric.MetricBuilderFactory; +import org.onap.appc.metricservice.metric.PrimitiveCounterBuilder; +import org.onap.appc.metricservice.metric.DmaapRequestCounterBuilder; public class MetricBuilderFactoryImpl implements MetricBuilderFactory { diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/PrimitiveCounterBuilderImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/PrimitiveCounterBuilderImpl.java index cee05fc4c..c95f89e75 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/PrimitiveCounterBuilderImpl.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/metric/impl/PrimitiveCounterBuilderImpl.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.metric.impl; +package org.onap.appc.metricservice.metric.impl; -import org.openecomp.appc.metricservice.metric.MetricType; -import org.openecomp.appc.metricservice.metric.PrimitiveCounter; -import org.openecomp.appc.metricservice.metric.PrimitiveCounterBuilder; +import org.onap.appc.metricservice.metric.MetricType; +import org.onap.appc.metricservice.metric.PrimitiveCounter; +import org.onap.appc.metricservice.metric.PrimitiveCounterBuilder; public class PrimitiveCounterBuilderImpl implements PrimitiveCounterBuilder { diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/PolicyBuilderFactory.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/PolicyBuilderFactory.java index 2db92db9f..fbdd04979 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/PolicyBuilderFactory.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/PolicyBuilderFactory.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.policy; +package org.onap.appc.metricservice.policy; public interface PolicyBuilderFactory { diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/PublishingPolicy.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/PublishingPolicy.java index 47ab741b1..44a05f994 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/PublishingPolicy.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/PublishingPolicy.java @@ -22,10 +22,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.policy; +package org.onap.appc.metricservice.policy; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.metricservice.metric.Metric; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.metricservice.metric.Metric; /** * diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/ScheduledPolicyBuilder.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/ScheduledPolicyBuilder.java index 86d156fc7..d67031d03 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/ScheduledPolicyBuilder.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/ScheduledPolicyBuilder.java @@ -22,10 +22,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.policy; +package org.onap.appc.metricservice.policy; -import org.openecomp.appc.metricservice.Publisher; -import org.openecomp.appc.metricservice.metric.Metric; +import org.onap.appc.metricservice.Publisher; +import org.onap.appc.metricservice.metric.Metric; /** * diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/ScheduledPublishingPolicy.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/ScheduledPublishingPolicy.java index 10569c122..697ef3ff7 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/ScheduledPublishingPolicy.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/ScheduledPublishingPolicy.java @@ -22,9 +22,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.policy; +package org.onap.appc.metricservice.policy; -import org.openecomp.appc.metricservice.Publisher; +import org.onap.appc.metricservice.Publisher; public interface ScheduledPublishingPolicy extends PublishingPolicy{ diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/PolicyBuilderFactoryImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/PolicyBuilderFactoryImpl.java index a2441902d..d9c4cf024 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/PolicyBuilderFactoryImpl.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/PolicyBuilderFactoryImpl.java @@ -22,10 +22,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.policy.impl; +package org.onap.appc.metricservice.policy.impl; -import org.openecomp.appc.metricservice.policy.PolicyBuilderFactory; -import org.openecomp.appc.metricservice.policy.ScheduledPolicyBuilder; +import org.onap.appc.metricservice.policy.PolicyBuilderFactory; +import org.onap.appc.metricservice.policy.ScheduledPolicyBuilder; public class PolicyBuilderFactoryImpl implements PolicyBuilderFactory { diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/ScheduledPolicyBuilderImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/ScheduledPolicyBuilderImpl.java index e164f3bef..65ce62435 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/ScheduledPolicyBuilderImpl.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/ScheduledPolicyBuilderImpl.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.policy.impl; +package org.onap.appc.metricservice.policy.impl; -import org.openecomp.appc.metricservice.Publisher; -import org.openecomp.appc.metricservice.metric.Metric; -import org.openecomp.appc.metricservice.policy.PublishingPolicy; -import org.openecomp.appc.metricservice.policy.ScheduledPolicyBuilder; +import org.onap.appc.metricservice.Publisher; +import org.onap.appc.metricservice.metric.Metric; +import org.onap.appc.metricservice.policy.PublishingPolicy; +import org.onap.appc.metricservice.policy.ScheduledPolicyBuilder; public class ScheduledPolicyBuilderImpl implements ScheduledPolicyBuilder { diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/ScheduledPublishingPolicyImpl.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/ScheduledPublishingPolicyImpl.java index 9bbb22344..8933150f3 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/ScheduledPublishingPolicyImpl.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/policy/impl/ScheduledPublishingPolicyImpl.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.policy.impl; +package org.onap.appc.metricservice.policy.impl; import java.text.SimpleDateFormat; import java.util.Date; @@ -32,14 +32,14 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.metricservice.MetricRegistry; -import org.openecomp.appc.metricservice.MetricService; -import org.openecomp.appc.metricservice.Publisher; -import org.openecomp.appc.metricservice.metric.Metric; -import org.openecomp.appc.metricservice.policy.ScheduledPublishingPolicy; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.metricservice.MetricRegistry; +import org.onap.appc.metricservice.MetricService; +import org.onap.appc.metricservice.Publisher; +import org.onap.appc.metricservice.metric.Metric; +import org.onap.appc.metricservice.policy.ScheduledPublishingPolicy; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/publisher/LogPublisher.java b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/publisher/LogPublisher.java index 85c8188ad..e4f160d40 100644 --- a/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/publisher/LogPublisher.java +++ b/appc-metric/appc-metric-bundle/src/main/java/org/openecomp/appc/metricservice/publisher/LogPublisher.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice.publisher; +package org.onap.appc.metricservice.publisher; -import org.openecomp.appc.metricservice.MetricRegistry; -import org.openecomp.appc.metricservice.Publisher; -import org.openecomp.appc.metricservice.metric.Metric; +import org.onap.appc.metricservice.MetricRegistry; +import org.onap.appc.metricservice.Publisher; +import org.onap.appc.metricservice.metric.Metric; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-metric/appc-metric-bundle/src/main/resources/org/openecomp/appc/default.properties b/appc-metric/appc-metric-bundle/src/main/resources/org/openecomp/appc/default.properties index e696380bd..f7eae381e 100644 --- a/appc-metric/appc-metric-bundle/src/main/resources/org/openecomp/appc/default.properties +++ b/appc-metric/appc-metric-bundle/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},. diff --git a/appc-metric/appc-metric-bundle/src/test/java/org/openecomp/appc/metricservice/TestMetricServiceImpl.java b/appc-metric/appc-metric-bundle/src/test/java/org/openecomp/appc/metricservice/TestMetricServiceImpl.java index f35410e09..7c8011e81 100644 --- a/appc-metric/appc-metric-bundle/src/test/java/org/openecomp/appc/metricservice/TestMetricServiceImpl.java +++ b/appc-metric/appc-metric-bundle/src/test/java/org/openecomp/appc/metricservice/TestMetricServiceImpl.java @@ -22,20 +22,20 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.metricservice; +package org.onap.appc.metricservice; import org.junit.Assert; import org.junit.Test; -import org.openecomp.appc.metricservice.impl.MetricServiceImpl; -import org.openecomp.appc.metricservice.metric.MetricType; -import org.openecomp.appc.metricservice.metric.PrimitiveCounter; -import org.openecomp.appc.metricservice.metric.DmaapRequestCounterMetric; -import org.openecomp.appc.metricservice.metric.DispatchingFuntionMetric; -import org.openecomp.appc.metricservice.metric.impl.DefaultPrimitiveCounter; -import org.openecomp.appc.metricservice.metric.impl.DmaapRequestCounterMetricImpl; -import org.openecomp.appc.metricservice.metric.impl.DispatchingFuntionMetricImpl; -import org.openecomp.appc.metricservice.metric.impl.DispatchingFunctionCounterBuilderImpl; -import org.openecomp.appc.metricservice.metric.impl.DmaapRequestCounterBuilderImpl; -import org.openecomp.appc.metricservice.metric.impl.PrimitiveCounterBuilderImpl; +import org.onap.appc.metricservice.impl.MetricServiceImpl; +import org.onap.appc.metricservice.metric.MetricType; +import org.onap.appc.metricservice.metric.PrimitiveCounter; +import org.onap.appc.metricservice.metric.DmaapRequestCounterMetric; +import org.onap.appc.metricservice.metric.DispatchingFuntionMetric; +import org.onap.appc.metricservice.metric.impl.DefaultPrimitiveCounter; +import org.onap.appc.metricservice.metric.impl.DmaapRequestCounterMetricImpl; +import org.onap.appc.metricservice.metric.impl.DispatchingFuntionMetricImpl; +import org.onap.appc.metricservice.metric.impl.DispatchingFunctionCounterBuilderImpl; +import org.onap.appc.metricservice.metric.impl.DmaapRequestCounterBuilderImpl; +import org.onap.appc.metricservice.metric.impl.PrimitiveCounterBuilderImpl; import java.text.SimpleDateFormat; import java.util.Calendar; diff --git a/appc-metric/appc-metric-bundle/src/test/resources/org/openecomp/appc/default.properties b/appc-metric/appc-metric-bundle/src/test/resources/org/openecomp/appc/default.properties index 3779c6465..596705820 100644 --- a/appc-metric/appc-metric-bundle/src/test/resources/org/openecomp/appc/default.properties +++ b/appc-metric/appc-metric-bundle/src/test/resources/org/openecomp/appc/default.properties @@ -23,7 +23,7 @@ ### # Define the name and path of any user-provided configuration (bootstrap) file that can be loaded to supply configuration options -#org.openecomp.appc.bootstrap.file=executor-test.properties -org.openecomp.appc.bootstrap.file=appc.properties -org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. +#org.onap.appc.bootstrap.file=executor-test.properties +org.onap.appc.bootstrap.file=appc.properties +org.onap.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},. diff --git a/appc-metric/appc-metric-features/pom.xml b/appc-metric/appc-metric-features/pom.xml index d2f38c0bc..6437dad1e 100644 --- a/appc-metric/appc-metric-features/pom.xml +++ b/appc-metric/appc-metric-features/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <artifactId>appc-metric</artifactId> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <version>1.3.0-SNAPSHOT</version> </parent> <name>appc-metric-features</name> @@ -13,7 +13,7 @@ <dependencies> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-metric-bundle</artifactId> <version>${project.version}</version> </dependency> diff --git a/appc-metric/appc-metric-features/src/main/resources/features.xml b/appc-metric/appc-metric-features/src/main/resources/features.xml index b770e6ac3..10e18c1f8 100644 --- a/appc-metric/appc-metric-features/src/main/resources/features.xml +++ b/appc-metric/appc-metric-features/src/main/resources/features.xml @@ -37,9 +37,9 @@ <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> <!-- appc-common bundle is flagged as being a dependency --> - <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle> + <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle> - <bundle>mvn:org.openecomp.appc/appc-metric-bundle/${project.version}</bundle> + <bundle>mvn:org.onap.appc/appc-metric-bundle/${project.version}</bundle> </feature> </features> diff --git a/appc-metric/appc-metric-installer/pom.xml b/appc-metric/appc-metric-installer/pom.xml index 73c1ad90c..320d5aa17 100644 --- a/appc-metric/appc-metric-installer/pom.xml +++ b/appc-metric/appc-metric-installer/pom.xml @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <artifactId>appc-metric</artifactId> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <version>1.3.0-SNAPSHOT</version> </parent> <artifactId>appc-metric-installer</artifactId> @@ -13,14 +13,14 @@ <properties> <application.name>appc-metric</application.name> <features.boot>appc-metric</features.boot> - <features.repositories>mvn:org.openecomp.appc/appc-metric-features/${project.version}/xml/features</features.repositories> + <features.repositories>mvn:org.onap.appc/appc-metric-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-metric-features</artifactId> <version>${project.version}</version> <classifier>features</classifier> @@ -34,7 +34,7 @@ </dependency> <dependency> - <groupId>org.openecomp.appc</groupId> + <groupId>org.onap.appc</groupId> <artifactId>appc-metric-bundle</artifactId> <version>${project.version}</version> </dependency> diff --git a/appc-metric/pom.xml b/appc-metric/pom.xml index 89f3ffbd0..49fcceb8e 100644 --- a/appc-metric/pom.xml +++ b/appc-metric/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> |