diff --git a/java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/AbstractAppTest.java b/java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/AbstractAppTest.java
index be68dd01..f48f3294 100644
--- a/java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/AbstractAppTest.java
+++ b/java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/AbstractAppTest.java
@@ -1,3 +1,16 @@
+/*
+ * 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.dropwizard;
 
 import io.dropwizard.Application;
diff --git a/java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/AbstractResourceTest.java b/java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/AbstractResourceTest.java
index 695fa6f4..3ed0dd45 100644
--- a/java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/AbstractResourceTest.java
+++ b/java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/AbstractResourceTest.java
@@ -1,3 +1,16 @@
+/*
+ * 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.dropwizard;
 
 import io.dropwizard.Configuration;
diff --git a/java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/JsonHelpers.java b/java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/JsonHelpers.java
index f20c5503..0eec96c8 100644
--- a/java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/JsonHelpers.java
+++ b/java/monasca-common-dropwizard/src/test/java/monasca/common/dropwizard/JsonHelpers.java
@@ -1,3 +1,16 @@
+/*
+ * 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.dropwizard;
 
 import io.dropwizard.testing.FixtureHelpers;
diff --git a/java/monasca-common-kafka/src/test/java/monasca/common/messaging/kafka/KafkaHealthCheckTest.java b/java/monasca-common-kafka/src/test/java/monasca/common/messaging/kafka/KafkaHealthCheckTest.java
index e04d67b4..f03941d9 100644
--- a/java/monasca-common-kafka/src/test/java/monasca/common/messaging/kafka/KafkaHealthCheckTest.java
+++ b/java/monasca-common-kafka/src/test/java/monasca/common/messaging/kafka/KafkaHealthCheckTest.java
@@ -1,3 +1,16 @@
+/*
+ * 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.messaging.kafka;
 
 import static org.testng.Assert.assertTrue;
diff --git a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AdminAuthException.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AdminAuthException.java
index 9198369e..d0092f17 100644
--- a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AdminAuthException.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AdminAuthException.java
@@ -1,3 +1,16 @@
+/*
+ * 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.middleware;
 
 /**
diff --git a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthClient.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthClient.java
index 3fc20891..e2f4721c 100644
--- a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthClient.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthClient.java
@@ -1,3 +1,16 @@
+/*
+ * 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.middleware;
 
 
diff --git a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthClientFactory.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthClientFactory.java
index 75289e53..f57d007f 100644
--- a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthClientFactory.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthClientFactory.java
@@ -1,3 +1,16 @@
+/*
+ * 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.middleware;
 
 import org.apache.commons.pool.impl.GenericObjectPool;
diff --git a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthConnectionException.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthConnectionException.java
index 661cbfad..8daf31c9 100644
--- a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthConnectionException.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthConnectionException.java
@@ -1,3 +1,16 @@
+/*
+ * 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.middleware;
 
 /**
diff --git a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthConstants.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthConstants.java
index b53fa16c..93df9d9c 100644
--- a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthConstants.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthConstants.java
@@ -1,238 +1,251 @@
-package monasca.common.middleware;
-
-public interface AuthConstants {
-  /**
-   * 'Confirmed' or 'Invalid'
-   */
-  public static enum IdentityStatus {
-    Confirmed, Invalid
-  }
-
-  // =============================== TOKEN ===================================
-  /**
-   * Credential (token) header
-   */
-  public static final String TOKEN = "X-AUTH-TOKEN";
-  /**
-   * Auth status parameter
-   */
-  public static final String AUTH_IDENTITY_STATUS = "X-IDENTITY-STATUS";
-  /**
-   * Auth user Id parameter
-   */
-  public static final String AUTH_USER_ID = "X-USER-ID";
-  /**
-   * Auth user name parameter
-   */
-  public static final String AUTH_USER_NAME = "X-USER-NAME";
-
-  /**
-   * Auth user roles parameter, comma-separated roles
-   */
-  public static final String AUTH_ROLES = "X-ROLES";
-  /**
-   * json encoded keystone service catalog
-   */
-  public static final String AUTH_SERVICE_CATALOG = "X-SERVICE-CATALOG";
-  /**
-   * Service Ids initialization parameter
-   */
-  public static final String SERVICE_IDS = "ServiceIds";
-  /**
-   * Endpoint Ids initialization parameter
-   */
-  public static final String ENDPOINT_IDS = "EndpointIds";
-  /**
-   * Keystone admin token for use in vanilla Keystone
-   */
-  public static final String ADMIN_TOKEN = "AdminToken";
-
-  // ============================ CONNECTION =================================
-  /**
-   * Auth server initialization parameter
-   */
-  public static final String SERVER_VIP = "ServerVIP";
-  /**
-   * Auth server port: 9543 for Thrift, 35357 for HTTP.
-   */
-  public static final String SERVER_PORT = "ServerPort";
+/*
+ * 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.middleware;
+
+public interface AuthConstants {
   /**
-   * Use https to connect to SERVER_VIP and SERVER_PORT if true.
+   * 'Confirmed' or 'Invalid'
    */
