diff --git a/java/mon-dropwizard/.gitignore b/java/monasca-common-dropwizard/.gitignore similarity index 100% rename from java/mon-dropwizard/.gitignore rename to java/monasca-common-dropwizard/.gitignore diff --git a/java/mon-dropwizard/pom.xml b/java/monasca-common-dropwizard/pom.xml similarity index 85% rename from java/mon-dropwizard/pom.xml rename to java/monasca-common-dropwizard/pom.xml index f4fc687e..f4b1eb28 100644 --- a/java/mon-dropwizard/pom.xml +++ b/java/monasca-common-dropwizard/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.hpcloud - mon-common + monasca-common + monasca-common ${computedVersion} - mon-dropwizard + monasca-common-dropwizard jar @@ -15,8 +15,8 @@ - com.hpcloud - mon-util + monasca-common + monasca-common-util ${project.version} @@ -40,8 +40,8 @@ - com.hpcloud - mon-testing + monasca-common + monasca-common-testing ${project.version} test diff --git a/java/mon-dropwizard/src/main/java/com/hpcloud/dropwizard/persistence/DatabaseModule.java b/java/monasca-common-dropwizard/src/main/java/com/hpcloud/dropwizard/persistence/DatabaseModule.java similarity index 100% rename from java/mon-dropwizard/src/main/java/com/hpcloud/dropwizard/persistence/DatabaseModule.java rename to java/monasca-common-dropwizard/src/main/java/com/hpcloud/dropwizard/persistence/DatabaseModule.java diff --git a/java/mon-dropwizard/src/test/java/com/hpcloud/dropwizard/AbstractAppTest.java b/java/monasca-common-dropwizard/src/test/java/com/hpcloud/dropwizard/AbstractAppTest.java similarity index 100% rename from java/mon-dropwizard/src/test/java/com/hpcloud/dropwizard/AbstractAppTest.java rename to java/monasca-common-dropwizard/src/test/java/com/hpcloud/dropwizard/AbstractAppTest.java diff --git a/java/mon-dropwizard/src/test/java/com/hpcloud/dropwizard/AbstractResourceTest.java b/java/monasca-common-dropwizard/src/test/java/com/hpcloud/dropwizard/AbstractResourceTest.java similarity index 100% rename from java/mon-dropwizard/src/test/java/com/hpcloud/dropwizard/AbstractResourceTest.java rename to java/monasca-common-dropwizard/src/test/java/com/hpcloud/dropwizard/AbstractResourceTest.java diff --git a/java/mon-dropwizard/src/test/java/com/hpcloud/dropwizard/JsonHelpers.java b/java/monasca-common-dropwizard/src/test/java/com/hpcloud/dropwizard/JsonHelpers.java similarity index 100% rename from java/mon-dropwizard/src/test/java/com/hpcloud/dropwizard/JsonHelpers.java rename to java/monasca-common-dropwizard/src/test/java/com/hpcloud/dropwizard/JsonHelpers.java diff --git a/java/mon-influxdb/pom.xml b/java/monasca-common-influxdb/pom.xml similarity index 81% rename from java/mon-influxdb/pom.xml rename to java/monasca-common-influxdb/pom.xml index 5796083c..f5652e2f 100644 --- a/java/mon-influxdb/pom.xml +++ b/java/monasca-common-influxdb/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.hpcloud - mon-common + monasca-common + monasca-common ${computedVersion} - mon-influxdb + monasca-common-influxdb jar diff --git a/java/mon-influxdb/src/main/java/com/hpcloud/configuration/DatabaseConfiguration.java b/java/monasca-common-influxdb/src/main/java/com/hpcloud/configuration/DatabaseConfiguration.java similarity index 100% rename from java/mon-influxdb/src/main/java/com/hpcloud/configuration/DatabaseConfiguration.java rename to java/monasca-common-influxdb/src/main/java/com/hpcloud/configuration/DatabaseConfiguration.java diff --git a/java/mon-influxdb/src/main/java/com/hpcloud/configuration/InfluxDbConfiguration.java b/java/monasca-common-influxdb/src/main/java/com/hpcloud/configuration/InfluxDbConfiguration.java similarity index 100% rename from java/mon-influxdb/src/main/java/com/hpcloud/configuration/InfluxDbConfiguration.java rename to java/monasca-common-influxdb/src/main/java/com/hpcloud/configuration/InfluxDbConfiguration.java diff --git a/java/mon-kafka/pom.xml b/java/monasca-common-kafka/pom.xml similarity index 85% rename from java/mon-kafka/pom.xml rename to java/monasca-common-kafka/pom.xml index c145c598..f6298e00 100644 --- a/java/mon-kafka/pom.xml +++ b/java/monasca-common-kafka/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.hpcloud - mon-common + monasca-common + monasca-common ${computedVersion} - mon-kafka + monasca-common-kafka jar @@ -21,8 +21,8 @@ ${jackson.version} - com.hpcloud - mon-util + monasca-common + monasca-common-util ${project.version} @@ -58,8 +58,8 @@ - com.hpcloud - mon-testing + monasca-common + monasca-common-testing ${project.version} test diff --git a/java/mon-kafka/src/main/java/com/hpcloud/configuration/KafkaConsumerConfiguration.java b/java/monasca-common-kafka/src/main/java/com/hpcloud/configuration/KafkaConsumerConfiguration.java similarity index 100% rename from java/mon-kafka/src/main/java/com/hpcloud/configuration/KafkaConsumerConfiguration.java rename to java/monasca-common-kafka/src/main/java/com/hpcloud/configuration/KafkaConsumerConfiguration.java diff --git a/java/mon-kafka/src/main/java/com/hpcloud/configuration/KafkaConsumerProperties.java b/java/monasca-common-kafka/src/main/java/com/hpcloud/configuration/KafkaConsumerProperties.java similarity index 100% rename from java/mon-kafka/src/main/java/com/hpcloud/configuration/KafkaConsumerProperties.java rename to java/monasca-common-kafka/src/main/java/com/hpcloud/configuration/KafkaConsumerProperties.java diff --git a/java/mon-kafka/src/main/java/com/hpcloud/configuration/KafkaProducerConfiguration.java b/java/monasca-common-kafka/src/main/java/com/hpcloud/configuration/KafkaProducerConfiguration.java similarity index 100% rename from java/mon-kafka/src/main/java/com/hpcloud/configuration/KafkaProducerConfiguration.java rename to java/monasca-common-kafka/src/main/java/com/hpcloud/configuration/KafkaProducerConfiguration.java diff --git a/java/mon-kafka/src/main/java/com/hpcloud/configuration/KafkaProducerProperties.java b/java/monasca-common-kafka/src/main/java/com/hpcloud/configuration/KafkaProducerProperties.java similarity index 100% rename from java/mon-kafka/src/main/java/com/hpcloud/configuration/KafkaProducerProperties.java rename to java/monasca-common-kafka/src/main/java/com/hpcloud/configuration/KafkaProducerProperties.java diff --git a/java/mon-kafka/src/main/java/com/hpcloud/messaging/kafka/KafkaConfiguration.java b/java/monasca-common-kafka/src/main/java/com/hpcloud/messaging/kafka/KafkaConfiguration.java similarity index 100% rename from java/mon-kafka/src/main/java/com/hpcloud/messaging/kafka/KafkaConfiguration.java rename to java/monasca-common-kafka/src/main/java/com/hpcloud/messaging/kafka/KafkaConfiguration.java diff --git a/java/mon-kafka/src/main/java/com/hpcloud/messaging/kafka/KafkaHealthCheck.java b/java/monasca-common-kafka/src/main/java/com/hpcloud/messaging/kafka/KafkaHealthCheck.java similarity index 100% rename from java/mon-kafka/src/main/java/com/hpcloud/messaging/kafka/KafkaHealthCheck.java rename to java/monasca-common-kafka/src/main/java/com/hpcloud/messaging/kafka/KafkaHealthCheck.java diff --git a/java/mon-kafka/src/main/resources/com/hpcloud/kafka-consumer-config-yml b/java/monasca-common-kafka/src/main/resources/com/hpcloud/kafka-consumer-config-yml similarity index 100% rename from java/mon-kafka/src/main/resources/com/hpcloud/kafka-consumer-config-yml rename to java/monasca-common-kafka/src/main/resources/com/hpcloud/kafka-consumer-config-yml diff --git a/java/mon-kafka/src/main/resources/com/hpcloud/kafka-producer-config.yml b/java/monasca-common-kafka/src/main/resources/com/hpcloud/kafka-producer-config.yml similarity index 100% rename from java/mon-kafka/src/main/resources/com/hpcloud/kafka-producer-config.yml rename to java/monasca-common-kafka/src/main/resources/com/hpcloud/kafka-producer-config.yml diff --git a/java/mon-kafka/src/test/java/com/hpcloud/messaging/kafka/KafkaHealthCheckTest.java b/java/monasca-common-kafka/src/test/java/com/hpcloud/messaging/kafka/KafkaHealthCheckTest.java similarity index 100% rename from java/mon-kafka/src/test/java/com/hpcloud/messaging/kafka/KafkaHealthCheckTest.java rename to java/monasca-common-kafka/src/test/java/com/hpcloud/messaging/kafka/KafkaHealthCheckTest.java diff --git a/java/mon-kafka/src/test/resources/log4j.properties b/java/monasca-common-kafka/src/test/resources/log4j.properties similarity index 100% rename from java/mon-kafka/src/test/resources/log4j.properties rename to java/monasca-common-kafka/src/test/resources/log4j.properties diff --git a/java/mon-middleware/.gitignore b/java/monasca-common-middleware/.gitignore similarity index 100% rename from java/mon-middleware/.gitignore rename to java/monasca-common-middleware/.gitignore diff --git a/java/mon-middleware/pom.xml b/java/monasca-common-middleware/pom.xml similarity index 88% rename from java/mon-middleware/pom.xml rename to java/monasca-common-middleware/pom.xml index e62a7f2c..12e10748 100644 --- a/java/mon-middleware/pom.xml +++ b/java/monasca-common-middleware/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.hpcloud - mon-common + monasca-common + monasca-common ${computedVersion} - mon-middleware + monasca-common-middleware jar @@ -63,14 +63,14 @@ - com.hpcloud - mon-testing + monasca-common + monasca-common-testing ${project.version} test - com.hpcloud - mon-util + monasca-common + monasca-common-util ${project.version} test diff --git a/java/mon-middleware/src/main/java/com/hpcloud/middleware/AuthClient.java b/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthClient.java similarity index 100% rename from java/mon-middleware/src/main/java/com/hpcloud/middleware/AuthClient.java rename to java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthClient.java diff --git a/java/mon-middleware/src/main/java/com/hpcloud/middleware/AuthClientFactory.java b/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthClientFactory.java similarity index 100% rename from java/mon-middleware/src/main/java/com/hpcloud/middleware/AuthClientFactory.java rename to java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthClientFactory.java diff --git a/java/mon-middleware/src/main/java/com/hpcloud/middleware/AuthConnectionException.java b/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthConnectionException.java similarity index 100% rename from java/mon-middleware/src/main/java/com/hpcloud/middleware/AuthConnectionException.java rename to java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthConnectionException.java diff --git a/java/mon-middleware/src/main/java/com/hpcloud/middleware/AuthConstants.java b/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthConstants.java similarity index 100% rename from java/mon-middleware/src/main/java/com/hpcloud/middleware/AuthConstants.java rename to java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthConstants.java diff --git a/java/mon-middleware/src/main/java/com/hpcloud/middleware/AuthException.java b/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthException.java similarity index 100% rename from java/mon-middleware/src/main/java/com/hpcloud/middleware/AuthException.java rename to java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/AuthException.java diff --git a/java/mon-middleware/src/main/java/com/hpcloud/middleware/CatalogV3.java b/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/CatalogV3.java similarity index 100% rename from java/mon-middleware/src/main/java/com/hpcloud/middleware/CatalogV3.java rename to java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/CatalogV3.java diff --git a/java/mon-middleware/src/main/java/com/hpcloud/middleware/Config.java b/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/Config.java similarity index 100% rename from java/mon-middleware/src/main/java/com/hpcloud/middleware/Config.java rename to java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/Config.java diff --git a/java/mon-middleware/src/main/java/com/hpcloud/middleware/ExceptionHandlerUtil.java b/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/ExceptionHandlerUtil.java similarity index 100% rename from java/mon-middleware/src/main/java/com/hpcloud/middleware/ExceptionHandlerUtil.java rename to java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/ExceptionHandlerUtil.java diff --git a/java/mon-middleware/src/main/java/com/hpcloud/middleware/FilterUtils.java b/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/FilterUtils.java similarity index 100% rename from java/mon-middleware/src/main/java/com/hpcloud/middleware/FilterUtils.java rename to java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/FilterUtils.java diff --git a/java/mon-middleware/src/main/java/com/hpcloud/middleware/HttpAuthClient.java b/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/HttpAuthClient.java similarity index 100% rename from java/mon-middleware/src/main/java/com/hpcloud/middleware/HttpAuthClient.java rename to java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/HttpAuthClient.java diff --git a/java/mon-middleware/src/main/java/com/hpcloud/middleware/HttpClientFactory.java b/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/HttpClientFactory.java similarity index 100% rename from java/mon-middleware/src/main/java/com/hpcloud/middleware/HttpClientFactory.java rename to java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/HttpClientFactory.java diff --git a/java/mon-middleware/src/main/java/com/hpcloud/middleware/HttpClientPoolFactory.java b/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/HttpClientPoolFactory.java similarity index 100% rename from java/mon-middleware/src/main/java/com/hpcloud/middleware/HttpClientPoolFactory.java rename to java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/HttpClientPoolFactory.java diff --git a/java/mon-middleware/src/main/java/com/hpcloud/middleware/HttpPoolCleaner.java b/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/HttpPoolCleaner.java similarity index 100% rename from java/mon-middleware/src/main/java/com/hpcloud/middleware/HttpPoolCleaner.java rename to java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/HttpPoolCleaner.java diff --git a/java/mon-middleware/src/main/java/com/hpcloud/middleware/ServiceUnavailableException.java b/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/ServiceUnavailableException.java similarity index 100% rename from java/mon-middleware/src/main/java/com/hpcloud/middleware/ServiceUnavailableException.java rename to java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/ServiceUnavailableException.java diff --git a/java/mon-middleware/src/main/java/com/hpcloud/middleware/TokenAuth.java b/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/TokenAuth.java similarity index 100% rename from java/mon-middleware/src/main/java/com/hpcloud/middleware/TokenAuth.java rename to java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/TokenAuth.java diff --git a/java/mon-middleware/src/main/java/com/hpcloud/middleware/TokenCache.java b/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/TokenCache.java similarity index 100% rename from java/mon-middleware/src/main/java/com/hpcloud/middleware/TokenCache.java rename to java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/TokenCache.java diff --git a/java/mon-middleware/src/main/java/com/hpcloud/middleware/TokenExceptionHandler.java b/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/TokenExceptionHandler.java similarity index 100% rename from java/mon-middleware/src/main/java/com/hpcloud/middleware/TokenExceptionHandler.java rename to java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/TokenExceptionHandler.java diff --git a/java/mon-middleware/src/main/java/com/hpcloud/middleware/UnavailableException.java b/java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/UnavailableException.java similarity index 100% rename from java/mon-middleware/src/main/java/com/hpcloud/middleware/UnavailableException.java rename to java/monasca-common-middleware/src/main/java/com/hpcloud/middleware/UnavailableException.java diff --git a/java/mon-model/.gitignore b/java/monasca-common-model/.gitignore similarity index 100% rename from java/mon-model/.gitignore rename to java/monasca-common-model/.gitignore diff --git a/java/mon-model/pom.xml b/java/monasca-common-model/pom.xml similarity index 93% rename from java/mon-model/pom.xml rename to java/monasca-common-model/pom.xml index 3c045a5d..bf854583 100644 --- a/java/mon-model/pom.xml +++ b/java/monasca-common-model/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.hpcloud - mon-common + monasca-common + monasca-common ${computedVersion} - mon-model + monasca-common-model jar @@ -16,8 +16,8 @@ - com.hpcloud - mon-util + monasca-common + monasca-common-util ${project.version} @@ -43,8 +43,8 @@ - com.hpcloud - mon-testing + monasca-common + monasca-common-testing ${project.version} test diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/event/AlarmCreatedEvent.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmCreatedEvent.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/event/AlarmCreatedEvent.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmCreatedEvent.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/event/AlarmDeletedEvent.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmDeletedEvent.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/event/AlarmDeletedEvent.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmDeletedEvent.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/event/AlarmStateTransitionedEvent.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmStateTransitionedEvent.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/event/AlarmStateTransitionedEvent.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmStateTransitionedEvent.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/event/AlarmUpdatedEvent.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmUpdatedEvent.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/event/AlarmUpdatedEvent.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/event/AlarmUpdatedEvent.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/model/ComputeServiceInfo.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/ComputeServiceInfo.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/model/ComputeServiceInfo.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/ComputeServiceInfo.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/model/ObjectStoreServiceInfo.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/ObjectStoreServiceInfo.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/model/ObjectStoreServiceInfo.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/ObjectStoreServiceInfo.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/model/ServiceInfo.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/ServiceInfo.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/model/ServiceInfo.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/ServiceInfo.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/model/Services.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/Services.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/model/Services.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/Services.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/model/VolumeServiceInfo.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/VolumeServiceInfo.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/model/VolumeServiceInfo.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/VolumeServiceInfo.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/model/alarm/AggregateFunction.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AggregateFunction.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/model/alarm/AggregateFunction.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AggregateFunction.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmExpression.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmExpression.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmExpression.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmExpression.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmExpressionErrorListener.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmExpressionErrorListener.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmExpressionErrorListener.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmExpressionErrorListener.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmOperator.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmOperator.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmOperator.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmOperator.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmState.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmState.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmState.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmState.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmSubExpression.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmSubExpression.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmSubExpression.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmSubExpression.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmSubExpressionListener.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmSubExpressionListener.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmSubExpressionListener.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/AlarmSubExpressionListener.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/model/alarm/BooleanExpression.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/BooleanExpression.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/model/alarm/BooleanExpression.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/BooleanExpression.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/model/alarm/BooleanOperator.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/BooleanOperator.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/model/alarm/BooleanOperator.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/alarm/BooleanOperator.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/model/metric/Metric.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/Metric.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/model/metric/Metric.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/Metric.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/model/metric/MetricDefinition.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/MetricDefinition.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/model/metric/MetricDefinition.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/MetricDefinition.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/model/metric/MetricEnvelope.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/MetricEnvelope.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/model/metric/MetricEnvelope.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/MetricEnvelope.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/model/metric/MetricEnvelopes.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/MetricEnvelopes.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/model/metric/MetricEnvelopes.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/MetricEnvelopes.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/common/model/metric/Metrics.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/Metrics.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/common/model/metric/Metrics.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/common/model/metric/Metrics.java diff --git a/java/mon-model/src/main/java/com/hpcloud/mon/domain/common/AbstractEntity.java b/java/monasca-common-model/src/main/java/com/hpcloud/mon/domain/common/AbstractEntity.java similarity index 100% rename from java/mon-model/src/main/java/com/hpcloud/mon/domain/common/AbstractEntity.java rename to java/monasca-common-model/src/main/java/com/hpcloud/mon/domain/common/AbstractEntity.java diff --git a/java/mon-model/src/main/resources/com/hpcloud/mon/common/model/alarm/AlarmExpression.g4 b/java/monasca-common-model/src/main/resources/com/hpcloud/mon/common/model/alarm/AlarmExpression.g4 similarity index 100% rename from java/mon-model/src/main/resources/com/hpcloud/mon/common/model/alarm/AlarmExpression.g4 rename to java/monasca-common-model/src/main/resources/com/hpcloud/mon/common/model/alarm/AlarmExpression.g4 diff --git a/java/mon-model/src/test/java/com/hpcloud/mon/common/model/ServicesTest.java b/java/monasca-common-model/src/test/java/com/hpcloud/mon/common/model/ServicesTest.java similarity index 100% rename from java/mon-model/src/test/java/com/hpcloud/mon/common/model/ServicesTest.java rename to java/monasca-common-model/src/test/java/com/hpcloud/mon/common/model/ServicesTest.java diff --git a/java/mon-model/src/test/java/com/hpcloud/mon/common/model/alarm/AlarmExpressionTest.java b/java/monasca-common-model/src/test/java/com/hpcloud/mon/common/model/alarm/AlarmExpressionTest.java similarity index 100% rename from java/mon-model/src/test/java/com/hpcloud/mon/common/model/alarm/AlarmExpressionTest.java rename to java/monasca-common-model/src/test/java/com/hpcloud/mon/common/model/alarm/AlarmExpressionTest.java diff --git a/java/mon-model/src/test/java/com/hpcloud/mon/common/model/alarm/AlarmSubExpressionTest.java b/java/monasca-common-model/src/test/java/com/hpcloud/mon/common/model/alarm/AlarmSubExpressionTest.java similarity index 100% rename from java/mon-model/src/test/java/com/hpcloud/mon/common/model/alarm/AlarmSubExpressionTest.java rename to java/monasca-common-model/src/test/java/com/hpcloud/mon/common/model/alarm/AlarmSubExpressionTest.java diff --git a/java/mon-model/src/test/java/com/hpcloud/mon/common/model/metric/MetricsTest.java b/java/monasca-common-model/src/test/java/com/hpcloud/mon/common/model/metric/MetricsTest.java similarity index 100% rename from java/mon-model/src/test/java/com/hpcloud/mon/common/model/metric/MetricsTest.java rename to java/monasca-common-model/src/test/java/com/hpcloud/mon/common/model/metric/MetricsTest.java diff --git a/java/mon-persistence/.gitignore b/java/monasca-common-persistence/.gitignore similarity index 100% rename from java/mon-persistence/.gitignore rename to java/monasca-common-persistence/.gitignore diff --git a/java/mon-persistence/pom.xml b/java/monasca-common-persistence/pom.xml similarity index 69% rename from java/mon-persistence/pom.xml rename to java/monasca-common-persistence/pom.xml index 41ba010c..01868abb 100644 --- a/java/mon-persistence/pom.xml +++ b/java/monasca-common-persistence/pom.xml @@ -2,17 +2,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.hpcloud - mon-common + monasca-common + monasca-common ${computedVersion} - mon-persistence + monasca-common-persistence jar - com.hpcloud - mon-util + monasca-common + monasca-common-util ${project.version} @@ -23,8 +23,8 @@ - com.hpcloud - mon-testing + monasca-common + monasca-common-testing ${project.version} test diff --git a/java/mon-persistence/src/main/java/com/hpcloud/persistence/AbstractPersistenceModule.java b/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/AbstractPersistenceModule.java similarity index 100% rename from java/mon-persistence/src/main/java/com/hpcloud/persistence/AbstractPersistenceModule.java rename to java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/AbstractPersistenceModule.java diff --git a/java/mon-persistence/src/main/java/com/hpcloud/persistence/BeanMapper.java b/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/BeanMapper.java similarity index 100% rename from java/mon-persistence/src/main/java/com/hpcloud/persistence/BeanMapper.java rename to java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/BeanMapper.java diff --git a/java/mon-persistence/src/main/java/com/hpcloud/persistence/BeanMapperFactory.java b/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/BeanMapperFactory.java similarity index 100% rename from java/mon-persistence/src/main/java/com/hpcloud/persistence/BeanMapperFactory.java rename to java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/BeanMapperFactory.java diff --git a/java/mon-persistence/src/main/java/com/hpcloud/persistence/DataTypes.java b/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/DataTypes.java similarity index 100% rename from java/mon-persistence/src/main/java/com/hpcloud/persistence/DataTypes.java rename to java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/DataTypes.java diff --git a/java/mon-persistence/src/main/java/com/hpcloud/persistence/KeyValueMapper.java b/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/KeyValueMapper.java similarity index 100% rename from java/mon-persistence/src/main/java/com/hpcloud/persistence/KeyValueMapper.java rename to java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/KeyValueMapper.java diff --git a/java/mon-persistence/src/main/java/com/hpcloud/persistence/SqlQueries.java b/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/SqlQueries.java similarity index 100% rename from java/mon-persistence/src/main/java/com/hpcloud/persistence/SqlQueries.java rename to java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/SqlQueries.java diff --git a/java/mon-persistence/src/main/java/com/hpcloud/persistence/SqlStatements.java b/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/SqlStatements.java similarity index 100% rename from java/mon-persistence/src/main/java/com/hpcloud/persistence/SqlStatements.java rename to java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/SqlStatements.java diff --git a/java/mon-persistence/src/main/java/com/hpcloud/persistence/package-info.java b/java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/package-info.java similarity index 100% rename from java/mon-persistence/src/main/java/com/hpcloud/persistence/package-info.java rename to java/monasca-common-persistence/src/main/java/com/hpcloud/persistence/package-info.java diff --git a/java/mon-persistence/src/test/java/com/hpcloud/persistence/AbstractPersistenceModuleTest.java b/java/monasca-common-persistence/src/test/java/com/hpcloud/persistence/AbstractPersistenceModuleTest.java similarity index 100% rename from java/mon-persistence/src/test/java/com/hpcloud/persistence/AbstractPersistenceModuleTest.java rename to java/monasca-common-persistence/src/test/java/com/hpcloud/persistence/AbstractPersistenceModuleTest.java diff --git a/java/mon-persistence/src/test/java/com/hpcloud/persistence/BeanMappeTest.java b/java/monasca-common-persistence/src/test/java/com/hpcloud/persistence/BeanMappeTest.java similarity index 100% rename from java/mon-persistence/src/test/java/com/hpcloud/persistence/BeanMappeTest.java rename to java/monasca-common-persistence/src/test/java/com/hpcloud/persistence/BeanMappeTest.java diff --git a/java/mon-persistence/src/test/java/com/hpcloud/persistence/SqlStatementsTest.java b/java/monasca-common-persistence/src/test/java/com/hpcloud/persistence/SqlStatementsTest.java similarity index 100% rename from java/mon-persistence/src/test/java/com/hpcloud/persistence/SqlStatementsTest.java rename to java/monasca-common-persistence/src/test/java/com/hpcloud/persistence/SqlStatementsTest.java diff --git a/java/mon-streaming/.gitignore b/java/monasca-common-streaming/.gitignore similarity index 100% rename from java/mon-streaming/.gitignore rename to java/monasca-common-streaming/.gitignore diff --git a/java/mon-streaming/pom.xml b/java/monasca-common-streaming/pom.xml similarity index 82% rename from java/mon-streaming/pom.xml rename to java/monasca-common-streaming/pom.xml index 5e2c30ea..cfe80295 100644 --- a/java/mon-streaming/pom.xml +++ b/java/monasca-common-streaming/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.hpcloud - mon-common + monasca-common + monasca-common ${computedVersion} - mon-streaming + monasca-common-streaming jar @@ -22,14 +22,14 @@ - com.hpcloud - mon-testing + monasca-common + monasca-common-testing ${project.version} test - com.hpcloud - mon-util + monasca-common + monasca-common-util ${project.version} test diff --git a/java/mon-streaming/src/main/java/com/hpcloud/streaming/storm/Logging.java b/java/monasca-common-streaming/src/main/java/com/hpcloud/streaming/storm/Logging.java similarity index 100% rename from java/mon-streaming/src/main/java/com/hpcloud/streaming/storm/Logging.java rename to java/monasca-common-streaming/src/main/java/com/hpcloud/streaming/storm/Logging.java diff --git a/java/mon-streaming/src/main/java/com/hpcloud/streaming/storm/Streams.java b/java/monasca-common-streaming/src/main/java/com/hpcloud/streaming/storm/Streams.java similarity index 100% rename from java/mon-streaming/src/main/java/com/hpcloud/streaming/storm/Streams.java rename to java/monasca-common-streaming/src/main/java/com/hpcloud/streaming/storm/Streams.java diff --git a/java/mon-streaming/src/main/java/com/hpcloud/streaming/storm/TupleDeserializer.java b/java/monasca-common-streaming/src/main/java/com/hpcloud/streaming/storm/TupleDeserializer.java similarity index 100% rename from java/mon-streaming/src/main/java/com/hpcloud/streaming/storm/TupleDeserializer.java rename to java/monasca-common-streaming/src/main/java/com/hpcloud/streaming/storm/TupleDeserializer.java diff --git a/java/mon-streaming/src/main/java/com/hpcloud/streaming/storm/Tuples.java b/java/monasca-common-streaming/src/main/java/com/hpcloud/streaming/storm/Tuples.java similarity index 100% rename from java/mon-streaming/src/main/java/com/hpcloud/streaming/storm/Tuples.java rename to java/monasca-common-streaming/src/main/java/com/hpcloud/streaming/storm/Tuples.java diff --git a/java/mon-streaming/src/test/java/com/hpcloud/streaming/storm/NoopSpout.java b/java/monasca-common-streaming/src/test/java/com/hpcloud/streaming/storm/NoopSpout.java similarity index 100% rename from java/mon-streaming/src/test/java/com/hpcloud/streaming/storm/NoopSpout.java rename to java/monasca-common-streaming/src/test/java/com/hpcloud/streaming/storm/NoopSpout.java diff --git a/java/mon-streaming/src/test/java/com/hpcloud/streaming/storm/PeriodicTupleProvider.java b/java/monasca-common-streaming/src/test/java/com/hpcloud/streaming/storm/PeriodicTupleProvider.java similarity index 100% rename from java/mon-streaming/src/test/java/com/hpcloud/streaming/storm/PeriodicTupleProvider.java rename to java/monasca-common-streaming/src/test/java/com/hpcloud/streaming/storm/PeriodicTupleProvider.java diff --git a/java/mon-streaming/src/test/java/com/hpcloud/streaming/storm/TestSpout.java b/java/monasca-common-streaming/src/test/java/com/hpcloud/streaming/storm/TestSpout.java similarity index 100% rename from java/mon-streaming/src/test/java/com/hpcloud/streaming/storm/TestSpout.java rename to java/monasca-common-streaming/src/test/java/com/hpcloud/streaming/storm/TestSpout.java diff --git a/java/mon-streaming/src/test/java/com/hpcloud/streaming/storm/TopologyTestCase.java b/java/monasca-common-streaming/src/test/java/com/hpcloud/streaming/storm/TopologyTestCase.java similarity index 100% rename from java/mon-streaming/src/test/java/com/hpcloud/streaming/storm/TopologyTestCase.java rename to java/monasca-common-streaming/src/test/java/com/hpcloud/streaming/storm/TopologyTestCase.java diff --git a/java/mon-testing/.gitignore b/java/monasca-common-testing/.gitignore similarity index 100% rename from java/mon-testing/.gitignore rename to java/monasca-common-testing/.gitignore diff --git a/java/mon-testing/pom.xml b/java/monasca-common-testing/pom.xml similarity index 92% rename from java/mon-testing/pom.xml rename to java/monasca-common-testing/pom.xml index f95b4e37..cd9ea04c 100644 --- a/java/mon-testing/pom.xml +++ b/java/monasca-common-testing/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.hpcloud - mon-common + monasca-common + monasca-common ${computedVersion} - mon-testing + monasca-common-testing jar diff --git a/java/mon-testing/src/main/java/com/hpcloud/testing/Assert.java b/java/monasca-common-testing/src/main/java/com/hpcloud/testing/Assert.java similarity index 100% rename from java/mon-testing/src/main/java/com/hpcloud/testing/Assert.java rename to java/monasca-common-testing/src/main/java/com/hpcloud/testing/Assert.java diff --git a/java/mon-testing/src/main/resources/testngAll.xml b/java/monasca-common-testing/src/main/resources/testngAll.xml similarity index 100% rename from java/mon-testing/src/main/resources/testngAll.xml rename to java/monasca-common-testing/src/main/resources/testngAll.xml diff --git a/java/mon-testing/src/test/resources/com/hpcloud/test-config.yml b/java/monasca-common-testing/src/test/resources/com/hpcloud/test-config.yml similarity index 100% rename from java/mon-testing/src/test/resources/com/hpcloud/test-config.yml rename to java/monasca-common-testing/src/test/resources/com/hpcloud/test-config.yml diff --git a/java/mon-util/.gitignore b/java/monasca-common-util/.gitignore similarity index 100% rename from java/mon-util/.gitignore rename to java/monasca-common-util/.gitignore diff --git a/java/mon-util/pom.xml b/java/monasca-common-util/pom.xml similarity index 94% rename from java/mon-util/pom.xml rename to java/monasca-common-util/pom.xml index fd4db002..edbf2a8a 100644 --- a/java/mon-util/pom.xml +++ b/java/monasca-common-util/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.hpcloud - mon-common + monasca-common + monasca-common ${computedVersion} - mon-util + monasca-common-util jar @@ -89,8 +89,8 @@ - com.hpcloud - mon-testing + monasca-common + monasca-common-testing ${project.version} test diff --git a/java/mon-util/src/main/java/com/hpcloud/util/Duration.java b/java/monasca-common-util/src/main/java/com/hpcloud/util/Duration.java similarity index 100% rename from java/mon-util/src/main/java/com/hpcloud/util/Duration.java rename to java/monasca-common-util/src/main/java/com/hpcloud/util/Duration.java diff --git a/java/mon-util/src/main/java/com/hpcloud/util/Exceptions.java b/java/monasca-common-util/src/main/java/com/hpcloud/util/Exceptions.java similarity index 100% rename from java/mon-util/src/main/java/com/hpcloud/util/Exceptions.java rename to java/monasca-common-util/src/main/java/com/hpcloud/util/Exceptions.java diff --git a/java/mon-util/src/main/java/com/hpcloud/util/Injector.java b/java/monasca-common-util/src/main/java/com/hpcloud/util/Injector.java similarity index 100% rename from java/mon-util/src/main/java/com/hpcloud/util/Injector.java rename to java/monasca-common-util/src/main/java/com/hpcloud/util/Injector.java diff --git a/java/mon-util/src/main/java/com/hpcloud/util/Serialization.java b/java/monasca-common-util/src/main/java/com/hpcloud/util/Serialization.java similarity index 100% rename from java/mon-util/src/main/java/com/hpcloud/util/Serialization.java rename to java/monasca-common-util/src/main/java/com/hpcloud/util/Serialization.java diff --git a/java/mon-util/src/main/java/com/hpcloud/util/Stack.java b/java/monasca-common-util/src/main/java/com/hpcloud/util/Stack.java similarity index 100% rename from java/mon-util/src/main/java/com/hpcloud/util/Stack.java rename to java/monasca-common-util/src/main/java/com/hpcloud/util/Stack.java diff --git a/java/mon-util/src/main/java/com/hpcloud/util/Types.java b/java/monasca-common-util/src/main/java/com/hpcloud/util/Types.java similarity index 100% rename from java/mon-util/src/main/java/com/hpcloud/util/Types.java rename to java/monasca-common-util/src/main/java/com/hpcloud/util/Types.java diff --git a/java/mon-util/src/main/java/com/hpcloud/util/concurrent/ExecutionListener.java b/java/monasca-common-util/src/main/java/com/hpcloud/util/concurrent/ExecutionListener.java similarity index 100% rename from java/mon-util/src/main/java/com/hpcloud/util/concurrent/ExecutionListener.java rename to java/monasca-common-util/src/main/java/com/hpcloud/util/concurrent/ExecutionListener.java diff --git a/java/mon-util/src/main/java/com/hpcloud/util/concurrent/InstrumentedThreadPoolExecutor.java b/java/monasca-common-util/src/main/java/com/hpcloud/util/concurrent/InstrumentedThreadPoolExecutor.java similarity index 100% rename from java/mon-util/src/main/java/com/hpcloud/util/concurrent/InstrumentedThreadPoolExecutor.java rename to java/monasca-common-util/src/main/java/com/hpcloud/util/concurrent/InstrumentedThreadPoolExecutor.java diff --git a/java/mon-util/src/main/java/com/hpcloud/util/concurrent/ThreadPools.java b/java/monasca-common-util/src/main/java/com/hpcloud/util/concurrent/ThreadPools.java similarity index 100% rename from java/mon-util/src/main/java/com/hpcloud/util/concurrent/ThreadPools.java rename to java/monasca-common-util/src/main/java/com/hpcloud/util/concurrent/ThreadPools.java diff --git a/java/mon-util/src/main/java/com/hpcloud/util/concurrent/package-info.java b/java/monasca-common-util/src/main/java/com/hpcloud/util/concurrent/package-info.java similarity index 100% rename from java/mon-util/src/main/java/com/hpcloud/util/concurrent/package-info.java rename to java/monasca-common-util/src/main/java/com/hpcloud/util/concurrent/package-info.java diff --git a/java/mon-util/src/main/java/com/hpcloud/util/config/ConfigurationException.java b/java/monasca-common-util/src/main/java/com/hpcloud/util/config/ConfigurationException.java similarity index 100% rename from java/mon-util/src/main/java/com/hpcloud/util/config/ConfigurationException.java rename to java/monasca-common-util/src/main/java/com/hpcloud/util/config/ConfigurationException.java diff --git a/java/mon-util/src/main/java/com/hpcloud/util/config/ConfigurationFactory.java b/java/monasca-common-util/src/main/java/com/hpcloud/util/config/ConfigurationFactory.java similarity index 100% rename from java/mon-util/src/main/java/com/hpcloud/util/config/ConfigurationFactory.java rename to java/monasca-common-util/src/main/java/com/hpcloud/util/config/ConfigurationFactory.java diff --git a/java/mon-util/src/main/java/com/hpcloud/util/config/Configurations.java b/java/monasca-common-util/src/main/java/com/hpcloud/util/config/Configurations.java similarity index 100% rename from java/mon-util/src/main/java/com/hpcloud/util/config/Configurations.java rename to java/monasca-common-util/src/main/java/com/hpcloud/util/config/Configurations.java diff --git a/java/mon-util/src/main/java/com/hpcloud/util/stats/SlidingWindowStats.java b/java/monasca-common-util/src/main/java/com/hpcloud/util/stats/SlidingWindowStats.java similarity index 100% rename from java/mon-util/src/main/java/com/hpcloud/util/stats/SlidingWindowStats.java rename to java/monasca-common-util/src/main/java/com/hpcloud/util/stats/SlidingWindowStats.java diff --git a/java/mon-util/src/main/java/com/hpcloud/util/stats/Statistic.java b/java/monasca-common-util/src/main/java/com/hpcloud/util/stats/Statistic.java similarity index 100% rename from java/mon-util/src/main/java/com/hpcloud/util/stats/Statistic.java rename to java/monasca-common-util/src/main/java/com/hpcloud/util/stats/Statistic.java diff --git a/java/mon-util/src/main/java/com/hpcloud/util/stats/Statistics.java b/java/monasca-common-util/src/main/java/com/hpcloud/util/stats/Statistics.java similarity index 100% rename from java/mon-util/src/main/java/com/hpcloud/util/stats/Statistics.java rename to java/monasca-common-util/src/main/java/com/hpcloud/util/stats/Statistics.java diff --git a/java/mon-util/src/main/java/com/hpcloud/util/time/TimeResolution.java b/java/monasca-common-util/src/main/java/com/hpcloud/util/time/TimeResolution.java similarity index 100% rename from java/mon-util/src/main/java/com/hpcloud/util/time/TimeResolution.java rename to java/monasca-common-util/src/main/java/com/hpcloud/util/time/TimeResolution.java diff --git a/java/mon-util/src/main/java/com/hpcloud/util/time/Times.java b/java/monasca-common-util/src/main/java/com/hpcloud/util/time/Times.java similarity index 100% rename from java/mon-util/src/main/java/com/hpcloud/util/time/Times.java rename to java/monasca-common-util/src/main/java/com/hpcloud/util/time/Times.java diff --git a/java/mon-util/src/main/java/com/hpcloud/util/validation/Validator.java b/java/monasca-common-util/src/main/java/com/hpcloud/util/validation/Validator.java similarity index 100% rename from java/mon-util/src/main/java/com/hpcloud/util/validation/Validator.java rename to java/monasca-common-util/src/main/java/com/hpcloud/util/validation/Validator.java diff --git a/java/mon-util/src/test/java/com/hpcloud/util/DurationTest.java b/java/monasca-common-util/src/test/java/com/hpcloud/util/DurationTest.java similarity index 100% rename from java/mon-util/src/test/java/com/hpcloud/util/DurationTest.java rename to java/monasca-common-util/src/test/java/com/hpcloud/util/DurationTest.java diff --git a/java/mon-util/src/test/java/com/hpcloud/util/SerializationTest.java b/java/monasca-common-util/src/test/java/com/hpcloud/util/SerializationTest.java similarity index 100% rename from java/mon-util/src/test/java/com/hpcloud/util/SerializationTest.java rename to java/monasca-common-util/src/test/java/com/hpcloud/util/SerializationTest.java diff --git a/java/mon-util/src/test/java/com/hpcloud/util/TypesTest.java b/java/monasca-common-util/src/test/java/com/hpcloud/util/TypesTest.java similarity index 100% rename from java/mon-util/src/test/java/com/hpcloud/util/TypesTest.java rename to java/monasca-common-util/src/test/java/com/hpcloud/util/TypesTest.java diff --git a/java/mon-util/src/test/java/com/hpcloud/util/stats/SlidingWindowStatsTest.java b/java/monasca-common-util/src/test/java/com/hpcloud/util/stats/SlidingWindowStatsTest.java similarity index 100% rename from java/mon-util/src/test/java/com/hpcloud/util/stats/SlidingWindowStatsTest.java rename to java/monasca-common-util/src/test/java/com/hpcloud/util/stats/SlidingWindowStatsTest.java diff --git a/java/mon-util/src/test/java/com/hpcloud/util/stats/StatisticsTest.java b/java/monasca-common-util/src/test/java/com/hpcloud/util/stats/StatisticsTest.java similarity index 100% rename from java/mon-util/src/test/java/com/hpcloud/util/stats/StatisticsTest.java rename to java/monasca-common-util/src/test/java/com/hpcloud/util/stats/StatisticsTest.java diff --git a/java/mon-util/src/test/java/com/hpcloud/util/time/TimesTest.java b/java/monasca-common-util/src/test/java/com/hpcloud/util/time/TimesTest.java similarity index 100% rename from java/mon-util/src/test/java/com/hpcloud/util/time/TimesTest.java rename to java/monasca-common-util/src/test/java/com/hpcloud/util/time/TimesTest.java diff --git a/java/mon-util/src/test/resources/logback.xml b/java/monasca-common-util/src/test/resources/logback.xml similarity index 100% rename from java/mon-util/src/test/resources/logback.xml rename to java/monasca-common-util/src/test/resources/logback.xml diff --git a/java/pom.xml b/java/pom.xml index 55a5c8f8..79dc3776 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -2,10 +2,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.hpcloud - mon-common + monasca-common + monasca-common ${computedVersion} - http://github.com/hpcloud-mon/mon-thresh + http://github.com/stackforge/monasca-common pom @@ -28,15 +28,15 @@ - mon-dropwizard - mon-kafka - mon-model - mon-persistence - mon-streaming - mon-testing - mon-util - mon-middleware - mon-influxdb + monasca-common-dropwizard + monasca-common-kafka + monasca-common-model + monasca-common-persistence + monasca-common-streaming + monasca-common-testing + monasca-common-util + monasca-common-middleware + monasca-common-influxdb diff --git a/run_maven.sh b/run_maven.sh index b2b5c1c2..8793c596 100755 --- a/run_maven.sh +++ b/run_maven.sh @@ -14,4 +14,9 @@ shift # Invoke the maven 3 on the real pom.xml ( cd java; ${MVN} $* ) + +# Copy the jars where the publisher will find them +mkdir -p target +cp java/*/target/*.jar target + rm -fr apache-maven-3.2.1*