You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2014/10/21 20:15:07 UTC

[1/9] Added teh apache license header in all the files

Repository: directory-fortress-core
Updated Branches:
  refs/heads/master 9f0df36fd -> 4cc2153a3


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/UserTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/UserTestData.java b/src/test/java/org/openldap/fortress/rbac/UserTestData.java
index 66db990..6d98b5d 100755
--- a/src/test/java/org/openldap/fortress/rbac/UserTestData.java
+++ b/src/test/java/org/openldap/fortress/rbac/UserTestData.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.rbac;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/accelerator/TestAccelerator.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/accelerator/TestAccelerator.java b/src/test/java/org/openldap/fortress/rbac/accelerator/TestAccelerator.java
index 5a1a7b2..389d91b 100644
--- a/src/test/java/org/openldap/fortress/rbac/accelerator/TestAccelerator.java
+++ b/src/test/java/org/openldap/fortress/rbac/accelerator/TestAccelerator.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac.accelerator;
 
 import org.junit.AfterClass;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/apacheds/AdminManagerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/apacheds/AdminManagerTest.java b/src/test/java/org/openldap/fortress/rbac/apacheds/AdminManagerTest.java
index 2b978f5..e997f5b 100644
--- a/src/test/java/org/openldap/fortress/rbac/apacheds/AdminManagerTest.java
+++ b/src/test/java/org/openldap/fortress/rbac/apacheds/AdminManagerTest.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac.apacheds;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/apacheds/FortressJUnitApachedsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/apacheds/FortressJUnitApachedsTest.java b/src/test/java/org/openldap/fortress/rbac/apacheds/FortressJUnitApachedsTest.java
index 1022bfa..1ff84f6 100644
--- a/src/test/java/org/openldap/fortress/rbac/apacheds/FortressJUnitApachedsTest.java
+++ b/src/test/java/org/openldap/fortress/rbac/apacheds/FortressJUnitApachedsTest.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac.apacheds;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/samples/AccessMgrSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/samples/AccessMgrSample.java b/src/test/java/org/openldap/fortress/samples/AccessMgrSample.java
index 79fc9d4..0e01f3e 100755
--- a/src/test/java/org/openldap/fortress/samples/AccessMgrSample.java
+++ b/src/test/java/org/openldap/fortress/samples/AccessMgrSample.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.samples;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/samples/AllSamplesJUnitTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/samples/AllSamplesJUnitTest.java b/src/test/java/org/openldap/fortress/samples/AllSamplesJUnitTest.java
index 948884f..37d8751 100755
--- a/src/test/java/org/openldap/fortress/samples/AllSamplesJUnitTest.java
+++ b/src/test/java/org/openldap/fortress/samples/AllSamplesJUnitTest.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.samples;
 
 import junit.framework.Test;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/samples/CreatePermOrgHierarchySample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/samples/CreatePermOrgHierarchySample.java b/src/test/java/org/openldap/fortress/samples/CreatePermOrgHierarchySample.java
index 3b4dd0d..976506a 100755
--- a/src/test/java/org/openldap/fortress/samples/CreatePermOrgHierarchySample.java
+++ b/src/test/java/org/openldap/fortress/samples/CreatePermOrgHierarchySample.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.samples;
 
 import org.openldap.fortress.DelAdminMgr;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/samples/CreatePermOrgSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/samples/CreatePermOrgSample.java b/src/test/java/org/openldap/fortress/samples/CreatePermOrgSample.java
index c9c0930..a1a3be4 100755
--- a/src/test/java/org/openldap/fortress/samples/CreatePermOrgSample.java
+++ b/src/test/java/org/openldap/fortress/samples/CreatePermOrgSample.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.samples;
 
 import org.openldap.fortress.DelReviewMgr;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/samples/CreatePermSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/samples/CreatePermSample.java b/src/test/java/org/openldap/fortress/samples/CreatePermSample.java
index 28e2bbd..3ade676 100755
--- a/src/test/java/org/openldap/fortress/samples/CreatePermSample.java
+++ b/src/test/java/org/openldap/fortress/samples/CreatePermSample.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.samples;
 
 import org.openldap.fortress.AdminMgr;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/samples/CreateRoleHierarchySample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/samples/CreateRoleHierarchySample.java b/src/test/java/org/openldap/fortress/samples/CreateRoleHierarchySample.java
index 93332dc..2afb3d8 100755
--- a/src/test/java/org/openldap/fortress/samples/CreateRoleHierarchySample.java
+++ b/src/test/java/org/openldap/fortress/samples/CreateRoleHierarchySample.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.samples;
 
 import org.openldap.fortress.AdminMgr;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/samples/CreateRoleSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/samples/CreateRoleSample.java b/src/test/java/org/openldap/fortress/samples/CreateRoleSample.java
index 7b44ed4..4fcbbe6 100755
--- a/src/test/java/org/openldap/fortress/samples/CreateRoleSample.java
+++ b/src/test/java/org/openldap/fortress/samples/CreateRoleSample.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.samples;
 
 import org.openldap.fortress.AdminMgr;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/samples/CreateSessionSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/samples/CreateSessionSample.java b/src/test/java/org/openldap/fortress/samples/CreateSessionSample.java
index 2f3f079..e92e812 100755
--- a/src/test/java/org/openldap/fortress/samples/CreateSessionSample.java
+++ b/src/test/java/org/openldap/fortress/samples/CreateSessionSample.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.samples;
 
 import org.openldap.fortress.AccessMgr;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/samples/CreateUserOrgHierarchySample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/samples/CreateUserOrgHierarchySample.java b/src/test/java/org/openldap/fortress/samples/CreateUserOrgHierarchySample.java
index 021bb73..12a206a 100755
--- a/src/test/java/org/openldap/fortress/samples/CreateUserOrgHierarchySample.java
+++ b/src/test/java/org/openldap/fortress/samples/CreateUserOrgHierarchySample.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.samples;
 
 import org.openldap.fortress.DelAdminMgr;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/samples/CreateUserOrgSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/samples/CreateUserOrgSample.java b/src/test/java/org/openldap/fortress/samples/CreateUserOrgSample.java
index 6be9e91..e37bcfb 100755
--- a/src/test/java/org/openldap/fortress/samples/CreateUserOrgSample.java
+++ b/src/test/java/org/openldap/fortress/samples/CreateUserOrgSample.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.samples;
 
 import org.openldap.fortress.DelAdminMgr;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/samples/CreateUserRoleSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/samples/CreateUserRoleSample.java b/src/test/java/org/openldap/fortress/samples/CreateUserRoleSample.java
index 63858fc..bfb3310 100755
--- a/src/test/java/org/openldap/fortress/samples/CreateUserRoleSample.java
+++ b/src/test/java/org/openldap/fortress/samples/CreateUserRoleSample.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.samples;
 
 import org.openldap.fortress.AdminMgr;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/samples/CreateUserSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/samples/CreateUserSample.java b/src/test/java/org/openldap/fortress/samples/CreateUserSample.java
index d60c2c5..3900938 100755
--- a/src/test/java/org/openldap/fortress/samples/CreateUserSample.java
+++ b/src/test/java/org/openldap/fortress/samples/CreateUserSample.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.samples;
 
 import org.openldap.fortress.GlobalErrIds;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/resources/fortress-schema.ldif
----------------------------------------------------------------------
diff --git a/src/test/resources/fortress-schema.ldif b/src/test/resources/fortress-schema.ldif
index cb36482..d5767a3 100644
--- a/src/test/resources/fortress-schema.ldif
+++ b/src/test/resources/fortress-schema.ldif
@@ -1,4 +1,22 @@
 # Generated by Apache Directory Studio on May 2, 2013 2:13:35 PM
+#
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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.
+#
 
 # SCHEMA "FORTRESS"
 dn: cn=fortress, ou=schema

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/resources/init-ldap.ldif
----------------------------------------------------------------------
diff --git a/src/test/resources/init-ldap.ldif b/src/test/resources/init-ldap.ldif
index a2c543e..c1b2c78 100644
--- a/src/test/resources/init-ldap.ldif
+++ b/src/test/resources/init-ldap.ldif
@@ -1,3 +1,21 @@
+#
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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.
+#
 dn: dc=example,dc=com
 objectclass: dcObject
 objectclass: organization

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/log4j.xml b/src/test/resources/log4j.xml
index 84cb37f..0f23ec0 100755
--- a/src/test/resources/log4j.xml
+++ b/src/test/resources/log4j.xml
@@ -1,7 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright © 2009-2014. Joshua Tree Software, LLC.  All Rights Reserved.
-  -->
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+-->
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 <log4j:configuration debug="false" xmlns:log4j="http://jakarta.apache.org/log4j/">
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/resources/test-data.ldif
----------------------------------------------------------------------
diff --git a/src/test/resources/test-data.ldif b/src/test/resources/test-data.ldif
index 1aa5bab..86d5376 100644
--- a/src/test/resources/test-data.ldif
+++ b/src/test/resources/test-data.ldif
@@ -1,3 +1,22 @@
+#
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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.
+#
+
 #dn: cn=oamROLE1,ou=Roles,ou=RBAC,dc=example,dc=com
 #objectclass: top
 #objectclass: ftRls


[5/9] Added teh apache license header in all the files

