[dss-commits] digitalSTROM Server branch, master, updated. 9b55dbe9a9987ef71ebf4e399de56130a3ea9623
git version control
dss-commits at forum.digitalstrom.org
Mon Jan 4 16:15:53 CET 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "digitalSTROM Server".
The branch, master has been updated
via 9b55dbe9a9987ef71ebf4e399de56130a3ea9623 (commit)
from 8d365b1238d9791e7068104ab57a84246bf6227d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9b55dbe9a9987ef71ebf4e399de56130a3ea9623
Author: Patrick Stählin <pstaehlin at futurelab.ch>
Date: Mon Jan 4 16:13:11 2010 +0100
Corrected copyright/authorship in all sources
-----------------------------------------------------------------------
Changes:
diff --git a/core/DS485Interface.h b/core/DS485Interface.h
index c200c39..5950be5 100644
--- a/core/DS485Interface.h
+++ b/core/DS485Interface.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/base.cpp b/core/base.cpp
index 4f926e4..dcbfcf7 100644
--- a/core/base.cpp
+++ b/core/base.cpp
@@ -1,7 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
- Copyright (c) 2008 Patrick Staehlin <me at packi.ch>
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/base.h b/core/base.h
index f833c86..2b76816 100644
--- a/core/base.h
+++ b/core/base.h
@@ -1,7 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
- Copyright (c) 2008 Patrick Staehlin <me at packi.ch>
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/bonjour.cpp b/core/bonjour.cpp
index 8b976d5..37fb973 100644
--- a/core/bonjour.cpp
+++ b/core/bonjour.cpp
@@ -1,8 +1,9 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
Copyright (c) 2008 Patrick Staehlin <me at packi.ch>
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
+
This file is part of digitalSTROM Server.
digitalSTROM Server is free software: you can redistribute it and/or modify
diff --git a/core/bonjour.h b/core/bonjour.h
index f192554..cfabb50 100644
--- a/core/bonjour.h
+++ b/core/bonjour.h
@@ -1,8 +1,9 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
Copyright (c) 2008 Patrick Staehlin <me at packi.ch>
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
+
This file is part of digitalSTROM Server.
digitalSTROM Server is free software: you can redistribute it and/or modify
diff --git a/core/busrequestdispatcher.cpp b/core/busrequestdispatcher.cpp
index 81fbc42..a984fb8 100644
--- a/core/busrequestdispatcher.cpp
+++ b/core/busrequestdispatcher.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/busrequestdispatcher.h b/core/busrequestdispatcher.h
index f410722..dcbba22 100644
--- a/core/busrequestdispatcher.h
+++ b/core/busrequestdispatcher.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/datetools.cpp b/core/datetools.cpp
index ea3a054..690bf73 100644
--- a/core/datetools.cpp
+++ b/core/datetools.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/datetools.h b/core/datetools.h
index ecdc9f2..a773843 100644
--- a/core/datetools.h
+++ b/core/datetools.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/ds485/ds485.cpp b/core/ds485/ds485.cpp
index 990e46c..bd0c212 100644
--- a/core/ds485/ds485.cpp
+++ b/core/ds485/ds485.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/ds485/ds485.h b/core/ds485/ds485.h
index 9dca45d..0f539b2 100644
--- a/core/ds485/ds485.h
+++ b/core/ds485/ds485.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/ds485/ds485busrequestdispatcher.cpp b/core/ds485/ds485busrequestdispatcher.cpp
index 63a9ca6..c3b05fb 100644
--- a/core/ds485/ds485busrequestdispatcher.cpp
+++ b/core/ds485/ds485busrequestdispatcher.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/ds485/ds485busrequestdispatcher.h b/core/ds485/ds485busrequestdispatcher.h
index d9045bd..0fcd132 100644
--- a/core/ds485/ds485busrequestdispatcher.h
+++ b/core/ds485/ds485busrequestdispatcher.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/ds485/ds485proxy.cpp b/core/ds485/ds485proxy.cpp
index b5b2677..890b2b9 100644
--- a/core/ds485/ds485proxy.cpp
+++ b/core/ds485/ds485proxy.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/ds485/ds485proxy.h b/core/ds485/ds485proxy.h
index 811db19..8002f82 100644
--- a/core/ds485/ds485proxy.h
+++ b/core/ds485/ds485proxy.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/ds485client.cpp b/core/ds485client.cpp
index 89f2390..44ca06f 100644
--- a/core/ds485client.cpp
+++ b/core/ds485client.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/ds485client.h b/core/ds485client.h
index 233c48f..3b3aa92 100644
--- a/core/ds485client.h
+++ b/core/ds485client.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/ds485const.h b/core/ds485const.h
index 5a1fab4..40e111d 100644
--- a/core/ds485const.h
+++ b/core/ds485const.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/ds485types.cpp b/core/ds485types.cpp
index ebfebb9..12b4bbf 100644
--- a/core/ds485types.cpp
+++ b/core/ds485types.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/ds485types.h b/core/ds485types.h
index a72dabd..8fa1ca8 100644
--- a/core/ds485types.h
+++ b/core/ds485types.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/dss.cpp b/core/dss.cpp
index 67fb9f6..2068678 100644
--- a/core/dss.cpp
+++ b/core/dss.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/dss.h b/core/dss.h
index 00fc97c..a7ce7db 100644
--- a/core/dss.h
+++ b/core/dss.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/event.cpp b/core/event.cpp
index e34af80..b79bcdb 100644
--- a/core/event.cpp
+++ b/core/event.cpp
@@ -1,7 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
- Copyright (c) 2008 Patrick Staehlin <me at packi.ch>
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/event.h b/core/event.h
index 2d938a1..abbc0fd 100644
--- a/core/event.h
+++ b/core/event.h
@@ -1,7 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
- Copyright (c) 2008 Patrick Staehlin <me at packi.ch>
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/eventinterpreterplugins.cpp b/core/eventinterpreterplugins.cpp
index 84bb1a9..462003f 100644
--- a/core/eventinterpreterplugins.cpp
+++ b/core/eventinterpreterplugins.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/eventinterpreterplugins.h b/core/eventinterpreterplugins.h
index 722160c..752a171 100644
--- a/core/eventinterpreterplugins.h
+++ b/core/eventinterpreterplugins.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/foreach.h b/core/foreach.h
index 9146c73..4dee778 100644
--- a/core/foreach.h
+++ b/core/foreach.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/jshandler.cpp b/core/jshandler.cpp
index f2e0e07..1da56e1 100644
--- a/core/jshandler.cpp
+++ b/core/jshandler.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/jshandler.h b/core/jshandler.h
index c89f710..a7ad4c4 100644
--- a/core/jshandler.h
+++ b/core/jshandler.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/logger.cpp b/core/logger.cpp
index 3b2ebaa..7ea2520 100644
--- a/core/logger.cpp
+++ b/core/logger.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/logger.h b/core/logger.h
index a490842..c610b12 100644
--- a/core/logger.h
+++ b/core/logger.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/metering/fake_meter.cpp b/core/metering/fake_meter.cpp
index 63dc148..2959bb1 100644
--- a/core/metering/fake_meter.cpp
+++ b/core/metering/fake_meter.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/metering/fake_meter.h b/core/metering/fake_meter.h
index 4a514c7..ddefe3e 100644
--- a/core/metering/fake_meter.h
+++ b/core/metering/fake_meter.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/metering/metering.cpp b/core/metering/metering.cpp
index 7521023..0c30895 100644
--- a/core/metering/metering.cpp
+++ b/core/metering/metering.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/metering/metering.h b/core/metering/metering.h
index a5974e7..940d4af 100644
--- a/core/metering/metering.h
+++ b/core/metering/metering.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/metering/series.cpp b/core/metering/series.cpp
index 66cb70c..cce8a2d 100644
--- a/core/metering/series.cpp
+++ b/core/metering/series.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/metering/series.h b/core/metering/series.h
index 41dbe6e..14eb36f 100644
--- a/core/metering/series.h
+++ b/core/metering/series.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/metering/seriespersistence.cpp b/core/metering/seriespersistence.cpp
index 1728de2..940d444 100644
--- a/core/metering/seriespersistence.cpp
+++ b/core/metering/seriespersistence.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/metering/seriespersistence.h b/core/metering/seriespersistence.h
index ec56603..3bbcc8d 100644
--- a/core/metering/seriespersistence.h
+++ b/core/metering/seriespersistence.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/addressablemodelitem.cpp b/core/model/addressablemodelitem.cpp
index aa949fb..2704679 100644
--- a/core/model/addressablemodelitem.cpp
+++ b/core/model/addressablemodelitem.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/addressablemodelitem.h b/core/model/addressablemodelitem.h
index 6cefc5c..ac878b7 100644
--- a/core/model/addressablemodelitem.h
+++ b/core/model/addressablemodelitem.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/apartment.cpp b/core/model/apartment.cpp
index 66fdd2d..82d536c 100644
--- a/core/model/apartment.cpp
+++ b/core/model/apartment.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/apartment.h b/core/model/apartment.h
index 08f9650..60b41fd 100644
--- a/core/model/apartment.h
+++ b/core/model/apartment.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/busrequest.cpp b/core/model/busrequest.cpp
index 8061c4d..1fe9053 100644
--- a/core/model/busrequest.cpp
+++ b/core/model/busrequest.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/busrequest.h b/core/model/busrequest.h
index bcb4121..399ec75 100644
--- a/core/model/busrequest.h
+++ b/core/model/busrequest.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/busscanner.cpp b/core/model/busscanner.cpp
index 2da9703..6f01991 100644
--- a/core/model/busscanner.cpp
+++ b/core/model/busscanner.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/busscanner.h b/core/model/busscanner.h
index cff9fa9..bcc54eb 100644
--- a/core/model/busscanner.h
+++ b/core/model/busscanner.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/device.cpp b/core/model/device.cpp
index 3813e74..2167fc0 100644
--- a/core/model/device.cpp
+++ b/core/model/device.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/device.h b/core/model/device.h
index e08393a..1b7441f 100644
--- a/core/model/device.h
+++ b/core/model/device.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/devicecontainer.cpp b/core/model/devicecontainer.cpp
index 0658f0f..aa2049a 100644
--- a/core/model/devicecontainer.cpp
+++ b/core/model/devicecontainer.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/devicecontainer.h b/core/model/devicecontainer.h
index 85f3e64..96cf46a 100644
--- a/core/model/devicecontainer.h
+++ b/core/model/devicecontainer.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/deviceinterface.cpp b/core/model/deviceinterface.cpp
index 6b8e096..072f546 100644
--- a/core/model/deviceinterface.cpp
+++ b/core/model/deviceinterface.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/deviceinterface.h b/core/model/deviceinterface.h
index ac5c103..57ed1c9 100644
--- a/core/model/deviceinterface.h
+++ b/core/model/deviceinterface.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/devicereference.cpp b/core/model/devicereference.cpp
index 0262058..22ac410 100644
--- a/core/model/devicereference.cpp
+++ b/core/model/devicereference.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/devicereference.h b/core/model/devicereference.h
index 7162c83..1970cca 100644
--- a/core/model/devicereference.h
+++ b/core/model/devicereference.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/group.cpp b/core/model/group.cpp
index 3394011..ee2cf25 100644
--- a/core/model/group.cpp
+++ b/core/model/group.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/group.h b/core/model/group.h
index c50d172..8fa13f6 100644
--- a/core/model/group.h
+++ b/core/model/group.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/modelevent.cpp b/core/model/modelevent.cpp
index dd345ed..a2157fc 100644
--- a/core/model/modelevent.cpp
+++ b/core/model/modelevent.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/modelevent.h b/core/model/modelevent.h
index 744a93f..dbe4e26 100644
--- a/core/model/modelevent.h
+++ b/core/model/modelevent.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/modeltypes.h b/core/model/modeltypes.h
index 01bb79d..295b331 100644
--- a/core/model/modeltypes.h
+++ b/core/model/modeltypes.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/modulator.cpp b/core/model/modulator.cpp
index 64a0324..3a5d7f7 100644
--- a/core/model/modulator.cpp
+++ b/core/model/modulator.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/modulator.h b/core/model/modulator.h
index dd98e08..c861135 100644
--- a/core/model/modulator.h
+++ b/core/model/modulator.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/nonaddressablemodelitem.cpp b/core/model/nonaddressablemodelitem.cpp
index 4a25b4d..1d8dae6 100644
--- a/core/model/nonaddressablemodelitem.cpp
+++ b/core/model/nonaddressablemodelitem.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/nonaddressablemodelitem.h b/core/model/nonaddressablemodelitem.h
index 0c1a917..852ba8a 100644
--- a/core/model/nonaddressablemodelitem.h
+++ b/core/model/nonaddressablemodelitem.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/physicalmodelitem.cpp b/core/model/physicalmodelitem.cpp
index d89aa8f..0cc8f93 100644
--- a/core/model/physicalmodelitem.cpp
+++ b/core/model/physicalmodelitem.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/physicalmodelitem.h b/core/model/physicalmodelitem.h
index 8d6171a..247ceea 100644
--- a/core/model/physicalmodelitem.h
+++ b/core/model/physicalmodelitem.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/scenehelper.cpp b/core/model/scenehelper.cpp
index 6128e33..7e8e18c 100644
--- a/core/model/scenehelper.cpp
+++ b/core/model/scenehelper.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/scenehelper.h b/core/model/scenehelper.h
index 54203ed..9dbdf45 100644
--- a/core/model/scenehelper.h
+++ b/core/model/scenehelper.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/set.cpp b/core/model/set.cpp
index 1a2acb5..5aa6366 100644
--- a/core/model/set.cpp
+++ b/core/model/set.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/set.h b/core/model/set.h
index b409117..f58c9b8 100644
--- a/core/model/set.h
+++ b/core/model/set.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/zone.cpp b/core/model/zone.cpp
index 0c948eb..39df0c7 100644
--- a/core/model/zone.cpp
+++ b/core/model/zone.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/model/zone.h b/core/model/zone.h
index 916f131..2defd2b 100644
--- a/core/model/zone.h
+++ b/core/model/zone.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/mutex.cpp b/core/mutex.cpp
index f4a4c0c..cb5b58b 100644
--- a/core/mutex.cpp
+++ b/core/mutex.cpp
@@ -1,7 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
- Copyright (c) 2008 Patrick Staehlin <me at packi.ch>
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/mutex.h b/core/mutex.h
index 2f0561f..9933dac 100644
--- a/core/mutex.h
+++ b/core/mutex.h
@@ -1,7 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
- Copyright (c) 2008 Patrick Staehlin <me at packi.ch>
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/propertysystem.cpp b/core/propertysystem.cpp
index c3c5d0b..c3f9064 100644
--- a/core/propertysystem.cpp
+++ b/core/propertysystem.cpp
@@ -1,8 +1,9 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
Copyright (c) 2008 Patrick Staehlin <me at packi.ch>
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
+
This file is part of digitalSTROM Server.
digitalSTROM Server is free software: you can redistribute it and/or modify
diff --git a/core/propertysystem.h b/core/propertysystem.h
index 96ae759..575c89e 100644
--- a/core/propertysystem.h
+++ b/core/propertysystem.h
@@ -1,8 +1,9 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
Copyright (c) 2008 Patrick Staehlin <me at packi.ch>
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
+
This file is part of digitalSTROM Server.
digitalSTROM Server is free software: you can redistribute it and/or modify
diff --git a/core/scripting/modeljs.cpp b/core/scripting/modeljs.cpp
index 24b8c12..4349052 100644
--- a/core/scripting/modeljs.cpp
+++ b/core/scripting/modeljs.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/scripting/modeljs.h b/core/scripting/modeljs.h
index 18e53da..5d4ac3b 100644
--- a/core/scripting/modeljs.h
+++ b/core/scripting/modeljs.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/session.cpp b/core/session.cpp
index a160840..f06fb6c 100644
--- a/core/session.cpp
+++ b/core/session.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/session.h b/core/session.h
index f4498f2..17a8139 100644
--- a/core/session.h
+++ b/core/session.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/setbuilder.cpp b/core/setbuilder.cpp
index 3051dd1..7f1e228 100644
--- a/core/setbuilder.cpp
+++ b/core/setbuilder.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/setbuilder.h b/core/setbuilder.h
index 4b44388..6862995 100644
--- a/core/setbuilder.h
+++ b/core/setbuilder.h
@@ -1,7 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
- Copyright (c) 2008 Patrick Staehlin <me at packi.ch>
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/sim/dsid_js.cpp b/core/sim/dsid_js.cpp
index ce71916..75b81d0 100644
--- a/core/sim/dsid_js.cpp
+++ b/core/sim/dsid_js.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/sim/dsid_js.h b/core/sim/dsid_js.h
index a75a267..483f75f 100644
--- a/core/sim/dsid_js.h
+++ b/core/sim/dsid_js.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/sim/dsid_plugin.cpp b/core/sim/dsid_plugin.cpp
index b52d47e..4b35771 100644
--- a/core/sim/dsid_plugin.cpp
+++ b/core/sim/dsid_plugin.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/sim/dsid_plugin.h b/core/sim/dsid_plugin.h
index 1e27738..bbca27d 100644
--- a/core/sim/dsid_plugin.h
+++ b/core/sim/dsid_plugin.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/sim/dsidsim.cpp b/core/sim/dsidsim.cpp
index 6b7f36b..63f05c4 100644
--- a/core/sim/dsidsim.cpp
+++ b/core/sim/dsidsim.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/sim/dsidsim.h b/core/sim/dsidsim.h
index f971ee8..b95a8a1 100644
--- a/core/sim/dsidsim.h
+++ b/core/sim/dsidsim.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/sim/dssim.cpp b/core/sim/dssim.cpp
index 4d814f2..f8ba649 100644
--- a/core/sim/dssim.cpp
+++ b/core/sim/dssim.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/sim/dssim.h b/core/sim/dssim.h
index 0345e21..bbd0758 100644
--- a/core/sim/dssim.h
+++ b/core/sim/dssim.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/sim/include/dsid_plugin.h b/core/sim/include/dsid_plugin.h
index 122075e..5ba355e 100644
--- a/core/sim/include/dsid_plugin.h
+++ b/core/sim/include/dsid_plugin.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/sim/plugin/pluginbase.cpp b/core/sim/plugin/pluginbase.cpp
index 60721b1..1bb6f7c 100644
--- a/core/sim/plugin/pluginbase.cpp
+++ b/core/sim/plugin/pluginbase.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/sim/plugin/pluginbase.h b/core/sim/plugin/pluginbase.h
index b1540dc..896b45d 100644
--- a/core/sim/plugin/pluginbase.h
+++ b/core/sim/plugin/pluginbase.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/sim/plugin/pluginmedia.cpp b/core/sim/plugin/pluginmedia.cpp
index f7f20c5..b901a83 100644
--- a/core/sim/plugin/pluginmedia.cpp
+++ b/core/sim/plugin/pluginmedia.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/sim/plugin/pluginmedia.h b/core/sim/plugin/pluginmedia.h
index 53e11c6..fb3fad6 100644
--- a/core/sim/plugin/pluginmedia.h
+++ b/core/sim/plugin/pluginmedia.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/structuremanipulator.cpp b/core/structuremanipulator.cpp
index 567bcab..6386f72 100644
--- a/core/structuremanipulator.cpp
+++ b/core/structuremanipulator.cpp
@@ -1,9 +1,24 @@
/*
- * structuremanipulator.cpp
- *
- * Created on: Aug 26, 2009
- * Author: patrick
- */
+ Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
+
+ This file is part of digitalSTROM Server.
+
+ digitalSTROM Server 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.
+
+ digitalSTROM Server 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 digitalSTROM Server. If not, see <http://www.gnu.org/licenses/>.
+
+*/
#include "structuremanipulator.h"
diff --git a/core/structuremanipulator.h b/core/structuremanipulator.h
index ee3566a..8ee4a2c 100644
--- a/core/structuremanipulator.h
+++ b/core/structuremanipulator.h
@@ -1,9 +1,24 @@
/*
- * structuremodifier.h
- *
- * Created on: Aug 26, 2009
- * Author: patrick
- */
+ Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
+
+ This file is part of digitalSTROM Server.
+
+ digitalSTROM Server 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.
+
+ digitalSTROM Server 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 digitalSTROM Server. If not, see <http://www.gnu.org/licenses/>.
+
+*/
#ifndef STRUCTUREMANIPULATOR_H_
#define STRUCTUREMANIPULATOR_H_
diff --git a/core/subsystem.cpp b/core/subsystem.cpp
index 85f59de..ab1ad1e 100644
--- a/core/subsystem.cpp
+++ b/core/subsystem.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/subsystem.h b/core/subsystem.h
index 9103ed3..5d8bb0c 100644
--- a/core/subsystem.h
+++ b/core/subsystem.h
@@ -1,7 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
- Copyright (c) 2008 Patrick Staehlin <me at packi.ch>
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/syncevent.cpp b/core/syncevent.cpp
index 856a176..b1fe81c 100644
--- a/core/syncevent.cpp
+++ b/core/syncevent.cpp
@@ -1,8 +1,9 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
Copyright (c) 2008 Patrick Staehlin <me at packi.ch>
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
+
This file is part of digitalSTROM Server.
digitalSTROM Server is free software: you can redistribute it and/or modify
diff --git a/core/syncevent.h b/core/syncevent.h
index c8ed267..da28861 100644
--- a/core/syncevent.h
+++ b/core/syncevent.h
@@ -1,8 +1,9 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
Copyright (c) 2008 Patrick Staehlin <me at packi.ch>
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
+
This file is part of digitalSTROM Server.
digitalSTROM Server is free software: you can redistribute it and/or modify
diff --git a/core/thread.h b/core/thread.h
index 56b53a5..2a5b187 100644
--- a/core/thread.h
+++ b/core/thread.h
@@ -1,7 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
- Copyright (c) 2006,2008 Patrick Stählin <me at packi.ch>
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/web/plugin/webserver_plugin.h b/core/web/plugin/webserver_plugin.h
index ea436c1..0a2de43 100644
--- a/core/web/plugin/webserver_plugin.h
+++ b/core/web/plugin/webserver_plugin.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/web/restful.cpp b/core/web/restful.cpp
index eb0b2e0..7449ce8 100644
--- a/core/web/restful.cpp
+++ b/core/web/restful.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/web/restful.h b/core/web/restful.h
index a668bdd..b98dcfe 100644
--- a/core/web/restful.h
+++ b/core/web/restful.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
@@ -17,8 +18,6 @@
You should have received a copy of the GNU General Public License
along with digitalSTROM Server. If not, see <http://www.gnu.org/licenses/>.
- Last change $Date: 2009-06-30 13:56:46 +0200 (Tue, 30 Jun 2009) $
- by $Author: pstaehlin $
*/
#ifndef RESTFUL_H_INCLUDED
diff --git a/core/web/restfulapiwriter.cpp b/core/web/restfulapiwriter.cpp
index 5dedaa3..226f727 100644
--- a/core/web/restfulapiwriter.cpp
+++ b/core/web/restfulapiwriter.cpp
@@ -1,9 +1,25 @@
/*
- * restfulapiwriter.cpp
- *
- * Created on: Jul 6, 2009
- * Author: patrick
- */
+ Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
+
+ This file is part of digitalSTROM Server.
+
+ digitalSTROM Server 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.
+
+ digitalSTROM Server 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 digitalSTROM Server. If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
#include "restfulapiwriter.h"
#include "core/foreach.h"
diff --git a/core/web/restfulapiwriter.h b/core/web/restfulapiwriter.h
index 2bdf233..87f6605 100644
--- a/core/web/restfulapiwriter.h
+++ b/core/web/restfulapiwriter.h
@@ -1,9 +1,24 @@
/*
- * restfulapiwriter.h
- *
- * Created on: Jul 6, 2009
- * Author: patrick
- */
+ Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
+
+ This file is part of digitalSTROM Server.
+
+ digitalSTROM Server 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.
+
+ digitalSTROM Server 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 digitalSTROM Server. If not, see <http://www.gnu.org/licenses/>.
+
+*/
#ifndef RESTFULAPIWRITER_H_
#define RESTFULAPIWRITER_H_
diff --git a/core/web/webrequests.cpp b/core/web/webrequests.cpp
index 35103b9..e835cfc 100644
--- a/core/web/webrequests.cpp
+++ b/core/web/webrequests.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/web/webrequests.h b/core/web/webrequests.h
index ceb1789..9692a7a 100644
--- a/core/web/webrequests.h
+++ b/core/web/webrequests.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/web/webserver.cpp b/core/web/webserver.cpp
index 49ffde7..b1d19f1 100644
--- a/core/web/webserver.cpp
+++ b/core/web/webserver.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/web/webserver.h b/core/web/webserver.h
index 8f03cc3..f506bf3 100644
--- a/core/web/webserver.h
+++ b/core/web/webserver.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/web/webserverapi.cpp b/core/web/webserverapi.cpp
index 3777640..af7cc0d 100644
--- a/core/web/webserverapi.cpp
+++ b/core/web/webserverapi.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/web/webserverapi.h b/core/web/webserverapi.h
index dadd857..ed2e21e 100644
--- a/core/web/webserverapi.h
+++ b/core/web/webserverapi.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/web/webserverplugin.cpp b/core/web/webserverplugin.cpp
index b8de81f..f3e8b9b 100644
--- a/core/web/webserverplugin.cpp
+++ b/core/web/webserverplugin.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/core/web/webserverplugin.h b/core/web/webserverplugin.h
index 67304eb..bd26d6e 100644
--- a/core/web/webserverplugin.h
+++ b/core/web/webserverplugin.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/debian/copyright b/debian/copyright
index 43a429a..4adb1c6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,11 +10,11 @@ Upstream Author(s):
Copyright:
- Copyright (C) 2008, 2009 by digitalSTROM.org
+ Copyright (C) 2008 - 2010 by digitalSTROM.org
License:
- GPLv2
+ GPLv3
The Debian packaging is copyright 2009, Johannes Winkelmann <johannes.winkelmann at aizo.com> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
diff --git a/examples/asterisk_event_generator.py b/examples/asterisk_event_generator.py
index ba3c038..1d8dff7 100755
--- a/examples/asterisk_event_generator.py
+++ b/examples/asterisk_event_generator.py
@@ -2,7 +2,8 @@
#
# Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
-# Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+#
+# Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
#
# This file is part of digitalSTROM Server.
#
diff --git a/examples/ds485_connection_check.py b/examples/ds485_connection_check.py
index 27efa04..d3d9654 100755
--- a/examples/ds485_connection_check.py
+++ b/examples/ds485_connection_check.py
@@ -2,7 +2,8 @@
#
# Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
-# Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+#
+# Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
#
# This file is part of digitalSTROM Server.
#
diff --git a/examples/fritzbox_event_generator.py b/examples/fritzbox_event_generator.py
index bcea3ce..0f80efd 100755
--- a/examples/fritzbox_event_generator.py
+++ b/examples/fritzbox_event_generator.py
@@ -2,7 +2,8 @@
#
# Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
-# Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+#
+# Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
#
# This file is part of digitalSTROM Server.
#
diff --git a/examples/mail_checker.py b/examples/mail_checker.py
index 6a2f49d..d483a12 100755
--- a/examples/mail_checker.py
+++ b/examples/mail_checker.py
@@ -2,7 +2,8 @@
#
# Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
-# Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+#
+# Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
#
# This file is part of digitalSTROM Server.
#
diff --git a/examples/speedport-email.py b/examples/speedport-email.py
index 85961f4..5ce29d2 100644
--- a/examples/speedport-email.py
+++ b/examples/speedport-email.py
@@ -2,7 +2,8 @@
#
# Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
-# Copyright (c) 2009 aizo ag, Schlieren, Switzerland
+#
+# Author: Roman Koehler, aizo ag
#
# This file is part of digitalSTROM Server
#
diff --git a/examples/twitter_bell.py b/examples/twitter_bell.py
index f8c5f93..46f73b0 100755
--- a/examples/twitter_bell.py
+++ b/examples/twitter_bell.py
@@ -2,7 +2,8 @@
#
# Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
-# Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+#
+# Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
#
# This file is part of digitalSTROM Server.
#
diff --git a/examples/twitter_phone.py b/examples/twitter_phone.py
index 16e61f9..bc48118 100755
--- a/examples/twitter_phone.py
+++ b/examples/twitter_phone.py
@@ -2,7 +2,8 @@
#
# Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
-# Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+#
+# Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
#
# This file is part of digitalSTROM Server.
#
diff --git a/main.cpp b/main.cpp
index e97fc5b..ea987b5 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/namespaces.cpp b/namespaces.cpp
index fec80f5..047296c 100644
--- a/namespaces.cpp
+++ b/namespaces.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
@@ -17,8 +18,6 @@
You should have received a copy of the GNU General Public License
along with digitalSTROM Server. If not, see <http://www.gnu.org/licenses/>.
- Last change $Date: 2009-06-19 15:50:57 +0200 (Fri, 19 Jun 2009) $
- by $Author: pstaehlin $
*/
diff --git a/tests/basetests.cpp b/tests/basetests.cpp
index 10cff28..3fb7a86 100644
--- a/tests/basetests.cpp
+++ b/tests/basetests.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/tests/busrequesttests.cpp b/tests/busrequesttests.cpp
index 81eae02..7f65032 100644
--- a/tests/busrequesttests.cpp
+++ b/tests/busrequesttests.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/tests/datetoolstests.cpp b/tests/datetoolstests.cpp
index 4b7865d..15da7cb 100644
--- a/tests/datetoolstests.cpp
+++ b/tests/datetoolstests.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/tests/ds485tests.cpp b/tests/ds485tests.cpp
index f0182f0..3b3a67e 100644
--- a/tests/ds485tests.cpp
+++ b/tests/ds485tests.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/tests/eventtests.cpp b/tests/eventtests.cpp
index f1ff4a7..e054ec4 100644
--- a/tests/eventtests.cpp
+++ b/tests/eventtests.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/tests/jshandlertests.cpp b/tests/jshandlertests.cpp
index 84db43a..e36e9ae 100644
--- a/tests/jshandlertests.cpp
+++ b/tests/jshandlertests.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/tests/modeljstests.cpp b/tests/modeljstests.cpp
index 5c197ee..5db4d3c 100644
--- a/tests/modeljstests.cpp
+++ b/tests/modeljstests.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/tests/modeltests.cpp b/tests/modeltests.cpp
index d79dcc1..82674fc 100644
--- a/tests/modeltests.cpp
+++ b/tests/modeltests.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/tests/propertysystemtests.cpp b/tests/propertysystemtests.cpp
index f1fd6f6..d632ae8 100644
--- a/tests/propertysystemtests.cpp
+++ b/tests/propertysystemtests.cpp
@@ -1,8 +1,9 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
Copyright (c) 2008 Patrick Staehlin <me at packi.ch>
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
+
This file is part of digitalSTROM Server.
digitalSTROM Server is free software: you can redistribute it and/or modify
diff --git a/tests/restfulapitests.cpp b/tests/restfulapitests.cpp
index fa1cdb2..d28f312 100644
--- a/tests/restfulapitests.cpp
+++ b/tests/restfulapitests.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2010 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2010 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/tests/scriptstest.cpp b/tests/scriptstest.cpp
index 148a24f..48ae8f7 100644
--- a/tests/scriptstest.cpp
+++ b/tests/scriptstest.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/tests/seriestests.cpp b/tests/seriestests.cpp
index ca43596..1682058 100644
--- a/tests/seriestests.cpp
+++ b/tests/seriestests.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/tests/tests.cpp b/tests/tests.cpp
index 7e30dd8..51089da 100644
--- a/tests/tests.cpp
+++ b/tests/tests.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/tests/tests.h b/tests/tests.h
index 9a24238..46363c1 100644
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/tools/stresstest.py b/tools/stresstest.py
index 2edb93b..622e20d 100755
--- a/tools/stresstest.py
+++ b/tools/stresstest.py
@@ -2,7 +2,8 @@
#
# Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
-# Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+#
+# Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
#
# This file is part of digitalSTROM Server.
#
diff --git a/unix/serialcom.cpp b/unix/serialcom.cpp
index 4774fd7..3af3ddf 100644
--- a/unix/serialcom.cpp
+++ b/unix/serialcom.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/unix/serialcom.h b/unix/serialcom.h
index 522bf8d..74879bc 100644
--- a/unix/serialcom.h
+++ b/unix/serialcom.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/unix/systeminfo.cpp b/unix/systeminfo.cpp
index 410d76a..75e1b54 100644
--- a/unix/systeminfo.cpp
+++ b/unix/systeminfo.cpp
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/unix/systeminfo.h b/unix/systeminfo.h
index 66c5e81..af682ea 100644
--- a/unix/systeminfo.h
+++ b/unix/systeminfo.h
@@ -1,6 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/unix/thread.cpp b/unix/thread.cpp
index 876268b..21ea242 100644
--- a/unix/thread.cpp
+++ b/unix/thread.cpp
@@ -1,7 +1,7 @@
/*
Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
- Copyright (c) 2009 futureLAB AG, Winterthur, Switzerland
- Copyright (c) 2008,2006 Patrick Stählin <me at packi.ch>
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
This file is part of digitalSTROM Server.
diff --git a/webservices/model_soap.cpp b/webservices/model_soap.cpp
index 38a8656..30d1289 100644
--- a/webservices/model_soap.cpp
+++ b/webservices/model_soap.cpp
@@ -1,3 +1,25 @@
+/*
+ Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
+
+ This file is part of digitalSTROM Server.
+
+ digitalSTROM Server 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.
+
+ digitalSTROM Server 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 digitalSTROM Server. If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
#include <vector>
#include <string>
#include <boost/shared_ptr.hpp>
diff --git a/webservices/model_soap.h b/webservices/model_soap.h
index 20dbaba..b36e40a 100644
--- a/webservices/model_soap.h
+++ b/webservices/model_soap.h
@@ -1,3 +1,25 @@
+/*
+ Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
+
+ This file is part of digitalSTROM Server.
+
+ digitalSTROM Server 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.
+
+ digitalSTROM Server 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 digitalSTROM Server. If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
//gsoap dss service name: dss
//gsoap dss service namespace: http://localhost:8080/dss.wsdl
//gsoap dss service port: http://localhost:8081
diff --git a/webservices/webservices.cpp b/webservices/webservices.cpp
index bbded58..b1afa44 100644
--- a/webservices/webservices.cpp
+++ b/webservices/webservices.cpp
@@ -1,3 +1,25 @@
+/*
+ Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
+
+ This file is part of digitalSTROM Server.
+
+ digitalSTROM Server 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.
+
+ digitalSTROM Server 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 digitalSTROM Server. If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
#include "webservices.h"
#include <cassert>
diff --git a/webservices/webservices.h b/webservices/webservices.h
index 46f8ccd..e1d2dfd 100644
--- a/webservices/webservices.h
+++ b/webservices/webservices.h
@@ -1,3 +1,25 @@
+/*
+ Copyright (c) 2009 digitalSTROM.org, Zurich, Switzerland
+
+ Author: Patrick Staehlin, futureLAB AG <pstaehlin at futurelab.ch>
+
+ This file is part of digitalSTROM Server.
+
+ digitalSTROM Server 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.
+
+ digitalSTROM Server 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 digitalSTROM Server. If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
#ifndef WEBSERVICES_H_
#define WEBSERVICES_H_
hooks/post-receive
--
digitalSTROM Server
More information about the dss-commits
mailing list