Fix license header violations in aaa-idmlight

Change-Id: Ib5148d1690134501cd14a47b9b991aabe5ee30bc
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/Activator.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/Activator.java
index 2eb5b57bc50ad7fee3d9cdb463b0a5460858ad8f..94cfe6136d54868d179a53cdd4fda044c1669171 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/Activator.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/Activator.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm;
 
 import org.apache.felix.dm.DependencyActivatorBase;

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/IdmLightApplication.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/IdmLightApplication.java
index 5f67dc77f4a287622b79b716d09cb9047fad1437..b6793b493aa3f03db7ffd2037cbe01fcde4364d5 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/IdmLightApplication.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/IdmLightApplication.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm;
 
 import java.sql.Connection;

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/IdmLightProxy.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/IdmLightProxy.java
index 4a752eed6f94e63f8dc279469b5f1a2a22584e1b..af20b9ad581258d5da9c61d9020fbdc7f30b8418 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/IdmLightProxy.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/IdmLightProxy.java
@@ -1,10 +1,11 @@
-/* Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+/*
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm;
 
 import static org.opendaylight.aaa.idm.persistence.StoreBuilder.DEFAULT_DOMAIN;

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/config/IdmLightConfig.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/config/IdmLightConfig.java
index 6c5a5f710d9b04bfa6271038eec957eb39f4cccc..3d2a5d092c845067f9a6368b508de7fb95a3442d 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/config/IdmLightConfig.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/config/IdmLightConfig.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.config;
 
 /**

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Claim.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Claim.java
index 5c9f3bda56a02e10900423ed09882d692702233a..28c56bf4d3c843e33d0869883041208eaf998fe5 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Claim.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Claim.java
@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.model;
 
 /**
  *
- * @author peter.mellquist@hp.com 
+ * @author peter.mellquist@hp.com
  *
  */
 
