From 7f55d8e6aa1615dc416961f40fbeecb4b4d857e3 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Wed, 24 Feb 2016 16:08:33 +0000
Subject: [PATCH] OPENDJ-2689 Update copyright headers
---
opendj-server-legacy/src/main/java/org/opends/server/util/ServerConstants.java | 60 +++++++++++++++++++++---------------------------------------
1 files changed, 21 insertions(+), 39 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/ServerConstants.java b/opendj-server-legacy/src/main/java/org/opends/server/util/ServerConstants.java
index 9e34a29..af3e905 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/ServerConstants.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/ServerConstants.java
@@ -1,28 +1,18 @@
/*
- * CDDL HEADER START
+ * The contents of this file are subject to the terms of the Common Development and
+ * Distribution License (the License). You may not use this file except in compliance with the
+ * License.
*
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
+ * specific language governing permission and limitations under the License.
*
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
+ * When distributing Covered Software, include this CDDL Header Notice in each file and include
+ * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
+ * Header, with the fields enclosed by brackets [] replaced by your own identifying
+ * information: "Portions Copyright [year] [name of copyright owner]".
*
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2010-2015 ForgeRock AS
+ * Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2010-2016 ForgeRock AS.
*/
package org.opends.server.util;
@@ -3113,26 +3103,18 @@
*/
public static final String[] CDDL_HEADER_LINES =
{
- "CDDL HEADER START",
+ "The contents of this file are subject to the terms of the Common Development and",
+ "Distribution License (the License). You may not use this file except in compliance with the",
+ "License.",
"",
- "The contents of this file are subject to the terms of the",
- "Common Development and Distribution License, Version 1.0 only",
- "(the \"License\"). You may not use this file except in compliance",
- "with the License.",
+ "You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the",
+ "specific language governing permission and limitations under the License.",
"",
- "You can obtain a copy of the license at legal-notices/CDDLv1_0.txt",
- "or http://forgerock.org/license/CDDLv1.0.html.",
- "See the License for the specific language governing permissions",
- "and limitations under the License.",
- "",
- "When distributing Covered Code, include this CDDL HEADER in each",
- "file and include the License file at legal-notices/CDDLv1_0.txt.",
- "If applicable, add the following below this CDDL HEADER, with the",
- "fields enclosed by brackets \"[]\" replaced with your own identifying",
- "information:",
- " Portions Copyright [yyyy] [name of copyright owner]",
- "",
- "CDDL HEADER END"
+ "When distributing Covered Software, include this CDDL Header Notice in each file and include",
+ "the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL",
+ "Header, with the fields enclosed by brackets [] replaced by your own identifying",
+ "information: \"Portions Copyright [year] [name of copyright owner]\".",
+ ""
};
/**
--
Gitblit v1.10.0