License contributed works as APL 2.0, 2nd pass

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@472 df292f66-193f-0410-a5fc-6d59da041ff2

6 files changed, 104 insertions, 87 deletions

diff --git a/lib/src/main/java/com/trilead/ssh2/DynamicPortForwarder.java b/lib/src/main/java/com/trilead/ssh2/DynamicPortForwarder.java
index 1fece14..a15efe7 100644
--- a/lib/src/main/java/com/trilead/ssh2/DynamicPortForwarder.java
+++ b/lib/src/main/java/com/trilead/ssh2/DynamicPortForwarder.java
@@ -1,20 +1,20 @@
 /*
-	ConnectBot: simple, powerful, open-source SSH client for Android
-	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-	
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any dater version.
-	
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ * ConnectBot: simple, powerful, open-source SSH client for Android
+ * Copyright 2007 Kenny Root, Jeffrey Sharkey
+ *
+ * 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 com.trilead.ssh2;
 
 import java.io.IOException;
@@ -28,7 +28,7 @@ import com.trilead.ssh2.channel.DynamicAcceptThread;
  * port via the secure tunnel to another host which is selected via the
  * SOCKS protocol. Checkout {@link Connection#createDynamicPortForwarder(int)}
  * on how to create one.
- * 
+ *
  * @author Kenny Root
  * @version $Id: $
  */
@@ -46,7 +46,7 @@ public class DynamicPortForwarder {
 		dat.setDaemon(true);
 		dat.start();
 	}
-	
+
 	DynamicPortForwarder(ChannelManager cm, InetSocketAddress addr) throws IOException {
 		this.cm = cm;
 
@@ -57,7 +57,7 @@ public class DynamicPortForwarder {
 
 	/**
 	 * Stop TCP/IP forwarding of newly arriving connections.
-	 * 
+	 *
 	 * @throws IOException
 	 */
 	public void close() throws IOException
diff --git a/lib/src/main/java/com/trilead/ssh2/channel/AuthAgentForwardThread.java b/lib/src/main/java/com/trilead/ssh2/channel/AuthAgentForwardThread.java
index b4ab108..57b9a5e 100644
--- a/lib/src/main/java/com/trilead/ssh2/channel/AuthAgentForwardThread.java
+++ b/lib/src/main/java/com/trilead/ssh2/channel/AuthAgentForwardThread.java
@@ -1,3 +1,20 @@
+/*
+ * ConnectBot: simple, powerful, open-source SSH client for Android
+ * Copyright 2007 Kenny Root, Jeffrey Sharkey
+ *
+ * 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 com.trilead.ssh2.channel;
 
 import java.io.IOException;
diff --git a/lib/src/main/java/com/trilead/ssh2/channel/DynamicAcceptThread.java b/lib/src/main/java/com/trilead/ssh2/channel/DynamicAcceptThread.java
index fee4529..f3c8b07 100644
--- a/lib/src/main/java/com/trilead/ssh2/channel/DynamicAcceptThread.java
+++ b/lib/src/main/java/com/trilead/ssh2/channel/DynamicAcceptThread.java
@@ -1,20 +1,20 @@
 /*
-	ConnectBot: simple, powerful, open-source SSH client for Android
-	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * ConnectBot: simple, powerful, open-source SSH client for Android
+ * Copyright 2007 Kenny Root, Jeffrey Sharkey
+ *
+ * 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 com.trilead.ssh2.channel;
 
 import java.io.IOException;
diff --git a/lib/src/main/java/com/trilead/ssh2/compression/CompressionFactory.java b/lib/src/main/java/com/trilead/ssh2/compression/CompressionFactory.java
index 30b3d21..a846f58 100644
--- a/lib/src/main/java/com/trilead/ssh2/compression/CompressionFactory.java
+++ b/lib/src/main/java/com/trilead/ssh2/compression/CompressionFactory.java
@@ -1,20 +1,20 @@
 /*
-	ConnectBot: simple, powerful, open-source SSH client for Android
-	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-	
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ * ConnectBot: simple, powerful, open-source SSH client for Android
+ * Copyright 2007 Kenny Root, Jeffrey Sharkey
+ *
+ * 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 com.trilead.ssh2.compression;
 
 import java.util.Vector;
@@ -35,7 +35,7 @@ public class CompressionFactory {
 			this.compressorClass = compressorClass;
 		}
 	}
-	
+
 	static Vector<CompressorEntry> compressors = new Vector<CompressorEntry>();
 
 	static
@@ -46,7 +46,7 @@ public class CompressionFactory {
 		compressors.addElement(new CompressorEntry("zlib@openssh.com", "com.trilead.ssh2.compression.Zlib"));
 		compressors.addElement(new CompressorEntry("none", ""));
 	}
-	
+
 	public static String[] getDefaultCompressorList()
 	{
 		String list[] = new String[compressors.size()];
@@ -57,7 +57,7 @@ public class CompressionFactory {
 		}
 		return list;
 	}
-	
+
 	public static void checkCompressorList(String[] compressorCandidates)
 	{
 		for (int i = 0; i < compressorCandidates.length; i++)
@@ -71,7 +71,7 @@ public class CompressionFactory {
 			CompressorEntry ce = getEntry(type);
 			if ("".equals(ce.compressorClass))
 				return null;
-			
+
 			Class<?> cc = Class.forName(ce.compressorClass);
 			ICompressor cmp = (ICompressor) cc.newInstance();
 
diff --git a/lib/src/main/java/com/trilead/ssh2/compression/ICompressor.java b/lib/src/main/java/com/trilead/ssh2/compression/ICompressor.java
index a71d31b..3f76326 100644
--- a/lib/src/main/java/com/trilead/ssh2/compression/ICompressor.java
+++ b/lib/src/main/java/com/trilead/ssh2/compression/ICompressor.java
@@ -1,29 +1,29 @@
 /*
-	ConnectBot: simple, powerful, open-source SSH client for Android
-	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-	
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * ConnectBot: simple, powerful, open-source SSH client for Android
+ * Copyright 2007 Kenny Root, Jeffrey Sharkey
+ *
+ * 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 com.trilead.ssh2.compression;
 
 /**
  * @author Kenny Root
- * 
+ *
  */
 public interface ICompressor {
 	int getBufferSize();
-	
+
 	int compress(byte[] buf, int start, int len, byte[] output);
 
 	byte[] uncompress(byte[] buf, int start, int[] len);
diff --git a/lib/src/main/java/com/trilead/ssh2/compression/Zlib.java b/lib/src/main/java/com/trilead/ssh2/compression/Zlib.java
index 8bd52d4..e9cc017 100644
--- a/lib/src/main/java/com/trilead/ssh2/compression/Zlib.java
+++ b/lib/src/main/java/com/trilead/ssh2/compression/Zlib.java
@@ -1,20 +1,20 @@
 /*
-	ConnectBot: simple, powerful, open-source SSH client for Android
-	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-	
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * ConnectBot: simple, powerful, open-source SSH client for Android
+ * Copyright 2007 Kenny Root, Jeffrey Sharkey
+ *
+ * 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 com.trilead.ssh2.compression;
 
 import com.jcraft.jzlib.JZlib;
@@ -22,7 +22,7 @@ import com.jcraft.jzlib.ZStream;
 
 /**
  * @author Kenny Root
- * 
+ *
  */
 public class Zlib implements ICompressor {
 	static private final int DEFAULT_BUF_SIZE = 4096;