Posted by el...@apache.org.
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/AdminMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/AdminMgrImpl.java b/src/main/java/org/openldap/fortress/rbac/AdminMgrImpl.java
index 83e1e3f..9adb93a 100755
--- a/src/main/java/org/openldap/fortress/rbac/AdminMgrImpl.java
+++ b/src/main/java/org/openldap/fortress/rbac/AdminMgrImpl.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/AdminRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/AdminRole.java b/src/main/java/org/openldap/fortress/rbac/AdminRole.java
index fd47146..5670b62 100755
--- a/src/main/java/org/openldap/fortress/rbac/AdminRole.java
+++ b/src/main/java/org/openldap/fortress/rbac/AdminRole.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/AdminRoleP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/AdminRoleP.java b/src/main/java/org/openldap/fortress/rbac/AdminRoleP.java
index cc4c831..8f09a5f 100755
--- a/src/main/java/org/openldap/fortress/rbac/AdminRoleP.java
+++ b/src/main/java/org/openldap/fortress/rbac/AdminRoleP.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/AdminRoleRelationship.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/AdminRoleRelationship.java b/src/main/java/org/openldap/fortress/rbac/AdminRoleRelationship.java
index ef3d296..b7617a1 100755
--- a/src/main/java/org/openldap/fortress/rbac/AdminRoleRelationship.java
+++ b/src/main/java/org/openldap/fortress/rbac/AdminRoleRelationship.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.rbac;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/AdminRoleUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/AdminRoleUtil.java b/src/main/java/org/openldap/fortress/rbac/AdminRoleUtil.java
index cffb9fa..966e331 100755
--- a/src/main/java/org/openldap/fortress/rbac/AdminRoleUtil.java
+++ b/src/main/java/org/openldap/fortress/rbac/AdminRoleUtil.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/AdminUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/AdminUtil.java b/src/main/java/org/openldap/fortress/rbac/AdminUtil.java
index ec7d125..3c08ca3 100755
--- a/src/main/java/org/openldap/fortress/rbac/AdminUtil.java
+++ b/src/main/java/org/openldap/fortress/rbac/AdminUtil.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import org.openldap.fortress.DelAccessMgr;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/Administrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/Administrator.java b/src/main/java/org/openldap/fortress/rbac/Administrator.java
index 7667e26..72c6ff8 100755
--- a/src/main/java/org/openldap/fortress/rbac/Administrator.java
+++ b/src/main/java/org/openldap/fortress/rbac/Administrator.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import java.util.Set;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/AuditMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/AuditMgrImpl.java b/src/main/java/org/openldap/fortress/rbac/AuditMgrImpl.java
index 5dd6963..1363439 100755
--- a/src/main/java/org/openldap/fortress/rbac/AuditMgrImpl.java
+++ b/src/main/java/org/openldap/fortress/rbac/AuditMgrImpl.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import org.openldap.fortress.AuditMgr;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/AuditP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/AuditP.java b/src/main/java/org/openldap/fortress/rbac/AuditP.java
index 94cd5e2..9c35c53 100755
--- a/src/main/java/org/openldap/fortress/rbac/AuditP.java
+++ b/src/main/java/org/openldap/fortress/rbac/AuditP.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/AuthZ.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/AuthZ.java b/src/main/java/org/openldap/fortress/rbac/AuthZ.java
index 8a61cc7..833fa5b 100755
--- a/src/main/java/org/openldap/fortress/rbac/AuthZ.java
+++ b/src/main/java/org/openldap/fortress/rbac/AuthZ.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/Bind.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/Bind.java b/src/main/java/org/openldap/fortress/rbac/Bind.java
index 5d95f72..8b97b9e 100755
--- a/src/main/java/org/openldap/fortress/rbac/Bind.java
+++ b/src/main/java/org/openldap/fortress/rbac/Bind.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/CharArrayAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/CharArrayAdapter.java b/src/main/java/org/openldap/fortress/rbac/CharArrayAdapter.java
index 2ff6fcd..6e4d214 100755
--- a/src/main/java/org/openldap/fortress/rbac/CharArrayAdapter.java
+++ b/src/main/java/org/openldap/fortress/rbac/CharArrayAdapter.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/ClassUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/ClassUtil.java b/src/main/java/org/openldap/fortress/rbac/ClassUtil.java
index 1315b63..2e8e669 100755
--- a/src/main/java/org/openldap/fortress/rbac/ClassUtil.java
+++ b/src/main/java/org/openldap/fortress/rbac/ClassUtil.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import org.openldap.fortress.CfgException;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/Context.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/Context.java b/src/main/java/org/openldap/fortress/rbac/Context.java
index 90c9ef5..cfa308e 100644
--- a/src/main/java/org/openldap/fortress/rbac/Context.java
+++ b/src/main/java/org/openldap/fortress/rbac/Context.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/DSDChecker.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/DSDChecker.java b/src/main/java/org/openldap/fortress/rbac/DSDChecker.java
index 41c82c4..1cb8450 100755
--- a/src/main/java/org/openldap/fortress/rbac/DSDChecker.java
+++ b/src/main/java/org/openldap/fortress/rbac/DSDChecker.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/DelAccessMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/DelAccessMgrImpl.java b/src/main/java/org/openldap/fortress/rbac/DelAccessMgrImpl.java
index f52c9ab..6dc847b 100755
--- a/src/main/java/org/openldap/fortress/rbac/DelAccessMgrImpl.java
+++ b/src/main/java/org/openldap/fortress/rbac/DelAccessMgrImpl.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import org.openldap.fortress.DelAccessMgr;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/DelAdminMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/DelAdminMgrImpl.java b/src/main/java/org/openldap/fortress/rbac/DelAdminMgrImpl.java
index dee0f87..afbf816 100755
--- a/src/main/java/org/openldap/fortress/rbac/DelAdminMgrImpl.java
+++ b/src/main/java/org/openldap/fortress/rbac/DelAdminMgrImpl.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import org.openldap.fortress.AdminMgr;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/DelReviewMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/DelReviewMgrImpl.java b/src/main/java/org/openldap/fortress/rbac/DelReviewMgrImpl.java
index 835bc6c..d211173 100755
--- a/src/main/java/org/openldap/fortress/rbac/DelReviewMgrImpl.java
+++ b/src/main/java/org/openldap/fortress/rbac/DelReviewMgrImpl.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import org.openldap.fortress.GlobalErrIds;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/FortEntity.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/FortEntity.java b/src/main/java/org/openldap/fortress/rbac/FortEntity.java
index 01a0b61..ed1d205 100755
--- a/src/main/java/org/openldap/fortress/rbac/FortEntity.java
+++ b/src/main/java/org/openldap/fortress/rbac/FortEntity.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/GlobalPwMsgIds.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/GlobalPwMsgIds.java b/src/main/java/org/openldap/fortress/rbac/GlobalPwMsgIds.java
index 571b435..be12381 100755
--- a/src/main/java/org/openldap/fortress/rbac/GlobalPwMsgIds.java
+++ b/src/main/java/org/openldap/fortress/rbac/GlobalPwMsgIds.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 /**

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/Graphable.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/Graphable.java b/src/main/java/org/openldap/fortress/rbac/Graphable.java
index ac14906..c298fc6 100644
--- a/src/main/java/org/openldap/fortress/rbac/Graphable.java
+++ b/src/main/java/org/openldap/fortress/rbac/Graphable.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/Hier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/Hier.java b/src/main/java/org/openldap/fortress/rbac/Hier.java
index 3c3b42f..bcad166 100755
--- a/src/main/java/org/openldap/fortress/rbac/Hier.java
+++ b/src/main/java/org/openldap/fortress/rbac/Hier.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/HierUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/HierUtil.java b/src/main/java/org/openldap/fortress/rbac/HierUtil.java
index 4b2c817..6f4cf52 100755
--- a/src/main/java/org/openldap/fortress/rbac/HierUtil.java
+++ b/src/main/java/org/openldap/fortress/rbac/HierUtil.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/Manageable.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/Manageable.java b/src/main/java/org/openldap/fortress/rbac/Manageable.java
index 4b07f13..197557f 100755
--- a/src/main/java/org/openldap/fortress/rbac/Manageable.java
+++ b/src/main/java/org/openldap/fortress/rbac/Manageable.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import org.openldap.fortress.SecurityException;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/Mod.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/Mod.java b/src/main/java/org/openldap/fortress/rbac/Mod.java
index 4ac203b..abc23bf 100755
--- a/src/main/java/org/openldap/fortress/rbac/Mod.java
+++ b/src/main/java/org/openldap/fortress/rbac/Mod.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import javax.xml.bind.annotation.XmlAccessType;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/OrgUnit.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/OrgUnit.java b/src/main/java/org/openldap/fortress/rbac/OrgUnit.java
index af771d8..f41be53 100755
--- a/src/main/java/org/openldap/fortress/rbac/OrgUnit.java
+++ b/src/main/java/org/openldap/fortress/rbac/OrgUnit.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.rbac;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/OrgUnitAnt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/OrgUnitAnt.java b/src/main/java/org/openldap/fortress/rbac/OrgUnitAnt.java
index a81f2dd..e373655 100755
--- a/src/main/java/org/openldap/fortress/rbac/OrgUnitAnt.java
+++ b/src/main/java/org/openldap/fortress/rbac/OrgUnitAnt.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/OrgUnitP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/OrgUnitP.java b/src/main/java/org/openldap/fortress/rbac/OrgUnitP.java
index eb87e9f..67fc397 100755
--- a/src/main/java/org/openldap/fortress/rbac/OrgUnitP.java
+++ b/src/main/java/org/openldap/fortress/rbac/OrgUnitP.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/OrgUnitRelationship.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/OrgUnitRelationship.java b/src/main/java/org/openldap/fortress/rbac/OrgUnitRelationship.java
index 13c8239..28230c7 100755
--- a/src/main/java/org/openldap/fortress/rbac/OrgUnitRelationship.java
+++ b/src/main/java/org/openldap/fortress/rbac/OrgUnitRelationship.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.rbac;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/PermGrant.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/PermGrant.java b/src/main/java/org/openldap/fortress/rbac/PermGrant.java
index dfb0cd4..ef278f8 100755
--- a/src/main/java/org/openldap/fortress/rbac/PermGrant.java
+++ b/src/main/java/org/openldap/fortress/rbac/PermGrant.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import javax.xml.bind.annotation.XmlAccessType;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/PermObj.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/PermObj.java b/src/main/java/org/openldap/fortress/rbac/PermObj.java
index 1003377..35d6ae7 100755
--- a/src/main/java/org/openldap/fortress/rbac/PermObj.java
+++ b/src/main/java/org/openldap/fortress/rbac/PermObj.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/PermP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/PermP.java b/src/main/java/org/openldap/fortress/rbac/PermP.java
index 4108516..6f4b37e 100755
--- a/src/main/java/org/openldap/fortress/rbac/PermP.java
+++ b/src/main/java/org/openldap/fortress/rbac/PermP.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/Permission.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/Permission.java b/src/main/java/org/openldap/fortress/rbac/Permission.java
index 8898d5f..8328819 100755
--- a/src/main/java/org/openldap/fortress/rbac/Permission.java
+++ b/src/main/java/org/openldap/fortress/rbac/Permission.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/PolicyP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/PolicyP.java b/src/main/java/org/openldap/fortress/rbac/PolicyP.java
index c79ef0b..38d0aeb 100755
--- a/src/main/java/org/openldap/fortress/rbac/PolicyP.java
+++ b/src/main/java/org/openldap/fortress/rbac/PolicyP.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/Props.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/Props.java b/src/main/java/org/openldap/fortress/rbac/Props.java
index 1d062a5..2dae449 100755
--- a/src/main/java/org/openldap/fortress/rbac/Props.java
+++ b/src/main/java/org/openldap/fortress/rbac/Props.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import javax.xml.bind.annotation.XmlAccessType;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/PsoUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/PsoUtil.java b/src/main/java/org/openldap/fortress/rbac/PsoUtil.java
index 33a80fc..302722f 100755
--- a/src/main/java/org/openldap/fortress/rbac/PsoUtil.java
+++ b/src/main/java/org/openldap/fortress/rbac/PsoUtil.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/PwMessage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/PwMessage.java b/src/main/java/org/openldap/fortress/rbac/PwMessage.java
index 6d7e76c..8e6c296 100755
--- a/src/main/java/org/openldap/fortress/rbac/PwMessage.java
+++ b/src/main/java/org/openldap/fortress/rbac/PwMessage.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/PwPolicy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/PwPolicy.java b/src/main/java/org/openldap/fortress/rbac/PwPolicy.java
index e8b33c2..de50775 100755
--- a/src/main/java/org/openldap/fortress/rbac/PwPolicy.java
+++ b/src/main/java/org/openldap/fortress/rbac/PwPolicy.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/PwPolicyControl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/PwPolicyControl.java b/src/main/java/org/openldap/fortress/rbac/PwPolicyControl.java
index 6ff4139..cd18ce7 100755
--- a/src/main/java/org/openldap/fortress/rbac/PwPolicyControl.java
+++ b/src/main/java/org/openldap/fortress/rbac/PwPolicyControl.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/PwPolicyMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/PwPolicyMgrImpl.java b/src/main/java/org/openldap/fortress/rbac/PwPolicyMgrImpl.java
index 6b5aa97..4eb376e 100755
--- a/src/main/java/org/openldap/fortress/rbac/PwPolicyMgrImpl.java
+++ b/src/main/java/org/openldap/fortress/rbac/PwPolicyMgrImpl.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import org.openldap.fortress.GlobalErrIds;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/Relationship.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/Relationship.java b/src/main/java/org/openldap/fortress/rbac/Relationship.java
index c48010c..0e4b015 100755
--- a/src/main/java/org/openldap/fortress/rbac/Relationship.java
+++ b/src/main/java/org/openldap/fortress/rbac/Relationship.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import java.lang.String;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/ReviewMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/ReviewMgrImpl.java b/src/main/java/org/openldap/fortress/rbac/ReviewMgrImpl.java
index 0e0a838..09a425d 100755
--- a/src/main/java/org/openldap/fortress/rbac/ReviewMgrImpl.java
+++ b/src/main/java/org/openldap/fortress/rbac/ReviewMgrImpl.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import org.openldap.fortress.GlobalErrIds;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/Role.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/Role.java b/src/main/java/org/openldap/fortress/rbac/Role.java
index a2de3d0..46a409b 100755
--- a/src/main/java/org/openldap/fortress/rbac/Role.java
+++ b/src/main/java/org/openldap/fortress/rbac/Role.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/RoleP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/RoleP.java b/src/main/java/org/openldap/fortress/rbac/RoleP.java
index dca1c79..1e62353 100755
--- a/src/main/java/org/openldap/fortress/rbac/RoleP.java
+++ b/src/main/java/org/openldap/fortress/rbac/RoleP.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/RolePerm.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/RolePerm.java b/src/main/java/org/openldap/fortress/rbac/RolePerm.java
index ce94778..13b20ea 100755
--- a/src/main/java/org/openldap/fortress/rbac/RolePerm.java
+++ b/src/main/java/org/openldap/fortress/rbac/RolePerm.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import javax.xml.bind.annotation.XmlAccessType;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/RoleRelationship.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/RoleRelationship.java b/src/main/java/org/openldap/fortress/rbac/RoleRelationship.java
index fda918f..251dcc4 100755
--- a/src/main/java/org/openldap/fortress/rbac/RoleRelationship.java
+++ b/src/main/java/org/openldap/fortress/rbac/RoleRelationship.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import javax.xml.bind.annotation.XmlAccessType;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/RoleUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/RoleUtil.java b/src/main/java/org/openldap/fortress/rbac/RoleUtil.java
index 0280ff1..bff5990 100755
--- a/src/main/java/org/openldap/fortress/rbac/RoleUtil.java
+++ b/src/main/java/org/openldap/fortress/rbac/RoleUtil.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 


[6/9] Added teh apache license header in all the files

Posted by el...@apache.org.
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/FortressAntTask.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/FortressAntTask.java b/src/main/java/org/openldap/fortress/ant/FortressAntTask.java
index 9c25803..44d5889 100755
--- a/src/main/java/org/openldap/fortress/ant/FortressAntTask.java
+++ b/src/main/java/org/openldap/fortress/ant/FortressAntTask.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/PermAnt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/PermAnt.java b/src/main/java/org/openldap/fortress/ant/PermAnt.java
index a497c42..a96726e 100755
--- a/src/main/java/org/openldap/fortress/ant/PermAnt.java
+++ b/src/main/java/org/openldap/fortress/ant/PermAnt.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/SDSetAnt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/SDSetAnt.java b/src/main/java/org/openldap/fortress/ant/SDSetAnt.java
index ec2cfbe..2bedd49 100755
--- a/src/main/java/org/openldap/fortress/ant/SDSetAnt.java
+++ b/src/main/java/org/openldap/fortress/ant/SDSetAnt.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/UserAnt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/UserAnt.java b/src/main/java/org/openldap/fortress/ant/UserAnt.java
index ff8dcac..25400d4 100755
--- a/src/main/java/org/openldap/fortress/ant/UserAnt.java
+++ b/src/main/java/org/openldap/fortress/ant/UserAnt.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/package.html b/src/main/java/org/openldap/fortress/ant/package.html
index 581b49c..728538f 100755
--- a/src/main/java/org/openldap/fortress/ant/package.html
+++ b/src/main/java/org/openldap/fortress/ant/package.html
@@ -1,17 +1,22 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+ *
+-->
 <html>
    <head>
       <title>Package Documentation for org.openldap.fortress.ant</title>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/cfg/Config.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/cfg/Config.java b/src/main/java/org/openldap/fortress/cfg/Config.java
index d0d448d..eeb439c 100755
--- a/src/main/java/org/openldap/fortress/cfg/Config.java
+++ b/src/main/java/org/openldap/fortress/cfg/Config.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.cfg;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/cfg/ConfigDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/cfg/ConfigDAO.java b/src/main/java/org/openldap/fortress/cfg/ConfigDAO.java
index ca2d14b..58bd803 100755
--- a/src/main/java/org/openldap/fortress/cfg/ConfigDAO.java
+++ b/src/main/java/org/openldap/fortress/cfg/ConfigDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.cfg;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/cfg/ConfigMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/cfg/ConfigMgr.java b/src/main/java/org/openldap/fortress/cfg/ConfigMgr.java
index 3d277da..21b0139 100755
--- a/src/main/java/org/openldap/fortress/cfg/ConfigMgr.java
+++ b/src/main/java/org/openldap/fortress/cfg/ConfigMgr.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.cfg;
 
 import org.openldap.fortress.SecurityException;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/cfg/ConfigMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/cfg/ConfigMgrFactory.java b/src/main/java/org/openldap/fortress/cfg/ConfigMgrFactory.java
index 9523167..1a54a07 100755
--- a/src/main/java/org/openldap/fortress/cfg/ConfigMgrFactory.java
+++ b/src/main/java/org/openldap/fortress/cfg/ConfigMgrFactory.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.cfg;
 
 import org.openldap.fortress.GlobalIds;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/cfg/ConfigMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/cfg/ConfigMgrImpl.java b/src/main/java/org/openldap/fortress/cfg/ConfigMgrImpl.java
index 71e5de5..e25ee54 100755
--- a/src/main/java/org/openldap/fortress/cfg/ConfigMgrImpl.java
+++ b/src/main/java/org/openldap/fortress/cfg/ConfigMgrImpl.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.cfg;
 
 import org.openldap.fortress.SecurityException;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/cfg/ConfigP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/cfg/ConfigP.java b/src/main/java/org/openldap/fortress/cfg/ConfigP.java
index 513e2ea..499cbc9 100755
--- a/src/main/java/org/openldap/fortress/cfg/ConfigP.java
+++ b/src/main/java/org/openldap/fortress/cfg/ConfigP.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.cfg;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/cfg/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/cfg/package.html b/src/main/java/org/openldap/fortress/cfg/package.html
index a3f0092..21d48d4 100755
--- a/src/main/java/org/openldap/fortress/cfg/package.html
+++ b/src/main/java/org/openldap/fortress/cfg/package.html
@@ -1,18 +1,22 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
-
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+ *
+-->
 <html>
    <head>
       <title>Package Documentation for org.openldap.fortress.config</title>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/cli/CmdLineParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/cli/CmdLineParser.java b/src/main/java/org/openldap/fortress/cli/CmdLineParser.java
index bb61b71..26e7377 100755
--- a/src/main/java/org/openldap/fortress/cli/CmdLineParser.java
+++ b/src/main/java/org/openldap/fortress/cli/CmdLineParser.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.cli;
 
 import java.text.NumberFormat;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/cli/CommandLineInterpreter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/cli/CommandLineInterpreter.java b/src/main/java/org/openldap/fortress/cli/CommandLineInterpreter.java
index bbd24ae..4da6da0 100755
--- a/src/main/java/org/openldap/fortress/cli/CommandLineInterpreter.java
+++ b/src/main/java/org/openldap/fortress/cli/CommandLineInterpreter.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.cli;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/cli/Options.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/cli/Options.java b/src/main/java/org/openldap/fortress/cli/Options.java
index ec27282..022528f 100755
--- a/src/main/java/org/openldap/fortress/cli/Options.java
+++ b/src/main/java/org/openldap/fortress/cli/Options.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.cli;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/cli/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/cli/package.html b/src/main/java/org/openldap/fortress/cli/package.html
index 80cf747..73f360f 100755
--- a/src/main/java/org/openldap/fortress/cli/package.html
+++ b/src/main/java/org/openldap/fortress/cli/package.html
@@ -1,18 +1,22 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
-
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+ *
+-->
 <html>
 <head>
     <title>Fortress Command Line Interpreter Reference Manual</title>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/ApacheDsDataProvider.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/ApacheDsDataProvider.java b/src/main/java/org/openldap/fortress/ldap/ApacheDsDataProvider.java
index f9d235e..f9d2562 100644
--- a/src/main/java/org/openldap/fortress/ldap/ApacheDsDataProvider.java
+++ b/src/main/java/org/openldap/fortress/ldap/ApacheDsDataProvider.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ldap;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/ConnectionPool.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/ConnectionPool.java b/src/main/java/org/openldap/fortress/ldap/ConnectionPool.java
index df9c0de..a0a11e2 100755
--- a/src/main/java/org/openldap/fortress/ldap/ConnectionPool.java
+++ b/src/main/java/org/openldap/fortress/ldap/ConnectionPool.java
@@ -1,46 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
- *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (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.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *
- *        Tony Dahbura (tony@dahbura.com)
- *            Fixed pool close to reset auth to original if
- *                changed during use.
- *            Setup LDAPConnection argument to immediately clone
- *                the passed connection so if the caller did
- *                something to it after pool creation then it
- *                would not affect pool operations.
+ *   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 org.openldap.fortress.ldap;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/LdapClientTrustStoreManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/LdapClientTrustStoreManager.java b/src/main/java/org/openldap/fortress/ldap/LdapClientTrustStoreManager.java
index e7631c8..74d0842 100644
--- a/src/main/java/org/openldap/fortress/ldap/LdapClientTrustStoreManager.java
+++ b/src/main/java/org/openldap/fortress/ldap/LdapClientTrustStoreManager.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.ldap;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/LdapCounters.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/LdapCounters.java b/src/main/java/org/openldap/fortress/ldap/LdapCounters.java
index 200ac2e..46d6144 100644
--- a/src/main/java/org/openldap/fortress/ldap/LdapCounters.java
+++ b/src/main/java/org/openldap/fortress/ldap/LdapCounters.java
@@ -1,21 +1,21 @@
 /*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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. 
- *  
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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 org.openldap.fortress.ldap;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/PoolMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/PoolMgr.java b/src/main/java/org/openldap/fortress/ldap/PoolMgr.java
index 73bfa7e..553f04a 100755
--- a/src/main/java/org/openldap/fortress/ldap/PoolMgr.java
+++ b/src/main/java/org/openldap/fortress/ldap/PoolMgr.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ldap;
 
 import org.openldap.fortress.GlobalIds;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/UnboundIdDataProvider.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/UnboundIdDataProvider.java b/src/main/java/org/openldap/fortress/ldap/UnboundIdDataProvider.java
index 455add6..7e716f2 100644
--- a/src/main/java/org/openldap/fortress/ldap/UnboundIdDataProvider.java
+++ b/src/main/java/org/openldap/fortress/ldap/UnboundIdDataProvider.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ldap;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/container/OrganizationalUnit.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/container/OrganizationalUnit.java b/src/main/java/org/openldap/fortress/ldap/container/OrganizationalUnit.java
index d419872..e00c6b5 100755
--- a/src/main/java/org/openldap/fortress/ldap/container/OrganizationalUnit.java
+++ b/src/main/java/org/openldap/fortress/ldap/container/OrganizationalUnit.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ldap.container;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/container/OrganizationalUnitDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/container/OrganizationalUnitDAO.java b/src/main/java/org/openldap/fortress/ldap/container/OrganizationalUnitDAO.java
index af6e94c..da50b1a 100755
--- a/src/main/java/org/openldap/fortress/ldap/container/OrganizationalUnitDAO.java
+++ b/src/main/java/org/openldap/fortress/ldap/container/OrganizationalUnitDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ldap.container;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/container/OrganizationalUnitP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/container/OrganizationalUnitP.java b/src/main/java/org/openldap/fortress/ldap/container/OrganizationalUnitP.java
index 34fb5ff..da1281e 100755
--- a/src/main/java/org/openldap/fortress/ldap/container/OrganizationalUnitP.java
+++ b/src/main/java/org/openldap/fortress/ldap/container/OrganizationalUnitP.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ldap.container;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/container/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/container/package.html b/src/main/java/org/openldap/fortress/ldap/container/package.html
index 18148f6..d24dd72 100755
--- a/src/main/java/org/openldap/fortress/ldap/container/package.html
+++ b/src/main/java/org/openldap/fortress/ldap/container/package.html
@@ -1,18 +1,22 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
-
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+ *
+-->
 <html>
    <head>
       <title>Package Documentation for org.openldap.fortress.ldap.container</title>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/group/Group.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/group/Group.java b/src/main/java/org/openldap/fortress/ldap/group/Group.java
index 5d3d65c..259eea4 100755
--- a/src/main/java/org/openldap/fortress/ldap/group/Group.java
+++ b/src/main/java/org/openldap/fortress/ldap/group/Group.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ldap.group;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/group/GroupDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/group/GroupDAO.java b/src/main/java/org/openldap/fortress/ldap/group/GroupDAO.java
index 74fd6d2..e13b349 100755
--- a/src/main/java/org/openldap/fortress/ldap/group/GroupDAO.java
+++ b/src/main/java/org/openldap/fortress/ldap/group/GroupDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ldap.group;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/group/GroupMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/group/GroupMgr.java b/src/main/java/org/openldap/fortress/ldap/group/GroupMgr.java
index 1a2ce6a..1dc4549 100755
--- a/src/main/java/org/openldap/fortress/ldap/group/GroupMgr.java
+++ b/src/main/java/org/openldap/fortress/ldap/group/GroupMgr.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ldap.group;
 
 import org.openldap.fortress.Manageable;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/group/GroupMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/group/GroupMgrFactory.java b/src/main/java/org/openldap/fortress/ldap/group/GroupMgrFactory.java
index 32b7cb9..7bcf9f1 100755
--- a/src/main/java/org/openldap/fortress/ldap/group/GroupMgrFactory.java
+++ b/src/main/java/org/openldap/fortress/ldap/group/GroupMgrFactory.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ldap.group;
 
 import org.openldap.fortress.GlobalErrIds;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/group/GroupMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/group/GroupMgrImpl.java b/src/main/java/org/openldap/fortress/ldap/group/GroupMgrImpl.java
index 549901a..b9e56f3 100755
--- a/src/main/java/org/openldap/fortress/ldap/group/GroupMgrImpl.java
+++ b/src/main/java/org/openldap/fortress/ldap/group/GroupMgrImpl.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ldap.group;
 
 import org.openldap.fortress.GlobalErrIds;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/group/GroupP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/group/GroupP.java b/src/main/java/org/openldap/fortress/ldap/group/GroupP.java
index 53acdbd..cdf5aac 100755
--- a/src/main/java/org/openldap/fortress/ldap/group/GroupP.java
+++ b/src/main/java/org/openldap/fortress/ldap/group/GroupP.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ldap.group;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/group/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/group/package.html b/src/main/java/org/openldap/fortress/ldap/group/package.html
index 27d5ef5..ec5727e 100755
--- a/src/main/java/org/openldap/fortress/ldap/group/package.html
+++ b/src/main/java/org/openldap/fortress/ldap/group/package.html
@@ -1,18 +1,22 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
-
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+ *
+-->
 <html>
    <head>
       <title>Package Documentation for org.openldap.fortress.ldap.group</title>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/openldap/OLPWControlImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/openldap/OLPWControlImpl.java b/src/main/java/org/openldap/fortress/ldap/openldap/OLPWControlImpl.java
index f1f82df..a7e76cd 100755
--- a/src/main/java/org/openldap/fortress/ldap/openldap/OLPWControlImpl.java
+++ b/src/main/java/org/openldap/fortress/ldap/openldap/OLPWControlImpl.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ldap.openldap;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/openldap/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/openldap/package.html b/src/main/java/org/openldap/fortress/ldap/openldap/package.html
index f20cb13..a673a76 100755
--- a/src/main/java/org/openldap/fortress/ldap/openldap/package.html
+++ b/src/main/java/org/openldap/fortress/ldap/openldap/package.html
@@ -1,18 +1,22 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
-
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+ *
+-->
 <html>
    <head>
       <title>Package Documentation for org.openldap.fortress.ldap.openldap</title>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/package.html b/src/main/java/org/openldap/fortress/ldap/package.html
index 24026ee..4c83828 100755
--- a/src/main/java/org/openldap/fortress/ldap/package.html
+++ b/src/main/java/org/openldap/fortress/ldap/package.html
@@ -1,18 +1,22 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
-
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+ *
+-->
 <html>
    <head>
       <title>Package Documentation for org.openldap.fortress.ldap</title>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/suffix/Suffix.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/suffix/Suffix.java b/src/main/java/org/openldap/fortress/ldap/suffix/Suffix.java
index f6cca14..62fe8af 100755
--- a/src/main/java/org/openldap/fortress/ldap/suffix/Suffix.java
+++ b/src/main/java/org/openldap/fortress/ldap/suffix/Suffix.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ldap.suffix;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/suffix/SuffixDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/suffix/SuffixDAO.java b/src/main/java/org/openldap/fortress/ldap/suffix/SuffixDAO.java
index 770f2e1..52ce44b 100755
--- a/src/main/java/org/openldap/fortress/ldap/suffix/SuffixDAO.java
+++ b/src/main/java/org/openldap/fortress/ldap/suffix/SuffixDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ldap.suffix;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/suffix/SuffixP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/suffix/SuffixP.java b/src/main/java/org/openldap/fortress/ldap/suffix/SuffixP.java
index 95000bf..c86a80d 100755
--- a/src/main/java/org/openldap/fortress/ldap/suffix/SuffixP.java
+++ b/src/main/java/org/openldap/fortress/ldap/suffix/SuffixP.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ldap.suffix;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ldap/suffix/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ldap/suffix/package.html b/src/main/java/org/openldap/fortress/ldap/suffix/package.html
index e429e4f..f1f0fa9 100755
--- a/src/main/java/org/openldap/fortress/ldap/suffix/package.html
+++ b/src/main/java/org/openldap/fortress/ldap/suffix/package.html
@@ -1,18 +1,22 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
-
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+ *
+-->
 <html>
    <head>
       <title>Package Documentation for org.openldap.fortress.ldap.suffix</title>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/overview.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/overview.html b/src/main/java/org/openldap/fortress/overview.html
index 703963e..f6e6599 100755
--- a/src/main/java/org/openldap/fortress/overview.html
+++ b/src/main/java/org/openldap/fortress/overview.html
@@ -1,20 +1,25 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+ *
+-->
 <html>
    <head>
-      <title>Overview of the org.openldap.fortress component</title>
+      <title>Overview of the org.apache.fortress component</title>
    </head>
    <body>
        A standards based and open source Identity Access Management Java SDK for LDAP v3 compliant systems.

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/package.html b/src/main/java/org/openldap/fortress/package.html
index 9bf0ec5..ae8d6b2 100755
--- a/src/main/java/org/openldap/fortress/package.html
+++ b/src/main/java/org/openldap/fortress/package.html
@@ -1,17 +1,22 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+ *
+-->
 <html>
    <head>
       <title>Package Documentation for org.openldap.fortress</title>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/AccelMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/AccelMgrImpl.java b/src/main/java/org/openldap/fortress/rbac/AccelMgrImpl.java
index 023ba3d..b315682 100644
--- a/src/main/java/org/openldap/fortress/rbac/AccelMgrImpl.java
+++ b/src/main/java/org/openldap/fortress/rbac/AccelMgrImpl.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/AccessMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/AccessMgrImpl.java b/src/main/java/org/openldap/fortress/rbac/AccessMgrImpl.java
index 3b1f408..ce9af23 100755
--- a/src/main/java/org/openldap/fortress/rbac/AccessMgrImpl.java
+++ b/src/main/java/org/openldap/fortress/rbac/AccessMgrImpl.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/Address.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/Address.java b/src/main/java/org/openldap/fortress/rbac/Address.java
index 0863e61..3629daa 100644
--- a/src/main/java/org/openldap/fortress/rbac/Address.java
+++ b/src/main/java/org/openldap/fortress/rbac/Address.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.rbac;
 


[7/9] Added teh apache license header in all the files

Posted by el...@apache.org.
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ValidationException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ValidationException.java b/src/main/java/org/openldap/fortress/ValidationException.java
index 4a3e1b7..62877ad 100755
--- a/src/main/java/org/openldap/fortress/ValidationException.java
+++ b/src/main/java/org/openldap/fortress/ValidationException.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Addadminrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Addadminrole.java b/src/main/java/org/openldap/fortress/ant/Addadminrole.java
index a931fae..36d2222 100755
--- a/src/main/java/org/openldap/fortress/ant/Addadminrole.java
+++ b/src/main/java/org/openldap/fortress/ant/Addadminrole.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Addadminroleinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Addadminroleinheritance.java b/src/main/java/org/openldap/fortress/ant/Addadminroleinheritance.java
index b0f5f0d..6304e6a 100755
--- a/src/main/java/org/openldap/fortress/ant/Addadminroleinheritance.java
+++ b/src/main/java/org/openldap/fortress/ant/Addadminroleinheritance.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.rbac.Relationship;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Addconfig.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Addconfig.java b/src/main/java/org/openldap/fortress/ant/Addconfig.java
index ce43209..518f37d 100755
--- a/src/main/java/org/openldap/fortress/ant/Addconfig.java
+++ b/src/main/java/org/openldap/fortress/ant/Addconfig.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Addcontainer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Addcontainer.java b/src/main/java/org/openldap/fortress/ant/Addcontainer.java
index a3865f4..f631ef8 100755
--- a/src/main/java/org/openldap/fortress/ant/Addcontainer.java
+++ b/src/main/java/org/openldap/fortress/ant/Addcontainer.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.ldap.container.OrganizationalUnit;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Addcontext.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Addcontext.java b/src/main/java/org/openldap/fortress/ant/Addcontext.java
index 7263b84..c51373e 100755
--- a/src/main/java/org/openldap/fortress/ant/Addcontext.java
+++ b/src/main/java/org/openldap/fortress/ant/Addcontext.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.rbac.Context;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Addgroup.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Addgroup.java b/src/main/java/org/openldap/fortress/ant/Addgroup.java
index bfd5b54..bdcf0c1 100755
--- a/src/main/java/org/openldap/fortress/ant/Addgroup.java
+++ b/src/main/java/org/openldap/fortress/ant/Addgroup.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.ldap.group.Group;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Addgroupmember.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Addgroupmember.java b/src/main/java/org/openldap/fortress/ant/Addgroupmember.java
index 85772fe..21ac885 100755
--- a/src/main/java/org/openldap/fortress/ant/Addgroupmember.java
+++ b/src/main/java/org/openldap/fortress/ant/Addgroupmember.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.ldap.group.Group;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Addgroupproperty.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Addgroupproperty.java b/src/main/java/org/openldap/fortress/ant/Addgroupproperty.java
index 0743634..16eabcd 100755
--- a/src/main/java/org/openldap/fortress/ant/Addgroupproperty.java
+++ b/src/main/java/org/openldap/fortress/ant/Addgroupproperty.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.ldap.group.Group;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Addorgunit.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Addorgunit.java b/src/main/java/org/openldap/fortress/ant/Addorgunit.java
index eb19494..1466aaf 100755
--- a/src/main/java/org/openldap/fortress/ant/Addorgunit.java
+++ b/src/main/java/org/openldap/fortress/ant/Addorgunit.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.rbac.OrgUnitAnt;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/AddpermGrant.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/AddpermGrant.java b/src/main/java/org/openldap/fortress/ant/AddpermGrant.java
index 5914782..85a54fb 100755
--- a/src/main/java/org/openldap/fortress/ant/AddpermGrant.java
+++ b/src/main/java/org/openldap/fortress/ant/AddpermGrant.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.rbac.PermGrant;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/AddpermObj.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/AddpermObj.java b/src/main/java/org/openldap/fortress/ant/AddpermObj.java
index 79d0ac0..99258b5 100755
--- a/src/main/java/org/openldap/fortress/ant/AddpermObj.java
+++ b/src/main/java/org/openldap/fortress/ant/AddpermObj.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/AddpermOp.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/AddpermOp.java b/src/main/java/org/openldap/fortress/ant/AddpermOp.java
index 848761a..a8a01ad 100755
--- a/src/main/java/org/openldap/fortress/ant/AddpermOp.java
+++ b/src/main/java/org/openldap/fortress/ant/AddpermOp.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Addpermorgunitinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Addpermorgunitinheritance.java b/src/main/java/org/openldap/fortress/ant/Addpermorgunitinheritance.java
index 8bd7218..adfe069 100755
--- a/src/main/java/org/openldap/fortress/ant/Addpermorgunitinheritance.java
+++ b/src/main/java/org/openldap/fortress/ant/Addpermorgunitinheritance.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.rbac.Relationship;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Addpwpolicy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Addpwpolicy.java b/src/main/java/org/openldap/fortress/ant/Addpwpolicy.java
index ea4b148..c279102 100755
--- a/src/main/java/org/openldap/fortress/ant/Addpwpolicy.java
+++ b/src/main/java/org/openldap/fortress/ant/Addpwpolicy.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.rbac.PwPolicy;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Addrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Addrole.java b/src/main/java/org/openldap/fortress/ant/Addrole.java
index c806586..d03505a 100755
--- a/src/main/java/org/openldap/fortress/ant/Addrole.java
+++ b/src/main/java/org/openldap/fortress/ant/Addrole.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.rbac.Role;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Addroleinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Addroleinheritance.java b/src/main/java/org/openldap/fortress/ant/Addroleinheritance.java
index 7be2b06..d1d7b41 100755
--- a/src/main/java/org/openldap/fortress/ant/Addroleinheritance.java
+++ b/src/main/java/org/openldap/fortress/ant/Addroleinheritance.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.rbac.Relationship;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Addsdset.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Addsdset.java b/src/main/java/org/openldap/fortress/ant/Addsdset.java
index fead1eb..e620167 100755
--- a/src/main/java/org/openldap/fortress/ant/Addsdset.java
+++ b/src/main/java/org/openldap/fortress/ant/Addsdset.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Addsuffix.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Addsuffix.java b/src/main/java/org/openldap/fortress/ant/Addsuffix.java
index 86b4981..2a8f890 100755
--- a/src/main/java/org/openldap/fortress/ant/Addsuffix.java
+++ b/src/main/java/org/openldap/fortress/ant/Addsuffix.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Adduser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Adduser.java b/src/main/java/org/openldap/fortress/ant/Adduser.java
index 337122e..8cb5897 100755
--- a/src/main/java/org/openldap/fortress/ant/Adduser.java
+++ b/src/main/java/org/openldap/fortress/ant/Adduser.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Adduseradminrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Adduseradminrole.java b/src/main/java/org/openldap/fortress/ant/Adduseradminrole.java
index 2c94430..1be3c0e 100755
--- a/src/main/java/org/openldap/fortress/ant/Adduseradminrole.java
+++ b/src/main/java/org/openldap/fortress/ant/Adduseradminrole.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.rbac.UserAdminRole;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Adduserorgunitinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Adduserorgunitinheritance.java b/src/main/java/org/openldap/fortress/ant/Adduserorgunitinheritance.java
index d430e60..8b1b4cf 100755
--- a/src/main/java/org/openldap/fortress/ant/Adduserorgunitinheritance.java
+++ b/src/main/java/org/openldap/fortress/ant/Adduserorgunitinheritance.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.rbac.Relationship;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Adduserrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Adduserrole.java b/src/main/java/org/openldap/fortress/ant/Adduserrole.java
index fd30500..9d7c98f 100755
--- a/src/main/java/org/openldap/fortress/ant/Adduserrole.java
+++ b/src/main/java/org/openldap/fortress/ant/Adduserrole.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.rbac.UserRole;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/AdminRoleAnt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/AdminRoleAnt.java b/src/main/java/org/openldap/fortress/ant/AdminRoleAnt.java
index 782abd7..3fac30a 100755
--- a/src/main/java/org/openldap/fortress/ant/AdminRoleAnt.java
+++ b/src/main/java/org/openldap/fortress/ant/AdminRoleAnt.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/ConfigAnt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/ConfigAnt.java b/src/main/java/org/openldap/fortress/ant/ConfigAnt.java
index 9e2cb89..936e16b 100755
--- a/src/main/java/org/openldap/fortress/ant/ConfigAnt.java
+++ b/src/main/java/org/openldap/fortress/ant/ConfigAnt.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Deladminrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Deladminrole.java b/src/main/java/org/openldap/fortress/ant/Deladminrole.java
index efcfcc6..2af75d6 100755
--- a/src/main/java/org/openldap/fortress/ant/Deladminrole.java
+++ b/src/main/java/org/openldap/fortress/ant/Deladminrole.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Deladminroleinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Deladminroleinheritance.java b/src/main/java/org/openldap/fortress/ant/Deladminroleinheritance.java
index 2784119..b5d8039 100755
--- a/src/main/java/org/openldap/fortress/ant/Deladminroleinheritance.java
+++ b/src/main/java/org/openldap/fortress/ant/Deladminroleinheritance.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.rbac.Relationship;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Delconfig.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Delconfig.java b/src/main/java/org/openldap/fortress/ant/Delconfig.java
index 1c7c890..23450d0 100755
--- a/src/main/java/org/openldap/fortress/ant/Delconfig.java
+++ b/src/main/java/org/openldap/fortress/ant/Delconfig.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Delcontainer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Delcontainer.java b/src/main/java/org/openldap/fortress/ant/Delcontainer.java
index 50e1425..56b7ee0 100755
--- a/src/main/java/org/openldap/fortress/ant/Delcontainer.java
+++ b/src/main/java/org/openldap/fortress/ant/Delcontainer.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.ldap.container.OrganizationalUnit;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Delgroup.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Delgroup.java b/src/main/java/org/openldap/fortress/ant/Delgroup.java
index 81a6577..9cbf217 100755
--- a/src/main/java/org/openldap/fortress/ant/Delgroup.java
+++ b/src/main/java/org/openldap/fortress/ant/Delgroup.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.ldap.group.Group;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Delgroupmember.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Delgroupmember.java b/src/main/java/org/openldap/fortress/ant/Delgroupmember.java
index 6bf276a..5efe3dd 100755
--- a/src/main/java/org/openldap/fortress/ant/Delgroupmember.java
+++ b/src/main/java/org/openldap/fortress/ant/Delgroupmember.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.ldap.group.Group;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Delgroupproperty.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Delgroupproperty.java b/src/main/java/org/openldap/fortress/ant/Delgroupproperty.java
index f099413..40d3d05 100755
--- a/src/main/java/org/openldap/fortress/ant/Delgroupproperty.java
+++ b/src/main/java/org/openldap/fortress/ant/Delgroupproperty.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.ldap.group.Group;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Delorgunit.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Delorgunit.java b/src/main/java/org/openldap/fortress/ant/Delorgunit.java
index f3322ce..31a75cb 100755
--- a/src/main/java/org/openldap/fortress/ant/Delorgunit.java
+++ b/src/main/java/org/openldap/fortress/ant/Delorgunit.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/DelpermGrant.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/DelpermGrant.java b/src/main/java/org/openldap/fortress/ant/DelpermGrant.java
index 8b8f34c..bd0cf55 100755
--- a/src/main/java/org/openldap/fortress/ant/DelpermGrant.java
+++ b/src/main/java/org/openldap/fortress/ant/DelpermGrant.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.rbac.PermGrant;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/DelpermObj.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/DelpermObj.java b/src/main/java/org/openldap/fortress/ant/DelpermObj.java
index 2fda292..ddf33e0 100755
--- a/src/main/java/org/openldap/fortress/ant/DelpermObj.java
+++ b/src/main/java/org/openldap/fortress/ant/DelpermObj.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/DelpermOp.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/DelpermOp.java b/src/main/java/org/openldap/fortress/ant/DelpermOp.java
index cdb9741..af37295 100755
--- a/src/main/java/org/openldap/fortress/ant/DelpermOp.java
+++ b/src/main/java/org/openldap/fortress/ant/DelpermOp.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Delpermorgunitinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Delpermorgunitinheritance.java b/src/main/java/org/openldap/fortress/ant/Delpermorgunitinheritance.java
index 726a715..7e9bbea 100755
--- a/src/main/java/org/openldap/fortress/ant/Delpermorgunitinheritance.java
+++ b/src/main/java/org/openldap/fortress/ant/Delpermorgunitinheritance.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.rbac.Relationship;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Delpwpolicy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Delpwpolicy.java b/src/main/java/org/openldap/fortress/ant/Delpwpolicy.java
index a1e1614..9f40bdb 100755
--- a/src/main/java/org/openldap/fortress/ant/Delpwpolicy.java
+++ b/src/main/java/org/openldap/fortress/ant/Delpwpolicy.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.rbac.PwPolicy;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Delrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Delrole.java b/src/main/java/org/openldap/fortress/ant/Delrole.java
index 35021be..95fc9c3 100755
--- a/src/main/java/org/openldap/fortress/ant/Delrole.java
+++ b/src/main/java/org/openldap/fortress/ant/Delrole.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.rbac.Role;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Delroleinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Delroleinheritance.java b/src/main/java/org/openldap/fortress/ant/Delroleinheritance.java
index b38d42a..583de8d 100755
--- a/src/main/java/org/openldap/fortress/ant/Delroleinheritance.java
+++ b/src/main/java/org/openldap/fortress/ant/Delroleinheritance.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.rbac.Relationship;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Delsdset.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Delsdset.java b/src/main/java/org/openldap/fortress/ant/Delsdset.java
index e3ea0a8..816de45 100755
--- a/src/main/java/org/openldap/fortress/ant/Delsdset.java
+++ b/src/main/java/org/openldap/fortress/ant/Delsdset.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Delsuffix.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Delsuffix.java b/src/main/java/org/openldap/fortress/ant/Delsuffix.java
index c1cef65..920e42f 100755
--- a/src/main/java/org/openldap/fortress/ant/Delsuffix.java
+++ b/src/main/java/org/openldap/fortress/ant/Delsuffix.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.ldap.suffix.Suffix;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Deluser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Deluser.java b/src/main/java/org/openldap/fortress/ant/Deluser.java
index 1045a18..76a8a89 100755
--- a/src/main/java/org/openldap/fortress/ant/Deluser.java
+++ b/src/main/java/org/openldap/fortress/ant/Deluser.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Deluseradminrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Deluseradminrole.java b/src/main/java/org/openldap/fortress/ant/Deluseradminrole.java
index 6e86d10..7fd529a 100755
--- a/src/main/java/org/openldap/fortress/ant/Deluseradminrole.java
+++ b/src/main/java/org/openldap/fortress/ant/Deluseradminrole.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.rbac.UserAdminRole;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Deluserorgunitinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Deluserorgunitinheritance.java b/src/main/java/org/openldap/fortress/ant/Deluserorgunitinheritance.java
index a565f92..b46e7c1 100755
--- a/src/main/java/org/openldap/fortress/ant/Deluserorgunitinheritance.java
+++ b/src/main/java/org/openldap/fortress/ant/Deluserorgunitinheritance.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.rbac.Relationship;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ant/Deluserrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ant/Deluserrole.java b/src/main/java/org/openldap/fortress/ant/Deluserrole.java
index 5aef462..d1a3d9f 100755
--- a/src/main/java/org/openldap/fortress/ant/Deluserrole.java
+++ b/src/main/java/org/openldap/fortress/ant/Deluserrole.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.ant;
 
 import org.openldap.fortress.rbac.UserRole;


[4/9] Added teh apache license header in all the files

Posted by el...@apache.org.
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/SDSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/SDSet.java b/src/main/java/org/openldap/fortress/rbac/SDSet.java
index 4b3325a..0ce8ff3 100755
--- a/src/main/java/org/openldap/fortress/rbac/SDSet.java
+++ b/src/main/java/org/openldap/fortress/rbac/SDSet.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import javax.xml.bind.annotation.XmlAccessType;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/SDUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/SDUtil.java b/src/main/java/org/openldap/fortress/rbac/SDUtil.java
index 1fa9e7c..da3024f 100755
--- a/src/main/java/org/openldap/fortress/rbac/SDUtil.java
+++ b/src/main/java/org/openldap/fortress/rbac/SDUtil.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import org.openldap.fortress.GlobalErrIds;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/SdP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/SdP.java b/src/main/java/org/openldap/fortress/rbac/SdP.java
index b0816ff..56270dc 100755
--- a/src/main/java/org/openldap/fortress/rbac/SdP.java
+++ b/src/main/java/org/openldap/fortress/rbac/SdP.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/Session.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/Session.java b/src/main/java/org/openldap/fortress/rbac/Session.java
index f954720..d2b7b43 100755
--- a/src/main/java/org/openldap/fortress/rbac/Session.java
+++ b/src/main/java/org/openldap/fortress/rbac/Session.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import javax.xml.bind.annotation.XmlAccessType;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/SetAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/SetAdapter.java b/src/main/java/org/openldap/fortress/rbac/SetAdapter.java
index 104f755..3ce619c 100755
--- a/src/main/java/org/openldap/fortress/rbac/SetAdapter.java
+++ b/src/main/java/org/openldap/fortress/rbac/SetAdapter.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/User.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/User.java b/src/main/java/org/openldap/fortress/rbac/User.java
index d1845ba..a468faa 100755
--- a/src/main/java/org/openldap/fortress/rbac/User.java
+++ b/src/main/java/org/openldap/fortress/rbac/User.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/UserAdminRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/UserAdminRole.java b/src/main/java/org/openldap/fortress/rbac/UserAdminRole.java
index 9369313..974db2d 100755
--- a/src/main/java/org/openldap/fortress/rbac/UserAdminRole.java
+++ b/src/main/java/org/openldap/fortress/rbac/UserAdminRole.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/UserAudit.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/UserAudit.java b/src/main/java/org/openldap/fortress/rbac/UserAudit.java
index adf3346..0a0a394 100755
--- a/src/main/java/org/openldap/fortress/rbac/UserAudit.java
+++ b/src/main/java/org/openldap/fortress/rbac/UserAudit.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import javax.xml.bind.annotation.XmlAccessType;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/UserP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/UserP.java b/src/main/java/org/openldap/fortress/rbac/UserP.java
index b6115bf..2d38ad8 100755
--- a/src/main/java/org/openldap/fortress/rbac/UserP.java
+++ b/src/main/java/org/openldap/fortress/rbac/UserP.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/UserRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/UserRole.java b/src/main/java/org/openldap/fortress/rbac/UserRole.java
index 4dc434e..90a29f4 100755
--- a/src/main/java/org/openldap/fortress/rbac/UserRole.java
+++ b/src/main/java/org/openldap/fortress/rbac/UserRole.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/UsoUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/UsoUtil.java b/src/main/java/org/openldap/fortress/rbac/UsoUtil.java
index 390f948..84d455a 100755
--- a/src/main/java/org/openldap/fortress/rbac/UsoUtil.java
+++ b/src/main/java/org/openldap/fortress/rbac/UsoUtil.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/Warning.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/Warning.java b/src/main/java/org/openldap/fortress/rbac/Warning.java
index 40e80c6..4a15aff 100644
--- a/src/main/java/org/openldap/fortress/rbac/Warning.java
+++ b/src/main/java/org/openldap/fortress/rbac/Warning.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/AcceleratorDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/AcceleratorDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/AcceleratorDAO.java
index 7361a39..816004c 100644
--- a/src/main/java/org/openldap/fortress/rbac/dao/AcceleratorDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/AcceleratorDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac.dao;
 
 import org.openldap.fortress.SecurityException;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/AdminRoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/AdminRoleDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/AdminRoleDAO.java
index e17aced..10f1b72 100644
--- a/src/main/java/org/openldap/fortress/rbac/dao/AdminRoleDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/AdminRoleDAO.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.rbac.dao;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/AuditDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/AuditDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/AuditDAO.java
index ada2c81..cd088f3 100644
--- a/src/main/java/org/openldap/fortress/rbac/dao/AuditDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/AuditDAO.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.rbac.dao;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/DAOType.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/DAOType.java b/src/main/java/org/openldap/fortress/rbac/dao/DAOType.java
index b7f8c46..08ed60e 100644
--- a/src/main/java/org/openldap/fortress/rbac/dao/DAOType.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/DAOType.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac.dao;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/DaoFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/DaoFactory.java b/src/main/java/org/openldap/fortress/rbac/dao/DaoFactory.java
index 8f8b4b2..d88ae15 100644
--- a/src/main/java/org/openldap/fortress/rbac/dao/DaoFactory.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/DaoFactory.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.rbac.dao;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/OrgUnitDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/OrgUnitDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/OrgUnitDAO.java
index 08d912b..84dab9b 100644
--- a/src/main/java/org/openldap/fortress/rbac/dao/OrgUnitDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/OrgUnitDAO.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.rbac.dao;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/PermDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/PermDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/PermDAO.java
index de79920..f6d7294 100644
--- a/src/main/java/org/openldap/fortress/rbac/dao/PermDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/PermDAO.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.rbac.dao;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/PolicyDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/PolicyDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/PolicyDAO.java
index 67d4c93..aaa9adf 100644
--- a/src/main/java/org/openldap/fortress/rbac/dao/PolicyDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/PolicyDAO.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.rbac.dao;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/RoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/RoleDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/RoleDAO.java
index 71db4db..575a43e 100644
--- a/src/main/java/org/openldap/fortress/rbac/dao/RoleDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/RoleDAO.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.rbac.dao;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/SdDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/SdDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/SdDAO.java
index 31d55fe..310d9ca 100644
--- a/src/main/java/org/openldap/fortress/rbac/dao/SdDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/SdDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac.dao;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/UserDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/UserDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/UserDAO.java
index 128c900..fcf737e 100644
--- a/src/main/java/org/openldap/fortress/rbac/dao/UserDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/UserDAO.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.rbac.dao;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/apache/AcceleratorDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/apache/AcceleratorDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/apache/AcceleratorDAO.java
index f6f2f03..8656eff 100644
--- a/src/main/java/org/openldap/fortress/rbac/dao/apache/AcceleratorDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/apache/AcceleratorDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac.dao.apache;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/apache/AdminRoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/apache/AdminRoleDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/apache/AdminRoleDAO.java
index b10424d..28d46a2 100755
--- a/src/main/java/org/openldap/fortress/rbac/dao/apache/AdminRoleDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/apache/AdminRoleDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac.dao.apache;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/apache/AuditDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/apache/AuditDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/apache/AuditDAO.java
index 86a8d4d..73e367a 100755
--- a/src/main/java/org/openldap/fortress/rbac/dao/apache/AuditDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/apache/AuditDAO.java
@@ -1,20 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
-
-
 package org.openldap.fortress.rbac.dao.apache;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/apache/OrgUnitDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/apache/OrgUnitDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/apache/OrgUnitDAO.java
index 503adfd..7fa5291 100755
--- a/src/main/java/org/openldap/fortress/rbac/dao/apache/OrgUnitDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/apache/OrgUnitDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac.dao.apache;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/apache/PermDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/apache/PermDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/apache/PermDAO.java
index 3396cff..2387ffd 100755
--- a/src/main/java/org/openldap/fortress/rbac/dao/apache/PermDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/apache/PermDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac.dao.apache;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/apache/PolicyDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/apache/PolicyDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/apache/PolicyDAO.java
index 1ebfbd9..29f9679 100755
--- a/src/main/java/org/openldap/fortress/rbac/dao/apache/PolicyDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/apache/PolicyDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac.dao.apache;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/apache/RoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/apache/RoleDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/apache/RoleDAO.java
index 7463a93..5c45f75 100755
--- a/src/main/java/org/openldap/fortress/rbac/dao/apache/RoleDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/apache/RoleDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac.dao.apache;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/apache/SdDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/apache/SdDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/apache/SdDAO.java
index 93ceff1..28aaac4 100755
--- a/src/main/java/org/openldap/fortress/rbac/dao/apache/SdDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/apache/SdDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac.dao.apache;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/apache/UserDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/apache/UserDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/apache/UserDAO.java
index 2f3a6d1..15d10b1 100755
--- a/src/main/java/org/openldap/fortress/rbac/dao/apache/UserDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/apache/UserDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac.dao.apache;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/unboundid/AdminRoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/unboundid/AdminRoleDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/unboundid/AdminRoleDAO.java
index 9139f67..c231941 100755
--- a/src/main/java/org/openldap/fortress/rbac/dao/unboundid/AdminRoleDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/unboundid/AdminRoleDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac.dao.unboundid;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/unboundid/AuditDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/unboundid/AuditDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/unboundid/AuditDAO.java
index 3d7255c..4438dbf 100755
--- a/src/main/java/org/openldap/fortress/rbac/dao/unboundid/AuditDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/unboundid/AuditDAO.java
@@ -1,20 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
-
-
 package org.openldap.fortress.rbac.dao.unboundid;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/unboundid/OrgUnitDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/unboundid/OrgUnitDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/unboundid/OrgUnitDAO.java
index b7d4836..51c019d 100755
--- a/src/main/java/org/openldap/fortress/rbac/dao/unboundid/OrgUnitDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/unboundid/OrgUnitDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac.dao.unboundid;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/unboundid/PermDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/unboundid/PermDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/unboundid/PermDAO.java
index e39ac4f..aa2b4d3 100755
--- a/src/main/java/org/openldap/fortress/rbac/dao/unboundid/PermDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/unboundid/PermDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac.dao.unboundid;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/unboundid/PolicyDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/unboundid/PolicyDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/unboundid/PolicyDAO.java
index 9f2ad80..74602d7 100755
--- a/src/main/java/org/openldap/fortress/rbac/dao/unboundid/PolicyDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/unboundid/PolicyDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac.dao.unboundid;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/unboundid/RoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/unboundid/RoleDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/unboundid/RoleDAO.java
index 91affb6..dac80d3 100755
--- a/src/main/java/org/openldap/fortress/rbac/dao/unboundid/RoleDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/unboundid/RoleDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac.dao.unboundid;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/unboundid/SdDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/unboundid/SdDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/unboundid/SdDAO.java
index c1cf0bf..3bc4371 100755
--- a/src/main/java/org/openldap/fortress/rbac/dao/unboundid/SdDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/unboundid/SdDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac.dao.unboundid;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/dao/unboundid/UserDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/dao/unboundid/UserDAO.java b/src/main/java/org/openldap/fortress/rbac/dao/unboundid/UserDAO.java
index 7c114ff..fd744a6 100755
--- a/src/main/java/org/openldap/fortress/rbac/dao/unboundid/UserDAO.java
+++ b/src/main/java/org/openldap/fortress/rbac/dao/unboundid/UserDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac.dao.unboundid;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rbac/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rbac/package.html b/src/main/java/org/openldap/fortress/rbac/package.html
index 91cb8f3..5ee9bfe 100755
--- a/src/main/java/org/openldap/fortress/rbac/package.html
+++ b/src/main/java/org/openldap/fortress/rbac/package.html
@@ -1,18 +1,22 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
-
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+ *
+-->
 <html>
    <head>
       <title>Package Documentation for org.openldap.fortress.rbac</title>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rest/AccessMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rest/AccessMgrRestImpl.java b/src/main/java/org/openldap/fortress/rest/AccessMgrRestImpl.java
index b6c9dc3..0284caa 100644
--- a/src/main/java/org/openldap/fortress/rest/AccessMgrRestImpl.java
+++ b/src/main/java/org/openldap/fortress/rest/AccessMgrRestImpl.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.rest;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rest/AdminMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rest/AdminMgrRestImpl.java b/src/main/java/org/openldap/fortress/rest/AdminMgrRestImpl.java
index ab8e7b9..1ebf11f 100644
--- a/src/main/java/org/openldap/fortress/rest/AdminMgrRestImpl.java
+++ b/src/main/java/org/openldap/fortress/rest/AdminMgrRestImpl.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.rest;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rest/AuditMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rest/AuditMgrRestImpl.java b/src/main/java/org/openldap/fortress/rest/AuditMgrRestImpl.java
index 9b9bd73..e7f42c3 100644
--- a/src/main/java/org/openldap/fortress/rest/AuditMgrRestImpl.java
+++ b/src/main/java/org/openldap/fortress/rest/AuditMgrRestImpl.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rest;
 
 import org.openldap.fortress.AuditMgr;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rest/CachedJaxbContext.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rest/CachedJaxbContext.java b/src/main/java/org/openldap/fortress/rest/CachedJaxbContext.java
index a3f5df3..8adeb26 100644
--- a/src/main/java/org/openldap/fortress/rest/CachedJaxbContext.java
+++ b/src/main/java/org/openldap/fortress/rest/CachedJaxbContext.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rest;
 
 import java.util.Hashtable;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rest/ConfigMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rest/ConfigMgrRestImpl.java b/src/main/java/org/openldap/fortress/rest/ConfigMgrRestImpl.java
index 4cd4ffb..ff3669d 100644
--- a/src/main/java/org/openldap/fortress/rest/ConfigMgrRestImpl.java
+++ b/src/main/java/org/openldap/fortress/rest/ConfigMgrRestImpl.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rest;
 
 import org.openldap.fortress.GlobalErrIds;


[3/9] Added teh apache license header in all the files

Posted by el...@apache.org.
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rest/DelAccessMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rest/DelAccessMgrRestImpl.java b/src/main/java/org/openldap/fortress/rest/DelAccessMgrRestImpl.java
index 2a8cb6d..0d41a95 100644
--- a/src/main/java/org/openldap/fortress/rest/DelAccessMgrRestImpl.java
+++ b/src/main/java/org/openldap/fortress/rest/DelAccessMgrRestImpl.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rest;
 
 import org.openldap.fortress.GlobalErrIds;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rest/DelAdminMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rest/DelAdminMgrRestImpl.java b/src/main/java/org/openldap/fortress/rest/DelAdminMgrRestImpl.java
index c685b54..a2bbbc7 100644
--- a/src/main/java/org/openldap/fortress/rest/DelAdminMgrRestImpl.java
+++ b/src/main/java/org/openldap/fortress/rest/DelAdminMgrRestImpl.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rest;
 
 import org.openldap.fortress.*;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rest/DelReviewMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rest/DelReviewMgrRestImpl.java b/src/main/java/org/openldap/fortress/rest/DelReviewMgrRestImpl.java
index 5c04eff..5485f33 100644
--- a/src/main/java/org/openldap/fortress/rest/DelReviewMgrRestImpl.java
+++ b/src/main/java/org/openldap/fortress/rest/DelReviewMgrRestImpl.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rest;
 
 import org.openldap.fortress.GlobalErrIds;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rest/FortRequest.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rest/FortRequest.java b/src/main/java/org/openldap/fortress/rest/FortRequest.java
index edcd02c..803e0aa 100644
--- a/src/main/java/org/openldap/fortress/rest/FortRequest.java
+++ b/src/main/java/org/openldap/fortress/rest/FortRequest.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.rest;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rest/FortResponse.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rest/FortResponse.java b/src/main/java/org/openldap/fortress/rest/FortResponse.java
index d9293e2..14545c8 100755
--- a/src/main/java/org/openldap/fortress/rest/FortResponse.java
+++ b/src/main/java/org/openldap/fortress/rest/FortResponse.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.rest;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rest/HttpIds.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rest/HttpIds.java b/src/main/java/org/openldap/fortress/rest/HttpIds.java
index d0ddeb9..5f51c37 100644
--- a/src/main/java/org/openldap/fortress/rest/HttpIds.java
+++ b/src/main/java/org/openldap/fortress/rest/HttpIds.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.rest;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rest/JAXBCachedEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rest/JAXBCachedEntry.java b/src/main/java/org/openldap/fortress/rest/JAXBCachedEntry.java
index 3c8616f..1459d18 100644
--- a/src/main/java/org/openldap/fortress/rest/JAXBCachedEntry.java
+++ b/src/main/java/org/openldap/fortress/rest/JAXBCachedEntry.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rest;
 
 import javax.xml.bind.JAXBContext;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rest/PwPolicyMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rest/PwPolicyMgrRestImpl.java b/src/main/java/org/openldap/fortress/rest/PwPolicyMgrRestImpl.java
index 62da391..7a608b1 100644
--- a/src/main/java/org/openldap/fortress/rest/PwPolicyMgrRestImpl.java
+++ b/src/main/java/org/openldap/fortress/rest/PwPolicyMgrRestImpl.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rest;
 
 import org.openldap.fortress.GlobalErrIds;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rest/RestUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rest/RestUtils.java b/src/main/java/org/openldap/fortress/rest/RestUtils.java
index 5e4e1cb..5fedd37 100644
--- a/src/main/java/org/openldap/fortress/rest/RestUtils.java
+++ b/src/main/java/org/openldap/fortress/rest/RestUtils.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rest;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rest/ReviewMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rest/ReviewMgrRestImpl.java b/src/main/java/org/openldap/fortress/rest/ReviewMgrRestImpl.java
index c9cef05..5496923 100755
--- a/src/main/java/org/openldap/fortress/rest/ReviewMgrRestImpl.java
+++ b/src/main/java/org/openldap/fortress/rest/ReviewMgrRestImpl.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rest;
 
 import org.openldap.fortress.GlobalErrIds;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/rest/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/rest/package.html b/src/main/java/org/openldap/fortress/rest/package.html
index 7fa0904..0bd4e89 100755
--- a/src/main/java/org/openldap/fortress/rest/package.html
+++ b/src/main/java/org/openldap/fortress/rest/package.html
@@ -1,17 +1,22 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+ *
+-->
 <html>
    <head>
       <title>Package Documentation for org.openldap.fortress.rest</title>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/LogUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/LogUtil.java b/src/main/java/org/openldap/fortress/util/LogUtil.java
index b452c54..0ccc04e 100755
--- a/src/main/java/org/openldap/fortress/util/LogUtil.java
+++ b/src/main/java/org/openldap/fortress/util/LogUtil.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.util;
 
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/Testable.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/Testable.java b/src/main/java/org/openldap/fortress/util/Testable.java
index f21fa91..cb4d93b 100644
--- a/src/main/java/org/openldap/fortress/util/Testable.java
+++ b/src/main/java/org/openldap/fortress/util/Testable.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.util;
 
 import org.apache.tools.ant.Task;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/attr/AttrHelper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/attr/AttrHelper.java b/src/main/java/org/openldap/fortress/util/attr/AttrHelper.java
index 92791ee..3840525 100755
--- a/src/main/java/org/openldap/fortress/util/attr/AttrHelper.java
+++ b/src/main/java/org/openldap/fortress/util/attr/AttrHelper.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.util.attr;
 
 import org.openldap.fortress.GlobalIds;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/attr/RegExUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/attr/RegExUtil.java b/src/main/java/org/openldap/fortress/util/attr/RegExUtil.java
index 0416ff4..d131d4e 100755
--- a/src/main/java/org/openldap/fortress/util/attr/RegExUtil.java
+++ b/src/main/java/org/openldap/fortress/util/attr/RegExUtil.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.util.attr;
 
 import org.openldap.fortress.GlobalErrIds;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/attr/VUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/attr/VUtil.java b/src/main/java/org/openldap/fortress/util/attr/VUtil.java
index ff309f9..a3bf5a4 100755
--- a/src/main/java/org/openldap/fortress/util/attr/VUtil.java
+++ b/src/main/java/org/openldap/fortress/util/attr/VUtil.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.util.attr;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/attr/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/attr/package.html b/src/main/java/org/openldap/fortress/util/attr/package.html
index 36a6adc..bc54d7a 100755
--- a/src/main/java/org/openldap/fortress/util/attr/package.html
+++ b/src/main/java/org/openldap/fortress/util/attr/package.html
@@ -1,18 +1,22 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
-
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+ *
+-->
 <html>
    <head>
       <title>Package Documentation for org.openldap.fortress.util.attr</title>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/cache/Cache.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/cache/Cache.java b/src/main/java/org/openldap/fortress/util/cache/Cache.java
index 5e30dc1..f7cc677 100644
--- a/src/main/java/org/openldap/fortress/util/cache/Cache.java
+++ b/src/main/java/org/openldap/fortress/util/cache/Cache.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.util.cache;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/cache/CacheException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/cache/CacheException.java b/src/main/java/org/openldap/fortress/util/cache/CacheException.java
index 749e379..812cd42 100644
--- a/src/main/java/org/openldap/fortress/util/cache/CacheException.java
+++ b/src/main/java/org/openldap/fortress/util/cache/CacheException.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.util.cache;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/cache/CacheFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/cache/CacheFactory.java b/src/main/java/org/openldap/fortress/util/cache/CacheFactory.java
index 2b2304a..984f706 100644
--- a/src/main/java/org/openldap/fortress/util/cache/CacheFactory.java
+++ b/src/main/java/org/openldap/fortress/util/cache/CacheFactory.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.util.cache;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/cache/CacheMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/cache/CacheMgr.java b/src/main/java/org/openldap/fortress/util/cache/CacheMgr.java
index 9875c76..8fc75d1 100644
--- a/src/main/java/org/openldap/fortress/util/cache/CacheMgr.java
+++ b/src/main/java/org/openldap/fortress/util/cache/CacheMgr.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.util.cache;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/cache/DsdCacheEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/cache/DsdCacheEntry.java b/src/main/java/org/openldap/fortress/util/cache/DsdCacheEntry.java
index e8189f9..60f49fd 100644
--- a/src/main/java/org/openldap/fortress/util/cache/DsdCacheEntry.java
+++ b/src/main/java/org/openldap/fortress/util/cache/DsdCacheEntry.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.util.cache;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/cache/EhCacheImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/cache/EhCacheImpl.java b/src/main/java/org/openldap/fortress/util/cache/EhCacheImpl.java
index 93ed128..f99f70f 100644
--- a/src/main/java/org/openldap/fortress/util/cache/EhCacheImpl.java
+++ b/src/main/java/org/openldap/fortress/util/cache/EhCacheImpl.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.util.cache;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/cache/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/cache/package.html b/src/main/java/org/openldap/fortress/util/cache/package.html
index c97a112..6169c06 100755
--- a/src/main/java/org/openldap/fortress/util/cache/package.html
+++ b/src/main/java/org/openldap/fortress/util/cache/package.html
@@ -1,18 +1,22 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
-
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+ *
+-->
 <html>
    <head>
       <title>Package Documentation for org.openldap.fortress.util.cache</title>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/crypto/EncryptUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/crypto/EncryptUtil.java b/src/main/java/org/openldap/fortress/util/crypto/EncryptUtil.java
index a00d7b0..e98caa4 100755
--- a/src/main/java/org/openldap/fortress/util/crypto/EncryptUtil.java
+++ b/src/main/java/org/openldap/fortress/util/crypto/EncryptUtil.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.util.crypto;
 
 import org.openldap.fortress.cfg.Config;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/crypto/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/crypto/package.html b/src/main/java/org/openldap/fortress/util/crypto/package.html
index 6c030f5..9eeb1fe 100755
--- a/src/main/java/org/openldap/fortress/util/crypto/package.html
+++ b/src/main/java/org/openldap/fortress/util/crypto/package.html
@@ -1,18 +1,22 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
-
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+ *
+-->
 <html>
    <head>
       <title>Package Documentation for org.openldap.fortress.util.crypto</title>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/package.html b/src/main/java/org/openldap/fortress/util/package.html
index c51a34c..972b19a 100755
--- a/src/main/java/org/openldap/fortress/util/package.html
+++ b/src/main/java/org/openldap/fortress/util/package.html
@@ -1,18 +1,22 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
-
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+ *
+-->
 <html>
    <head>
       <title>Package Documentation for org.openldap.fortress.util</title>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/time/CUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/time/CUtil.java b/src/main/java/org/openldap/fortress/util/time/CUtil.java
index 475d894..0c70e1e 100755
--- a/src/main/java/org/openldap/fortress/util/time/CUtil.java
+++ b/src/main/java/org/openldap/fortress/util/time/CUtil.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.util.time;
 
 import org.openldap.fortress.CfgException;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/time/ClockTime.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/time/ClockTime.java b/src/main/java/org/openldap/fortress/util/time/ClockTime.java
index 7f0ef60..208b6d2 100755
--- a/src/main/java/org/openldap/fortress/util/time/ClockTime.java
+++ b/src/main/java/org/openldap/fortress/util/time/ClockTime.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.util.time;
 
 import org.openldap.fortress.GlobalErrIds;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/time/Constraint.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/time/Constraint.java b/src/main/java/org/openldap/fortress/util/time/Constraint.java
index b3fccbe..2f55cbd 100755
--- a/src/main/java/org/openldap/fortress/util/time/Constraint.java
+++ b/src/main/java/org/openldap/fortress/util/time/Constraint.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.util.time;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/time/Date.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/time/Date.java b/src/main/java/org/openldap/fortress/util/time/Date.java
index 7901ec4..b9b71e0 100755
--- a/src/main/java/org/openldap/fortress/util/time/Date.java
+++ b/src/main/java/org/openldap/fortress/util/time/Date.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.util.time;
 
 import org.openldap.fortress.GlobalErrIds;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/time/Day.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/time/Day.java b/src/main/java/org/openldap/fortress/util/time/Day.java
index f2a2d5d..06ea48e 100755
--- a/src/main/java/org/openldap/fortress/util/time/Day.java
+++ b/src/main/java/org/openldap/fortress/util/time/Day.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.util.time;
 
 import org.openldap.fortress.GlobalErrIds;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/time/LockDate.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/time/LockDate.java b/src/main/java/org/openldap/fortress/util/time/LockDate.java
index 62907da..8d28507 100755
--- a/src/main/java/org/openldap/fortress/util/time/LockDate.java
+++ b/src/main/java/org/openldap/fortress/util/time/LockDate.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.util.time;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/time/TUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/time/TUtil.java b/src/main/java/org/openldap/fortress/util/time/TUtil.java
index 0829e17..99e84ce 100755
--- a/src/main/java/org/openldap/fortress/util/time/TUtil.java
+++ b/src/main/java/org/openldap/fortress/util/time/TUtil.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.util.time;
 
 import java.util.GregorianCalendar;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/time/Time.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/time/Time.java b/src/main/java/org/openldap/fortress/util/time/Time.java
index 6170493..d7af44d 100755
--- a/src/main/java/org/openldap/fortress/util/time/Time.java
+++ b/src/main/java/org/openldap/fortress/util/time/Time.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress.util.time;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/time/Timeout.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/time/Timeout.java b/src/main/java/org/openldap/fortress/util/time/Timeout.java
index 1f7e5ca..9ebdaec 100755
--- a/src/main/java/org/openldap/fortress/util/time/Timeout.java
+++ b/src/main/java/org/openldap/fortress/util/time/Timeout.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.util.time;
 
 import org.openldap.fortress.GlobalErrIds;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/time/Validator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/time/Validator.java b/src/main/java/org/openldap/fortress/util/time/Validator.java
index d2792a3..db22ef2 100755
--- a/src/main/java/org/openldap/fortress/util/time/Validator.java
+++ b/src/main/java/org/openldap/fortress/util/time/Validator.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.util.time;
 
 import org.openldap.fortress.rbac.Session;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/util/time/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/util/time/package.html b/src/main/java/org/openldap/fortress/util/time/package.html
index 6b866e6..10fca3a 100755
--- a/src/main/java/org/openldap/fortress/util/time/package.html
+++ b/src/main/java/org/openldap/fortress/util/time/package.html
@@ -1,18 +1,22 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
-
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+ *
+-->
 <html>
    <head>
       <title>Package Documentation for org.openldap.fortress.util.time</title>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/AccessMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/AccessMgrConsole.java b/src/test/java/org/openldap/fortress/AccessMgrConsole.java
index 3bcc939..1661a70 100755
--- a/src/test/java/org/openldap/fortress/AccessMgrConsole.java
+++ b/src/test/java/org/openldap/fortress/AccessMgrConsole.java
@@ -1,20 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
- */
-
-/*
- *  This class is used for testing purposes.
  */
 package org.openldap.fortress;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/AdminMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/AdminMgrConsole.java b/src/test/java/org/openldap/fortress/AdminMgrConsole.java
