[or-cvs] [jtorctl/master] Add the LICENSE file back for jtorctl, and remove $ID$ entries from files.

Sebastian Hahn sebastian at torproject.org
Thu Feb 5 17:04:50 UTC 2009 

Cleaning up after the git conversion. The LICENSE file got lost, and $ID$ in a file doesn't make sense anymore.
---
 LICENSE                                            |   32 ++++++++++++++++++++
 net/freehaven/tor/control/Bytes.java               |    1 -
 net/freehaven/tor/control/ConfigEntry.java         |    1 -
 net/freehaven/tor/control/EventHandler.java        |    1 -
 net/freehaven/tor/control/NullEventHandler.java    |    1 -
 net/freehaven/tor/control/PasswordDigest.java      |    1 -
 net/freehaven/tor/control/TorControlCommands.java  |    1 -
 .../tor/control/TorControlConnection.java          |    1 -
 net/freehaven/tor/control/TorControlError.java     |    1 -
 .../tor/control/TorControlSyntaxError.java         |    2 +
 .../control/examples/DebuggingEventHandler.java    |    1 -
 net/freehaven/tor/control/examples/Main.java       |    1 -
 12 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..f475bc8
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,32 @@
+===============================================================================
+The Tor controller demonstration code is distributed under this license:
+
+Copyright (c) 2005, Nick Mathewson, Roger Dingledine
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+    * Neither the names of the copyright owners nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/net/freehaven/tor/control/Bytes.java b/net/freehaven/tor/control/Bytes.java
index 89cd178..07c25d0 100644
--- a/net/freehaven/tor/control/Bytes.java
+++ b/net/freehaven/tor/control/Bytes.java
@@ -1,4 +1,3 @@
-// $Id$
 // Copyright 2005 Nick Mathewson, Roger Dingledine
 // See LICENSE file for copying information
 package net.freehaven.tor.control;
diff --git a/net/freehaven/tor/control/ConfigEntry.java b/net/freehaven/tor/control/ConfigEntry.java
index bddab79..c9e4cfc 100644
--- a/net/freehaven/tor/control/ConfigEntry.java
+++ b/net/freehaven/tor/control/ConfigEntry.java
@@ -1,4 +1,3 @@
-// $Id$
 // Copyright 2005 Nick Mathewson, Roger Dingledine
 // See LICENSE file for copying information
 package net.freehaven.tor.control;
diff --git a/net/freehaven/tor/control/EventHandler.java b/net/freehaven/tor/control/EventHandler.java
index c964d87..11c45a4 100644
--- a/net/freehaven/tor/control/EventHandler.java
+++ b/net/freehaven/tor/control/EventHandler.java
@@ -1,4 +1,3 @@
-// $Id$
 // Copyright 2005 Nick Mathewson, Roger Dingledine
 // See LICENSE file for copying information
 package net.freehaven.tor.control;
diff --git a/net/freehaven/tor/control/NullEventHandler.java b/net/freehaven/tor/control/NullEventHandler.java
index acda5ba..26958e0 100644
--- a/net/freehaven/tor/control/NullEventHandler.java
+++ b/net/freehaven/tor/control/NullEventHandler.java
@@ -1,4 +1,3 @@
-// $Id$
 // Copyright 2005 Nick Mathewson, Roger Dingledine
 // See LICENSE file for copying information
 package net.freehaven.tor.control;
diff --git a/net/freehaven/tor/control/PasswordDigest.java b/net/freehaven/tor/control/PasswordDigest.java
index c3b76c4..680db7b 100644
--- a/net/freehaven/tor/control/PasswordDigest.java
+++ b/net/freehaven/tor/control/PasswordDigest.java
@@ -1,4 +1,3 @@
-// $Id$
 // Copyright 2005 Nick Mathewson, Roger Dingledine
 // See LICENSE file for copying information
 package net.freehaven.tor.control;
diff --git a/net/freehaven/tor/control/TorControlCommands.java b/net/freehaven/tor/control/TorControlCommands.java
index de3204e..36482d5 100644
--- a/net/freehaven/tor/control/TorControlCommands.java
+++ b/net/freehaven/tor/control/TorControlCommands.java
@@ -1,4 +1,3 @@
-// $Id$
 // Copyright 2005 Nick Mathewson, Roger Dingledine
 // See LICENSE file for copying information
 package net.freehaven.tor.control;
diff --git a/net/freehaven/tor/control/TorControlConnection.java b/net/freehaven/tor/control/TorControlConnection.java
index 141c032..fbeb5de 100644
--- a/net/freehaven/tor/control/TorControlConnection.java
+++ b/net/freehaven/tor/control/TorControlConnection.java
@@ -1,4 +1,3 @@
-// $Id$
 // Copyright 2005 Nick Mathewson, Roger Dingledine
 // See LICENSE file for copying information
 package net.freehaven.tor.control;
diff --git a/net/freehaven/tor/control/TorControlError.java b/net/freehaven/tor/control/TorControlError.java
index b28bf44..fc6f11f 100644
--- a/net/freehaven/tor/control/TorControlError.java
+++ b/net/freehaven/tor/control/TorControlError.java
@@ -1,4 +1,3 @@
-// $Id$
 // Copyright 2005 Nick Mathewson, Roger Dingledine
 // See LICENSE file for copying information
 package net.freehaven.tor.control;
diff --git a/net/freehaven/tor/control/TorControlSyntaxError.java b/net/freehaven/tor/control/TorControlSyntaxError.java
index 983977c..3c17561 100644
--- a/net/freehaven/tor/control/TorControlSyntaxError.java
+++ b/net/freehaven/tor/control/TorControlSyntaxError.java
@@ -1,3 +1,5 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
 package net.freehaven.tor.control;
 
 /**
diff --git a/net/freehaven/tor/control/examples/DebuggingEventHandler.java b/net/freehaven/tor/control/examples/DebuggingEventHandler.java
index 987d62f..2bd68cc 100644
--- a/net/freehaven/tor/control/examples/DebuggingEventHandler.java
+++ b/net/freehaven/tor/control/examples/DebuggingEventHandler.java
@@ -1,4 +1,3 @@
-// $Id$
 // Copyright 2005 Nick Mathewson, Roger Dingledine
 // See LICENSE file for copying information
 package net.freehaven.tor.control.examples;
diff --git a/net/freehaven/tor/control/examples/Main.java b/net/freehaven/tor/control/examples/Main.java
index 2b5afd1..b8b52a9 100644
--- a/net/freehaven/tor/control/examples/Main.java
+++ b/net/freehaven/tor/control/examples/Main.java
@@ -1,4 +1,3 @@
-// $Id$
 // Copyright 2005 Nick Mathewson, Roger Dingledine
 // See LICENSE file for copying information
 package net.freehaven.tor.control.examples;
-- 
1.5.6.5

More information about the tor-commits mailing list