Change package names from com.hpcloud to monasca.common

To have sensible package names this required changing the model package
names

Change-Id: I7ce96c4574d1e851f64ee6235324bb12fd01ac78

README.md

@@ -19,22 +19,14 @@ A change has been submitted to StackForge to switch to bare-trusty for this buil
 
 ### Application Specific Sub-Projects
 
-* [mon-model](https://git.hpcloud.netstackforge/monasca-common/tree/master/mon-model) - Common domain and event models for monitoring services.
+* [monasca-common-model](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-model) - Common domain and event models for monitoring services.
 
 ### Platform Sub-Projects
 
-* [mon-dropwizard](https://git.hpcloud.netstackforge/monasca-common/tree/master/mon-dropwizard) - Utilities for building and testing dropwizard services.
+* [monasca-common-dropwizard](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-dropwizard) - Utilities for building and testing dropwizard services.
-* [mon-kafka](https://git.hpcloud.netstackforge/monasca-common/tree/master/mon-kafka) - Various utilities for working with Kafka.
+* [monasca-common-kafka](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-kafka) - Various utilities for working with Kafka.
-* [mon-persistence](https://git.hpcloud.netstackforge/monasca-common/tree/master/mon-persistence) - Persistence related infrastructure and utilities.
+* [monasca-common-persistence](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-persistence) - Persistence related infrastructure and utilities.
-* [mon-service](https://git.hpcloud.netstackforge/monasca-common/tree/master/mon-service) - Simple service abstractions and utilities.
+* [monasca-common-service](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-service) - Simple service abstractions and utilities.
-* [mon-streaming](https://git.hpcloud.netstackforge/monasca-common/tree/master/mon-streaming) - Streaming related utilities.
+* [monasca-common-streaming](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-streaming) - Streaming related utilities.
-* [mon-testing](https://git.hpcloud.netstackforge/monasca-common/tree/master/mon-testing) - A set of testing related dependencies.
+* [monasca-common-testing](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-testing) - A set of testing related dependencies.
-* [mon-util](https://git.hpcloud.netstackforge/monasca-common/tree/master/mon-util) - Various utilities such as for serialization, dependency injection, date and time, invocation retries, concurrency, etc.
+* [monasca-common-util](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-util) - Various utilities such as for serialization, dependency injection, date and time, invocation retries, concurrency, etc.
-
-### Deploying to Nexus
-
-To deploy to nexus, just run the command below, inserting a version number that is greater than the current nexus version (this command is usually performed by Jenkins):
-
-```
-mvn deploy -DBUILD_NUM=${BUILD_NUMBER}
-```

java/monasca-common-dropwizard/src/main/java/monasca/common/dropwizard/persistence/DatabaseModule.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.dropwizard.persistence;
+package monasca.common.dropwizard.persistence;
 
 import io.dropwizard.db.DataSourceFactory;
 import io.dropwizard.jdbi.DBIFactory;

java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/AbstractAppTest.java

@@ -1,4 +1,4 @@
-package com.hpcloud.dropwizard;
+package monasca.common.dropwizard;
 
 import io.dropwizard.Application;
 import io.dropwizard.Configuration;
@@ -120,4 +120,4 @@ public abstract class AbstractAppTest<C extends Configuration> {
   public Environment getEnvironment() {
     return environment;
   }
-}
+}

java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/AbstractResourceTest.java

@@ -1,4 +1,4 @@
-package com.hpcloud.dropwizard;
+package monasca.common.dropwizard;
 
 import io.dropwizard.Configuration;
 import io.dropwizard.configuration.ConfigurationFactory;
@@ -130,4 +130,4 @@ public abstract class AbstractResourceTest {
   }
 
   protected abstract void setupResources() throws Exception;
-}
+}

java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/JsonHelpers.java

@@ -1,4 +1,4 @@
-package com.hpcloud.dropwizard;
+package monasca.common.dropwizard;
 
 import io.dropwizard.testing.FixtureHelpers;
 

java/monasca-common-influxdb/src/main/java/monasca/common/configuration/DatabaseConfiguration.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.hpcloud.configuration;
+package monasca.common.configuration;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

java/monasca-common-influxdb/src/main/java/monasca/common/configuration/InfluxDbConfiguration.java

@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.hpcloud.configuration;
+package monasca.common.configuration;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

java/monasca-common-kafka/src/main/java/monasca/common/configuration/KafkaConsumerConfiguration.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.configuration;
+package monasca.common.configuration;
 
 import java.io.Serializable;
 

java/monasca-common-kafka/src/main/java/monasca/common/configuration/KafkaConsumerProperties.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.configuration;
+package monasca.common.configuration;
 
 import java.io.Serializable;
 import java.util.Properties;

java/monasca-common-kafka/src/main/java/monasca/common/configuration/KafkaProducerConfiguration.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.configuration;
+package monasca.common.configuration;
 
 import java.io.Serializable;
 

java/monasca-common-kafka/src/main/java/monasca/common/configuration/KafkaProducerProperties.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.configuration;
+package monasca.common.configuration;
 
 import java.util.Properties;
 

java/monasca-common-kafka/src/main/java/monasca/common/messaging/kafka/KafkaConfiguration.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.messaging.kafka;
+package monasca.common.messaging.kafka;
 
 import org.hibernate.validator.constraints.NotEmpty;
 

java/monasca-common-kafka/src/main/java/monasca/common/messaging/kafka/KafkaHealthCheck.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.messaging.kafka;
+package monasca.common.messaging.kafka;
 
 import java.util.HashMap;
 import java.util.Map;

java/monasca-common-kafka/src/main/resources/monasca/common/kafka-producer-config.yml

@@ -18,7 +18,7 @@ serializerClass: kafkaserializerStringEncoder
 #keyserializerclass:
 
 #Required
-partitionerClass: comhpcloudSimplePartitioner
+partitionerClass: monascaSimplePartitioner
 
 #compressionCodec:
 #compressedTopics :
@@ -30,4 +30,4 @@ partitionerClass: comhpcloudSimplePartitioner
 #queueEnqueueTimeoutMs:
 #batchNumMessages:
 #sendBufferBytes:
-#clientId:
+#clientId:

java/monasca-common-kafka/src/test/java/monasca/common/messaging/kafka/KafkaHealthCheckTest.java

@@ -1,4 +1,4 @@
-package com.hpcloud.messaging.kafka;
+package monasca.common.messaging.kafka;
 
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;

java/monasca-common-kafka/src/test/resources/log4j.properties

@@ -1,8 +1,8 @@
 log4j.rootLogger=INFO, console
 
-log4j.logger.com.hpcloud.mon=DEBUG
+log4j.logger.monasca.common.configuration=DEBUG
-log4j.logger.com.hpcloud.messaging=DEBUG
+log4j.logger.monasca.common.messaging=DEBUG
 
 log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.conversionPattern=%-5p [%d{ISO8601}] [%.18t] %c{1}: %m%n
+log4j.appender.console.layout.conversionPattern=%-5p [%d{ISO8601}] [%.18t] %c{1}: %m%n

java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthClient.java

@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 
 import java.util.Map;

java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthClientFactory.java

@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 import org.apache.commons.pool.impl.GenericObjectPool;
 

java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthConnectionException.java

@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 /**
  * An exception to indicate any connection issue.

java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthConstants.java

@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 public interface AuthConstants {
   /**
@@ -231,4 +231,4 @@ public interface AuthConstants {
   public static final String ADMIN_SECRET_KEY = "AdminSecretKey";
   public static final String ADMIN_PROJECT_ID = "AdminProjectId";
 
-}
+}

java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthException.java

@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 /**
  * An exception to indicate any authentication error.

java/monasca-common-middleware/src/main/java/monasca/common/middleware/CatalogV3.java

@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 import java.util.List;
 

java/monasca-common-middleware/src/main/java/monasca/common/middleware/Config.java

@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletContext;

java/monasca-common-middleware/src/main/java/monasca/common/middleware/ExceptionHandlerUtil.java

@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 public class ExceptionHandlerUtil {
 	

java/monasca-common-middleware/src/main/java/monasca/common/middleware/FilterUtils.java

@@ -1,25 +1,25 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 
-import static com.hpcloud.middleware.AuthConstants.AUTH_IDENTITY_STATUS;
+import static monasca.common.middleware.AuthConstants.AUTH_IDENTITY_STATUS;
 
-import static com.hpcloud.middleware.AuthConstants.AUTH_ROLES;
+import static monasca.common.middleware.AuthConstants.AUTH_ROLES;
-import static com.hpcloud.middleware.AuthConstants.AUTH_TENANT_NAME;
+import static monasca.common.middleware.AuthConstants.AUTH_TENANT_NAME;
 
-import static com.hpcloud.middleware.AuthConstants.AUTH_USER_ID;
+import static monasca.common.middleware.AuthConstants.AUTH_USER_ID;
-import static com.hpcloud.middleware.AuthConstants.AUTH_DOMAIN_ID;
+import static monasca.common.middleware.AuthConstants.AUTH_DOMAIN_ID;
-import static com.hpcloud.middleware.AuthConstants.AUTH_DOMAIN_NAME;
+import static monasca.common.middleware.AuthConstants.AUTH_DOMAIN_NAME;
-import static com.hpcloud.middleware.AuthConstants.AUTH_PROJECT_ID;
+import static monasca.common.middleware.AuthConstants.AUTH_PROJECT_ID;
-import static com.hpcloud.middleware.AuthConstants.AUTH_PROJECT_NAME;
+import static monasca.common.middleware.AuthConstants.AUTH_PROJECT_NAME;
-import static com.hpcloud.middleware.AuthConstants.AUTH_TENANT_ID;
+import static monasca.common.middleware.AuthConstants.AUTH_TENANT_ID;
-import static com.hpcloud.middleware.AuthConstants.AUTH_USER_NAME;
+import static monasca.common.middleware.AuthConstants.AUTH_USER_NAME;
-import static com.hpcloud.middleware.AuthConstants.IdentityStatus;
+import static monasca.common.middleware.AuthConstants.IdentityStatus;
-import static com.hpcloud.middleware.AuthConstants.AUTH_PROJECT_DOMAIN_ID;
+import static monasca.common.middleware.AuthConstants.AUTH_PROJECT_DOMAIN_ID;
-import static com.hpcloud.middleware.AuthConstants.AUTH_PROJECT_DOMAIN_NAME;
+import static monasca.common.middleware.AuthConstants.AUTH_PROJECT_DOMAIN_NAME;
-import static com.hpcloud.middleware.AuthConstants.AUTH_USER_DOMAIN_ID;
+import static monasca.common.middleware.AuthConstants.AUTH_USER_DOMAIN_ID;
-import static com.hpcloud.middleware.AuthConstants.AUTH_USER_DOMAIN_NAME;
+import static monasca.common.middleware.AuthConstants.AUTH_USER_DOMAIN_NAME;
-import static com.hpcloud.middleware.AuthConstants.AUTH_HP_IDM_ROLES;
+import static monasca.common.middleware.AuthConstants.AUTH_HP_IDM_ROLES;
-import static com.hpcloud.middleware.AuthConstants.AUTH_SERVICE_CATALOG;
+import static monasca.common.middleware.AuthConstants.AUTH_SERVICE_CATALOG;
 
 import java.io.IOException;
 import java.lang.reflect.Modifier;

java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpAuthClient.java

@@ -1,7 +1,7 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
-import static com.hpcloud.middleware.AuthConstants.TOKEN;
+import static monasca.common.middleware.AuthConstants.TOKEN;
-import static com.hpcloud.middleware.AuthConstants.AUTH_SUBJECT_TOKEN;
+import static monasca.common.middleware.AuthConstants.AUTH_SUBJECT_TOKEN;
 
 import java.io.BufferedReader;
 import java.io.IOException;

java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpClientFactory.java

@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 import org.apache.commons.pool.impl.GenericObjectPool;
 

java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpClientPoolFactory.java

@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 import java.io.File;
 import java.io.FileInputStream;

java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpPoolCleaner.java

@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 import java.util.concurrent.TimeUnit;
 

java/monasca-common-middleware/src/main/java/monasca/common/middleware/ServiceUnavailableException.java

@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 /**
  * Created by johnderr on 6/25/14.

java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenAuth.java

@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author liemmn
  */
-public class TokenAuth implements Filter, com.hpcloud.middleware.AuthConstants {
+public class TokenAuth implements Filter, monasca.common.middleware.AuthConstants {
 
   private static final String TOKEN_NOTFOUND = "Bad Request: Token not found in the request";
   private static final String SERVICE_IDS_PARAM = "serviceIds";
@@ -46,7 +46,7 @@ public class TokenAuth implements Filter, com.hpcloud.middleware.AuthConstants {
   private static final String SERVICE_CATALOG_PARAM = "includeCatalog";
   private static final String API_VERSION_PARAM = "apiVersion";
 
-  private final com.hpcloud.middleware.Config appConfig = Config.getInstance();
+  private final monasca.common.middleware.Config appConfig = Config.getInstance();
 
   private FilterConfig filterConfig;
 

java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenCache.java

@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 import com.google.common.cache.*;
 import org.apache.http.client.ClientProtocolException;

java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenExceptionHandler.java

@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 import java.io.IOException;
 

java/monasca-common-middleware/src/main/java/monasca/common/middleware/UnavailableException.java

@@ -1,4 +1,4 @@
-package com.hpcloud.middleware;
+package monasca.common.middleware;
 
 /**
  * Created by johnderr on 6/25/14.

java/monasca-common-model/src/main/java/monasca/common/model/ComputeServiceInfo.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model;
+package monasca.common.model;
 
 import java.util.Arrays;
 import java.util.List;

java/monasca-common-model/src/main/java/monasca/common/model/ObjectStoreServiceInfo.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model;
+package monasca.common.model;
 
 import java.util.Arrays;
 import java.util.List;

java/monasca-common-model/src/main/java/monasca/common/model/ServiceInfo.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model;
+package monasca.common.model;
 
 import java.util.List;
 import java.util.Set;
@@ -37,4 +37,4 @@ interface ServiceInfo {
    * Returns the supported metric names.
    */
   Set<String> getSupportedMetricNames();
-}
+}

java/monasca-common-model/src/main/java/monasca/common/model/Services.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model;
+package monasca.common.model;
 
 import java.util.HashMap;
 import java.util.Map;

java/monasca-common-model/src/main/java/monasca/common/model/VolumeServiceInfo.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model;
+package monasca.common.model;
 
 import java.util.Arrays;
 import java.util.List;

java/monasca-common-model/src/main/java/monasca/common/model/alarm/AggregateFunction.java

@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.hpcloud.util.stats.Statistic;
+import monasca.common.util.stats.Statistic;
-import com.hpcloud.util.stats.Statistics.Average;
+import monasca.common.util.stats.Statistics.Average;
-import com.hpcloud.util.stats.Statistics.Count;
+import monasca.common.util.stats.Statistics.Count;
-import com.hpcloud.util.stats.Statistics.Max;
+import monasca.common.util.stats.Statistics.Max;
-import com.hpcloud.util.stats.Statistics.Min;
+import monasca.common.util.stats.Statistics.Min;
-import com.hpcloud.util.stats.Statistics.Sum;
+import monasca.common.util.stats.Statistics.Sum;
 
 public enum AggregateFunction {
   MIN, MAX, SUM, COUNT, AVG;
@@ -50,4 +50,4 @@ public enum AggregateFunction {
       return Max.class;
     return null;
   }
-}
+}

java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmExpression.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,7 +27,7 @@ import org.antlr.v4.runtime.tree.ParseTreeWalker;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.hpcloud.util.Stack;
+import monasca.common.util.Stack;
 
 /**
  * Alarm expression value object.

java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmExpressionErrorListener.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 import org.antlr.v4.runtime.BaseErrorListener;
 import org.antlr.v4.runtime.RecognitionException;

java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmOperator.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
@@ -64,4 +64,4 @@ public enum AlarmOperator {
   public String toString() {
     return operatorSymbols;
   }
-}
+}

java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmState.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
@@ -25,4 +25,4 @@ public enum AlarmState {
   public static AlarmState fromJson(String text) {
     return valueOf(text.toUpperCase());
   }
-}
+}

java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmSubExpression.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 import java.io.Serializable;
 
@@ -24,9 +24,9 @@ import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ParseTreeWalker;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.hpcloud.mon.common.model.alarm.AlarmExpressionLexer;
+import monasca.common.model.alarm.AlarmExpressionLexer;
-import com.hpcloud.mon.common.model.alarm.AlarmExpressionParser;
+import monasca.common.model.alarm.AlarmExpressionParser;
-import com.hpcloud.mon.common.model.metric.MetricDefinition;
+import monasca.common.model.metric.MetricDefinition;
 
 /**
  * Alarm sub expression value object.

java/monasca-common-model/src/main/java/monasca/common/model/alarm/AlarmSubExpressionListener.java

@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import com.hpcloud.mon.common.model.metric.MetricDefinition;
+import monasca.common.model.metric.MetricDefinition;
 
 /**
  * Complex alarm parser lister for sub expression extraction.

java/monasca-common-model/src/main/java/monasca/common/model/alarm/BooleanExpression.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 import java.util.ArrayList;
 import java.util.List;

java/monasca-common-model/src/main/java/monasca/common/model/alarm/BooleanOperator.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 /**
  * Boolean operator.

java/monasca-common-model/src/main/java/monasca/common/model/domain/common/AbstractEntity.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.domain.common;
+package monasca.common.model.domain.common;
 
 /**
  * Defines an entity with a surrogate key.

java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmCreatedEvent.java

@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package monasca.common.model.event;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonRootName;
+import monasca.common.model.alarm.AlarmSubExpression;
+
+/**
+ * Represents an alarm having been created.
+ */
+@JsonRootName(value = "alarm-created")
+public class AlarmCreatedEvent implements Serializable {
+  private static final long serialVersionUID = -2971178340115415059L;
+
+  public String tenantId;
+  public String alarmId;
+  public String alarmName;
+  public String alarmExpression;
+  public Map<String, AlarmSubExpression> alarmSubExpressions;
+
+  public AlarmCreatedEvent() {
+  }
+
+  public AlarmCreatedEvent(String tenantId, String alarmId, String alarmName,
+      String alarmExpression, Map<String, AlarmSubExpression> alarmSubExpressions) {
+    this.tenantId = tenantId;
+    this.alarmId = alarmId;
+    this.alarmName = alarmName;
+    this.alarmExpression = alarmExpression;
+    this.alarmSubExpressions = alarmSubExpressions;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj)
+      return true;
+    if (obj == null)
+      return false;
+    if (getClass() != obj.getClass())
+      return false;
+    AlarmCreatedEvent other = (AlarmCreatedEvent) obj;
+    if (alarmExpression == null) {
+      if (other.alarmExpression != null)
+        return false;
+    } else if (!alarmExpression.equals(other.alarmExpression))
+      return false;
+    if (alarmId == null) {
+      if (other.alarmId != null)
+        return false;
+    } else if (!alarmId.equals(other.alarmId))
+      return false;
+    if (alarmName == null) {
+      if (other.alarmName != null)
+        return false;
+    } else if (!alarmName.equals(other.alarmName))
+      return false;
+    if (alarmSubExpressions == null) {
+      if (other.alarmSubExpressions != null)
+        return false;
+    } else if (!alarmSubExpressions.equals(other.alarmSubExpressions))
+      return false;
+    if (tenantId == null) {
+      if (other.tenantId != null)
+        return false;
+    } else if (!tenantId.equals(other.tenantId))
+      return false;
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    final int prime = 31;
+    int result = 1;
+    result = prime * result + ((alarmExpression == null) ? 0 : alarmExpression.hashCode());
+    result = prime * result + ((alarmId == null) ? 0 : alarmId.hashCode());
+    result = prime * result + ((alarmName == null) ? 0 : alarmName.hashCode());
+    result = prime * result + ((alarmSubExpressions == null) ? 0 : alarmSubExpressions.hashCode());
+    result = prime * result + ((tenantId == null) ? 0 : tenantId.hashCode());
+    return result;
+  }
+
+  @Override
+  public String toString() {
+    return String.format(
+        "AlarmCreatedEvent [tenantId=%s, alarmId=%s, alarmName=%s, expression=%s]", tenantId,
+        alarmId, alarmName, alarmExpression);
+  }
+}

java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmDefinitionCreatedEvent.java

@@ -11,14 +11,14 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.hpcloud.mon.common.event;
+package monasca.common.model.event;
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonRootName;
-import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
+import monasca.common.model.alarm.AlarmSubExpression;
 
 /**
  * Represents an alarm definition having been created.

java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmDefinitionDeletedEvent.java

@@ -11,13 +11,13 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.hpcloud.mon.common.event;
+package monasca.common.model.event;
 
 import java.io.Serializable;
 import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonRootName;
-import com.hpcloud.mon.common.model.metric.MetricDefinition;
+import monasca.common.model.metric.MetricDefinition;
 
 /**
  * Represents an alarm definition having been deleted.

java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmDefinitionUpdatedEvent.java

@@ -11,14 +11,14 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.hpcloud.mon.common.event;
+package monasca.common.model.event;
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonRootName;
-import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
+import monasca.common.model.alarm.AlarmSubExpression;
 
 /**
  * Represents an alarm definition having been updated.

java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmDeletedEvent.java

@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.hpcloud.mon.common.event;
+package monasca.common.model.event;
 
 import java.io.Serializable;
 import java.util.List;
@@ -19,8 +19,8 @@ import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonRootName;
 
-import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
+import monasca.common.model.alarm.AlarmSubExpression;
-import com.hpcloud.mon.common.model.metric.MetricDefinition;
+import monasca.common.model.metric.MetricDefinition;
 
 /**
  * Represents an alarm having been deleted.

java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmStateTransitionedEvent.java

@@ -11,13 +11,13 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.hpcloud.mon.common.event;
+package monasca.common.model.event;
 
 import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonRootName;
-import com.hpcloud.mon.common.model.alarm.AlarmState;
+import monasca.common.model.alarm.AlarmState;
-import com.hpcloud.mon.common.model.metric.MetricDefinition;
+import monasca.common.model.metric.MetricDefinition;
 
 /**
  * Represents an alarm state transition having occurred.

java/monasca-common-model/src/main/java/monasca/common/model/event/AlarmUpdatedEvent.java

@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.hpcloud.mon.common.event;
+package monasca.common.model.event;
 
 import java.io.Serializable;
 import java.util.List;
@@ -19,9 +19,9 @@ import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonRootName;
 
-import com.hpcloud.mon.common.model.alarm.AlarmState;
+import monasca.common.model.alarm.AlarmState;
-import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
+import monasca.common.model.alarm.AlarmSubExpression;
-import com.hpcloud.mon.common.model.metric.MetricDefinition;
+import monasca.common.model.metric.MetricDefinition;
 
 /**
  * Represents an alarm having been updated.

java/monasca-common-model/src/main/java/monasca/common/model/metric/Metric.java

@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.hpcloud.mon.common.model.metric;
+package monasca.common.model.metric;
 
 import java.io.Serializable;
 

java/monasca-common-model/src/main/java/monasca/common/model/metric/MetricDefinition.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.metric;
+package monasca.common.model.metric;
 
 import java.io.Serializable;
 import java.util.Map;

java/monasca-common-model/src/main/java/monasca/common/model/metric/MetricEnvelope.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.metric;
+package monasca.common.model.metric;
 
 import java.util.Map;
 

java/monasca-common-model/src/main/java/monasca/common/model/metric/MetricEnvelopes.java

@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.metric;
+package monasca.common.model.metric;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.hpcloud.util.Exceptions;
+import monasca.common.util.Exceptions;
 
 /**
  * Utilities for working with MetricEnvelopes.

java/monasca-common-model/src/main/java/monasca/common/model/metric/Metrics.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.mon.common.model.metric;
+package monasca.common.model.metric;
 
 import java.io.IOException;
 import java.util.Map;
@@ -28,7 +28,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.hpcloud.util.Exceptions;
+import monasca.common.util.Exceptions;
 
 /**
  * Utilities for working with Metrics.

java/monasca-common-model/src/test/java/monasca/common/mon/common/model/ServicesTest.java

@@ -1,4 +1,4 @@
-package com.hpcloud.mon.common.model;
+package monasca.common.model;
 
 import static org.testng.Assert.assertTrue;
 

java/monasca-common-model/src/test/java/monasca/common/mon/common/model/alarm/AlarmExpressionTest.java

@@ -1,4 +1,4 @@
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
@@ -10,7 +10,7 @@ import java.util.List;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableMap;
-import com.hpcloud.mon.common.model.metric.MetricDefinition;
+import monasca.common.model.metric.MetricDefinition;
 
 @Test
 public class AlarmExpressionTest {

java/monasca-common-model/src/test/java/monasca/common/mon/common/model/alarm/AlarmSubExpressionTest.java

@@ -1,4 +1,4 @@
-package com.hpcloud.mon.common.model.alarm;
+package monasca.common.model.alarm;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
@@ -7,11 +7,11 @@ import static org.testng.Assert.assertTrue;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableMap;
-import com.hpcloud.mon.common.model.alarm.AggregateFunction;
+import monasca.common.model.alarm.AggregateFunction;
-import com.hpcloud.mon.common.model.alarm.AlarmExpression;
+import monasca.common.model.alarm.AlarmExpression;
-import com.hpcloud.mon.common.model.alarm.AlarmOperator;
+import monasca.common.model.alarm.AlarmOperator;
-import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
+import monasca.common.model.alarm.AlarmSubExpression;
-import com.hpcloud.mon.common.model.metric.MetricDefinition;
+import monasca.common.model.metric.MetricDefinition;
 
 @Test
 public class AlarmSubExpressionTest {

java/monasca-common-model/src/test/java/monasca/common/mon/common/model/metric/MetricsTest.java

@@ -1,4 +1,4 @@
-package com.hpcloud.mon.common.model.metric;
+package monasca.common.model.metric;
 
 import static org.testng.Assert.assertEquals;
 
@@ -8,8 +8,8 @@ import java.util.TreeMap;
 
 import org.testng.annotations.Test;
 
-import com.hpcloud.mon.common.model.metric.Metric;
+import monasca.common.model.metric.Metric;
-import com.hpcloud.mon.common.model.metric.Metrics;
+import monasca.common.model.metric.Metrics;
 
 @Test
 public class MetricsTest {

java/monasca-common-persistence/src/main/java/monasca/common/persistence/AbstractPersistenceModule.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 
 import org.skife.jdbi.v2.DBI;
 

java/monasca-common-persistence/src/main/java/monasca/common/persistence/BeanMapper.java

@@ -1,4 +1,4 @@
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 
 /*
  * Copyright 2004 - 2011 Brian McCallister

java/monasca-common-persistence/src/main/java/monasca/common/persistence/BeanMapperFactory.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 
 import org.skife.jdbi.v2.ResultSetMapperFactory;
 import org.skife.jdbi.v2.StatementContext;
@@ -34,4 +34,4 @@ public class BeanMapperFactory implements ResultSetMapperFactory {
   public ResultSetMapper mapperFor(Class type, StatementContext ctx) {
     return new BeanMapper(type);
   }
-}
+}

java/monasca-common-persistence/src/main/java/monasca/common/persistence/DataTypes.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 
 import java.io.Reader;
 import java.sql.Clob;

java/monasca-common-persistence/src/main/java/monasca/common/persistence/KeyValueMapper.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

java/monasca-common-persistence/src/main/java/monasca/common/persistence/SqlQueries.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 
 import java.util.Iterator;
 import java.util.Map;

java/monasca-common-persistence/src/main/java/monasca/common/persistence/SqlStatements.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 
 import java.util.List;
 import java.util.Map;

java/monasca-common-persistence/src/main/java/monasca/common/persistence/package-info.java

@@ -1,5 +1,5 @@
 /**
  * Persistence related types.
  */
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 

java/monasca-common-persistence/src/test/java/monasca/common/persistence/AbstractPersistenceModuleTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
@@ -26,7 +26,7 @@ import org.testng.annotations.Test;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Module;
-import com.hpcloud.util.Injector;
+import monasca.common.util.Injector;
 
 @Test
 public class AbstractPersistenceModuleTest {

java/monasca-common-persistence/src/test/java/monasca/common/persistence/BeanMappeTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 
 import static org.testng.Assert.*;
 import org.testng.annotations.Test;

java/monasca-common-persistence/src/test/java/monasca/common/persistence/SqlStatementsTest.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.persistence;
+package monasca.common.persistence;
 
 import java.util.ArrayList;
 import java.util.HashMap;

java/monasca-common-streaming/src/main/java/monasca/common/streaming/storm/Logging.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.streaming.storm;
+package monasca.common.streaming.storm;
 
 import backtype.storm.task.TopologyContext;
 

java/monasca-common-streaming/src/main/java/monasca/common/streaming/storm/Streams.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.streaming.storm;
+package monasca.common.streaming.storm;
 
 /**
  * Utilities for working with streams.

java/monasca-common-streaming/src/main/java/monasca/common/streaming/storm/TupleDeserializer.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.streaming.storm;
+package monasca.common.streaming.storm;
 
 import java.util.List;
 

java/monasca-common-streaming/src/main/java/monasca/common/streaming/storm/Tuples.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.streaming.storm;
+package monasca.common.streaming.storm;
 
 import backtype.storm.Constants;
 import backtype.storm.tuple.Tuple;

java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/NoopSpout.java

@@ -1,4 +1,4 @@
-package com.hpcloud.streaming.storm;
+package monasca.common.streaming.storm;
 
 import java.util.Map;
 

java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/PeriodicTupleProvider.java

@@ -1,8 +1,8 @@
-package com.hpcloud.streaming.storm;
+package monasca.common.streaming.storm;
 
 import java.util.List;
 
-import com.hpcloud.streaming.storm.TestSpout.TupleProvider;
+import monasca.common.streaming.storm.TestSpout.TupleProvider;
 
 public class PeriodicTupleProvider implements TupleProvider {
   @Override

java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/TestSpout.java

@@ -1,4 +1,4 @@
-package com.hpcloud.streaming.storm;
+package monasca.common.streaming.storm;
 
 import java.util.List;
 import java.util.Map;
@@ -8,7 +8,7 @@ import backtype.storm.task.TopologyContext;
 import backtype.storm.topology.OutputFieldsDeclarer;
 import backtype.storm.topology.base.BaseRichSpout;
 
-import com.hpcloud.streaming.storm.TupleDeserializer;
+import monasca.common.streaming.storm.TupleDeserializer;
 
 public class TestSpout extends BaseRichSpout {
   private static final long serialVersionUID = 849564133745588803L;

java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/TopologyTestCase.java

@@ -1,4 +1,4 @@
-package com.hpcloud.streaming.storm;
+package monasca.common.streaming.storm;
 
 import org.testng.annotations.AfterSuite;
 import org.testng.annotations.BeforeSuite;
@@ -9,7 +9,7 @@ import backtype.storm.LocalCluster;
 import backtype.storm.generated.StormTopology;
 
 import com.google.common.base.Preconditions;
-import com.hpcloud.util.Injector;
+import monasca.common.util.Injector;
 
 @Test(groups = "integration")
 public class TopologyTestCase {

java/monasca-common-testing/src/main/java/monasca/common/testing/Assert.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.testing;
+package monasca.common.testing;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.fail;

java/monasca-common-testing/src/main/resources/testngAll.xml

@@ -11,11 +11,11 @@
       </run>
     </groups>
     <packages>
-      <package name="com.hpcloud.*" />
+      <package name="monasca.*" />
     </packages>
   </test>
 
   <listeners>
-    <!-- <listener class-name="com.hpcloud.LoggingListener" /> -->
+    <!-- <listener class-name="monasca.LoggingListener" /> -->
   </listeners>
-</suite>
+</suite>

java/monasca-common-util/src/main/java/monasca/common/util/Duration.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util;
+package monasca.common.util;
 
 import java.io.Serializable;
 import java.util.HashMap;

java/monasca-common-util/src/main/java/monasca/common/util/Exceptions.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util;
+package monasca.common.util;
 
 import com.google.common.base.Preconditions;
 

java/monasca-common-util/src/main/java/monasca/common/util/Injector.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util;
+package monasca.common.util;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.ConfigurationException;

java/monasca-common-util/src/main/java/monasca/common/util/Serialization.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util;
+package monasca.common.util;
 
 import java.io.IOException;
 import java.util.Map;

java/monasca-common-util/src/main/java/monasca/common/util/Stack.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util;
+package monasca.common.util;
 
 import java.util.ArrayList;
 

java/monasca-common-util/src/main/java/monasca/common/util/Types.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util;
+package monasca.common.util;
 
 import java.lang.reflect.Method;
 

java/monasca-common-util/src/main/java/monasca/common/util/concurrent/ExecutionListener.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util.concurrent;
+package monasca.common.util.concurrent;
 
 /**
  * Listens to execution related events.
@@ -23,4 +23,4 @@ public interface ExecutionListener {
   void afterExecute(Runnable r, Throwable t);
 
   void beforeExecute(Thread t, Runnable r);
-}
+}

java/monasca-common-util/src/main/java/monasca/common/util/concurrent/InstrumentedThreadPoolExecutor.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util.concurrent;
+package monasca.common.util.concurrent;
 
 import java.util.HashSet;
 import java.util.Set;

java/monasca-common-util/src/main/java/monasca/common/util/concurrent/ThreadPools.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util.concurrent;
+package monasca.common.util.concurrent;
 
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.SynchronousQueue;

java/monasca-common-util/src/main/java/monasca/common/util/concurrent/package-info.java

@@ -1,5 +1,5 @@
 /**
  * Utilities for concurrent processing.
  */
-package com.hpcloud.util.concurrent;
+package monasca.common.util.concurrent;
 

java/monasca-common-util/src/main/java/monasca/common/util/config/ConfigurationException.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hpcloud.util.config;
+package monasca.common.util.config;
 
 /**
  * An exception thrown where there is an error parsing a configuration object.