index b6707c2..080ce60 100755
--- a/src/test/java/org/openldap/fortress/AdminMgrConsole.java
+++ b/src/test/java/org/openldap/fortress/AdminMgrConsole.java
@@ -1,20 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
- */
-
-/*
- *  This class is used for testing purposes.
  */
 package org.openldap.fortress;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/AuditMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/AuditMgrConsole.java b/src/test/java/org/openldap/fortress/AuditMgrConsole.java
index 77196e2..c833afd 100755
--- a/src/test/java/org/openldap/fortress/AuditMgrConsole.java
+++ b/src/test/java/org/openldap/fortress/AuditMgrConsole.java
@@ -1,20 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
- */
-
-/*
- *  This class is used for testing purposes.
  */
 package org.openldap.fortress;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/ConfigMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/ConfigMgrConsole.java b/src/test/java/org/openldap/fortress/ConfigMgrConsole.java
index 86763f9..364a24f 100755
--- a/src/test/java/org/openldap/fortress/ConfigMgrConsole.java
+++ b/src/test/java/org/openldap/fortress/ConfigMgrConsole.java
@@ -1,20 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
- */
-
-/*
- *  This class is used for testing purposes.
  */
 package org.openldap.fortress;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/DelegatedAccessMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/DelegatedAccessMgrConsole.java b/src/test/java/org/openldap/fortress/DelegatedAccessMgrConsole.java
