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:09 UTC

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

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;