From 50100ca86d3b1bd85c04ffd8938f8030a50811f8 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Tue, 5 Jan 2016 11:30:38 +0100
Subject: [PATCH] Fixed copyright blurbs.

---
 .../contexts/httpservice.xml                  | 20 +++----------------
 .../java/org/eclipse/jetty/util/Callback.java | 18 +----------------
 pom.xml                                       |  2 +-
 3 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml b/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml
index 6aae6e9bf09..28b06ea5813 100644
--- a/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml
+++ b/jetty-osgi/jetty-osgi-httpservice/contexts/httpservice.xml
@@ -1,31 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
-<!--
- Copyright (c) 2009-2011 Intalio, Inc.
-
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- and Apache License v2.0 which accompanies this distribution.
- The Eclipse Public License is available at
- http://www.eclipse.org/legal/epl-v10.html
- The Apache License v2.0 is available at
- http://www.opensource.org/licenses/apache2.0.php
- You may elect to redistribute this code under either of these licenses.
- Contributors:
-    Hugues Malphettes - initial API and implementation
--->
 <Configure class="org.eclipse.jetty.servlet.ServletContextHandler">
-<!-- this configures the servlet session manager -->
+  <!-- this configures the servlet session manager -->
   <Set name="SessionHandler">
     <New class="org.eclipse.jetty.server.session.SessionHandler"/>
   </Set>
-<!-- this servlet provides the OSGi HTTP Service once it is initialized -->
+  <!-- this servlet provides the OSGi HTTP Service once it is initialized -->
   <Call name="addServlet">
     <Arg>org.eclipse.equinox.http.servlet.HttpServiceServlet</Arg>
     <Arg>/*</Arg>
     <Set name="InitOrder">1</Set>
   </Call>
-<!-- custom pluggable error handler -->
+  <!-- custom pluggable error handler -->
   <Set name="ErrorHandler">
     <New class="org.eclipse.jetty.osgi.httpservice.HttpServiceErrorPageErrorHandler"/>
   </Set>
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/Callback.java b/jetty-util/src/main/java/org/eclipse/jetty/util/Callback.java
index 29b6450451a..6425e29346e 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/Callback.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/Callback.java
@@ -16,28 +16,12 @@
 //  ========================================================================
 //
 
-/*
- * Copyright (c) 2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package org.eclipse.jetty.util;
 
 /**
  * <p>A callback abstraction that handles completed/failed events of asynchronous operations.</p>
  *
- * <p>Semantically this is equivalent to an optimise Promise&lt;Void&gt;, but callback is a more meaningful 
+ * <p>Semantically this is equivalent to an optimise Promise&lt;Void&gt;, but callback is a more meaningful
  * name than EmptyPromise</p>
  */
 public interface Callback
diff --git a/pom.xml b/pom.xml
index a8966cd34df..fc6bcf07126 100644
--- a/pom.xml
+++ b/pom.xml
@@ -299,7 +299,7 @@
               <Bundle-Vendor>Eclipse Jetty Project</Bundle-Vendor>
               <Bundle-Classpath>.</Bundle-Classpath>
               <Export-Package>${bundle-symbolic-name}.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
-              <Bundle-Copyright>Copyright (c) 2008-2014 Mort Bay Consulting Pty. Ltd.</Bundle-Copyright>
+              <Bundle-Copyright>Copyright (c) 2008-2016 Mort Bay Consulting Pty. Ltd.</Bundle-Copyright>
               <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
             </instructions>
           </configuration>