-  public static final String USE_HTTPS = "UseHttps";
-  /**
-   * connection timeout initialization parameter
-   */
-  public static final String CONN_TIMEOUT = "ConnTimeout";
-  /**
-   * 2-way SSL initialization parameter: True or False
-   */
-  public static final String CONN_SSL_CLIENT_AUTH = "ConnSSLClientAuth";
-  /**
-   * SSL keystore initialization parameter
-   */
-  public static final String KEYSTORE = "Keystore";
-  /**
-   * SSL keystore password initialization parameter
-   */
-  public static final String KEYSTORE_PASS = "KeystorePass";
-  /**
-   * SSL truststore initialization parameter
-   */
-  public static final String TRUSTSTORE = "Truststore";
-  /**
-   * SSL truststore password initialization parameter
-   */
-  public static final String TRUSTSTORE_PASS = "TruststorePass";
-
-  // ============================== POOLING ==================================
-  /**
-   * Maximum number of objects that can be allocated by the pool (checked out
-   * to clients, or idle awaiting checkout) at a given time. When
-   * non-positive, there is no limit to the number of objects that can be
-   * managed by the pool at one time. When maxActive is reached, the pool is
-   * said to be exhausted. The default setting for this parameter is 8.
-   */
-  public static final String CONN_POOL_MAX_ACTIVE = "ConnPoolMaxActive";
-  /**
-   * Maximum number of objects that can sit idle in the pool at any time. When
-   * negative, there is no limit to the number of objects that may be idle at
-   * one time. The default setting for this parameter is 8.
-   */
-  public static final String CONN_POOL_MAX_IDLE = "ConnPoolMaxIdle";
-  /**
-   * How long the eviction thread should sleep before "runs" of examining idle
-   * objects. When non-positive, no eviction thread will be launched. The
-   * default setting for this parameter is -1 (i.e., idle object eviction is
-   * disabled by default).
-   */
-  public static final String CONN_POOL_EVICT_PERIOD = "ConnPoolEvictPeriod";
-  /**
-   * Minimum amount of time that an object may sit idle in the pool before it
-   * is eligible for eviction due to idle time. When non-positive, no object
-   * will be dropped from the pool due to idle time alone. This setting has no
-   * effect unless ConnPoolEvictPeriod > 0. The default setting for this
-   * parameter is 30 minutes.
-   */
-  public static final String CONN_POOL_MIN_IDLE_TIME = "ConnPoolMinIdleTime";
-
-  // ============================== CACHING ==================================
-  public static final String TIME_TO_CACHE_TOKEN = "TimeToCacheToken";
-  public static final String MAX_TOKEN_CACHE_SIZE = "MaxTokenCacheSize";
-
-  /**
-   * Number of connection timeout retries *
-   */
-  public static final String CONN_TIMEOUT_RETRIES = "ConnRetryTimes";
-  /**
-   * Number of connection timeout retries *
-   */
-  public static final String PAUSE_BETWEEN_RETRIES = "ConnRetryInterval";
-  /**
-   * Authentication decision is forwarded to next filter *
-   */
-  public static final String DELAY_AUTH_DECISION = "DelayAuthDecision";
-
-  public static final String SIGNATURE_METHOD = "HmacSHA1";
-
-
-  /**
-   * Version of CS to authenticate the credentials *
-   */
-  public static final String AUTH_VERSION = "AuthVersion";
-
-  /**
-   * Include Service Catalog as part of Authentication Response *
-   */
-  public static final String INCLUDE_SERVICE_CATALOG = "IncludeServiceCatalog";
-
-  /**
-   * Identity service managed unique identifier, string. Only present if this
-   * is a project-scoped v3 token, or a tenant-scoped v2 token.
-   */
-  public static final String AUTH_PROJECT_ID = "X-PROJECT-ID";
-
-  /**
-   * Project name, unique within owning domain, string. Only present if this
-   * is a project-scoped v3 token, or a tenant-scoped v2 token.
-   */
-  public static final String AUTH_PROJECT_NAME = "X-PROJECT-NAME";
-
-  /**
-   * Identity service managed unique identifier of owning domain of project,
-   * string. Only present if this is a project-scoped v3 token. If this
-   * variable is set, this indicates that the PROJECT_NAME can only be assumed
-   * to be unique within this domain.
-   */
-  public static final String AUTH_PROJECT_DOMAIN_ID = "X-PROJECT-DOMAIN-ID";
-
-  /**
-   * Name of owning domain of project, string. Only present if this is a
-   * project-scoped v3 token. If this variable is set, this indicates that the
-   * PROJECT_NAME can only be assumed to be unique within this domain.
-   */
-  public static final String AUTH_PROJECT_DOMAIN_NAME = "X-PROJECT-DOMAIN-NAME";
-
-  /**
-   * Identity service managed unique identifier of owning domain of user,
-   * string. If this variable is set, this indicates that the USER_NAME can
-   * only be assumed to be unique within this domain.
-   */
-  public static final String AUTH_USER_DOMAIN_ID = "X-USER-DOMAIN-ID";
-
-  /**
-   * Name of owning domain of user, string. If this variable is set, this
-   * indicates that the USER_NAME can only be assumed to be unique within this
-   * domain.
-   */
-  public static final String AUTH_USER_DOMAIN_NAME = "X-USER-DOMAIN-NAME";
-
-  /**
-   * Identity service managed unique identifier, string. Only present if this
-   * is a domain-scoped v3 token.
-   */
-  public static final String AUTH_DOMAIN_ID = "X-DOMAIN-ID";
-
-  /**
-   * Unique domain name, string. Only present if this is a domain-scoped v3
-   * token.
-   */
-  public static final String AUTH_DOMAIN_NAME = "X-DOMAIN-NAME";
-
-  public static final String AUTH_HP_IDM_ROLES = "X-HP-IDM-Non-Tenant-Roles";
-
-  public static final String REMOTE_HOST = "RemoteHost";
-  public static final String REMOTE_ADDR = "RemoteAddress";
-
-  // Depracated Headers.
-  /**
-   * Auth user roles parameter, comma-separated roles
-   */
-  public static final String AUTH_ROLE = "X-ROLE";
-  /**
-   * Auth tenant Id parameter
-   */
-  public static final String AUTH_TENANT_ID = "X-TENANT-ID";
-  /**
-   * Auth tenant name parameter
-   */
-  public static final String AUTH_TENANT_NAME = "X-TENANT-NAME";
-  /**
-   * Auth tenant name parameter
-   */
-  public static final String AUTH_TENANT = "X-TENANT";
-  /**
-   * *Deprecated* in favor of HTTP_X_USER_ID and HTTP_X_USER_NAME User name,
-   * unique within owning domain, string
-   */
-  public static final String AUTH_USER = "X-USER";
-
-  public static final String AUTH_SUBJECT_TOKEN = "X-Subject-Token";
-  public static final String ADMIN_USER = "AdminUser";
-  public static final String ADMIN_PASSWORD = "AdminPassword";
-  public static final String ADMIN_AUTH_METHOD = "AdminAuthMethod";
-  public static final String ADMIN_ACCESS_KEY = "AdminAccessKey";
-  public static final String ADMIN_SECRET_KEY = "AdminSecretKey";
-  public static final String ADMIN_PROJECT_ID = "AdminProjectId";
-
+  public static enum IdentityStatus {
+    Confirmed, Invalid
+  }
+
+  // =============================== TOKEN ===================================
+  /**
+   * Credential (token) header
+   */
+  public static final String TOKEN = "X-AUTH-TOKEN";
+  /**
+   * Auth status parameter
+   */
+  public static final String AUTH_IDENTITY_STATUS = "X-IDENTITY-STATUS";
+  /**
+   * Auth user Id parameter
+   */
+  public static final String AUTH_USER_ID = "X-USER-ID";
+  /**
+   * Auth user name parameter
+   */
+  public static final String AUTH_USER_NAME = "X-USER-NAME";
+
+  /**
+   * Auth user roles parameter, comma-separated roles
+   */
+  public static final String AUTH_ROLES = "X-ROLES";
+  /**
+   * json encoded keystone service catalog
+   */
+  public static final String AUTH_SERVICE_CATALOG = "X-SERVICE-CATALOG";
+  /**
+   * Service Ids initialization parameter
+   */
+  public static final String SERVICE_IDS = "ServiceIds";
+  /**
+   * Endpoint Ids initialization parameter
+   */
+  public static final String ENDPOINT_IDS = "EndpointIds";
+  /**
+   * Keystone admin token for use in vanilla Keystone
+   */
+  public static final String ADMIN_TOKEN = "AdminToken";
+
+  // ============================ CONNECTION =================================
+  /**
+   * Auth server initialization parameter
+   */
+  public static final String SERVER_VIP = "ServerVIP";
+  /**
+   * Auth server port: 9543 for Thrift, 35357 for HTTP.
+   */
+  public static final String SERVER_PORT = "ServerPort";
+  /*
+   * Use https to connect to SERVER_VIP and SERVER_PORT if true
+   *
+  public static final String USE_HTTPS = "UseHttps"
+  /**
+   * connection timeout initialization parameter
+   */
+  public static final String CONN_TIMEOUT = "ConnTimeout";
+  /**
+   * 2-way SSL initialization parameter: True or False
+   */
+  public static final String CONN_SSL_CLIENT_AUTH = "ConnSSLClientAuth";
+  /**
+   * SSL keystore initialization parameter
+   */
+  public static final String KEYSTORE = "Keystore";
+  /**
+   * SSL keystore password initialization parameter
+   */
+  public static final String KEYSTORE_PASS = "KeystorePass";
+  /**
+   * SSL truststore initialization parameter
+   */
+  public static final String TRUSTSTORE = "Truststore";
+  /**
+   * SSL truststore password initialization parameter
+   */
+  public static final String TRUSTSTORE_PASS = "TruststorePass";
+
+  // ============================== POOLING ==================================
+  /**
+   * Maximum number of objects that can be allocated by the pool (checked out
+   * to clients, or idle awaiting checkout) at a given time. When
+   * non-positive, there is no limit to the number of objects that can be
+   * managed by the pool at one time. When maxActive is reached, the pool is
+   * said to be exhausted. The default setting for this parameter is 8.
+   */
+  public static final String CONN_POOL_MAX_ACTIVE = "ConnPoolMaxActive";
+  /**
+   * Maximum number of objects that can sit idle in the pool at any time. When
+   * negative, there is no limit to the number of objects that may be idle at
+   * one time. The default setting for this parameter is 8.
+   */
+  public static final String CONN_POOL_MAX_IDLE = "ConnPoolMaxIdle";
+  /**
+   * How long the eviction thread should sleep before "runs" of examining idle
+   * objects. When non-positive, no eviction thread will be launched. The
+   * default setting for this parameter is -1 (i.e., idle object eviction is
+   * disabled by default).
+   */
+  public static final String CONN_POOL_EVICT_PERIOD = "ConnPoolEvictPeriod";
+  /**
+   * Minimum amount of time that an object may sit idle in the pool before it
+   * is eligible for eviction due to idle time. When non-positive, no object
+   * will be dropped from the pool due to idle time alone. This setting has no
+   * effect unless ConnPoolEvictPeriod > 0. The default setting for this
+   * parameter is 30 minutes.
+   */
+  public static final String CONN_POOL_MIN_IDLE_TIME = "ConnPoolMinIdleTime";
+
+  // ============================== CACHING ==================================
+  public static final String TIME_TO_CACHE_TOKEN = "TimeToCacheToken";
+  public static final String MAX_TOKEN_CACHE_SIZE = "MaxTokenCacheSize";
+
+  /**
+   * Number of connection timeout retries *
+   */
+  public static final String CONN_TIMEOUT_RETRIES = "ConnRetryTimes";
+  /**
+   * Number of connection timeout retries *
+   */
+  public static final String PAUSE_BETWEEN_RETRIES = "ConnRetryInterval";
+  /**
+   * Authentication decision is forwarded to next filter *
+   */
+  public static final String DELAY_AUTH_DECISION = "DelayAuthDecision";
+
+  public static final String SIGNATURE_METHOD = "HmacSHA1";
+
+
+  /**
+   * Version of CS to authenticate the credentials *
+   */
+  public static final String AUTH_VERSION = "AuthVersion";
+
+  /**
+   * Include Service Catalog as part of Authentication Response *
+   */
+  public static final String INCLUDE_SERVICE_CATALOG = "IncludeServiceCatalog";
+
+  /**
+   * Identity service managed unique identifier, string. Only present if this
+   * is a project-scoped v3 token, or a tenant-scoped v2 token.
+   */
+  public static final String AUTH_PROJECT_ID = "X-PROJECT-ID";
+
+  /**
+   * Project name, unique within owning domain, string. Only present if this
+   * is a project-scoped v3 token, or a tenant-scoped v2 token.
+   */
+  public static final String AUTH_PROJECT_NAME = "X-PROJECT-NAME";
+
+  /**
+   * Identity service managed unique identifier of owning domain of project,
+   * string. Only present if this is a project-scoped v3 token. If this
+   * variable is set, this indicates that the PROJECT_NAME can only be assumed
+   * to be unique within this domain.
+   */
+  public static final String AUTH_PROJECT_DOMAIN_ID = "X-PROJECT-DOMAIN-ID";
+
+  /**
+   * Name of owning domain of project, string. Only present if this is a
+   * project-scoped v3 token. If this variable is set, this indicates that the
+   * PROJECT_NAME can only be assumed to be unique within this domain.
+   */
+  public static final String AUTH_PROJECT_DOMAIN_NAME = "X-PROJECT-DOMAIN-NAME";
+
+  /**
+   * Identity service managed unique identifier of owning domain of user,
+   * string. If this variable is set, this indicates that the USER_NAME can
+   * only be assumed to be unique within this domain.
+   */
+  public static final String AUTH_USER_DOMAIN_ID = "X-USER-DOMAIN-ID";
+
+  /**
+   * Name of owning domain of user, string. If this variable is set, this
+   * indicates that the USER_NAME can only be assumed to be unique within this
+   * domain.
+   */
+  public static final String AUTH_USER_DOMAIN_NAME = "X-USER-DOMAIN-NAME";
+
+  /**
+   * Identity service managed unique identifier, string. Only present if this
+   * is a domain-scoped v3 token.
+   */
+  public static final String AUTH_DOMAIN_ID = "X-DOMAIN-ID";
+
+  /**
+   * Unique domain name, string. Only present if this is a domain-scoped v3
+   * token.
+   */
+  public static final String AUTH_DOMAIN_NAME = "X-DOMAIN-NAME";
+
+  public static final String AUTH_HP_IDM_ROLES = "X-HP-IDM-Non-Tenant-Roles";
+
+  public static final String REMOTE_HOST = "RemoteHost";
+  public static final String REMOTE_ADDR = "RemoteAddress";
+
+  // Depracated Headers.
+  /**
+   * Auth user roles parameter, comma-separated roles
+   */
+  public static final String AUTH_ROLE = "X-ROLE";
+  /**
+   * Auth tenant Id parameter
+   */
+  public static final String AUTH_TENANT_ID = "X-TENANT-ID";
+  /**
+   * Auth tenant name parameter
+   */
+  public static final String AUTH_TENANT_NAME = "X-TENANT-NAME";
+  /**
+   * Auth tenant name parameter
+   */
+  public static final String AUTH_TENANT = "X-TENANT";
+  /**
+   * *Deprecated* in favor of HTTP_X_USER_ID and HTTP_X_USER_NAME User name,
+   * unique within owning domain, string
+   */
+  public static final String AUTH_USER = "X-USER";
+
+  public static final String AUTH_SUBJECT_TOKEN = "X-Subject-Token";
+  public static final String ADMIN_USER = "AdminUser";
+  public static final String ADMIN_PASSWORD = "AdminPassword";
+  public static final String ADMIN_AUTH_METHOD = "AdminAuthMethod";
+  public static final String ADMIN_ACCESS_KEY = "AdminAccessKey";
+  public static final String ADMIN_SECRET_KEY = "AdminSecretKey";
+  public static final String ADMIN_PROJECT_ID = "AdminProjectId";
+
 }
