You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2016/04/15 09:42:49 UTC
[10/51] [partial] zest-java git commit: Massive update of source file headers, removing author names in line with ASF recommendations.

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/http/build.gradle b/libraries/http/build.gradle
index 0f82572..d7e3cdc 100644
--- a/libraries/http/build.gradle
+++ b/libraries/http/build.gradle
@@ -1,20 +1,21 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.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.
  *
- *   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.
  */
 
 description = "Apache Zest™ Http Library provides embedded Jetty for Apache Zest™ application use."

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/dev-status.xml
----------------------------------------------------------------------
diff --git a/libraries/http/dev-status.xml b/libraries/http/dev-status.xml
index b316462..a4a8f91 100644
--- a/libraries/http/dev-status.xml
+++ b/libraries/http/dev-status.xml
@@ -1,20 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.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.
+  ~
+  ~
+  -->
 <module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/AbstractJettyMixin.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/AbstractJettyMixin.java b/libraries/http/src/main/java/org/apache/zest/library/http/AbstractJettyMixin.java
index b4b669a..d9e5346 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/AbstractJettyMixin.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/AbstractJettyMixin.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/ConstraintInfo.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/ConstraintInfo.java b/libraries/http/src/main/java/org/apache/zest/library/http/ConstraintInfo.java
index 0859c3a..0fe3802 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/ConstraintInfo.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/ConstraintInfo.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/ConstraintService.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/ConstraintService.java b/libraries/http/src/main/java/org/apache/zest/library/http/ConstraintService.java
index 5931b30..0d3a8d4 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/ConstraintService.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/ConstraintService.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/ContextListenerInfo.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/ContextListenerInfo.java b/libraries/http/src/main/java/org/apache/zest/library/http/ContextListenerInfo.java
index c4e06cb..1270c53 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/ContextListenerInfo.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/ContextListenerInfo.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2012, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/Dispatchers.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/Dispatchers.java b/libraries/http/src/main/java/org/apache/zest/library/http/Dispatchers.java
index d9294a9..2177301 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/Dispatchers.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/Dispatchers.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2008 Richard Wallace.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
  *
- * 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
  *