index 2a62158..3e58025 100755
--- a/src/test/java/org/openldap/fortress/DelegatedAccessMgrConsole.java
+++ b/src/test/java/org/openldap/fortress/DelegatedAccessMgrConsole.java
@@ -1,20 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
- */
-
-/*
- *  This class is used for testing purposes.
  */
 package org.openldap.fortress;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/DelegatedAdminMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/DelegatedAdminMgrConsole.java b/src/test/java/org/openldap/fortress/DelegatedAdminMgrConsole.java
index f9d64d1..1eff54b 100755
--- a/src/test/java/org/openldap/fortress/DelegatedAdminMgrConsole.java
+++ b/src/test/java/org/openldap/fortress/DelegatedAdminMgrConsole.java
@@ -1,20 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
- */
-
-/*
- *  This class is used for testing purposes.
  */
 package org.openldap.fortress;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/DelegatedReviewMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/DelegatedReviewMgrConsole.java b/src/test/java/org/openldap/fortress/DelegatedReviewMgrConsole.java
index 2b8d1ae..8f416ea 100755
--- a/src/test/java/org/openldap/fortress/DelegatedReviewMgrConsole.java
+++ b/src/test/java/org/openldap/fortress/DelegatedReviewMgrConsole.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 import org.openldap.fortress.rbac.AdminRole;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/EncryptMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/EncryptMgrConsole.java b/src/test/java/org/openldap/fortress/EncryptMgrConsole.java
index 3c5fb5c..8d7a1db 100755
--- a/src/test/java/org/openldap/fortress/EncryptMgrConsole.java
+++ b/src/test/java/org/openldap/fortress/EncryptMgrConsole.java
@@ -1,20 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
- */
-
-/*
- *  This class is used for testing purposes.
  */
 package org.openldap.fortress;
 