diff --git a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthException.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthException.java
index 7a641372..4d1402d5 100644
--- a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthException.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/AuthException.java
@@ -1,3 +1,16 @@
+/*
+ * 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.middleware;
 
 /**
diff --git a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/Config.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/Config.java
index 58b5ca84..20f3f688 100644
--- a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/Config.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/Config.java
@@ -1,3 +1,16 @@
+/*
+ * 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.middleware;
 
 import javax.servlet.FilterConfig;
diff --git a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/ExceptionHandlerUtil.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/ExceptionHandlerUtil.java
index 485a2b52..f667a3e6 100644
--- a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/ExceptionHandlerUtil.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/ExceptionHandlerUtil.java
@@ -1,3 +1,16 @@
+/*
+ * 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.middleware;
 
 public class ExceptionHandlerUtil {
diff --git a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/FilterUtils.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/FilterUtils.java
index 1e1bad64..87003329 100644
--- a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/FilterUtils.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/FilterUtils.java
@@ -1,3 +1,16 @@
+/*
+ * 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.middleware;
 
 
diff --git a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpAuthClient.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpAuthClient.java
index 4425d5a2..3400f0ff 100644
--- a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpAuthClient.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpAuthClient.java
@@ -1,3 +1,16 @@
+/*
+ * 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.middleware;
 
 import static monasca.common.middleware.AuthConstants.TOKEN;
diff --git a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpClientFactory.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpClientFactory.java
index c73aaab2..3fd2b655 100644
--- a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpClientFactory.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpClientFactory.java
@@ -1,3 +1,16 @@
+/*
+ * 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.middleware;
 
 import org.apache.commons.pool.impl.GenericObjectPool;
diff --git a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpClientPoolFactory.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpClientPoolFactory.java
index 1a2bd880..9d7997f6 100644
--- a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpClientPoolFactory.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpClientPoolFactory.java
@@ -1,3 +1,16 @@
+/*
+ * 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.middleware;
 
 import java.io.File;
diff --git a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpPoolCleaner.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpPoolCleaner.java
index c76e53bc..9e3bcbef 100644
--- a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpPoolCleaner.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/HttpPoolCleaner.java
@@ -1,3 +1,16 @@
+/*
+ * 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.middleware;
 
 import java.util.concurrent.TimeUnit;
diff --git a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/ServiceUnavailableException.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/ServiceUnavailableException.java
index 8581a343..6847bbfe 100644
--- a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/ServiceUnavailableException.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/ServiceUnavailableException.java
@@ -1,3 +1,16 @@
+/*
+ * 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.middleware;
 
 /**
diff --git a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenAuth.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenAuth.java
index c2b2831c..61a612b5 100644
--- a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenAuth.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenAuth.java
@@ -1,3 +1,16 @@
+/*
+ * 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.middleware;
 
 import java.io.IOException;
diff --git a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenCache.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenCache.java
index 53ee3814..c15a15f4 100644
--- a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenCache.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenCache.java
@@ -1,3 +1,16 @@
+/*
+ * 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.middleware;
 
 import com.google.common.cache.*;
diff --git a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenExceptionHandler.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenExceptionHandler.java
index 9e63fe2a..46cd00f6 100644
--- a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenExceptionHandler.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/TokenExceptionHandler.java
@@ -1,3 +1,16 @@
+/*
+ * 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.middleware;
 
 import java.io.IOException;
diff --git a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/UnavailableException.java b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/UnavailableException.java
index dad11ce9..4cfa5876 100644
--- a/java/monasca-common-middleware/src/main/java/monasca/common/middleware/UnavailableException.java
+++ b/java/monasca-common-middleware/src/main/java/monasca/common/middleware/UnavailableException.java
@@ -1,3 +1,16 @@
+/*
+ * 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.middleware;
 
 /**
diff --git a/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/ServicesTest.java b/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/ServicesTest.java
index 8ae35f12..de907625 100644
--- a/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/ServicesTest.java
+++ b/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/ServicesTest.java
@@ -1,3 +1,16 @@
+/*
+ * 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;
 
 import static org.testng.Assert.assertTrue;
diff --git a/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/alarm/AlarmExpressionTest.java b/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/alarm/AlarmExpressionTest.java
index 110b244b..c14668bc 100644
--- a/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/alarm/AlarmExpressionTest.java
+++ b/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/alarm/AlarmExpressionTest.java
@@ -1,3 +1,16 @@
+/*
+ * 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.alarm;
 
 import static org.testng.Assert.assertEquals;
diff --git a/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/alarm/AlarmSubExpressionTest.java b/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/alarm/AlarmSubExpressionTest.java
index 175101dd..0f9c42e7 100644
--- a/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/alarm/AlarmSubExpressionTest.java
+++ b/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/alarm/AlarmSubExpressionTest.java
@@ -1,3 +1,16 @@
+/*
+ * 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.alarm;
 
 import static org.testng.Assert.assertEquals;
diff --git a/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/metric/MetricsTest.java b/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/metric/MetricsTest.java
index ba8bb44b..de7ef8e7 100644
--- a/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/metric/MetricsTest.java
+++ b/java/monasca-common-model/src/test/java/monasca/common/mon/common/model/metric/MetricsTest.java
@@ -1,3 +1,16 @@
+/*
+ * 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.metric;
 
 import static org.testng.Assert.assertEquals;
diff --git a/java/monasca-common-persistence/src/main/java/monasca/common/persistence/package-info.java b/java/monasca-common-persistence/src/main/java/monasca/common/persistence/package-info.java
index 03b04e08..992f80b1 100644
--- a/java/monasca-common-persistence/src/main/java/monasca/common/persistence/package-info.java
+++ b/java/monasca-common-persistence/src/main/java/monasca/common/persistence/package-info.java
@@ -1,3 +1,16 @@
+/*
+ * 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.
+ */
 /**
  * Persistence related types.
  */