- *   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.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed  under the  License is distributed on an "AS IS" BASIS,
- * WITHOUT  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.apache.zest.library.http;
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/FilterInfo.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/FilterInfo.java b/libraries/http/src/main/java/org/apache/zest/library/http/FilterInfo.java
index fc363cf..7d15c50 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/FilterInfo.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/FilterInfo.java
@@ -1,20 +1,21 @@
 /*
- * Copyright 2008 Richard Wallace.
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
  *
- * 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
  *
- *   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.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed  under the  License is distributed on an "AS IS" BASIS,
- * WITHOUT  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.apache.zest.library.http;
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/HttpService.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/HttpService.java b/libraries/http/src/main/java/org/apache/zest/library/http/HttpService.java
index c4d2861..bee0e02 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/HttpService.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/HttpService.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2008 Niclas Hedhman.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
  *
- * 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
  *
- *   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.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed  under the  License is distributed on an "AS IS" BASIS,
- * WITHOUT  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.apache.zest.library.http;
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/Interface.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/Interface.java b/libraries/http/src/main/java/org/apache/zest/library/http/Interface.java
index 38efe23..4c54ab7 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/Interface.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/Interface.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2008 Niclas Hedhman.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
  *
- * 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
  *
- *   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.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed  under the  License is distributed on an "AS IS" BASIS,
- * WITHOUT  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.apache.zest.library.http;
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/InterfaceImpl.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/InterfaceImpl.java b/libraries/http/src/main/java/org/apache/zest/library/http/InterfaceImpl.java
index 027637e..169b1a3 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/InterfaceImpl.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/InterfaceImpl.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2008, Rickard Öberg. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/JettyActivation.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/JettyActivation.java b/libraries/http/src/main/java/org/apache/zest/library/http/JettyActivation.java
index e2d38b9..8c7b839 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/JettyActivation.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/JettyActivation.java
@@ -1,16 +1,23 @@
 /*
- * Copyright (c) 2012, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http;
 
 import org.apache.zest.api.activation.ActivatorAdapter;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/JettyConfiguration.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/JettyConfiguration.java b/libraries/http/src/main/java/org/apache/zest/library/http/JettyConfiguration.java
index dfea87c..84e3b84 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/JettyConfiguration.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/JettyConfiguration.java
@@ -1,15 +1,20 @@
 /*
- * Copyright (c) 2008, Rickard Öberg. All Rights Reserved.
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/JettyConfigurationHelper.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/JettyConfigurationHelper.java b/libraries/http/src/main/java/org/apache/zest/library/http/JettyConfigurationHelper.java
index a9e9ad4..ad64817 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/JettyConfigurationHelper.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/JettyConfigurationHelper.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/JettyMixin.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/JettyMixin.java b/libraries/http/src/main/java/org/apache/zest/library/http/JettyMixin.java
index 18a95ce..f4f7e93 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/JettyMixin.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/JettyMixin.java
@@ -1,15 +1,20 @@
 /*
- * Copyright (c) 2008, Rickard Öberg. All Rights Reserved.
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/JettyService.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/JettyService.java b/libraries/http/src/main/java/org/apache/zest/library/http/JettyService.java
index afc1abd..3864aed 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/JettyService.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/JettyService.java
@@ -1,15 +1,20 @@
 /*
- * Copyright (c) 2008, Rickard Öberg. All Rights Reserved.
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/JettyServiceAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/JettyServiceAssembler.java b/libraries/http/src/main/java/org/apache/zest/library/http/JettyServiceAssembler.java
index 655533b..226d99a 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/JettyServiceAssembler.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/JettyServiceAssembler.java
@@ -1,20 +1,21 @@
 /*
- * Copyright 2008 Edward Yakop.
- * Copyright 2011-2014 Paul Merlin.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
  *
- * 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
  *
- *   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.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed  under the  License is distributed on an "AS IS" BASIS,
- * WITHOUT  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.apache.zest.library.http;
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/SecureJettyConfiguration.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/SecureJettyConfiguration.java b/libraries/http/src/main/java/org/apache/zest/library/http/SecureJettyConfiguration.java
index 04f6ffb..e9002d7 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/SecureJettyConfiguration.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/SecureJettyConfiguration.java
@@ -1,16 +1,23 @@
 /*
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http;
 
 import java.security.SecureRandom;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/SecureJettyMixin.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/SecureJettyMixin.java b/libraries/http/src/main/java/org/apache/zest/library/http/SecureJettyMixin.java
index 493bbd4..c9cb925 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/SecureJettyMixin.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/SecureJettyMixin.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/SecureJettyService.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/SecureJettyService.java b/libraries/http/src/main/java/org/apache/zest/library/http/SecureJettyService.java
index 6886966..936bee9 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/SecureJettyService.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/SecureJettyService.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/SecureJettyServiceAssembler.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/SecureJettyServiceAssembler.java b/libraries/http/src/main/java/org/apache/zest/library/http/SecureJettyServiceAssembler.java
index 630843c..1de2ff8 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/SecureJettyServiceAssembler.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/SecureJettyServiceAssembler.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/ServletInfo.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/ServletInfo.java b/libraries/http/src/main/java/org/apache/zest/library/http/ServletInfo.java
index 159957c..ba63ffe 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/ServletInfo.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/ServletInfo.java
@@ -1,15 +1,20 @@
 /*
- * Copyright (c) 2008, Rickard Öberg. All Rights Reserved.
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.
  *
  */
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/Servlets.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/Servlets.java b/libraries/http/src/main/java/org/apache/zest/library/http/Servlets.java
index d97c75c..0b31987 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/Servlets.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/Servlets.java
@@ -1,20 +1,21 @@
 /*
- * Copyright (c) 2008, Richard Wallace. All Rights Reserved.
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
  *
- * 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
  *
- *   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.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed  under the  License is distributed on an "AS IS" BASIS,
- * WITHOUT  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.apache.zest.library.http;
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/UnitOfWorkFilter.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/UnitOfWorkFilter.java b/libraries/http/src/main/java/org/apache/zest/library/http/UnitOfWorkFilter.java
index d52924d..9323f83 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/UnitOfWorkFilter.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/UnitOfWorkFilter.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2008, Rickard Öberg. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.
  *
  */
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/UnitOfWorkFilterService.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/UnitOfWorkFilterService.java b/libraries/http/src/main/java/org/apache/zest/library/http/UnitOfWorkFilterService.java
index 6af145f..305749c 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/UnitOfWorkFilterService.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/UnitOfWorkFilterService.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2008, Rickard Öberg. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.
  *
  */
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/WelcomeServlet.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/WelcomeServlet.java b/libraries/http/src/main/java/org/apache/zest/library/http/WelcomeServlet.java
index 3657142..8de8a13 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/WelcomeServlet.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/WelcomeServlet.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2008, Rickard Öberg. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.
  *
  */
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/WelcomeServletService.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/WelcomeServletService.java b/libraries/http/src/main/java/org/apache/zest/library/http/WelcomeServletService.java
index d84afa7..88cbf55 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/WelcomeServletService.java
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/WelcomeServletService.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2008, Rickard Öberg. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.
  *
  */
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/main/java/org/apache/zest/library/http/package.html
----------------------------------------------------------------------
diff --git a/libraries/http/src/main/java/org/apache/zest/library/http/package.html b/libraries/http/src/main/java/org/apache/zest/library/http/package.html
index 1451cf5..a265bc0 100644
--- a/libraries/http/src/main/java/org/apache/zest/library/http/package.html
+++ b/libraries/http/src/main/java/org/apache/zest/library/http/package.html
@@ -1,19 +1,22 @@
 <!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.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>
     <body>
         <h2>HTTP Library.</h2>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/test/java/org/apache/zest/library/http/AbstractJettyTest.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/test/java/org/apache/zest/library/http/AbstractJettyTest.java b/libraries/http/src/test/java/org/apache/zest/library/http/AbstractJettyTest.java
