[or-cvs] [puppetor/master] Update license stuff.
Karsten Loesing
karsten.loesing at gmx.net
Tue Feb 3 14:13:59 UTC 2009
Update copyright lines to 2009, add Sebastian, and remove Groovy.
---
LICENSE | 47 +-------------------
src/org/torproject/puppetor/ClientApplication.java | 3 +-
src/org/torproject/puppetor/ClientEventType.java | 3 +-
src/org/torproject/puppetor/DirectoryNode.java | 3 +-
src/org/torproject/puppetor/Event.java | 3 +-
src/org/torproject/puppetor/EventListener.java | 3 +-
src/org/torproject/puppetor/EventManager.java | 3 +-
src/org/torproject/puppetor/EventType.java | 3 +-
src/org/torproject/puppetor/HiddenService.java | 32 +++++++++++++
.../puppetor/HiddenServiceEventType.java | 3 +-
src/org/torproject/puppetor/Network.java | 3 +-
src/org/torproject/puppetor/NetworkFactory.java | 3 +-
src/org/torproject/puppetor/NodeEventType.java | 3 +-
src/org/torproject/puppetor/NodeState.java | 3 +-
src/org/torproject/puppetor/ProxyNode.java | 3 +-
src/org/torproject/puppetor/PuppeTorException.java | 3 +-
src/org/torproject/puppetor/RouterNode.java | 3 +-
src/org/torproject/puppetor/ServerApplication.java | 3 +-
src/org/torproject/puppetor/ServerEventType.java | 3 +-
.../examples/AccessingPublicWebServerOverTor.java | 3 +-
...ccessingHiddenServiceOverPrivateTorNetwork.java | 3 +-
...AccessingHiddenServiceOverPublicTorNetwork.java | 3 +-
...AdvertisingHiddenServiceToPublicTorNetwork.java | 3 +-
.../puppetor/examples/LongRunningNetwork.java | 3 +-
.../MergingRoutersWithLongRunningNetwork.java | 3 +-
.../puppetor/impl/ClientApplicationImpl.java | 3 +-
.../puppetor/impl/DirectoryNodeImpl.java | 3 +-
src/org/torproject/puppetor/impl/EventImpl.java | 3 +-
.../torproject/puppetor/impl/EventManagerImpl.java | 3 +-
.../puppetor/impl/HiddenServiceImpl.java | 32 +++++++++++++
src/org/torproject/puppetor/impl/NetworkImpl.java | 3 +-
.../torproject/puppetor/impl/ProxyNodeImpl.java | 3 +-
.../torproject/puppetor/impl/RouterNodeImpl.java | 3 +-
.../puppetor/impl/ServerApplicationImpl.java | 3 +-
34 files changed, 128 insertions(+), 76 deletions(-)
diff --git a/LICENSE b/LICENSE
index 77abd8d..01354ee 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,8 @@
===============================================================================
PuppeTor - A Java-based Tor Simulator - is distributed under this license:
-Copyright (c) 2007, Karsten Loesing
+Copyright 2007 Karsten Loesing
+Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -65,47 +66,3 @@ 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.
-
-===============================================================================
-Groovy is distributed under this license:
-
-Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions of source code must retain copyright
- statements and notices. Redistributions must also contain a
- copy of this document.
-
-2. 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.
-
-3. The name "groovy" must not be used to endorse or promote
- products derived from this Software without prior written
- permission of The Codehaus. For written permission,
- please contact info at codehaus.org.
-
-4. Products derived from this Software may not be called "groovy"
- nor may "groovy" appear in their names without prior written
- permission of The Codehaus. "groovy" is a registered
- trademark of The Codehaus.
-
-5. Due credit should be given to The Codehaus -
- http://groovy.codehaus.org/
-
-THIS SOFTWARE IS PROVIDED BY THE CODEHAUS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESSED 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 CODEHAUS OR ITS 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/src/org/torproject/puppetor/ClientApplication.java b/src/org/torproject/puppetor/ClientApplication.java
index 2c40298..18a005c 100644
--- a/src/org/torproject/puppetor/ClientApplication.java
+++ b/src/org/torproject/puppetor/ClientApplication.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/ClientEventType.java b/src/org/torproject/puppetor/ClientEventType.java
index 14b76a4..e389ca9 100644
--- a/src/org/torproject/puppetor/ClientEventType.java
+++ b/src/org/torproject/puppetor/ClientEventType.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/DirectoryNode.java b/src/org/torproject/puppetor/DirectoryNode.java
index cfc7327..b58fced 100644
--- a/src/org/torproject/puppetor/DirectoryNode.java
+++ b/src/org/torproject/puppetor/DirectoryNode.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/Event.java b/src/org/torproject/puppetor/Event.java
index 18658b1..6d6ae63 100644
--- a/src/org/torproject/puppetor/Event.java
+++ b/src/org/torproject/puppetor/Event.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/EventListener.java b/src/org/torproject/puppetor/EventListener.java
index 31ee3ef..a80f369 100644
--- a/src/org/torproject/puppetor/EventListener.java
+++ b/src/org/torproject/puppetor/EventListener.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/EventManager.java b/src/org/torproject/puppetor/EventManager.java
index c04bb27..f1569aa 100644
--- a/src/org/torproject/puppetor/EventManager.java
+++ b/src/org/torproject/puppetor/EventManager.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/EventType.java b/src/org/torproject/puppetor/EventType.java
index 9b37709..6c4c6f5 100644
--- a/src/org/torproject/puppetor/EventType.java
+++ b/src/org/torproject/puppetor/EventType.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/HiddenService.java b/src/org/torproject/puppetor/HiddenService.java
index fb820a5..dcf6f66 100644
--- a/src/org/torproject/puppetor/HiddenService.java
+++ b/src/org/torproject/puppetor/HiddenService.java
@@ -1,3 +1,35 @@
+/*
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
+ *
+ * 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.
+ */
package org.torproject.puppetor;
import java.rmi.Remote;
diff --git a/src/org/torproject/puppetor/HiddenServiceEventType.java b/src/org/torproject/puppetor/HiddenServiceEventType.java
index 2661657..65886cb 100644
--- a/src/org/torproject/puppetor/HiddenServiceEventType.java
+++ b/src/org/torproject/puppetor/HiddenServiceEventType.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/Network.java b/src/org/torproject/puppetor/Network.java
index 78d45a9..78dda4a 100644
--- a/src/org/torproject/puppetor/Network.java
+++ b/src/org/torproject/puppetor/Network.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/NetworkFactory.java b/src/org/torproject/puppetor/NetworkFactory.java
index 2b8244b..7277148 100644
--- a/src/org/torproject/puppetor/NetworkFactory.java
+++ b/src/org/torproject/puppetor/NetworkFactory.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/NodeEventType.java b/src/org/torproject/puppetor/NodeEventType.java
index b186457..d810837 100644
--- a/src/org/torproject/puppetor/NodeEventType.java
+++ b/src/org/torproject/puppetor/NodeEventType.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/NodeState.java b/src/org/torproject/puppetor/NodeState.java
index a8ce7fa..85f0988 100644
--- a/src/org/torproject/puppetor/NodeState.java
+++ b/src/org/torproject/puppetor/NodeState.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/ProxyNode.java b/src/org/torproject/puppetor/ProxyNode.java
index a78c297..1883c0d 100644
--- a/src/org/torproject/puppetor/ProxyNode.java
+++ b/src/org/torproject/puppetor/ProxyNode.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/PuppeTorException.java b/src/org/torproject/puppetor/PuppeTorException.java
index 73f08ff..4032d62 100644
--- a/src/org/torproject/puppetor/PuppeTorException.java
+++ b/src/org/torproject/puppetor/PuppeTorException.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/RouterNode.java b/src/org/torproject/puppetor/RouterNode.java
index d876892..26dbd21 100644
--- a/src/org/torproject/puppetor/RouterNode.java
+++ b/src/org/torproject/puppetor/RouterNode.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/ServerApplication.java b/src/org/torproject/puppetor/ServerApplication.java
index 7e77652..f847502 100644
--- a/src/org/torproject/puppetor/ServerApplication.java
+++ b/src/org/torproject/puppetor/ServerApplication.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/ServerEventType.java b/src/org/torproject/puppetor/ServerEventType.java
index fd80155..e0f54d1 100644
--- a/src/org/torproject/puppetor/ServerEventType.java
+++ b/src/org/torproject/puppetor/ServerEventType.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/examples/AccessingPublicWebServerOverTor.java b/src/org/torproject/puppetor/examples/AccessingPublicWebServerOverTor.java
index 2d8317e..eb925bf 100644
--- a/src/org/torproject/puppetor/examples/AccessingPublicWebServerOverTor.java
+++ b/src/org/torproject/puppetor/examples/AccessingPublicWebServerOverTor.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/examples/AdvertisingAndAccessingHiddenServiceOverPrivateTorNetwork.java b/src/org/torproject/puppetor/examples/AdvertisingAndAccessingHiddenServiceOverPrivateTorNetwork.java
index 79c16b0..1574ebf 100644
--- a/src/org/torproject/puppetor/examples/AdvertisingAndAccessingHiddenServiceOverPrivateTorNetwork.java
+++ b/src/org/torproject/puppetor/examples/AdvertisingAndAccessingHiddenServiceOverPrivateTorNetwork.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/examples/AdvertisingAndAccessingHiddenServiceOverPublicTorNetwork.java b/src/org/torproject/puppetor/examples/AdvertisingAndAccessingHiddenServiceOverPublicTorNetwork.java
index a22a42f..dc0cc72 100644
--- a/src/org/torproject/puppetor/examples/AdvertisingAndAccessingHiddenServiceOverPublicTorNetwork.java
+++ b/src/org/torproject/puppetor/examples/AdvertisingAndAccessingHiddenServiceOverPublicTorNetwork.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/examples/AdvertisingHiddenServiceToPublicTorNetwork.java b/src/org/torproject/puppetor/examples/AdvertisingHiddenServiceToPublicTorNetwork.java
index 1343c62..3d22e2e 100644
--- a/src/org/torproject/puppetor/examples/AdvertisingHiddenServiceToPublicTorNetwork.java
+++ b/src/org/torproject/puppetor/examples/AdvertisingHiddenServiceToPublicTorNetwork.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/examples/LongRunningNetwork.java b/src/org/torproject/puppetor/examples/LongRunningNetwork.java
index 5185059..f5ef7f1 100644
--- a/src/org/torproject/puppetor/examples/LongRunningNetwork.java
+++ b/src/org/torproject/puppetor/examples/LongRunningNetwork.java
@@ -1,6 +1,7 @@
/*
- * Copyright (c) 2007, Patrick Geyer, Johannes Jungkunst, Karsten Loesing,
+ * Copyright 2007 Patrick Geyer, Johannes Jungkunst, Karsten Loesing, and
* Stefan Schilling
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/examples/MergingRoutersWithLongRunningNetwork.java b/src/org/torproject/puppetor/examples/MergingRoutersWithLongRunningNetwork.java
index df381d6..a2043b1 100644
--- a/src/org/torproject/puppetor/examples/MergingRoutersWithLongRunningNetwork.java
+++ b/src/org/torproject/puppetor/examples/MergingRoutersWithLongRunningNetwork.java
@@ -1,6 +1,7 @@
/*
- * Copyright (c) 2007, Patrick Geyer, Johannes Jungkunst, Karsten Loesing,
+ * Copyright 2007 Patrick Geyer, Johannes Jungkunst, Karsten Loesing, and
* Stefan Schilling
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/impl/ClientApplicationImpl.java b/src/org/torproject/puppetor/impl/ClientApplicationImpl.java
index ca996f7..8866dcb 100644
--- a/src/org/torproject/puppetor/impl/ClientApplicationImpl.java
+++ b/src/org/torproject/puppetor/impl/ClientApplicationImpl.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/impl/DirectoryNodeImpl.java b/src/org/torproject/puppetor/impl/DirectoryNodeImpl.java
index 53927cb..e7bc3d0 100644
--- a/src/org/torproject/puppetor/impl/DirectoryNodeImpl.java
+++ b/src/org/torproject/puppetor/impl/DirectoryNodeImpl.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/impl/EventImpl.java b/src/org/torproject/puppetor/impl/EventImpl.java
index e4aefa5..cf799a6 100644
--- a/src/org/torproject/puppetor/impl/EventImpl.java
+++ b/src/org/torproject/puppetor/impl/EventImpl.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/impl/EventManagerImpl.java b/src/org/torproject/puppetor/impl/EventManagerImpl.java
index d163ac8..8c23452 100644
--- a/src/org/torproject/puppetor/impl/EventManagerImpl.java
+++ b/src/org/torproject/puppetor/impl/EventManagerImpl.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/impl/HiddenServiceImpl.java b/src/org/torproject/puppetor/impl/HiddenServiceImpl.java
index d8bf7f2..e0bf955 100644
--- a/src/org/torproject/puppetor/impl/HiddenServiceImpl.java
+++ b/src/org/torproject/puppetor/impl/HiddenServiceImpl.java
@@ -1,3 +1,35 @@
+/*
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
+ *
+ * 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.
+ */
package org.torproject.puppetor.impl;
import java.io.BufferedReader;
diff --git a/src/org/torproject/puppetor/impl/NetworkImpl.java b/src/org/torproject/puppetor/impl/NetworkImpl.java
index 4dd3ba9..3502045 100644
--- a/src/org/torproject/puppetor/impl/NetworkImpl.java
+++ b/src/org/torproject/puppetor/impl/NetworkImpl.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/impl/ProxyNodeImpl.java b/src/org/torproject/puppetor/impl/ProxyNodeImpl.java
index c349333..c28f385 100644
--- a/src/org/torproject/puppetor/impl/ProxyNodeImpl.java
+++ b/src/org/torproject/puppetor/impl/ProxyNodeImpl.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/impl/RouterNodeImpl.java b/src/org/torproject/puppetor/impl/RouterNodeImpl.java
index ce12d56..355d5d1 100644
--- a/src/org/torproject/puppetor/impl/RouterNodeImpl.java
+++ b/src/org/torproject/puppetor/impl/RouterNodeImpl.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
diff --git a/src/org/torproject/puppetor/impl/ServerApplicationImpl.java b/src/org/torproject/puppetor/impl/ServerApplicationImpl.java
index 361dfae..e41d8d8 100644
--- a/src/org/torproject/puppetor/impl/ServerApplicationImpl.java
+++ b/src/org/torproject/puppetor/impl/ServerApplicationImpl.java
@@ -1,5 +1,6 @@
/*
- * Copyright (c) 2007, Karsten Loesing
+ * Copyright 2007 Karsten Loesing
+ * Copyright 2008-2009 Karsten Loesing and Sebastian Hahn
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
--
1.5.6.5
More information about the tor-commits
mailing list