From 3bea3598871b4dbac200f0eec65e0bc46a71f6ec Mon Sep 17 00:00:00 2001 From: Gaetan Boismal <gaetan.boismal@forgerock.com> Date: Wed, 24 Feb 2016 16:06:12 +0000 Subject: [PATCH] Fix copyright headers --- opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistorical.java | 3 +-- opendj-dsml-servlet/resources/schema/bindings.xjb | 2 +- opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeValuePasswordValidatorConfiguration.xml | 2 +- opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java | 27 --------------------------- 4 files changed, 3 insertions(+), 31 deletions(-) diff --git a/opendj-dsml-servlet/resources/schema/bindings.xjb b/opendj-dsml-servlet/resources/schema/bindings.xjb index 4e2fd5f..2039ba7 100644 --- a/opendj-dsml-servlet/resources/schema/bindings.xjb +++ b/opendj-dsml-servlet/resources/schema/bindings.xjb @@ -22,7 +22,7 @@ ! CDDL HEADER END ! ! - ! Copyright 2012 ForgeRock, AS. + ! Copyright 2012 ForgeRock AS. ! --> <bindings xmlns="http://java.sun.com/xml/ns/jaxb" version="2.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" schemaLocation="DSMLv2.xsd" > diff --git a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeValuePasswordValidatorConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeValuePasswordValidatorConfiguration.xml index 777ef7c..c338598 100644 --- a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeValuePasswordValidatorConfiguration.xml +++ b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeValuePasswordValidatorConfiguration.xml @@ -23,7 +23,7 @@ ! ! ! Copyright 2007-2008 Sun Microsystems, Inc. - ! Portions Copyright 2012 ForgeRock, AS. + ! Portions Copyright 2012 ForgeRock AS. ! --> <adm:managed-object name="attribute-value-password-validator" plural-name="attribute-value-password-validators" diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java index 3035e78..4309d56 100644 --- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java +++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java @@ -25,33 +25,6 @@ * Portions Copyright 2014-2016 ForgeRock AS */ -/* - * CDDL HEADER START - * - * 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-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 - * - * - * Copyright 2008 Sun Microsystems, Inc. - * Portions Copyright 2014-2015 ForgeRock AS - */ - package org.opends.guitools.controlpanel.ui; import static org.opends.messages.AdminToolMessages.*; diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistorical.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistorical.java index abcff67..991bc40 100644 --- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistorical.java +++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistorical.java @@ -22,8 +22,7 @@ * * * Copyright 2006-2010 Sun Microsystems, Inc. - * Portions Copyright 2013-2014 ForgeRock, AS. - * Portions Copyright 2015-2016 ForgeRock AS. + * Portions Copyright 2013-2016 ForgeRock AS. */ package org.opends.server.replication.plugin; -- Gitblit v1.10.0