index fbd113e..8c24cd0 100644
--- a/libraries/http/src/test/java/org/apache/zest/library/http/AbstractJettyTest.java
+++ b/libraries/http/src/test/java/org/apache/zest/library/http/AbstractJettyTest.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/test/java/org/apache/zest/library/http/AbstractSecureJettyTest.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/test/java/org/apache/zest/library/http/AbstractSecureJettyTest.java b/libraries/http/src/test/java/org/apache/zest/library/http/AbstractSecureJettyTest.java
index 923956e..1cf0abf 100644
--- a/libraries/http/src/test/java/org/apache/zest/library/http/AbstractSecureJettyTest.java
+++ b/libraries/http/src/test/java/org/apache/zest/library/http/AbstractSecureJettyTest.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/test/java/org/apache/zest/library/http/FooServletContextListener.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/test/java/org/apache/zest/library/http/FooServletContextListener.java b/libraries/http/src/test/java/org/apache/zest/library/http/FooServletContextListener.java
index c80bf4f..2030551 100644
--- a/libraries/http/src/test/java/org/apache/zest/library/http/FooServletContextListener.java
+++ b/libraries/http/src/test/java/org/apache/zest/library/http/FooServletContextListener.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2012 Paul Merlin.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
  *
- * 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
  *
- * 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.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.apache.zest.library.http;
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/test/java/org/apache/zest/library/http/FooServletContextListenerService.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/test/java/org/apache/zest/library/http/FooServletContextListenerService.java b/libraries/http/src/test/java/org/apache/zest/library/http/FooServletContextListenerService.java
index 4245341..0d5216d 100644
--- a/libraries/http/src/test/java/org/apache/zest/library/http/FooServletContextListenerService.java
+++ b/libraries/http/src/test/java/org/apache/zest/library/http/FooServletContextListenerService.java
@@ -1,19 +1,21 @@
 /*
- * Copyright 2012 Paul Merlin.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
  *
- * 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
  *
- * 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.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.apache.zest.library.http;
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/test/java/org/apache/zest/library/http/HelloWorldServlet.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/test/java/org/apache/zest/library/http/HelloWorldServlet.java b/libraries/http/src/test/java/org/apache/zest/library/http/HelloWorldServlet.java
index e4ed898..e280ca0 100644
--- a/libraries/http/src/test/java/org/apache/zest/library/http/HelloWorldServlet.java
+++ b/libraries/http/src/test/java/org/apache/zest/library/http/HelloWorldServlet.java
@@ -1,16 +1,21 @@
-/* 
- * Copyright (c) 2008, Edward Yakop. All Rights Reserved.
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
  *
- * 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.apache.zest.library.http;
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/test/java/org/apache/zest/library/http/HelloWorldServletService.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/test/java/org/apache/zest/library/http/HelloWorldServletService.java b/libraries/http/src/test/java/org/apache/zest/library/http/HelloWorldServletService.java
index 7e2040f..6bbf71a 100644
--- a/libraries/http/src/test/java/org/apache/zest/library/http/HelloWorldServletService.java
+++ b/libraries/http/src/test/java/org/apache/zest/library/http/HelloWorldServletService.java
@@ -1,18 +1,21 @@
-/*  Copyright 2008 Edward Yakop.
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
  *
- * 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
  *
- * 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.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.apache.zest.library.http;
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/test/java/org/apache/zest/library/http/JettyJMXStatisticsTest.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/test/java/org/apache/zest/library/http/JettyJMXStatisticsTest.java b/libraries/http/src/test/java/org/apache/zest/library/http/JettyJMXStatisticsTest.java
index 136afa8..7d737a6 100644
--- a/libraries/http/src/test/java/org/apache/zest/library/http/JettyJMXStatisticsTest.java
+++ b/libraries/http/src/test/java/org/apache/zest/library/http/JettyJMXStatisticsTest.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/test/java/org/apache/zest/library/http/JettyServiceTest.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/test/java/org/apache/zest/library/http/JettyServiceTest.java b/libraries/http/src/test/java/org/apache/zest/library/http/JettyServiceTest.java
index 3a3b36f..6e6e7df 100644
--- a/libraries/http/src/test/java/org/apache/zest/library/http/JettyServiceTest.java
+++ b/libraries/http/src/test/java/org/apache/zest/library/http/JettyServiceTest.java
@@ -1,20 +1,21 @@
-/**
- * Copyright (c) 2008, Edward Yakop. All Rights Reserved.
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
  *
- * 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
  *
- * 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.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.apache.zest.library.http;
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/test/java/org/apache/zest/library/http/JettyTestSuite.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/test/java/org/apache/zest/library/http/JettyTestSuite.java b/libraries/http/src/test/java/org/apache/zest/library/http/JettyTestSuite.java
index bbbf051..e96e402 100644
--- a/libraries/http/src/test/java/org/apache/zest/library/http/JettyTestSuite.java
+++ b/libraries/http/src/test/java/org/apache/zest/library/http/JettyTestSuite.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/test/java/org/apache/zest/library/http/MutualSecureJettyServiceTest.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/test/java/org/apache/zest/library/http/MutualSecureJettyServiceTest.java b/libraries/http/src/test/java/org/apache/zest/library/http/MutualSecureJettyServiceTest.java
index 5e12441..228c791 100644
--- a/libraries/http/src/test/java/org/apache/zest/library/http/MutualSecureJettyServiceTest.java
+++ b/libraries/http/src/test/java/org/apache/zest/library/http/MutualSecureJettyServiceTest.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/test/java/org/apache/zest/library/http/SecureJettyServiceTest.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/test/java/org/apache/zest/library/http/SecureJettyServiceTest.java b/libraries/http/src/test/java/org/apache/zest/library/http/SecureJettyServiceTest.java
index abab99d..df4e0c5 100644
--- a/libraries/http/src/test/java/org/apache/zest/library/http/SecureJettyServiceTest.java
+++ b/libraries/http/src/test/java/org/apache/zest/library/http/SecureJettyServiceTest.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/test/java/org/apache/zest/library/http/VirtualHostJettyServiceTest.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/test/java/org/apache/zest/library/http/VirtualHostJettyServiceTest.java b/libraries/http/src/test/java/org/apache/zest/library/http/VirtualHostJettyServiceTest.java
index 9f018bd..87b869d 100644
--- a/libraries/http/src/test/java/org/apache/zest/library/http/VirtualHostJettyServiceTest.java
+++ b/libraries/http/src/test/java/org/apache/zest/library/http/VirtualHostJettyServiceTest.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/test/java/org/apache/zest/library/http/dns/LocalManagedDns.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/test/java/org/apache/zest/library/http/dns/LocalManagedDns.java b/libraries/http/src/test/java/org/apache/zest/library/http/dns/LocalManagedDns.java
index c6cfdb1..68b208d 100644
--- a/libraries/http/src/test/java/org/apache/zest/library/http/dns/LocalManagedDns.java
+++ b/libraries/http/src/test/java/org/apache/zest/library/http/dns/LocalManagedDns.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http.dns;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/b8ee1cf3/libraries/http/src/test/java/org/apache/zest/library/http/dns/LocalManagedDnsDescriptor.java
----------------------------------------------------------------------
diff --git a/libraries/http/src/test/java/org/apache/zest/library/http/dns/LocalManagedDnsDescriptor.java b/libraries/http/src/test/java/org/apache/zest/library/http/dns/LocalManagedDnsDescriptor.java
index fbcea2e..a2ae722 100644
--- a/libraries/http/src/test/java/org/apache/zest/library/http/dns/LocalManagedDnsDescriptor.java
+++ b/libraries/http/src/test/java/org/apache/zest/library/http/dns/LocalManagedDnsDescriptor.java
@@ -1,14 +1,20 @@
 /*
- * Copyright (c) 2011, Paul Merlin. All Rights Reserved.
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * 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.apache.zest.library.http.dns;