[9/9] git commit: Added teh apache license header in all the files

Posted by el...@apache.org.
Added teh apache license header in all the files


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/4cc2153a
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/4cc2153a
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/4cc2153a

Branch: refs/heads/master
Commit: 4cc2153a30ce292827b424a6cb222b0f178e0217
Parents: e5ec67a
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Tue Oct 21 20:14:52 2014 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Tue Oct 21 20:14:52 2014 +0200

----------------------------------------------------------------------
 README-QUICKSTART-APACHEDS.html             | 30 +++++++++++++----------
 README-QUICKSTART-WINDOWS.html              | 30 +++++++++++++----------
 README-QUICKSTART.html                      | 30 +++++++++++++----------
 README.txt                                  | 23 +++++++++++-------
 b.bat                                       | 18 ++++++++++++++
 b.sh                                        | 18 ++++++++++++++
 build.properties                            | 23 +++++++++++-------
 build.sh                                    | 18 ++++++++++++++
 build.xml                                   | 31 +++++++++++++-----------
 config/bootstrap/fortress.properties.src    | 24 ++++++++++--------
 config/bootstrap/log4j.xml                  | 21 +++++++++++++---
 config/ehcache.xml                          | 20 +++++++++++++++
 config/fortress.properties.src              | 24 ++++++++++--------
 config/log4j.xml                            | 20 +++++++++++++--
 getIvy.xml                                  | 30 +++++++++++++----------
 ivy.xml                                     | 30 +++++++++++++----------
 ldap/DB_CONFIG                              | 18 ++++++++++++++
 ldap/schema/apacheds-fortress.ldif          | 18 ++++++++++++++
 ldap/schema/fortress.schema                 | 24 +++++++++++-------
 ldap/schema/rbac.schema                     | 20 ++++++++++++++-
 ldap/setup/CommanderDemoUsers.xml           | 30 +++++++++++++----------
 ldap/setup/DelegatedAdminManagerLoad.xml    | 30 +++++++++++++----------
 ldap/setup/FortressDemoUsers.xml            | 30 +++++++++++++----------
 ldap/setup/HierarchicalAdminRoleExample.xml | 30 +++++++++++++----------
 ldap/setup/HierarchicalRoleExample.xml      | 30 +++++++++++++----------
 ldap/setup/LdapGroupSetup.xml               | 30 +++++++++++++----------
 ldap/setup/LoadTestUsers.xml                | 30 +++++++++++++----------
 ldap/setup/OrgUnitExample.xml               | 30 +++++++++++++----------
 ldap/setup/RbacAcceleratorTestUsers.xml     | 30 +++++++++++++----------
 ldap/setup/demo-fortressproject-users.xml   | 30 +++++++++++++----------
 ldap/setup/install.sh                       | 18 ++++++++++++++
 ldap/setup/mkDir.cmd                        | 18 ++++++++++++++
 ldap/setup/refreshLDAPData-src.xml          | 30 +++++++++++++----------
 ldap/setup/startSlapd.cmd                   | 18 ++++++++++++++
 ldap/setup/startSlapd.cmd.src               | 18 ++++++++++++++
 ldap/setup/startSlapd.sh                    | 18 ++++++++++++++
 ldap/setup/stopSlapd.cmd                    | 18 ++++++++++++++
 ldap/setup/stopSlapd.sh                     | 18 ++++++++++++++
 ldap/setup/uninstall.sh                     | 18 ++++++++++++++
 ldap/slapd.conf.src                         | 24 +++++++++++-------
 ldap/symas-openldap.conf                    | 19 +++++++++++++--
 ldap/symas-openldap.conf.src                | 19 +++++++++++++--
 mtDemo.xml                                  | 29 ++++++++++++----------
 mttest.sh                                   | 18 ++++++++++++++
 44 files changed, 752 insertions(+), 301 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/README-QUICKSTART-APACHEDS.html
----------------------------------------------------------------------
diff --git a/README-QUICKSTART-APACHEDS.html b/README-QUICKSTART-APACHEDS.html
index dd0d66c..b8aefe9 100644
--- a/README-QUICKSTART-APACHEDS.html
+++ b/README-QUICKSTART-APACHEDS.html
@@ -1,17 +1,21 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.
+-->
 <body>
   <img src="./images/fortresscommunitylogov3.jpg" />  
 <br>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/README-QUICKSTART-WINDOWS.html
----------------------------------------------------------------------
diff --git a/README-QUICKSTART-WINDOWS.html b/README-QUICKSTART-WINDOWS.html
index 41d0f1a..466314e 100644
--- a/README-QUICKSTART-WINDOWS.html
+++ b/README-QUICKSTART-WINDOWS.html
@@ -1,17 +1,21 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.
+-->
 <body>
   <img src="./images/fortresscommunitylogov3.jpg" />  
 <br>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/README-QUICKSTART.html
----------------------------------------------------------------------
diff --git a/README-QUICKSTART.html b/README-QUICKSTART.html
index 621e921..cfc1da6 100755
--- a/README-QUICKSTART.html
+++ b/README-QUICKSTART.html
@@ -1,17 +1,21 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.
+-->
 <body>
   <img src="./images/fortresscommunitylogov3.jpg" />  
 <br>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
index bc39ae9..bbe909d 100755
--- a/README.txt
+++ b/README.txt
@@ -1,16 +1,21 @@
 #
-# This work is part of OpenLDAP Software <http://www.openldap.org/>.
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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
 #
-# Copyright 1998-2014 The OpenLDAP Foundation.
-# All rights reserved.
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted only as authorized by the OpenLDAP
-# Public License.
+#   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.
 #
-# A copy of this license is available in the file LICENSE in the
-# top-level directory of the distribution or, alternatively, at
-# <http://www.OpenLDAP.org/license.html>.
 ___________________________________________________________________________________
 ###################################################################################
 # README for Fortress Identity and Access Management SDK

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/b.bat
----------------------------------------------------------------------
diff --git a/b.bat b/b.bat
index fa011ca..704563c 100644
--- a/b.bat
+++ b/b.bat
@@ -1,3 +1,21 @@
+@rem
+@rem   Licensed to the Apache Software Foundation (ASF) under one
+@rem   or more contributor license agreements.  See the NOTICE file
+@rem   distributed with this work for additional information
+@rem   regarding copyright ownership.  The ASF licenses this file
+@rem   to you under the Apache License, Version 2.0 (the
+@rem   "License"); you may not use this file except in compliance
+@rem   with the License.  You may obtain a copy of the License at
+@rem
+@rem     http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem   Unless required by applicable law or agreed to in writing,
+@rem   software distributed under the License is distributed on an
+@rem   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@rem   KIND, either express or implied.  See the License for the
+@rem   specific language governing permissions and limitations
+@rem   under the License.
+@rem
 set JAVA_HOME=\Progra~1\Java\jdk1.7.0
 set ANT_HOME=.\apache-ant
 %ANT_HOME%\bin\ant %1 %2 %3 %4
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/b.sh
----------------------------------------------------------------------
diff --git a/b.sh b/b.sh
index d7d7a68..d373e5d 100755
--- a/b.sh
+++ b/b.sh
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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.
+#
 export JAVA_HOME=/opt/jdk1.7.0_10
 export ANT_HOME=./apache-ant
 $ANT_HOME/bin/ant $1 $2 $3 $4

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index 34ec983..dc24129 100644
--- a/build.properties
+++ b/build.properties
@@ -1,16 +1,21 @@
 #
-# This work is part of OpenLDAP Software <http://www.openldap.org/>.
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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
 #
-# Copyright 1998-2014 The OpenLDAP Foundation.
-# All rights reserved.
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted only as authorized by the OpenLDAP
-# Public License.
+#   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.
 #
-# A copy of this license is available in the file LICENSE in the
-# top-level directory of the distribution or, alternatively, at
-# <http://www.OpenLDAP.org/license.html>.
 #
 ########################################################################
 # 0. About the fortress build.properties file

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/build.sh
----------------------------------------------------------------------
diff --git a/build.sh b/build.sh
index 74ad23d..5486709 100755
--- a/build.sh
+++ b/build.sh
@@ -1,3 +1,21 @@
+#
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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.
+#
 export JAVA_HOME=/opt/jdk1.7.0_10
 #export JAVA_HOME=/opt/jdk1.8.0_05
 export ANT_HOME=/home/smckinn/JavaTools/apache-ant-1.8.2

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index be0e10d..b827977 100644
--- a/build.xml
+++ b/build.xml
@@ -1,18 +1,21 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
-
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.
+-->
 <project name="fortress-core" default="build" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
     <!-- =================================
           initialize all Fortress Core package properties

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/config/bootstrap/fortress.properties.src
----------------------------------------------------------------------
diff --git a/config/bootstrap/fortress.properties.src b/config/bootstrap/fortress.properties.src
index 3698533..713adbe 100755
--- a/config/bootstrap/fortress.properties.src
+++ b/config/bootstrap/fortress.properties.src
@@ -1,16 +1,20 @@
 #
-# This work is part of OpenLDAP Software <http://www.openldap.org/>.
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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
 #
-# Copyright 1998-2014 The OpenLDAP Foundation.
-# All rights reserved.
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted only as authorized by the OpenLDAP
-# Public License.
-#
-# A copy of this license is available in the file LICENSE in the
-# top-level directory of the distribution or, alternatively, at
-# <http://www.OpenLDAP.org/license.html>.
+#   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.
 #
 
 # Host name and port of LDAP DIT:

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/config/bootstrap/log4j.xml
----------------------------------------------------------------------
diff --git a/config/bootstrap/log4j.xml b/config/bootstrap/log4j.xml
index ee87c08..7186e0a 100755
--- a/config/bootstrap/log4j.xml
+++ b/config/bootstrap/log4j.xml
@@ -1,7 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright © 2009-2013. Joshua Tree Software, LLC.  All Rights Reserved.
-  -->
+<!-- 
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+-->
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 <log4j:configuration debug="false" xmlns:log4j="http://jakarta.apache.org/log4j/">
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/config/ehcache.xml
----------------------------------------------------------------------
diff --git a/config/ehcache.xml b/config/ehcache.xml
index b4ed921..8afb05f 100755
--- a/config/ehcache.xml
+++ b/config/ehcache.xml
@@ -1,6 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+ *
+-->
+
+<!--
 Fortress CacheManager Configuration
 ==========================
 This ehcache.xml corresponds to a single CacheManager.

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/config/fortress.properties.src
----------------------------------------------------------------------
diff --git a/config/fortress.properties.src b/config/fortress.properties.src
index 0be6bfc..fda8446 100755
--- a/config/fortress.properties.src
+++ b/config/fortress.properties.src
@@ -1,16 +1,20 @@
 #
-# This work is part of OpenLDAP Software <http://www.openldap.org/>.
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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
 #
-# Copyright 1998-2014 The OpenLDAP Foundation.
-# All rights reserved.
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted only as authorized by the OpenLDAP
-# Public License.
-#
-# A copy of this license is available in the file LICENSE in the
-# top-level directory of the distribution or, alternatively, at
-# <http://www.OpenLDAP.org/license.html>.
+#   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.
 #
 # Fortress slapd.conf default settings.
 # Note: Directives that begin with '@' are substitution parms for Fortress' build.xml 'init-slapd' target.

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/config/log4j.xml
----------------------------------------------------------------------
diff --git a/config/log4j.xml b/config/log4j.xml
index 8c77cca..e2097b6 100755
--- a/config/log4j.xml
+++ b/config/log4j.xml
@@ -1,7 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright © 2009-2013. Joshua Tree Software, LLC.  All Rights Reserved.
-  -->
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+ *
+ -->
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 <log4j:configuration debug="false" xmlns:log4j="http://jakarta.apache.org/log4j/">
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/getIvy.xml
----------------------------------------------------------------------
diff --git a/getIvy.xml b/getIvy.xml
index 1225a64..cd9a879 100755
--- a/getIvy.xml
+++ b/getIvy.xml
@@ -1,17 +1,21 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.
+-->
 <project name="fortress-core" default="download" basedir="." >
 
      <target name="init">

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index e264d04..f4a37b3 100755
--- a/ivy.xml
+++ b/ivy.xml
@@ -1,17 +1,21 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.
+-->
 <!--<ivy-module version="2.0">-->
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd"

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/DB_CONFIG
----------------------------------------------------------------------
diff --git a/ldap/DB_CONFIG b/ldap/DB_CONFIG
index d3d6ab6..912fb9a 100755
--- a/ldap/DB_CONFIG
+++ b/ldap/DB_CONFIG
@@ -1,3 +1,21 @@
+#
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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.
+#
 set_cachesize 0 2097152 0
 set_lk_max_objects 1500
 set_lk_max_locks 1500

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/schema/apacheds-fortress.ldif
----------------------------------------------------------------------
diff --git a/ldap/schema/apacheds-fortress.ldif b/ldap/schema/apacheds-fortress.ldif
index 3c86bfb..3ed056f 100644
--- a/ldap/schema/apacheds-fortress.ldif
+++ b/ldap/schema/apacheds-fortress.ldif
@@ -1,4 +1,22 @@
 # Generated by Apache Directory Studio on May 2, 2013 2:13:35 PM
+#
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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.
+#
 
 # SCHEMA "FORTRESS"
 dn: cn=fortress, ou=schema

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/schema/fortress.schema
----------------------------------------------------------------------
diff --git a/ldap/schema/fortress.schema b/ldap/schema/fortress.schema
index 8c76c08..78bcd37 100644
--- a/ldap/schema/fortress.schema
+++ b/ldap/schema/fortress.schema
@@ -1,17 +1,23 @@
 ######################################################################
 #
-# This work is part of OpenLDAP Software <http://www.openldap.org/>.
 #
-# Copyright 1998-2014 The OpenLDAP Foundation.
-# All rights reserved.
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted only as authorized by the OpenLDAP
-# Public License.
+#     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.
 #
-# A copy of this license is available in the file LICENSE in the
-# top-level directory of the distribution or, alternatively, at
-# <http://www.OpenLDAP.org/license.html>.
 #
 # Fortress slapd.conf default settings.
 # Note: Directives that begin with '@' are substitution parms for Fortress' build.xml 'init-slapd' target.

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/schema/rbac.schema
----------------------------------------------------------------------
diff --git a/ldap/schema/rbac.schema b/ldap/schema/rbac.schema
index 384bbfa..28cbf8c 100644
--- a/ldap/schema/rbac.schema
+++ b/ldap/schema/rbac.schema
@@ -1,5 +1,23 @@
 ######################################################################
-###  Copyright © Symas Corporation, 2014 All Rights Reserved.
+#
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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.
+#
+######################################################################
 ###  RBAC Accelerator Schema version 1.0.0.RC34
 ###  This schema is used by RBAC accelerator overlay in OpenLDAP
 ######################################################################

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/setup/CommanderDemoUsers.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/CommanderDemoUsers.xml b/ldap/setup/CommanderDemoUsers.xml
index 4a83c82..e67032f 100644
--- a/ldap/setup/CommanderDemoUsers.xml
+++ b/ldap/setup/CommanderDemoUsers.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.
+-->
 <project basedir="." default="all" name="Fortress Sample Data">
     <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="FortressAdmin" >
         <classpath path="${java.class.path}"/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/setup/DelegatedAdminManagerLoad.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/DelegatedAdminManagerLoad.xml b/ldap/setup/DelegatedAdminManagerLoad.xml
index b1368fd..5b308f6 100644
--- a/ldap/setup/DelegatedAdminManagerLoad.xml
+++ b/ldap/setup/DelegatedAdminManagerLoad.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.
+-->
 <project basedir="." default="all" name="Fortress Sample Data">
     <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="FortressAdmin" >
         <classpath path="${java.class.path}"/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/setup/FortressDemoUsers.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/FortressDemoUsers.xml b/ldap/setup/FortressDemoUsers.xml
index 25a24c4..dde1d30 100755
--- a/ldap/setup/FortressDemoUsers.xml
+++ b/ldap/setup/FortressDemoUsers.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.
+-->
 <project basedir="." default="all" name="Fortress Sample Data">
     <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="FortressAdmin" >
         <classpath path="${java.class.path}"/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/setup/HierarchicalAdminRoleExample.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/HierarchicalAdminRoleExample.xml b/ldap/setup/HierarchicalAdminRoleExample.xml
index 43cf83a..384c818 100755
--- a/ldap/setup/HierarchicalAdminRoleExample.xml
+++ b/ldap/setup/HierarchicalAdminRoleExample.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.
+-->
 <project basedir="." default="all" name="Fortress Sample Data">
     <!--property name="version" value="${version}"/-->
     <property name="version" value="1.0-RC24"/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/setup/HierarchicalRoleExample.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/HierarchicalRoleExample.xml b/ldap/setup/HierarchicalRoleExample.xml
index 79fbc27..e4c3eeb 100755
--- a/ldap/setup/HierarchicalRoleExample.xml
+++ b/ldap/setup/HierarchicalRoleExample.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.
+-->
 <project basedir="." default="all" name="Fortress Sample Data">
     <!--<property name="version" value="1.0.0-rc11"/>-->
     <property name="home.dir" value = "../../" />

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/setup/LdapGroupSetup.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/LdapGroupSetup.xml b/ldap/setup/LdapGroupSetup.xml
index 84b9606..936c174 100644
--- a/ldap/setup/LdapGroupSetup.xml
+++ b/ldap/setup/LdapGroupSetup.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.
+-->
 <project basedir="." default="all" name="Fortress LDAP Group Test 002 Data">
     <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="FortressAdmin" >
         <classpath path="${java.class.path}"/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/setup/LoadTestUsers.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/LoadTestUsers.xml b/ldap/setup/LoadTestUsers.xml
index 46444ce..8ff6729 100644
--- a/ldap/setup/LoadTestUsers.xml
+++ b/ldap/setup/LoadTestUsers.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.
+-->
 <project basedir="." default="all" name="Fortress Sample Data">
     <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="FortressAdmin" >
         <classpath path="${java.class.path}"/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/setup/OrgUnitExample.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/OrgUnitExample.xml b/ldap/setup/OrgUnitExample.xml
index ac80814..11223e2 100755
--- a/ldap/setup/OrgUnitExample.xml
+++ b/ldap/setup/OrgUnitExample.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.
+-->
 <project basedir="." default="all" name="Fortress Sample Data">
     <!--<property name="version" value="1.0.0-rc11"/>-->
     <property name="version" value="${version}"/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/setup/RbacAcceleratorTestUsers.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/RbacAcceleratorTestUsers.xml b/ldap/setup/RbacAcceleratorTestUsers.xml
index 43f6c88..7c329f2 100644
--- a/ldap/setup/RbacAcceleratorTestUsers.xml
+++ b/ldap/setup/RbacAcceleratorTestUsers.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.
+-->
 <project basedir="." default="all" name="Fortress Sample Data">
     <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="FortressAdmin" >
         <classpath path="${java.class.path}"/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/setup/demo-fortressproject-users.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/demo-fortressproject-users.xml b/ldap/setup/demo-fortressproject-users.xml
index 4484cb7..6fdbc93 100644
--- a/ldap/setup/demo-fortressproject-users.xml
+++ b/ldap/setup/demo-fortressproject-users.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.
+-->
 <project basedir="." default="all" name="Fortress Sample Data">
 
     <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="FortressAdmin" >

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/setup/install.sh
----------------------------------------------------------------------
diff --git a/ldap/setup/install.sh b/ldap/setup/install.sh
index 01f0187..1b73d8a 100755
--- a/ldap/setup/install.sh
+++ b/ldap/setup/install.sh
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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.
+#
 
 export SLAPD_INSTALL="$1"
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/setup/mkDir.cmd
----------------------------------------------------------------------
diff --git a/ldap/setup/mkDir.cmd b/ldap/setup/mkDir.cmd
index ddea4c2..b2af0db 100644
--- a/ldap/setup/mkDir.cmd
+++ b/ldap/setup/mkDir.cmd
@@ -1,2 +1,20 @@
+@rem
+@rem   Licensed to the Apache Software Foundation (ASF) under one
+@rem   or more contributor license agreements.  See the NOTICE file
+@rem   distributed with this work for additional information
+@rem   regarding copyright ownership.  The ASF licenses this file
+@rem   to you under the Apache License, Version 2.0 (the
+@rem   "License"); you may not use this file except in compliance
+@rem   with the License.  You may obtain a copy of the License at
+@rem
+@rem     http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem   Unless required by applicable law or agreed to in writing,
+@rem   software distributed under the License is distributed on an
+@rem   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@rem   KIND, either express or implied.  See the License for the
+@rem   specific language governing permissions and limitations
+@rem   under the License.
+@rem
 echo 'Making folder %1...'
 mkdir %1

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/setup/refreshLDAPData-src.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/refreshLDAPData-src.xml b/ldap/setup/refreshLDAPData-src.xml
index 7a6b0c5..39120f6 100755
--- a/ldap/setup/refreshLDAPData-src.xml
+++ b/ldap/setup/refreshLDAPData-src.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.
+-->
 <project basedir="." default="all" name="Fortress Properties">
     <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="FortressAdmin" >
         <classpath path="${java.class.path}"/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/setup/startSlapd.cmd