@@ -21,7 +21,7 @@ import java.util.ArrayList;
 @XmlRootElement(name = "Claim")
 public class Claim {
    private Integer domainid;
-   private Integer userid; 
+   private Integer userid;
    private String username;
    private List<Role> roles;
 
@@ -47,7 +47,7 @@ public class Claim {
 
    public void setUsername(String name) {
       this.username = name;
-   }  
+   }
 
    public List<Role> getRoles() {
       return roles;

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Domain.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Domain.java
index 657a9c46a7b8b28b9d6af1967d42c247f974c456..f60756a905ca30009623dc05a5f8cf752278f5ef 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Domain.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Domain.java
@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.model;
 
 /**
  *
- * @author peter.mellquist@hp.com 
+ * @author peter.mellquist@hp.com
  *
  */
 
@@ -38,7 +38,7 @@ public class Domain {
 
    public void setName(String name) {
       this.name = name;
-   }  
+   }
 
    public String getDescription() {
       return description;

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Domains.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Domains.java
index de154db93ffce55c1235d1bad4c21a9a3c348f4e..ddc3360ce134d1c3e16a54a4b8dd4209e82d6dbd 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Domains.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Domains.java
@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.model;
 
 /**
  *
- * @author peter.mellquist@hp.com 
+ * @author peter.mellquist@hp.com
  *
  */
 
@@ -25,7 +25,7 @@ public class Domains {
 
    public void setDomains(List<Domain> domains) {
       this.domains = domains;
-   } 
+   }
 
    public List<Domain> getDomains() {
       return domains;

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Grant.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Grant.java
index 175ae19a64db5f59745c60f51fba44db8ccc35dd..12aee254d0db967002334f48730c46ee47abd2db 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Grant.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Grant.java
@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.model;
 
 /**
  *
- * @author peter.mellquist@hp.com 
+ * @author peter.mellquist@hp.com
  *
  */
 
@@ -48,7 +48,7 @@ public class Grant {
    public void setDomainid(Integer id) {
       this.domainid = id;
    }
- 
+
    public Integer getUserid() {
       return userid;
    }

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Grants.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Grants.java
index 4505831d856e41f5a05a64c37bcf6311c893baeb..8ab47830ea087d59ee5d878ee445b4596ad7d767 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Grants.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Grants.java
@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.model;
 
 /**
  *
- * @author peter.mellquist@hp.com 
+ * @author peter.mellquist@hp.com
  *
  */
 
@@ -25,7 +25,7 @@ public class Grants {
 
    public void setGrants(List<Grant> grants) {
       this.grants = grants;
-   } 
+   }
 
    public List<Grant> getGrants() {
       return grants;

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/IDMError.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/IDMError.java
index cb8822b2d4ee8c683e4a6427eb9bb6a07ec6b309..5a909dc731a7d7e44339337a4aeb9c488f15206a 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/IDMError.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/IDMError.java
@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.model;
 
 /**
  *
- * @author peter.mellquist@hp.com 
+ * @author peter.mellquist@hp.com
  *
  */
 
@@ -52,9 +52,9 @@ public class IDMError{
       this.details=details;
    }
 
-   public Response response() { 
+   public Response response() {
       logger.error("error: " + this.message + " details: " + this.details + " status: " + code);
       return Response.status(this.code).entity(this).build();
    }
-       
+
 }

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Role.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Role.java
index b95ec5da47a6e3d742fe9254299d9569509dff9b..6574f030136bdf15f49f7400cb6a22f8958b2388 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Role.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Role.java
@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.model;
 
 /**
  *
- * @author peter.mellquist@hp.com 
+ * @author peter.mellquist@hp.com
  *
  */
 
@@ -36,7 +36,7 @@ public class Role {
 
    public void setName(String name) {
       this.name = name;
-   }  
+   }
 
    public String getDescription() {
       return description;

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Roles.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Roles.java
index 6010e79aa86e079bc1bb94f248f2c9ca239544c1..08835656e1ce0071d2ce3b665b59b0313536a013 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Roles.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Roles.java
@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.model;
 
 /**
  *
- * @author peter.mellquist@hp.com 
+ * @author peter.mellquist@hp.com
  *
  */
 
@@ -25,7 +25,7 @@ public class Roles {
 
    public void setRoles(List<Role> roles) {
       this.roles = roles;
-   } 
+   }
 
    public List<Role> getRoles() {
       return roles;

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/User.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/User.java
index 7acf4fcc668c356cdfd096518d5bb1fefdcfe52a..35af5d946ed7db1a38458111fa66f5c3271e3652 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/User.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/User.java
@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.model;
 
 /**
  *
- * @author peter.mellquist@hp.com 
+ * @author peter.mellquist@hp.com
  *
  */
 
@@ -41,7 +41,7 @@ public class User {
 
    public void setName(String name) {
       this.name = name;
-   }  
+   }
 
    public String getDescription() {
       return description;

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/UserPwd.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/UserPwd.java
index bd14bfed0b9e4dc31f46e3ff2b32e720e147e8ba..13bf3cd130bb4cd6a958035248c09193d743979c 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/UserPwd.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/UserPwd.java
@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.model;
 
 /**
  *
- * @author peter.mellquist@hp.com 
+ * @author peter.mellquist@hp.com
  *
  */
 
@@ -27,7 +27,7 @@ public class UserPwd {
 
    public void setUsername(String name) {
       this.username = name;
-   }  
+   }
 
    public String getUserpwd() {
       return userpwd;

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Users.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Users.java
index a3181aefba0b8da2a164a444ebf5981f2c6fd2e2..e95fe28d9b78633904087c8a93af3db2a0ae35d0 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Users.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Users.java
@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.model;
 
 /**
  *
- * @author peter.mellquist@hp.com 
+ * @author peter.mellquist@hp.com
  *
  */
 
@@ -26,7 +26,7 @@ public class Users {
 
    public void setUsers(List<User> users) {
       this.users = users;
-   } 
+   }
 
    public List<User> getUsers() {
       return users;

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Version.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Version.java
index e255d72e9a50c7a7c77efe19d671befb7a9400ec..a21a98934464a299e70b44c2c65d7aee42f9cab0 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Version.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/model/Version.java
@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.model;
 
 /**
  *
- * @author peter.mellquist@hp.com 
+ * @author peter.mellquist@hp.com
  *
  */
 

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/DomainStore.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/DomainStore.java
index cd4b0c0152b237448b12b0cbc9ef2fc105d1e72a..756cf4d551bef89f320ed86daef48de34de13806 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/DomainStore.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/DomainStore.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.persistence;
 
 /**

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/GrantStore.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/GrantStore.java
index 248f4878f075ecadbfdc6863342a3a979433ff65..b7a4105551ebf6557d33eedc1711b175a7c96093 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/GrantStore.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/GrantStore.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.persistence;
 
 /**

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/RoleStore.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/RoleStore.java
index acab277734f6206d8e3d207f41ec1ad762b0f7e9..0eb743ae1c5702f065d2a2d667dfaad2f2f99c6a 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/RoleStore.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/RoleStore.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.persistence;
 
 /**

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/SHA256Calculator.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/SHA256Calculator.java
index 73fa4c6891a7c3b3a7d6b49473ed09a0c1ffbda2..7fcaf81e7ab6661f5721e7abe684a6bbfc2b39ba 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/SHA256Calculator.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/SHA256Calculator.java
@@ -4,7 +4,6 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
  */
 package org.opendaylight.aaa.idm.persistence;
 

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/StoreBuilder.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/StoreBuilder.java
index 235ad83420328a591f57b22986b15dfd1b9a3559..3c901e8ea3bcd322d6caf5153770d96c94ff7451 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/StoreBuilder.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/StoreBuilder.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.persistence;
 
 import org.opendaylight.aaa.idm.persistence.DomainStore;
@@ -19,7 +19,7 @@ import org.opendaylight.aaa.idm.model.Grant;
 
 /**
  *
- * @author peter.mellquist@hp.com 
+ * @author peter.mellquist@hp.com
  *
  */
 

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/StoreException.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/StoreException.java
index e0a9b7b1cb61e7b95b5b7eef087cb4645c926932..3e2266f62c83597c1d67926e068924ea661ac652 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/StoreException.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/StoreException.java
@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.persistence;
 
 /**
  *
- * @author peter.mellquist@hp.com 
+ * @author peter.mellquist@hp.com
  *
  */
 import org.slf4j.Logger;
@@ -20,9 +20,9 @@ public class StoreException  extends Exception{
    private static Logger logger = LoggerFactory.getLogger(StoreException.class);
 
    public String message=null;
-       
+
    public StoreException(String msg) {
-      logger.error(msg);       
+      logger.error(msg);
       message = new String(msg);
    }
 }

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/UserStore.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/UserStore.java
index eba92e1ec9d0329ecebb4d5a55a0b7d1accd4356..9ce8142bb44c8500938fa7b2090a5044c9813520 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/UserStore.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/persistence/UserStore.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.persistence;
 
 /**

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/rest/DomainHandler.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/rest/DomainHandler.java
index 39f2406df9d35b7f55469482cbb778e7f4ce7c77..2c02533026a7fd95dbfd1a777ef86ee194d76619 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/rest/DomainHandler.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/rest/DomainHandler.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.rest;
 
 /**

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/rest/RoleHandler.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/rest/RoleHandler.java
index 0cefbe52a7052218dce58eb61ccf33a93a4c0389..7b404d1eb15a4e55abb4289f4b67081c355036e0 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/rest/RoleHandler.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/rest/RoleHandler.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.rest;
 
 /**

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/rest/UserHandler.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/rest/UserHandler.java
index 25aef62b55f77f5ed1dc5a7d17aaa4acd7a96c0e..5b96a2201cece233adfb83adfff29560245bf9df 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/rest/UserHandler.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/rest/UserHandler.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.rest;
 
 /**

diff --git a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/rest/VersionHandler.java b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/rest/VersionHandler.java
index 60f288f966b2ebfd6bc0fcb202fba32079353c0b..6936cd0b07e78a68515ea3917877ad466e2cd52d 100644 (file)
--- a/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/rest/VersionHandler.java
+++ b/aaa-idmlight/src/main/java/org/opendaylight/aaa/idm/rest/VersionHandler.java
@@ -1,16 +1,16 @@
 /*
- * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.rest;
 
 /**
  *
- * @author peter.mellquist@hp.com 
+ * @author peter.mellquist@hp.com
  *
  */
 
@@ -22,15 +22,15 @@ import javax.ws.rs.core.Context;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.opendaylight.aaa.idm.model.Version;
-       
+
 @Path("/")
 public class VersionHandler {
-   private static Logger logger = LoggerFactory.getLogger(VersionHandler.class);;      
-   
+   private static Logger logger = LoggerFactory.getLogger(VersionHandler.class);;
+
    protected static String CURRENT_VERSION      = "v1";
    protected static String LAST_UPDATED         = "2014-04-18T18:30:02.25Z";
-   protected static String CURRENT_STATUS       = "CURRENT"; 
-   
+   protected static String CURRENT_STATUS       = "CURRENT";
+
    @GET
    @Produces("application/json")
    public Version getVersion(@Context HttpServletRequest request) {
@@ -38,8 +38,8 @@ public class VersionHandler {
       Version version = new Version();
       version.setId(CURRENT_VERSION);
       version.setUpdated(LAST_UPDATED);
-      version.setStatus(CURRENT_STATUS);          
-      return version; 
+      version.setStatus(CURRENT_STATUS);
+      return version;
    }
-   
+
 }

diff --git a/aaa-idmlight/src/test/java/org/opendaylight/aaa/idm/persistence/DomainStoreTest.java b/aaa-idmlight/src/test/java/org/opendaylight/aaa/idm/persistence/DomainStoreTest.java
index 112013146f7d0b1943d312777644d8aff5127e81..8fba63a36be48b12db5903d21775a5a1a2a2ec63 100644 (file)
--- a/aaa-idmlight/src/test/java/org/opendaylight/aaa/idm/persistence/DomainStoreTest.java
+++ b/aaa-idmlight/src/test/java/org/opendaylight/aaa/idm/persistence/DomainStoreTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2014-2015 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.persistence;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;

diff --git a/aaa-idmlight/src/test/java/org/opendaylight/aaa/idm/persistence/GrantStoreTest.java b/aaa-idmlight/src/test/java/org/opendaylight/aaa/idm/persistence/GrantStoreTest.java
index 2a79a2aa18900977ef3277bbab17c9138bc09d5e..d0dcd9b3747a3c17e3c33aae0d7a8b96b2db6368 100644 (file)
--- a/aaa-idmlight/src/test/java/org/opendaylight/aaa/idm/persistence/GrantStoreTest.java
+++ b/aaa-idmlight/src/test/java/org/opendaylight/aaa/idm/persistence/GrantStoreTest.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2014-2015 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.persistence;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;

diff --git a/aaa-idmlight/src/test/java/org/opendaylight/aaa/idm/persistence/PasswordHashTest.java b/aaa-idmlight/src/test/java/org/opendaylight/aaa/idm/persistence/PasswordHashTest.java
index 4033d1b8484dbec1a975c406cddecf4bc905cee3..b7baaf3d92ad27c09515ae62fb036c48dd4bd3b7 100644 (file)
--- a/aaa-idmlight/src/test/java/org/opendaylight/aaa/idm/persistence/PasswordHashTest.java
+++ b/aaa-idmlight/src/test/java/org/opendaylight/aaa/idm/persistence/PasswordHashTest.java
@@ -4,9 +4,10 @@
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
  */
+
 package org.opendaylight.aaa.idm.persistence;
+
 import java.io.File;
 
 import org.junit.After;

diff --git a/aaa-idmlight/src/test/java/org/opendaylight/aaa/idm/persistence/RoleStoreTest.java b/aaa-idmlight/src/test/java/org/opendaylight/aaa/idm/persistence/RoleStoreTest.java
index 02df5c19aad2158478cdb68d1a7370676d04fd07..2d633fea6f1f452e871d8fa31d1a3cb01a36b559 100644 (file)
--- a/aaa-idmlight/src/test/java/org/opendaylight/aaa/idm/persistence/RoleStoreTest.java
+++ b/aaa-idmlight/src/test/java/org/opendaylight/aaa/idm/persistence/RoleStoreTest.java
@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 2014-2015 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.persistence;
+
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 import static org.mockito.Matchers.*;

diff --git a/aaa-idmlight/src/test/java/org/opendaylight/aaa/idm/persistence/UserStoreTest.java b/aaa-idmlight/src/test/java/org/opendaylight/aaa/idm/persistence/UserStoreTest.java
index 7f2f58dd6efc3de7ac920906794bd7bcef19af68..01f4900c267a1c4fd06a3b66f98283fe8d49756e 100644 (file)
--- a/aaa-idmlight/src/test/java/org/opendaylight/aaa/idm/persistence/UserStoreTest.java
+++ b/aaa-idmlight/src/test/java/org/opendaylight/aaa/idm/persistence/UserStoreTest.java
@@ -1,12 +1,13 @@
 /*
- * Copyright (c) 2014-2015 Hewlett-Packard Development Company, L.P. and others.
- * All rights reserved.
+ * Copyright (c) 2014, 2015 Hewlett-Packard Development Company, L.P. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
- * terms of the Eclipse License v1.0 which accompanies this distribution,
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.aaa.idm.persistence;
+
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 import static org.mockito.Matchers.*;