diff --git a/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/NoopSpout.java b/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/NoopSpout.java
index e0539242..6426c2ab 100644
--- a/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/NoopSpout.java
+++ b/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/NoopSpout.java
@@ -1,3 +1,16 @@
+/*
+ * 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.streaming.storm;
 
 import java.util.Map;
diff --git a/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/PeriodicTupleProvider.java b/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/PeriodicTupleProvider.java
index 1d67bce9..4a458498 100644
--- a/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/PeriodicTupleProvider.java
+++ b/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/PeriodicTupleProvider.java
@@ -1,3 +1,16 @@
+/*
+ * 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.streaming.storm;
 
 import java.util.List;
diff --git a/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/TestSpout.java b/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/TestSpout.java
index 8319a0af..118d6f72 100644
--- a/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/TestSpout.java
+++ b/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/TestSpout.java
@@ -1,3 +1,16 @@
+/*
+ * 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.streaming.storm;
 
 import java.util.List;
diff --git a/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/TopologyTestCase.java b/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/TopologyTestCase.java
index 8a10be48..529ce1f2 100644
--- a/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/TopologyTestCase.java
+++ b/java/monasca-common-streaming/src/test/java/monasca/common/streaming/storm/TopologyTestCase.java
@@ -1,3 +1,16 @@
+/*
+ * 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.streaming.storm;
 
 import org.testng.annotations.Test;
diff --git a/java/monasca-common-util/src/main/java/monasca/common/util/concurrent/package-info.java b/java/monasca-common-util/src/main/java/monasca/common/util/concurrent/package-info.java
index ee348398..47611b10 100644
--- a/java/monasca-common-util/src/main/java/monasca/common/util/concurrent/package-info.java
+++ b/java/monasca-common-util/src/main/java/monasca/common/util/concurrent/package-info.java
@@ -1,3 +1,16 @@
+/*
+ * 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.
+ */
 /**
  * Utilities for concurrent processing.
  */