----------------------------------------------------------------------
diff --git a/ldap/setup/startSlapd.cmd b/ldap/setup/startSlapd.cmd
index aca05d2..9cbe234 100644
--- a/ldap/setup/startSlapd.cmd
+++ b/ldap/setup/startSlapd.cmd
@@ -1,3 +1,21 @@
+@rem
+@rem   Licensed to the Apache Software Foundation (ASF) under one
+@rem   or more contributor license agreements.  See the NOTICE file
+@rem   distributed with this work for additional information
+@rem   regarding copyright ownership.  The ASF licenses this file
+@rem   to you under the Apache License, Version 2.0 (the
+@rem   "License"); you may not use this file except in compliance
+@rem   with the License.  You may obtain a copy of the License at
+@rem
+@rem     http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem   Unless required by applicable law or agreed to in writing,
+@rem   software distributed under the License is distributed on an
+@rem   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@rem   KIND, either express or implied.  See the License for the
+@rem   specific language governing permissions and limitations
+@rem   under the License.
+@rem
 echo 'Starting OpenLDAP...'
 @rem cd C:\JavaTools\symas-openldap-gold-win
 slapd.exe -f ${slapd.exe.location}\etc\openldap\slapd.conf
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/setup/startSlapd.cmd.src
----------------------------------------------------------------------
diff --git a/ldap/setup/startSlapd.cmd.src b/ldap/setup/startSlapd.cmd.src
index 2d68cff..3349c18 100644
--- a/ldap/setup/startSlapd.cmd.src
+++ b/ldap/setup/startSlapd.cmd.src
@@ -1,3 +1,21 @@
+@rem
+@rem   Licensed to the Apache Software Foundation (ASF) under one
+@rem   or more contributor license agreements.  See the NOTICE file
+@rem   distributed with this work for additional information
+@rem   regarding copyright ownership.  The ASF licenses this file
+@rem   to you under the Apache License, Version 2.0 (the
+@rem   "License"); you may not use this file except in compliance
+@rem   with the License.  You may obtain a copy of the License at
+@rem
+@rem     http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem   Unless required by applicable law or agreed to in writing,
+@rem   software distributed under the License is distributed on an
+@rem   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@rem   KIND, either express or implied.  See the License for the
+@rem   specific language governing permissions and limitations
+@rem   under the License.
+@rem
 echo 'Starting OpenLDAP...'
 @rem cd C:\JavaTools\symas-openldap-gold-win
 slapd.exe -f @SLAPD_LOCATION@\etc\openldap\slapd.conf
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/setup/startSlapd.sh
----------------------------------------------------------------------
diff --git a/ldap/setup/startSlapd.sh b/ldap/setup/startSlapd.sh
index 9e58d7f..e6e5cbd 100755
--- a/ldap/setup/startSlapd.sh
+++ b/ldap/setup/startSlapd.sh
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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.
+#
 #Echo on
 
 export SLAPD="$1"

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/setup/stopSlapd.cmd
----------------------------------------------------------------------
diff --git a/ldap/setup/stopSlapd.cmd b/ldap/setup/stopSlapd.cmd
index 3aa55af..02469f8 100644
--- a/ldap/setup/stopSlapd.cmd
+++ b/ldap/setup/stopSlapd.cmd
@@ -1,3 +1,21 @@
+@rem
+@rem   Licensed to the Apache Software Foundation (ASF) under one
+@rem   or more contributor license agreements.  See the NOTICE file
+@rem   distributed with this work for additional information
+@rem   regarding copyright ownership.  The ASF licenses this file
+@rem   to you under the Apache License, Version 2.0 (the
+@rem   "License"); you may not use this file except in compliance
+@rem   with the License.  You may obtain a copy of the License at
+@rem
+@rem     http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem   Unless required by applicable law or agreed to in writing,
+@rem   software distributed under the License is distributed on an
+@rem   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@rem   KIND, either express or implied.  See the License for the
+@rem   specific language governing permissions and limitations
+@rem   under the License.
+@rem
 echo 'Stopping OpenLDAP...'
 #slapd.exe -f C:\JavaTools\symas-openldap-gold-win\etc\openldap\slapd.conf
 set prgId=type slapd.pid

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/setup/stopSlapd.sh
----------------------------------------------------------------------
diff --git a/ldap/setup/stopSlapd.sh b/ldap/setup/stopSlapd.sh
index c5f9128..e961d00 100755
--- a/ldap/setup/stopSlapd.sh
+++ b/ldap/setup/stopSlapd.sh
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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.
+#
 if [ -z $1 ]
 then
     echo 'sudo NOT enabled'

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/setup/uninstall.sh
----------------------------------------------------------------------
diff --git a/ldap/setup/uninstall.sh b/ldap/setup/uninstall.sh
index 9db6641..a0ffbe4 100755
--- a/ldap/setup/uninstall.sh
+++ b/ldap/setup/uninstall.sh
@@ -1,4 +1,22 @@
 #!/bin/sh
+#
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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.
+#
 
 export SLAPD_REMOVE="$1"
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/slapd.conf.src
----------------------------------------------------------------------
diff --git a/ldap/slapd.conf.src b/ldap/slapd.conf.src
index 31f1415..747e2d5 100755
--- a/ldap/slapd.conf.src
+++ b/ldap/slapd.conf.src
@@ -1,16 +1,22 @@
 #
-# This work is part of OpenLDAP Software <http://www.openldap.org/>.
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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
 #
-# Copyright 1998-2014 The OpenLDAP Foundation.
-# All rights reserved.
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted only as authorized by the OpenLDAP
-# Public License.
+#   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.
 #
-# A copy of this license is available in the file LICENSE in the
-# top-level directory of the distribution or, alternatively, at
-# <http://www.OpenLDAP.org/license.html>.
+
 #
 # Fortress slapd.conf default settings.
 # Note: Directives that begin with '@' are substitution parms for Fortress' build.xml 'init-slapd' target.

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/symas-openldap.conf
----------------------------------------------------------------------
diff --git a/ldap/symas-openldap.conf b/ldap/symas-openldap.conf
index 6c99295..d5b6496 100644
--- a/ldap/symas-openldap.conf
+++ b/ldap/symas-openldap.conf
@@ -1,6 +1,21 @@
 #
-# Symas OpenLDAP Configuration file
-# Copyright (c) 2009 Symas Corporation. All Rights Reserved.
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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.
+#
 #
 # This file contains configuration information for Symas OpenLDAP.
 # Refer to the comments just before each variable to determine proper

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/ldap/symas-openldap.conf.src
----------------------------------------------------------------------
diff --git a/ldap/symas-openldap.conf.src b/ldap/symas-openldap.conf.src
index 9cffe5c..1df591e 100644
--- a/ldap/symas-openldap.conf.src
+++ b/ldap/symas-openldap.conf.src
@@ -1,6 +1,21 @@
 #
-# Symas OpenLDAP Configuration file
-# Copyright (c) 2009 Symas Corporation. All Rights Reserved.
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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.
+#
 #
 # This file contains configuration information for Symas OpenLDAP.
 # Refer to the comments just before each variable to determine proper

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/mtDemo.xml
----------------------------------------------------------------------
diff --git a/mtDemo.xml b/mtDemo.xml
index 5644a7f..d348927 100644
--- a/mtDemo.xml
+++ b/mtDemo.xml
@@ -1,18 +1,21 @@
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you 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.
+-->
 <project name="fortress-core-multitenancy-demo" default="build" basedir=".">
 
     <import file="build.xml"/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4cc2153a/mttest.sh
----------------------------------------------------------------------
diff --git a/mttest.sh b/mttest.sh
index 75e3909..3a9226d 100755
--- a/mttest.sh
+++ b/mttest.sh
@@ -1,3 +1,21 @@
+#
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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.
+#
 echo 'Test Home...'
 ./build.sh -buildfile mtDemo.xml mt-demo0 >mttest.out 2>mttest.err &
 echo 'Load & Test Client123...'


[8/9] git commit: Added teh apache license header in all the files

Posted by el...@apache.org.
Added teh apache license header in all the files


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/e5ec67a0
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/e5ec67a0
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/e5ec67a0

Branch: refs/heads/master
Commit: e5ec67a02dc867cd28619dae6cbf695751869c59
Parents: 9f0df36
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Tue Oct 21 20:14:23 2014 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Tue Oct 21 20:14:23 2014 +0200

