licensing update to APSL 2.0

darcs-hash:20050104224512-5007d-1b6eb29381e910553043df18ff6069794ca6a37e.gz

diff --git a/src/org/ibex/net/HTTP.java b/src/org/ibex/net/HTTP.java
index 69f54cd..ebdbf91 100644 (file)
--- a/src/org/ibex/net/HTTP.java
+++ b/src/org/ibex/net/HTTP.java
@@ -1,4 +1,7 @@
-// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2000-2005 the Contributors, as shown in the revision logs.
+// Licensed under the Apache Public Source License 2.0 ("the License").
+// You may not use this file except in compliance with the License.
+
 package org.ibex.net;
 
 import java.net.*;

diff --git a/src/org/ibex/net/SSL.java b/src/org/ibex/net/SSL.java
index 672ba11..4c1f615 100644 (file)
--- a/src/org/ibex/net/SSL.java
+++ b/src/org/ibex/net/SSL.java
@@ -1,14 +1,14 @@
+// Copyright 2000-2005 the Contributors, as shown in the revision logs.
+// Licensed under the Apache Public Source License 2.0 ("the License").
+// You may not use this file except in compliance with the License.
+
 /*
  * org.ibex.net.SSL - By Brian Alliet
  * Copyright (C) 2004 Brian Alliet
  * 
  * Based on TinySSL by Adam Megacz
  * Copyright (C) 2003 Adam Megacz <adam@xwt.org> all rights reserved.
- * 
- * You may modify, copy, and redistribute this code under the terms of
- * the GNU Lesser General Public License version 2.1, with the exception
- * of the portion of clause 6a after the semicolon (aka the "obnoxious
- * relink clause")
+ *
  */
 
 package org.ibex.net;

diff --git a/src/org/ibex/net/ssl/GenCompactCAList.java b/src/org/ibex/net/ssl/GenCompactCAList.java
index e15a194..a1e502f 100644 (file)
--- a/src/org/ibex/net/ssl/GenCompactCAList.java
+++ b/src/org/ibex/net/ssl/GenCompactCAList.java
@@ -1,3 +1,7 @@
+// Copyright 2000-2005 the Contributors, as shown in the revision logs.
+// Licensed under the Apache Public Source License 2.0 ("the License").
+// You may not use this file except in compliance with the License.
+
 package org.ibex.net.ssl;
 
 import java.io.*;

diff --git a/src/org/ibex/net/ssl/RootCerts.java b/src/org/ibex/net/ssl/RootCerts.java
index bd0f17d..c341c99 100644 (file)
--- a/src/org/ibex/net/ssl/RootCerts.java
+++ b/src/org/ibex/net/ssl/RootCerts.java
@@ -1,3 +1,7 @@
+// Copyright 2000-2005 the Contributors, as shown in the revision logs.
+// Licensed under the Apache Public Source License 2.0 ("the License").
+// You may not use this file except in compliance with the License.
+
 package org.ibex.net.ssl;
 public final class RootCerts {
     private final static String DATA =

diff --git a/src/org/ibex/net/ssl/SwingVerifyCallback.java b/src/org/ibex/net/ssl/SwingVerifyCallback.java
index 832ef2f..b1250c6 100644 (file)
--- a/src/org/ibex/net/ssl/SwingVerifyCallback.java
+++ b/src/org/ibex/net/ssl/SwingVerifyCallback.java
@@ -1,3 +1,7 @@
+// Copyright 2000-2005 the Contributors, as shown in the revision logs.
+// Licensed under the Apache Public Source License 2.0 ("the License").
+// You may not use this file except in compliance with the License.
+
 package org.ibex.net.ssl;
 
 import javax.swing.*;

diff --git a/src/org/ibex/net/ssl/Test.java b/src/org/ibex/net/ssl/Test.java
index aa43ccb..63efbad 100644 (file)
--- a/src/org/ibex/net/ssl/Test.java
+++ b/src/org/ibex/net/ssl/Test.java
@@ -1,3 +1,7 @@
+// Copyright 2000-2005 the Contributors, as shown in the revision logs.
+// Licensed under the Apache Public Source License 2.0 ("the License").
+// You may not use this file except in compliance with the License.
+
 package org.ibex.net.ssl;
 
 import org.ibex.net.SSL;