diff --git a/java/monasca-common-util/src/test/java/monasca/common/util/DurationTest.java b/java/monasca-common-util/src/test/java/monasca/common/util/DurationTest.java
index a1b600da..1253e9c3 100644
--- a/java/monasca-common-util/src/test/java/monasca/common/util/DurationTest.java
+++ b/java/monasca-common-util/src/test/java/monasca/common/util/DurationTest.java
@@ -1,3 +1,16 @@
+/*
+ * 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.util;
 
 import static org.testng.Assert.assertEquals;
diff --git a/java/monasca-common-util/src/test/java/monasca/common/util/SerializationTest.java b/java/monasca-common-util/src/test/java/monasca/common/util/SerializationTest.java
index 598f4e8f..50a220fd 100644
--- a/java/monasca-common-util/src/test/java/monasca/common/util/SerializationTest.java
+++ b/java/monasca-common-util/src/test/java/monasca/common/util/SerializationTest.java
@@ -1,3 +1,16 @@
+/*
+ * 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.util;
 
 import static org.testng.Assert.assertEquals;
diff --git a/java/monasca-common-util/src/test/java/monasca/common/util/TypesTest.java b/java/monasca-common-util/src/test/java/monasca/common/util/TypesTest.java
index b603a4b6..25151aad 100644
--- a/java/monasca-common-util/src/test/java/monasca/common/util/TypesTest.java
+++ b/java/monasca-common-util/src/test/java/monasca/common/util/TypesTest.java
@@ -1,3 +1,16 @@
+/*
+ * 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.util;
 
 import static com.google.inject.matcher.Matchers.any;
diff --git a/java/monasca-common-util/src/test/java/monasca/common/util/stats/SlidingWindowStatsTest.java b/java/monasca-common-util/src/test/java/monasca/common/util/stats/SlidingWindowStatsTest.java
index aebecebe..7585213b 100644
--- a/java/monasca-common-util/src/test/java/monasca/common/util/stats/SlidingWindowStatsTest.java
+++ b/java/monasca-common-util/src/test/java/monasca/common/util/stats/SlidingWindowStatsTest.java
@@ -1,3 +1,16 @@
+/*
+ * 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.util.stats;
 
 import static monasca.common.testing.Assert.assertArraysEqual;
diff --git a/java/monasca-common-util/src/test/java/monasca/common/util/stats/StatisticsTest.java b/java/monasca-common-util/src/test/java/monasca/common/util/stats/StatisticsTest.java
index 8721d891..e545c584 100644
--- a/java/monasca-common-util/src/test/java/monasca/common/util/stats/StatisticsTest.java
+++ b/java/monasca-common-util/src/test/java/monasca/common/util/stats/StatisticsTest.java
@@ -1,3 +1,16 @@
+/*
+ * 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.util.stats;
 
 import static org.testng.Assert.assertEquals;
diff --git a/java/monasca-common-util/src/test/java/monasca/common/util/time/TimesTest.java b/java/monasca-common-util/src/test/java/monasca/common/util/time/TimesTest.java
index e3fbf519..b5a9cd5b 100644
--- a/java/monasca-common-util/src/test/java/monasca/common/util/time/TimesTest.java
+++ b/java/monasca-common-util/src/test/java/monasca/common/util/time/TimesTest.java
@@ -1,3 +1,16 @@
+/*
+ * 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.util.time;
 
 import static org.testng.Assert.assertEquals;