----------------------------------------------------------------------
 .../java/org/openldap/fortress/AccelMgr.java    | 24 +++++----
 .../org/openldap/fortress/AccelMgrFactory.java  | 24 +++++----
 .../java/org/openldap/fortress/AccessMgr.java   | 24 +++++----
 .../org/openldap/fortress/AccessMgrFactory.java | 24 +++++----
 .../java/org/openldap/fortress/AdminMgr.java    | 24 +++++----
 .../org/openldap/fortress/AdminMgrFactory.java  | 24 +++++----
 .../java/org/openldap/fortress/AuditMgr.java    | 24 +++++----
 .../org/openldap/fortress/AuditMgrFactory.java  | 24 +++++----
 .../fortress/AuthorizationException.java        | 24 +++++----
 .../org/openldap/fortress/BaseException.java    | 24 +++++----
 .../openldap/fortress/BaseRuntimeException.java | 24 +++++----
 .../org/openldap/fortress/CfgException.java     | 24 +++++----
 .../openldap/fortress/CfgRuntimeException.java  | 24 +++++----
 .../org/openldap/fortress/CreateException.java  | 24 +++++----
 .../org/openldap/fortress/DelAccessMgr.java     | 24 +++++----
 .../openldap/fortress/DelAccessMgrFactory.java  | 24 +++++----
 .../java/org/openldap/fortress/DelAdminMgr.java | 24 +++++----
 .../openldap/fortress/DelAdminMgrFactory.java   | 24 +++++----
 .../org/openldap/fortress/DelReviewMgr.java     | 24 +++++----
 .../openldap/fortress/DelReviewMgrFactory.java  | 24 +++++----
 .../org/openldap/fortress/FinderException.java  | 24 +++++----
 .../org/openldap/fortress/GlobalErrIds.java     | 24 +++++----
 .../java/org/openldap/fortress/GlobalIds.java   | 24 +++++----
 .../java/org/openldap/fortress/Manageable.java  | 24 +++++----
 .../org/openldap/fortress/ObjectFactory.java    | 23 +++++----
 .../openldap/fortress/PasswordException.java    | 24 +++++----
 .../java/org/openldap/fortress/PwPolicyMgr.java | 24 +++++----
 .../openldap/fortress/PwPolicyMgrFactory.java   | 24 +++++----
 .../org/openldap/fortress/RemoveException.java  | 24 +++++----
 .../org/openldap/fortress/RestException.java    | 24 +++++----
 .../java/org/openldap/fortress/ReviewMgr.java   | 24 +++++----
 .../org/openldap/fortress/ReviewMgrFactory.java | 24 +++++----
 .../openldap/fortress/SecurityException.java    | 24 +++++----
 .../openldap/fortress/StandardException.java    | 24 +++++----
 .../org/openldap/fortress/UpdateException.java  | 24 +++++----
 .../openldap/fortress/ValidationException.java  | 24 +++++----
 .../org/openldap/fortress/ant/Addadminrole.java | 24 +++++----
 .../fortress/ant/Addadminroleinheritance.java   | 24 +++++----
 .../org/openldap/fortress/ant/Addconfig.java    | 24 +++++----
 .../org/openldap/fortress/ant/Addcontainer.java | 24 +++++----
 .../org/openldap/fortress/ant/Addcontext.java   | 24 +++++----
 .../org/openldap/fortress/ant/Addgroup.java     | 24 +++++----
 .../openldap/fortress/ant/Addgroupmember.java   | 24 +++++----
 .../openldap/fortress/ant/Addgroupproperty.java | 24 +++++----
 .../org/openldap/fortress/ant/Addorgunit.java   | 24 +++++----
 .../org/openldap/fortress/ant/AddpermGrant.java | 24 +++++----
 .../org/openldap/fortress/ant/AddpermObj.java   | 24 +++++----
 .../org/openldap/fortress/ant/AddpermOp.java    | 24 +++++----
 .../fortress/ant/Addpermorgunitinheritance.java | 24 +++++----
 .../org/openldap/fortress/ant/Addpwpolicy.java  | 24 +++++----
 .../java/org/openldap/fortress/ant/Addrole.java | 24 +++++----
 .../fortress/ant/Addroleinheritance.java        | 24 +++++----
 .../org/openldap/fortress/ant/Addsdset.java     | 24 +++++----
 .../org/openldap/fortress/ant/Addsuffix.java    | 24 +++++----
 .../java/org/openldap/fortress/ant/Adduser.java | 24 +++++----
 .../openldap/fortress/ant/Adduseradminrole.java | 24 +++++----
 .../fortress/ant/Adduserorgunitinheritance.java | 24 +++++----
 .../org/openldap/fortress/ant/Adduserrole.java  | 24 +++++----
 .../org/openldap/fortress/ant/AdminRoleAnt.java | 24 +++++----
 .../org/openldap/fortress/ant/ConfigAnt.java    | 24 +++++----
 .../org/openldap/fortress/ant/Deladminrole.java | 24 +++++----
 .../fortress/ant/Deladminroleinheritance.java   | 24 +++++----
 .../org/openldap/fortress/ant/Delconfig.java    | 24 +++++----
 .../org/openldap/fortress/ant/Delcontainer.java | 24 +++++----
 .../org/openldap/fortress/ant/Delgroup.java     | 24 +++++----
 .../openldap/fortress/ant/Delgroupmember.java   | 24 +++++----
 .../openldap/fortress/ant/Delgroupproperty.java | 24 +++++----
 .../org/openldap/fortress/ant/Delorgunit.java   | 24 +++++----
 .../org/openldap/fortress/ant/DelpermGrant.java | 24 +++++----
 .../org/openldap/fortress/ant/DelpermObj.java   | 24 +++++----
 .../org/openldap/fortress/ant/DelpermOp.java    | 24 +++++----
 .../fortress/ant/Delpermorgunitinheritance.java | 24 +++++----
 .../org/openldap/fortress/ant/Delpwpolicy.java  | 24 +++++----
 .../java/org/openldap/fortress/ant/Delrole.java | 24 +++++----
 .../fortress/ant/Delroleinheritance.java        | 24 +++++----
 .../org/openldap/fortress/ant/Delsdset.java     | 24 +++++----
 .../org/openldap/fortress/ant/Delsuffix.java    | 24 +++++----
 .../java/org/openldap/fortress/ant/Deluser.java | 24 +++++----
 .../openldap/fortress/ant/Deluseradminrole.java | 24 +++++----
 .../fortress/ant/Deluserorgunitinheritance.java | 24 +++++----
 .../org/openldap/fortress/ant/Deluserrole.java  | 24 +++++----
 .../openldap/fortress/ant/FortressAntTask.java  | 24 +++++----
 .../java/org/openldap/fortress/ant/PermAnt.java | 24 +++++----
 .../org/openldap/fortress/ant/SDSetAnt.java     | 24 +++++----
 .../java/org/openldap/fortress/ant/UserAnt.java | 24 +++++----
 .../java/org/openldap/fortress/ant/package.html | 31 +++++++-----
 .../java/org/openldap/fortress/cfg/Config.java  | 24 +++++----
 .../org/openldap/fortress/cfg/ConfigDAO.java    | 24 +++++----
 .../org/openldap/fortress/cfg/ConfigMgr.java    | 24 +++++----
 .../openldap/fortress/cfg/ConfigMgrFactory.java | 24 +++++----
 .../openldap/fortress/cfg/ConfigMgrImpl.java    | 24 +++++----
 .../java/org/openldap/fortress/cfg/ConfigP.java | 24 +++++----
 .../java/org/openldap/fortress/cfg/package.html | 32 ++++++------
 .../openldap/fortress/cli/CmdLineParser.java    | 24 +++++----
 .../fortress/cli/CommandLineInterpreter.java    | 23 +++++----
 .../java/org/openldap/fortress/cli/Options.java | 23 +++++----
 .../java/org/openldap/fortress/cli/package.html | 32 ++++++------
 .../fortress/ldap/ApacheDsDataProvider.java     | 24 +++++----
 .../openldap/fortress/ldap/ConnectionPool.java  | 52 ++++++--------------
 .../ldap/LdapClientTrustStoreManager.java       | 23 +++++----
 .../openldap/fortress/ldap/LdapCounters.java    | 34 ++++++-------
 .../org/openldap/fortress/ldap/PoolMgr.java     | 24 +++++----
 .../fortress/ldap/UnboundIdDataProvider.java    | 24 +++++----
 .../ldap/container/OrganizationalUnit.java      | 24 +++++----
 .../ldap/container/OrganizationalUnitDAO.java   | 24 +++++----
 .../ldap/container/OrganizationalUnitP.java     | 24 +++++----
 .../fortress/ldap/container/package.html        | 32 ++++++------
 .../org/openldap/fortress/ldap/group/Group.java | 24 +++++----
 .../openldap/fortress/ldap/group/GroupDAO.java  | 24 +++++----
 .../openldap/fortress/ldap/group/GroupMgr.java  | 24 +++++----
 .../fortress/ldap/group/GroupMgrFactory.java    | 24 +++++----
 .../fortress/ldap/group/GroupMgrImpl.java       | 24 +++++----
 .../openldap/fortress/ldap/group/GroupP.java    | 24 +++++----
 .../openldap/fortress/ldap/group/package.html   | 32 ++++++------
 .../fortress/ldap/openldap/OLPWControlImpl.java | 24 +++++----
 .../fortress/ldap/openldap/package.html         | 32 ++++++------
 .../org/openldap/fortress/ldap/package.html     | 32 ++++++------
 .../openldap/fortress/ldap/suffix/Suffix.java   | 24 +++++----
 .../fortress/ldap/suffix/SuffixDAO.java         | 24 +++++----
 .../openldap/fortress/ldap/suffix/SuffixP.java  | 24 +++++----
 .../openldap/fortress/ldap/suffix/package.html  | 32 ++++++------
 .../java/org/openldap/fortress/overview.html    | 33 +++++++------
 .../java/org/openldap/fortress/package.html     | 31 +++++++-----
 .../openldap/fortress/rbac/AccelMgrImpl.java    | 24 +++++----
 .../openldap/fortress/rbac/AccessMgrImpl.java   | 24 +++++----
 .../org/openldap/fortress/rbac/Address.java     | 23 +++++----
 .../openldap/fortress/rbac/AdminMgrImpl.java    | 24 +++++----
 .../org/openldap/fortress/rbac/AdminRole.java   | 24 +++++----
 .../org/openldap/fortress/rbac/AdminRoleP.java  | 24 +++++----
 .../fortress/rbac/AdminRoleRelationship.java    | 23 +++++----
 .../openldap/fortress/rbac/AdminRoleUtil.java   | 24 +++++----
 .../org/openldap/fortress/rbac/AdminUtil.java   | 24 +++++----
 .../openldap/fortress/rbac/Administrator.java   | 24 +++++----
 .../openldap/fortress/rbac/AuditMgrImpl.java    | 24 +++++----
 .../java/org/openldap/fortress/rbac/AuditP.java | 24 +++++----
 .../java/org/openldap/fortress/rbac/AuthZ.java  | 24 +++++----
 .../java/org/openldap/fortress/rbac/Bind.java   | 24 +++++----
 .../fortress/rbac/CharArrayAdapter.java         | 24 +++++----
 .../org/openldap/fortress/rbac/ClassUtil.java   | 24 +++++----
 .../org/openldap/fortress/rbac/Context.java     | 24 +++++----
 .../org/openldap/fortress/rbac/DSDChecker.java  | 24 +++++----
 .../fortress/rbac/DelAccessMgrImpl.java         | 24 +++++----
 .../openldap/fortress/rbac/DelAdminMgrImpl.java | 24 +++++----
 .../fortress/rbac/DelReviewMgrImpl.java         | 24 +++++----
 .../org/openldap/fortress/rbac/FortEntity.java  | 24 +++++----
 .../openldap/fortress/rbac/GlobalPwMsgIds.java  | 24 +++++----
 .../org/openldap/fortress/rbac/Graphable.java   | 24 +++++----
 .../java/org/openldap/fortress/rbac/Hier.java   | 24 +++++----
 .../org/openldap/fortress/rbac/HierUtil.java    | 24 +++++----
 .../org/openldap/fortress/rbac/Manageable.java  | 24 +++++----
 .../java/org/openldap/fortress/rbac/Mod.java    | 24 +++++----
 .../org/openldap/fortress/rbac/OrgUnit.java     | 23 +++++----
 .../org/openldap/fortress/rbac/OrgUnitAnt.java  | 24 +++++----
 .../org/openldap/fortress/rbac/OrgUnitP.java    | 24 +++++----
 .../fortress/rbac/OrgUnitRelationship.java      | 23 +++++----
 .../org/openldap/fortress/rbac/PermGrant.java   | 24 +++++----
 .../org/openldap/fortress/rbac/PermObj.java     | 24 +++++----
 .../java/org/openldap/fortress/rbac/PermP.java  | 24 +++++----
 .../org/openldap/fortress/rbac/Permission.java  | 24 +++++----
 .../org/openldap/fortress/rbac/PolicyP.java     | 24 +++++----
 .../java/org/openldap/fortress/rbac/Props.java  | 24 +++++----
 .../org/openldap/fortress/rbac/PsoUtil.java     | 24 +++++----
 .../org/openldap/fortress/rbac/PwMessage.java   | 24 +++++----
 .../org/openldap/fortress/rbac/PwPolicy.java    | 24 +++++----
 .../openldap/fortress/rbac/PwPolicyControl.java | 24 +++++----
 .../openldap/fortress/rbac/PwPolicyMgrImpl.java | 24 +++++----
 .../openldap/fortress/rbac/Relationship.java    | 24 +++++----
 .../openldap/fortress/rbac/ReviewMgrImpl.java   | 24 +++++----
 .../java/org/openldap/fortress/rbac/Role.java   | 24 +++++----
 .../java/org/openldap/fortress/rbac/RoleP.java  | 24 +++++----
 .../org/openldap/fortress/rbac/RolePerm.java    | 24 +++++----
 .../fortress/rbac/RoleRelationship.java         | 24 +++++----
 .../org/openldap/fortress/rbac/RoleUtil.java    | 24 +++++----
 .../java/org/openldap/fortress/rbac/SDSet.java  | 24 +++++----
 .../java/org/openldap/fortress/rbac/SDUtil.java | 24 +++++----
 .../java/org/openldap/fortress/rbac/SdP.java    | 24 +++++----
 .../org/openldap/fortress/rbac/Session.java     | 24 +++++----
 .../org/openldap/fortress/rbac/SetAdapter.java  | 24 +++++----
 .../java/org/openldap/fortress/rbac/User.java   | 24 +++++----
 .../openldap/fortress/rbac/UserAdminRole.java   | 24 +++++----
 .../org/openldap/fortress/rbac/UserAudit.java   | 24 +++++----
 .../java/org/openldap/fortress/rbac/UserP.java  | 24 +++++----
 .../org/openldap/fortress/rbac/UserRole.java    | 24 +++++----
 .../org/openldap/fortress/rbac/UsoUtil.java     | 24 +++++----
 .../org/openldap/fortress/rbac/Warning.java     | 24 +++++----
 .../fortress/rbac/dao/AcceleratorDAO.java       | 24 +++++----
 .../fortress/rbac/dao/AdminRoleDAO.java         | 23 +++++----
 .../openldap/fortress/rbac/dao/AuditDAO.java    | 23 +++++----
 .../org/openldap/fortress/rbac/dao/DAOType.java | 24 +++++----
 .../openldap/fortress/rbac/dao/DaoFactory.java  | 23 +++++----
 .../openldap/fortress/rbac/dao/OrgUnitDAO.java  | 23 +++++----
 .../org/openldap/fortress/rbac/dao/PermDAO.java | 23 +++++----
 .../openldap/fortress/rbac/dao/PolicyDAO.java   | 23 +++++----
 .../org/openldap/fortress/rbac/dao/RoleDAO.java | 23 +++++----
 .../org/openldap/fortress/rbac/dao/SdDAO.java   | 24 +++++----
 .../org/openldap/fortress/rbac/dao/UserDAO.java | 23 +++++----
 .../rbac/dao/apache/AcceleratorDAO.java         | 24 +++++----
 .../fortress/rbac/dao/apache/AdminRoleDAO.java  | 24 +++++----
 .../fortress/rbac/dao/apache/AuditDAO.java      | 26 +++++-----
 .../fortress/rbac/dao/apache/OrgUnitDAO.java    | 24 +++++----
 .../fortress/rbac/dao/apache/PermDAO.java       | 24 +++++----
 .../fortress/rbac/dao/apache/PolicyDAO.java     | 24 +++++----
 .../fortress/rbac/dao/apache/RoleDAO.java       | 24 +++++----
 .../fortress/rbac/dao/apache/SdDAO.java         | 24 +++++----
 .../fortress/rbac/dao/apache/UserDAO.java       | 24 +++++----
 .../rbac/dao/unboundid/AdminRoleDAO.java        | 24 +++++----
 .../fortress/rbac/dao/unboundid/AuditDAO.java   | 26 +++++-----
 .../fortress/rbac/dao/unboundid/OrgUnitDAO.java | 24 +++++----
 .../fortress/rbac/dao/unboundid/PermDAO.java    | 24 +++++----
 .../fortress/rbac/dao/unboundid/PolicyDAO.java  | 24 +++++----
 .../fortress/rbac/dao/unboundid/RoleDAO.java    | 24 +++++----
 .../fortress/rbac/dao/unboundid/SdDAO.java      | 24 +++++----
 .../fortress/rbac/dao/unboundid/UserDAO.java    | 24 +++++----
 .../org/openldap/fortress/rbac/package.html     | 32 ++++++------
 .../fortress/rest/AccessMgrRestImpl.java        | 23 +++++----
 .../fortress/rest/AdminMgrRestImpl.java         | 23 +++++----
 .../fortress/rest/AuditMgrRestImpl.java         | 24 +++++----
 .../fortress/rest/CachedJaxbContext.java        | 24 +++++----
 .../fortress/rest/ConfigMgrRestImpl.java        | 24 +++++----
 .../fortress/rest/DelAccessMgrRestImpl.java     | 24 +++++----
 .../fortress/rest/DelAdminMgrRestImpl.java      | 24 +++++----
 .../fortress/rest/DelReviewMgrRestImpl.java     | 24 +++++----
 .../org/openldap/fortress/rest/FortRequest.java | 23 +++++----
 .../openldap/fortress/rest/FortResponse.java    | 23 +++++----
 .../org/openldap/fortress/rest/HttpIds.java     | 23 +++++----
 .../openldap/fortress/rest/JAXBCachedEntry.java | 24 +++++----
 .../fortress/rest/PwPolicyMgrRestImpl.java      | 24 +++++----
 .../org/openldap/fortress/rest/RestUtils.java   | 24 +++++----
 .../fortress/rest/ReviewMgrRestImpl.java        | 24 +++++----
 .../org/openldap/fortress/rest/package.html     | 31 +++++++-----
 .../org/openldap/fortress/util/LogUtil.java     | 24 +++++----
 .../org/openldap/fortress/util/Testable.java    | 24 +++++----
 .../openldap/fortress/util/attr/AttrHelper.java | 24 +++++----
 .../openldap/fortress/util/attr/RegExUtil.java  | 24 +++++----
 .../org/openldap/fortress/util/attr/VUtil.java  | 24 +++++----
 .../openldap/fortress/util/attr/package.html    | 32 ++++++------
 .../org/openldap/fortress/util/cache/Cache.java | 23 +++++----
 .../fortress/util/cache/CacheException.java     | 23 +++++----
 .../fortress/util/cache/CacheFactory.java       | 23 +++++----
 .../openldap/fortress/util/cache/CacheMgr.java  | 23 +++++----
 .../fortress/util/cache/DsdCacheEntry.java      | 23 +++++----
 .../fortress/util/cache/EhCacheImpl.java        | 23 +++++----
 .../openldap/fortress/util/cache/package.html   | 32 ++++++------
 .../fortress/util/crypto/EncryptUtil.java       | 24 +++++----
 .../openldap/fortress/util/crypto/package.html  | 32 ++++++------
 .../org/openldap/fortress/util/package.html     | 32 ++++++------
 .../org/openldap/fortress/util/time/CUtil.java  | 24 +++++----
 .../openldap/fortress/util/time/ClockTime.java  | 24 +++++----
 .../openldap/fortress/util/time/Constraint.java | 24 +++++----
 .../org/openldap/fortress/util/time/Date.java   | 24 +++++----
 .../org/openldap/fortress/util/time/Day.java    | 24 +++++----
 .../openldap/fortress/util/time/LockDate.java   | 24 +++++----
 .../org/openldap/fortress/util/time/TUtil.java  | 24 +++++----
 .../org/openldap/fortress/util/time/Time.java   | 23 +++++----
 .../openldap/fortress/util/time/Timeout.java    | 24 +++++----
 .../openldap/fortress/util/time/Validator.java  | 24 +++++----
 .../openldap/fortress/util/time/package.html    | 32 ++++++------
 .../org/openldap/fortress/AccessMgrConsole.java | 27 +++++-----
 .../org/openldap/fortress/AdminMgrConsole.java  | 27 +++++-----
 .../org/openldap/fortress/AuditMgrConsole.java  | 27 +++++-----
 .../org/openldap/fortress/ConfigMgrConsole.java | 27 +++++-----
 .../fortress/DelegatedAccessMgrConsole.java     | 27 +++++-----
 .../fortress/DelegatedAdminMgrConsole.java      | 27 +++++-----
 .../fortress/DelegatedReviewMgrConsole.java     | 24 +++++----
 .../openldap/fortress/EncryptMgrConsole.java    | 27 +++++-----
 .../org/openldap/fortress/FortressConsole.java  | 28 +++++------
 .../org/openldap/fortress/GroupMgrConsole.java  | 27 +++++-----
 .../org/openldap/fortress/PolicyMgrConsole.java | 27 +++++-----
 .../openldap/fortress/ProcessMenuCommand.java   | 27 +++++-----
 .../java/org/openldap/fortress/ReaderUtil.java  | 24 +++++----
 .../org/openldap/fortress/ReviewMgrConsole.java | 24 +++++----
 .../org/openldap/fortress/ant/TestAddUsers.xml  | 20 +++++++-
 .../openldap/fortress/example/Addexample.java   | 24 +++++----
 .../openldap/fortress/example/Delexample.java   | 24 +++++----
 .../org/openldap/fortress/example/EErrIds.java  | 24 +++++----
 .../org/openldap/fortress/example/EIds.java     | 24 +++++----
 .../org/openldap/fortress/example/Example.java  | 24 +++++----
 .../fortress/example/ExampleAdminMgr.java       | 24 +++++----
 .../example/ExampleAdminMgrFactory.java         | 24 +++++----
 .../fortress/example/ExampleAdminMgrImpl.java   | 24 +++++----
 .../openldap/fortress/example/ExampleDAO.java   | 24 +++++----
 .../org/openldap/fortress/example/ExampleP.java | 24 +++++----
 .../openldap/fortress/example/example.schema    | 21 +++++++-
 .../openldap/fortress/group/GroupAntTest.java   | 24 +++++----
 .../openldap/fortress/group/LoadGroupTest1.xml  | 30 ++++++-----
 .../openldap/fortress/group/LoadGroupTest2.xml  | 30 ++++++-----
 .../openldap/fortress/group/LoadGroupTest3.xml  | 30 ++++++-----
 .../fortress/jmeter/AccelCreateSession.java     | 24 +++++----
 .../openldap/fortress/jmeter/CheckAccess.java   | 24 +++++----
 .../fortress/jmeter/FortressCreateSession.java  | 24 +++++----
 .../fortress/rbac/AccelMgrImplTest.java         | 24 +++++----
 .../fortress/rbac/AccessMgrImplTest.java        | 24 +++++----
 .../fortress/rbac/AdminMgrImplTest.java         | 24 +++++----
 .../fortress/rbac/AdminRoleTestData.java        | 24 +++++----
 .../fortress/rbac/AuditMgrImplTest.java         | 24 +++++----
 .../org/openldap/fortress/rbac/CacheSample.java | 24 +++++----
 .../fortress/rbac/DelegatedMgrImplTest.java     | 24 +++++----
 .../fortress/rbac/FortressAntLoadTest.java      | 24 +++++----
 .../fortress/rbac/FortressJUnitTest.java        | 24 +++++----
 .../openldap/fortress/rbac/MyAnnotation.java    | 24 +++++----
 .../openldap/fortress/rbac/OrgUnitTestData.java | 24 +++++----
 .../java/org/openldap/fortress/rbac/PRA.java    | 24 +++++----
 .../org/openldap/fortress/rbac/PRATestData.java | 24 +++++----
 .../openldap/fortress/rbac/PermTestData.java    | 24 +++++----
 .../openldap/fortress/rbac/PolicyTestData.java  | 24 +++++----
 .../fortress/rbac/PswdPolicyMgrImplTest.java    | 24 +++++----
 .../fortress/rbac/ReviewMgrImplTest.java        | 24 +++++----
 .../openldap/fortress/rbac/RoleTestData.java    | 24 +++++----
 .../org/openldap/fortress/rbac/TestUtils.java   | 24 +++++----
 .../java/org/openldap/fortress/rbac/URA.java    | 24 +++++----
 .../org/openldap/fortress/rbac/URATestData.java | 24 +++++----
 .../openldap/fortress/rbac/UserTestData.java    | 23 +++++----
 .../rbac/accelerator/TestAccelerator.java       | 24 +++++----
 .../rbac/apacheds/AdminManagerTest.java         | 24 +++++----
 .../apacheds/FortressJUnitApachedsTest.java     | 24 +++++----
 .../fortress/samples/AccessMgrSample.java       | 24 +++++----
 .../fortress/samples/AllSamplesJUnitTest.java   | 24 +++++----
 .../samples/CreatePermOrgHierarchySample.java   | 24 +++++----
 .../fortress/samples/CreatePermOrgSample.java   | 24 +++++----
 .../fortress/samples/CreatePermSample.java      | 24 +++++----
 .../samples/CreateRoleHierarchySample.java      | 24 +++++----
 .../fortress/samples/CreateRoleSample.java      | 24 +++++----
 .../fortress/samples/CreateSessionSample.java   | 24 +++++----
 .../samples/CreateUserOrgHierarchySample.java   | 24 +++++----
 .../fortress/samples/CreateUserOrgSample.java   | 24 +++++----
 .../fortress/samples/CreateUserRoleSample.java  | 24 +++++----
 .../fortress/samples/CreateUserSample.java      | 24 +++++----
 src/test/resources/fortress-schema.ldif         | 18 +++++++
 src/test/resources/init-ldap.ldif               | 18 +++++++
 src/test/resources/log4j.xml                    | 19 ++++++-
 src/test/resources/test-data.ldif               | 19 +++++++
 331 files changed, 4741 insertions(+), 3373 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/AccelMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/AccelMgr.java b/src/main/java/org/openldap/fortress/AccelMgr.java
index 9a2da51..6c339de 100644
--- a/src/main/java/org/openldap/fortress/AccelMgr.java
+++ b/src/main/java/org/openldap/fortress/AccelMgr.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/AccelMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/AccelMgrFactory.java b/src/main/java/org/openldap/fortress/AccelMgrFactory.java
index a382975..5b6f08c 100644
--- a/src/main/java/org/openldap/fortress/AccelMgrFactory.java
+++ b/src/main/java/org/openldap/fortress/AccelMgrFactory.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 import org.openldap.fortress.cfg.Config;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/AccessMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/AccessMgr.java b/src/main/java/org/openldap/fortress/AccessMgr.java
index 0a39aba..75c79d1 100755
--- a/src/main/java/org/openldap/fortress/AccessMgr.java
+++ b/src/main/java/org/openldap/fortress/AccessMgr.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/AccessMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/AccessMgrFactory.java b/src/main/java/org/openldap/fortress/AccessMgrFactory.java
index ba37902..97f84bd 100755
--- a/src/main/java/org/openldap/fortress/AccessMgrFactory.java
+++ b/src/main/java/org/openldap/fortress/AccessMgrFactory.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 import org.openldap.fortress.cfg.Config;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/AdminMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/AdminMgr.java b/src/main/java/org/openldap/fortress/AdminMgr.java
index a91b58a..ce99a30 100755
--- a/src/main/java/org/openldap/fortress/AdminMgr.java
+++ b/src/main/java/org/openldap/fortress/AdminMgr.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 import org.openldap.fortress.rbac.PermObj;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/AdminMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/AdminMgrFactory.java b/src/main/java/org/openldap/fortress/AdminMgrFactory.java
index 3eed026..db8e5b8 100755
--- a/src/main/java/org/openldap/fortress/AdminMgrFactory.java
+++ b/src/main/java/org/openldap/fortress/AdminMgrFactory.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 import org.openldap.fortress.cfg.Config;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/AuditMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/AuditMgr.java b/src/main/java/org/openldap/fortress/AuditMgr.java
index db9ad0c..534d7da 100755
--- a/src/main/java/org/openldap/fortress/AuditMgr.java
+++ b/src/main/java/org/openldap/fortress/AuditMgr.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 import org.openldap.fortress.rbac.AuthZ;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/AuditMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/AuditMgrFactory.java b/src/main/java/org/openldap/fortress/AuditMgrFactory.java
index a31ca06..e0d4c98 100755
--- a/src/main/java/org/openldap/fortress/AuditMgrFactory.java
+++ b/src/main/java/org/openldap/fortress/AuditMgrFactory.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 import org.openldap.fortress.cfg.Config;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/AuthorizationException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/AuthorizationException.java b/src/main/java/org/openldap/fortress/AuthorizationException.java
index 38fb1b4..31e0156 100755
--- a/src/main/java/org/openldap/fortress/AuthorizationException.java
+++ b/src/main/java/org/openldap/fortress/AuthorizationException.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/BaseException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/BaseException.java b/src/main/java/org/openldap/fortress/BaseException.java
index 26088fb..84c59f1 100755
--- a/src/main/java/org/openldap/fortress/BaseException.java
+++ b/src/main/java/org/openldap/fortress/BaseException.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 /**

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/BaseRuntimeException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/BaseRuntimeException.java b/src/main/java/org/openldap/fortress/BaseRuntimeException.java
index b0dc063..cce5de4 100755
--- a/src/main/java/org/openldap/fortress/BaseRuntimeException.java
+++ b/src/main/java/org/openldap/fortress/BaseRuntimeException.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 /**

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/CfgException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/CfgException.java b/src/main/java/org/openldap/fortress/CfgException.java
index 6ea0296..cca880d 100755
--- a/src/main/java/org/openldap/fortress/CfgException.java
+++ b/src/main/java/org/openldap/fortress/CfgException.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/CfgRuntimeException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/CfgRuntimeException.java b/src/main/java/org/openldap/fortress/CfgRuntimeException.java
index af7b4a8..84733db 100755
--- a/src/main/java/org/openldap/fortress/CfgRuntimeException.java
+++ b/src/main/java/org/openldap/fortress/CfgRuntimeException.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 /**

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/CreateException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/CreateException.java b/src/main/java/org/openldap/fortress/CreateException.java
index 61ceb23..874a10f 100755
--- a/src/main/java/org/openldap/fortress/CreateException.java
+++ b/src/main/java/org/openldap/fortress/CreateException.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/DelAccessMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/DelAccessMgr.java b/src/main/java/org/openldap/fortress/DelAccessMgr.java
index 5ff85ff..f0ca4e5 100755
--- a/src/main/java/org/openldap/fortress/DelAccessMgr.java
+++ b/src/main/java/org/openldap/fortress/DelAccessMgr.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 import org.openldap.fortress.rbac.UserAdminRole;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/DelAccessMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/DelAccessMgrFactory.java b/src/main/java/org/openldap/fortress/DelAccessMgrFactory.java
index 2e0ab5c..7cecd5a 100755
--- a/src/main/java/org/openldap/fortress/DelAccessMgrFactory.java
+++ b/src/main/java/org/openldap/fortress/DelAccessMgrFactory.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 import org.openldap.fortress.cfg.Config;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/DelAdminMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/DelAdminMgr.java b/src/main/java/org/openldap/fortress/DelAdminMgr.java
index c8dfb56..fe0b315 100755
--- a/src/main/java/org/openldap/fortress/DelAdminMgr.java
+++ b/src/main/java/org/openldap/fortress/DelAdminMgr.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 import org.openldap.fortress.rbac.AdminRole;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/DelAdminMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/DelAdminMgrFactory.java b/src/main/java/org/openldap/fortress/DelAdminMgrFactory.java
index 2430eb0..849a616 100755
--- a/src/main/java/org/openldap/fortress/DelAdminMgrFactory.java
+++ b/src/main/java/org/openldap/fortress/DelAdminMgrFactory.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 import org.openldap.fortress.cfg.Config;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/DelReviewMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/DelReviewMgr.java b/src/main/java/org/openldap/fortress/DelReviewMgr.java
index 60331b1..f7805f6 100755
--- a/src/main/java/org/openldap/fortress/DelReviewMgr.java
+++ b/src/main/java/org/openldap/fortress/DelReviewMgr.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 import org.openldap.fortress.rbac.AdminRole;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/DelReviewMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/DelReviewMgrFactory.java b/src/main/java/org/openldap/fortress/DelReviewMgrFactory.java
index 678321f..e3bc413 100755
--- a/src/main/java/org/openldap/fortress/DelReviewMgrFactory.java
+++ b/src/main/java/org/openldap/fortress/DelReviewMgrFactory.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 import org.openldap.fortress.cfg.Config;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/FinderException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/FinderException.java b/src/main/java/org/openldap/fortress/FinderException.java
index b445af4..54234eb 100755
--- a/src/main/java/org/openldap/fortress/FinderException.java
+++ b/src/main/java/org/openldap/fortress/FinderException.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/GlobalErrIds.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/GlobalErrIds.java b/src/main/java/org/openldap/fortress/GlobalErrIds.java
index 6c116f5..2ec840b 100755
--- a/src/main/java/org/openldap/fortress/GlobalErrIds.java
+++ b/src/main/java/org/openldap/fortress/GlobalErrIds.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 /**

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/GlobalIds.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/GlobalIds.java b/src/main/java/org/openldap/fortress/GlobalIds.java
index fc55cd3..d598b1b 100755
--- a/src/main/java/org/openldap/fortress/GlobalIds.java
+++ b/src/main/java/org/openldap/fortress/GlobalIds.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/Manageable.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/Manageable.java b/src/main/java/org/openldap/fortress/Manageable.java
index afd9fb0..736cc2f 100644
--- a/src/main/java/org/openldap/fortress/Manageable.java
+++ b/src/main/java/org/openldap/fortress/Manageable.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ObjectFactory.java b/src/main/java/org/openldap/fortress/ObjectFactory.java
index 908844e..a0a36c2 100755
--- a/src/main/java/org/openldap/fortress/ObjectFactory.java
+++ b/src/main/java/org/openldap/fortress/ObjectFactory.java
@@ -1,16 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
 package org.openldap.fortress;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/PasswordException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/PasswordException.java b/src/main/java/org/openldap/fortress/PasswordException.java
index f6dd01e..02ec1a1 100755
--- a/src/main/java/org/openldap/fortress/PasswordException.java
+++ b/src/main/java/org/openldap/fortress/PasswordException.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/PwPolicyMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/PwPolicyMgr.java b/src/main/java/org/openldap/fortress/PwPolicyMgr.java
index b6529c3..6bda7b2 100755
--- a/src/main/java/org/openldap/fortress/PwPolicyMgr.java
+++ b/src/main/java/org/openldap/fortress/PwPolicyMgr.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 import org.openldap.fortress.rbac.PwPolicy;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/PwPolicyMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/PwPolicyMgrFactory.java b/src/main/java/org/openldap/fortress/PwPolicyMgrFactory.java
index 9677ffa..fd5afb5 100755
--- a/src/main/java/org/openldap/fortress/PwPolicyMgrFactory.java
+++ b/src/main/java/org/openldap/fortress/PwPolicyMgrFactory.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 import org.openldap.fortress.cfg.Config;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/RemoveException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/RemoveException.java b/src/main/java/org/openldap/fortress/RemoveException.java
index ce74d75..b803d8c 100755
--- a/src/main/java/org/openldap/fortress/RemoveException.java
+++ b/src/main/java/org/openldap/fortress/RemoveException.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 /**

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/RestException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/RestException.java b/src/main/java/org/openldap/fortress/RestException.java
index 4942925..a2744cf 100644
--- a/src/main/java/org/openldap/fortress/RestException.java
+++ b/src/main/java/org/openldap/fortress/RestException.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ReviewMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ReviewMgr.java b/src/main/java/org/openldap/fortress/ReviewMgr.java
index 0987a19..74bdbbd 100755
--- a/src/main/java/org/openldap/fortress/ReviewMgr.java
+++ b/src/main/java/org/openldap/fortress/ReviewMgr.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 import org.openldap.fortress.rbac.OrgUnit;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/ReviewMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/ReviewMgrFactory.java b/src/main/java/org/openldap/fortress/ReviewMgrFactory.java
index cc9b222..587242d 100755
--- a/src/main/java/org/openldap/fortress/ReviewMgrFactory.java
+++ b/src/main/java/org/openldap/fortress/ReviewMgrFactory.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 import org.openldap.fortress.cfg.Config;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/SecurityException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/SecurityException.java b/src/main/java/org/openldap/fortress/SecurityException.java
index b39cb4e..bba7b4d 100755
--- a/src/main/java/org/openldap/fortress/SecurityException.java
+++ b/src/main/java/org/openldap/fortress/SecurityException.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 /**

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/StandardException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/StandardException.java b/src/main/java/org/openldap/fortress/StandardException.java
index 8faf10b..ccd5a58 100755
--- a/src/main/java/org/openldap/fortress/StandardException.java
+++ b/src/main/java/org/openldap/fortress/StandardException.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 /**

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/main/java/org/openldap/fortress/UpdateException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/openldap/fortress/UpdateException.java b/src/main/java/org/openldap/fortress/UpdateException.java
index 8e5dafc..26db0ce 100755
--- a/src/main/java/org/openldap/fortress/UpdateException.java
+++ b/src/main/java/org/openldap/fortress/UpdateException.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 /**


[2/9] Added teh apache license header in all the files

Posted by el...@apache.org.
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/FortressConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/FortressConsole.java b/src/test/java/org/openldap/fortress/FortressConsole.java
index 11d8da1..48f4671 100755
--- a/src/test/java/org/openldap/fortress/FortressConsole.java
+++ b/src/test/java/org/openldap/fortress/FortressConsole.java
@@ -1,22 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
-/*
- *  This class is used for testing purposes.
- */
-
 package org.openldap.fortress;
 
 /**

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/GroupMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/GroupMgrConsole.java b/src/test/java/org/openldap/fortress/GroupMgrConsole.java
index 66791c5..ea96e92 100755
--- a/src/test/java/org/openldap/fortress/GroupMgrConsole.java
+++ b/src/test/java/org/openldap/fortress/GroupMgrConsole.java
@@ -1,20 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
- */
-
-/*
- *  This class is used for testing purposes.
  */
 package org.openldap.fortress;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/PolicyMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/PolicyMgrConsole.java b/src/test/java/org/openldap/fortress/PolicyMgrConsole.java
index 51ab80e..cbec451 100755
--- a/src/test/java/org/openldap/fortress/PolicyMgrConsole.java
+++ b/src/test/java/org/openldap/fortress/PolicyMgrConsole.java
@@ -1,20 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
- */
-
-/*
- *  This class is used for testing purposes.
  */
 package org.openldap.fortress;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/ProcessMenuCommand.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/ProcessMenuCommand.java b/src/test/java/org/openldap/fortress/ProcessMenuCommand.java
index 9912a66..327add8 100755
--- a/src/test/java/org/openldap/fortress/ProcessMenuCommand.java
+++ b/src/test/java/org/openldap/fortress/ProcessMenuCommand.java
@@ -1,20 +1,21 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
- */
-
-/*
- *  This module is used for testing purposes.
  */
 package org.openldap.fortress;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/ReaderUtil.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/ReaderUtil.java b/src/test/java/org/openldap/fortress/ReaderUtil.java
index 906032b..602c345 100755
--- a/src/test/java/org/openldap/fortress/ReaderUtil.java
+++ b/src/test/java/org/openldap/fortress/ReaderUtil.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/ReviewMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/ReviewMgrConsole.java b/src/test/java/org/openldap/fortress/ReviewMgrConsole.java
index f1eceda..ac6dd58 100755
--- a/src/test/java/org/openldap/fortress/ReviewMgrConsole.java
+++ b/src/test/java/org/openldap/fortress/ReviewMgrConsole.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress;
 
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/ant/TestAddUsers.xml
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/ant/TestAddUsers.xml b/src/test/java/org/openldap/fortress/ant/TestAddUsers.xml
index 06058e6..b211622 100755
--- a/src/test/java/org/openldap/fortress/ant/TestAddUsers.xml
+++ b/src/test/java/org/openldap/fortress/ant/TestAddUsers.xml
@@ -1,7 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2009-2011. Joshua Tree Software, LLC.  All Rights Reserved.
-  -->
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+ *
+-->
 
 <project basedir="." default="all" name="Fortress Sample Data">
     <property name="root.dir" value = "/home/smckinn/" />

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/example/Addexample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/example/Addexample.java b/src/test/java/org/openldap/fortress/example/Addexample.java
index ba5f4ef..e60606a 100755
--- a/src/test/java/org/openldap/fortress/example/Addexample.java
+++ b/src/test/java/org/openldap/fortress/example/Addexample.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.example;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/example/Delexample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/example/Delexample.java b/src/test/java/org/openldap/fortress/example/Delexample.java
index 03db924..63b2492 100755
--- a/src/test/java/org/openldap/fortress/example/Delexample.java
+++ b/src/test/java/org/openldap/fortress/example/Delexample.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.example;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/example/EErrIds.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/example/EErrIds.java b/src/test/java/org/openldap/fortress/example/EErrIds.java
index 64ca44b..0ea1823 100755
--- a/src/test/java/org/openldap/fortress/example/EErrIds.java
+++ b/src/test/java/org/openldap/fortress/example/EErrIds.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.example;
 
 public class EErrIds

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/example/EIds.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/example/EIds.java b/src/test/java/org/openldap/fortress/example/EIds.java
index deef2d3..c05811c 100755
--- a/src/test/java/org/openldap/fortress/example/EIds.java
+++ b/src/test/java/org/openldap/fortress/example/EIds.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.example;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/example/Example.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/example/Example.java b/src/test/java/org/openldap/fortress/example/Example.java
index 2461c8b..8245701 100755
--- a/src/test/java/org/openldap/fortress/example/Example.java
+++ b/src/test/java/org/openldap/fortress/example/Example.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.example;
 
 import java.rmi.server.UID;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/example/ExampleAdminMgr.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/example/ExampleAdminMgr.java b/src/test/java/org/openldap/fortress/example/ExampleAdminMgr.java
index 643d737..314defb 100755
--- a/src/test/java/org/openldap/fortress/example/ExampleAdminMgr.java
+++ b/src/test/java/org/openldap/fortress/example/ExampleAdminMgr.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.example;
 
 import org.openldap.fortress.SecurityException;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/example/ExampleAdminMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/example/ExampleAdminMgrFactory.java b/src/test/java/org/openldap/fortress/example/ExampleAdminMgrFactory.java
index 1fbc749..83c46ac 100755
--- a/src/test/java/org/openldap/fortress/example/ExampleAdminMgrFactory.java
+++ b/src/test/java/org/openldap/fortress/example/ExampleAdminMgrFactory.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.example;
 
 import org.openldap.fortress.SecurityException;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/example/ExampleAdminMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/example/ExampleAdminMgrImpl.java b/src/test/java/org/openldap/fortress/example/ExampleAdminMgrImpl.java
index e5b3b21..317ab68 100755
--- a/src/test/java/org/openldap/fortress/example/ExampleAdminMgrImpl.java
+++ b/src/test/java/org/openldap/fortress/example/ExampleAdminMgrImpl.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.example;
 
 import org.openldap.fortress.SecurityException;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/example/ExampleDAO.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/example/ExampleDAO.java b/src/test/java/org/openldap/fortress/example/ExampleDAO.java
index 7d65996..68c34e9 100755
--- a/src/test/java/org/openldap/fortress/example/ExampleDAO.java
+++ b/src/test/java/org/openldap/fortress/example/ExampleDAO.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.example;
 
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/example/ExampleP.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/example/ExampleP.java b/src/test/java/org/openldap/fortress/example/ExampleP.java
index d7ffc85..d74c05c 100755
--- a/src/test/java/org/openldap/fortress/example/ExampleP.java
+++ b/src/test/java/org/openldap/fortress/example/ExampleP.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.example;
 
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/example/example.schema
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/example/example.schema b/src/test/java/org/openldap/fortress/example/example.schema
index 4eacdc7..e0ac63b 100755
--- a/src/test/java/org/openldap/fortress/example/example.schema
+++ b/src/test/java/org/openldap/fortress/example/example.schema
@@ -1,4 +1,23 @@
-###  Fortress Example Schema for training     #################
+###
+#   Licensed to the Apache Software Foundation (ASF) under one
+#   or more contributor license agreements.  See the NOTICE file
+#   distributed with this work for additional information
+#   regarding copyright ownership.  The ASF licenses this file
+#   to you 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.
+#
+###########################################################
+###  Fortress Example Schema for training     #############
 ###  IANA PRIVATE ENTERPRISE NUMBERS
 ###  38088
 ###  Joshua Tree Software, LLC

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/group/GroupAntTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/group/GroupAntTest.java b/src/test/java/org/openldap/fortress/group/GroupAntTest.java
index dbc24c2..a732b56 100644
--- a/src/test/java/org/openldap/fortress/group/GroupAntTest.java
+++ b/src/test/java/org/openldap/fortress/group/GroupAntTest.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.group;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/group/LoadGroupTest1.xml
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/group/LoadGroupTest1.xml b/src/test/java/org/openldap/fortress/group/LoadGroupTest1.xml
index 25543b1..5570f08 100644
--- a/src/test/java/org/openldap/fortress/group/LoadGroupTest1.xml
+++ b/src/test/java/org/openldap/fortress/group/LoadGroupTest1.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+-->
 <project basedir="../../../../../../../ldap/setup" default="all" name="Fortress LDAP Group Test 001 Data">
     <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="GroupTest" >
         <classpath path="${java.class.path}"/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/group/LoadGroupTest2.xml
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/group/LoadGroupTest2.xml b/src/test/java/org/openldap/fortress/group/LoadGroupTest2.xml
index 7dddd52..9107ca3 100644
--- a/src/test/java/org/openldap/fortress/group/LoadGroupTest2.xml
+++ b/src/test/java/org/openldap/fortress/group/LoadGroupTest2.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+-->
 <project basedir="../../../../../../../ldap/setup" default="all" name="Fortress LDAP Group Test 002 Data">
     <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="GroupTest" >
         <classpath path="${java.class.path}"/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/group/LoadGroupTest3.xml
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/group/LoadGroupTest3.xml b/src/test/java/org/openldap/fortress/group/LoadGroupTest3.xml
index cda8789..228c3de 100644
--- a/src/test/java/org/openldap/fortress/group/LoadGroupTest3.xml
+++ b/src/test/java/org/openldap/fortress/group/LoadGroupTest3.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ This work is part of OpenLDAP Software <http://www.openldap.org/>.
-  ~
-  ~ Copyright 1998-2014 The OpenLDAP Foundation.
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted only as authorized by the OpenLDAP
-  ~ Public License.
-  ~
-  ~ A copy of this license is available in the file LICENSE in the
-  ~ top-level directory of the distribution or, alternatively, at
-  ~ <http://www.OpenLDAP.org/license.html>.
-  -->
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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.
+-->
 <project basedir="../../../../../../../ldap/setup" default="all" name="Fortress LDAP Group Test 001 Data">
     <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="GroupTest" >
         <classpath path="${java.class.path}"/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/jmeter/AccelCreateSession.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/jmeter/AccelCreateSession.java b/src/test/java/org/openldap/fortress/jmeter/AccelCreateSession.java
index 45f9bcd..6068113 100644
--- a/src/test/java/org/openldap/fortress/jmeter/AccelCreateSession.java
+++ b/src/test/java/org/openldap/fortress/jmeter/AccelCreateSession.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.jmeter;
 
 import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/jmeter/CheckAccess.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/jmeter/CheckAccess.java b/src/test/java/org/openldap/fortress/jmeter/CheckAccess.java
index cefd03c..e44eee4 100644
--- a/src/test/java/org/openldap/fortress/jmeter/CheckAccess.java
+++ b/src/test/java/org/openldap/fortress/jmeter/CheckAccess.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.jmeter;
 
 import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/jmeter/FortressCreateSession.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/jmeter/FortressCreateSession.java b/src/test/java/org/openldap/fortress/jmeter/FortressCreateSession.java
index 9e53382..845f084 100644
--- a/src/test/java/org/openldap/fortress/jmeter/FortressCreateSession.java
+++ b/src/test/java/org/openldap/fortress/jmeter/FortressCreateSession.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.jmeter;
 
 import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/AccelMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/AccelMgrImplTest.java b/src/test/java/org/openldap/fortress/rbac/AccelMgrImplTest.java
index f2e34fe..22e8e8f 100644
--- a/src/test/java/org/openldap/fortress/rbac/AccelMgrImplTest.java
+++ b/src/test/java/org/openldap/fortress/rbac/AccelMgrImplTest.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/AccessMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/AccessMgrImplTest.java b/src/test/java/org/openldap/fortress/rbac/AccessMgrImplTest.java
index 721ae08..b243d92 100755
--- a/src/test/java/org/openldap/fortress/rbac/AccessMgrImplTest.java
+++ b/src/test/java/org/openldap/fortress/rbac/AccessMgrImplTest.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/AdminMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/AdminMgrImplTest.java b/src/test/java/org/openldap/fortress/rbac/AdminMgrImplTest.java
index fdbc998..19f8ff7 100755
--- a/src/test/java/org/openldap/fortress/rbac/AdminMgrImplTest.java
+++ b/src/test/java/org/openldap/fortress/rbac/AdminMgrImplTest.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/AdminRoleTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/AdminRoleTestData.java b/src/test/java/org/openldap/fortress/rbac/AdminRoleTestData.java
index bb0fa99..7902d2f 100755
--- a/src/test/java/org/openldap/fortress/rbac/AdminRoleTestData.java
+++ b/src/test/java/org/openldap/fortress/rbac/AdminRoleTestData.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/AuditMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/AuditMgrImplTest.java b/src/test/java/org/openldap/fortress/rbac/AuditMgrImplTest.java
index 9fa798c..f33505d 100755
--- a/src/test/java/org/openldap/fortress/rbac/AuditMgrImplTest.java
+++ b/src/test/java/org/openldap/fortress/rbac/AuditMgrImplTest.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/CacheSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/CacheSample.java b/src/test/java/org/openldap/fortress/rbac/CacheSample.java
index c5ad28e..b6fb3c8 100644
--- a/src/test/java/org/openldap/fortress/rbac/CacheSample.java
+++ b/src/test/java/org/openldap/fortress/rbac/CacheSample.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/DelegatedMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/DelegatedMgrImplTest.java b/src/test/java/org/openldap/fortress/rbac/DelegatedMgrImplTest.java
index e72dfdb..7acc5ff 100755
--- a/src/test/java/org/openldap/fortress/rbac/DelegatedMgrImplTest.java
+++ b/src/test/java/org/openldap/fortress/rbac/DelegatedMgrImplTest.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/FortressAntLoadTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/FortressAntLoadTest.java b/src/test/java/org/openldap/fortress/rbac/FortressAntLoadTest.java
index b6f8ea5..422c4ca 100644
--- a/src/test/java/org/openldap/fortress/rbac/FortressAntLoadTest.java
+++ b/src/test/java/org/openldap/fortress/rbac/FortressAntLoadTest.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import java.io.FileWriter;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/FortressJUnitTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/FortressJUnitTest.java b/src/test/java/org/openldap/fortress/rbac/FortressJUnitTest.java
index 4f919f9..4019f7d 100755
--- a/src/test/java/org/openldap/fortress/rbac/FortressJUnitTest.java
+++ b/src/test/java/org/openldap/fortress/rbac/FortressJUnitTest.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import junit.framework.Test;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/MyAnnotation.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/MyAnnotation.java b/src/test/java/org/openldap/fortress/rbac/MyAnnotation.java
index a73f5ab..a72a412 100755
--- a/src/test/java/org/openldap/fortress/rbac/MyAnnotation.java
+++ b/src/test/java/org/openldap/fortress/rbac/MyAnnotation.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 import java.lang.annotation.Retention;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/OrgUnitTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/OrgUnitTestData.java b/src/test/java/org/openldap/fortress/rbac/OrgUnitTestData.java
index 4ce6f90..15d6f9b 100755
--- a/src/test/java/org/openldap/fortress/rbac/OrgUnitTestData.java
+++ b/src/test/java/org/openldap/fortress/rbac/OrgUnitTestData.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/PRA.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/PRA.java b/src/test/java/org/openldap/fortress/rbac/PRA.java
index e393f46..416b7d5 100755
--- a/src/test/java/org/openldap/fortress/rbac/PRA.java
+++ b/src/test/java/org/openldap/fortress/rbac/PRA.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/PRATestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/PRATestData.java b/src/test/java/org/openldap/fortress/rbac/PRATestData.java
index 55c0540..a922ba1 100755
--- a/src/test/java/org/openldap/fortress/rbac/PRATestData.java
+++ b/src/test/java/org/openldap/fortress/rbac/PRATestData.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/PermTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/PermTestData.java b/src/test/java/org/openldap/fortress/rbac/PermTestData.java
index ae5ae83..07d16aa 100755
--- a/src/test/java/org/openldap/fortress/rbac/PermTestData.java
+++ b/src/test/java/org/openldap/fortress/rbac/PermTestData.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/PolicyTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/PolicyTestData.java b/src/test/java/org/openldap/fortress/rbac/PolicyTestData.java
index 9866e9c..24e2063 100755
--- a/src/test/java/org/openldap/fortress/rbac/PolicyTestData.java
+++ b/src/test/java/org/openldap/fortress/rbac/PolicyTestData.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/PswdPolicyMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/PswdPolicyMgrImplTest.java b/src/test/java/org/openldap/fortress/rbac/PswdPolicyMgrImplTest.java
index b415a34..4031ac7 100755
--- a/src/test/java/org/openldap/fortress/rbac/PswdPolicyMgrImplTest.java
+++ b/src/test/java/org/openldap/fortress/rbac/PswdPolicyMgrImplTest.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/ReviewMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/ReviewMgrImplTest.java b/src/test/java/org/openldap/fortress/rbac/ReviewMgrImplTest.java
index 2546286..f499fdf 100755
--- a/src/test/java/org/openldap/fortress/rbac/ReviewMgrImplTest.java
+++ b/src/test/java/org/openldap/fortress/rbac/ReviewMgrImplTest.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/RoleTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/RoleTestData.java b/src/test/java/org/openldap/fortress/rbac/RoleTestData.java
index edf8bf1..1125ee8 100755
--- a/src/test/java/org/openldap/fortress/rbac/RoleTestData.java
+++ b/src/test/java/org/openldap/fortress/rbac/RoleTestData.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/TestUtils.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/TestUtils.java b/src/test/java/org/openldap/fortress/rbac/TestUtils.java
index 3439ec9..2b7c57c 100755
--- a/src/test/java/org/openldap/fortress/rbac/TestUtils.java
+++ b/src/test/java/org/openldap/fortress/rbac/TestUtils.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/URA.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/URA.java b/src/test/java/org/openldap/fortress/rbac/URA.java
index 01eb9fa..8fad7a7 100755
--- a/src/test/java/org/openldap/fortress/rbac/URA.java
+++ b/src/test/java/org/openldap/fortress/rbac/URA.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;
 
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5ec67a0/src/test/java/org/openldap/fortress/rbac/URATestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/openldap/fortress/rbac/URATestData.java b/src/test/java/org/openldap/fortress/rbac/URATestData.java
index d0be4a4..0c47ad3 100755
--- a/src/test/java/org/openldap/fortress/rbac/URATestData.java
+++ b/src/test/java/org/openldap/fortress/rbac/URATestData.java
@@ -1,18 +1,22 @@
 /*
- * This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you 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
  *
- * Copyright 1998-2014 The OpenLDAP Foundation.
- * All rights reserved.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted only as authorized by the OpenLDAP
- * Public License.
+ *   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.
  *
- * A copy of this license is available in the file LICENSE in the
- * top-level directory of the distribution or, alternatively, at
- * <http://www.OpenLDAP.org/license.html>.
  */
-
 package org.openldap.fortress.rbac;