start licensing devel
authorSandro Knauß <knauss@netzguerilla.net>
Fri, 10 Aug 2012 14:42:26 +0200
branchdevel
changeset 291 84eb5a7a715a
parent 290 21601a54c44c
child 292 f4212d230f54
start licensing
LICENSE.txt
MANIFEST.in
README
README.txt
iro/offer/smstrade.py
iro/offer/smtp.py
iro/telnumber.py
iro/view/xmlrpc.py
iro/view/xmlrpc_old.py
setup.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/LICENSE.txt	Fri Aug 10 14:42:26 2012 +0200
@@ -0,0 +1,7 @@
+Copyright (c) 2012 netzguerilla.net <iro@netzguerilla.net>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/MANIFEST.in	Fri Aug 10 13:58:28 2012 +0200
+++ b/MANIFEST.in	Fri Aug 10 14:42:26 2012 +0200
@@ -1,5 +1,1 @@
-include README
-include MANIFEST.in
-include iro.conf.inst
-recursive-include extras *
-recursive-include bin *
+include *.txt
--- a/README	Fri Aug 10 13:58:28 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-Iro is a non blocking server for sending a message to a bunsh of recipients. It can handle different types of message and can be extended easially.
-It was initially written for sms backend of http://castorticker.de. There are different backends are supported by Iro. 
-Iro helps you for these kinds of tasks: You want to send a message to some recipient over a different backend, than for other recipients.
-Or you want to define fallback strategies: If one messages can't be send over this backend use another.
-Because Iro also knows users, you can create bills for different clients.
-
-Installation of Iro
-===================
-
-Install the module via ``setup.py install`` und ran ``iro-install``. That will create a sample configuration file named ``iro.conf``.
-Update the configuration file and run ``iro-install install``  afterwards. That will create the Database and Offers for you.
-After that you have to `adding_user`. Now you are ready to start Iro ``twisted iro``.
-
-
-.. _adding_user:
-
-Add User and Userrights
------------------------
-
-You'll need user and right to spefific Offers, that a user can send with a specific Offer. Till now, it is the only way to add/modify user/userrights. 
-
- 
-You can add users and userright via SQL::
-
-  INSERT INTO user (name,apikey,ng_kunde) VALUES("test","a1b2c3");
-  INSERT INTO userrights (user,offer,default) VALUES ("test",OFFERNAME,NULL);
-
-or use python/ipython::
-
-  >>> import iro.model.schema
-  >>> from iro.model.schema import *
-  >>> from sqlalchemy import create_engine
-  >>> from iro.model.utils import WithSession
-  >>> engine = create_engine(DBURL)
-  >>> with WithSession(engine) as session:
-  ...   u = User(name="test",apikey="a1a2c3")      
-  ...   session.add(u)
-  ...   o = session.query(Offer).filter_by(name=OFFERNAME).first()
-  ...   u.rights.append(Userright(o, default=None))
-  ...   session.commit()
-  >>>
-
-.. note::
-  Please make sure that, the apikey only using *hex digest [0-9a-f]*
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/README.txt	Fri Aug 10 14:42:26 2012 +0200
@@ -0,0 +1,44 @@
+Iro is a non blocking server for sending a message to a bunsh of recipients. It can handle different types of message and can be extended easially.
+It was initially written for sms backend of http://castorticker.de. There are different backends are supported by Iro. 
+Iro helps you for these kinds of tasks: You want to send a message to some recipient over a different backend, than for other recipients.
+Or you want to define fallback strategies: If one messages can't be send over this backend use another.
+Because Iro also knows users, you can create bills for different clients.
+
+Installation of Iro
+===================
+
+Install the module via ``setup.py install`` und ran ``iro-install``. That will create a sample configuration file named ``iro.conf``.
+Update the configuration file and run ``iro-install install``  afterwards. That will create the Database and Offers for you.
+After that you have to `adding_user`. Now you are ready to start Iro ``twisted iro``.
+
+
+.. _adding_user:
+
+Add User and Userrights
+-----------------------
+
+You'll need user and right to spefific Offers, that a user can send with a specific Offer. Till now, it is the only way to add/modify user/userrights. 
+
+ 
+You can add users and userright via SQL::
+
+  INSERT INTO user (name,apikey,ng_kunde) VALUES("test","a1b2c3");
+  INSERT INTO userrights (user,offer,default) VALUES ("test",OFFERNAME,NULL);
+
+or use python/ipython::
+
+  >>> import iro.model.schema
+  >>> from iro.model.schema import *
+  >>> from sqlalchemy import create_engine
+  >>> from iro.model.utils import WithSession
+  >>> engine = create_engine(DBURL)
+  >>> with WithSession(engine) as session:
+  ...   u = User(name="test",apikey="a1a2c3")      
+  ...   session.add(u)
+  ...   o = session.query(Offer).filter_by(name=OFFERNAME).first()
+  ...   u.rights.append(Userright(o, default=None))
+  ...   session.commit()
+  >>>
+
+.. note::
+  Please make sure that, the apikey only using *hex digest [0-9a-f]*
--- a/iro/offer/smstrade.py	Fri Aug 10 13:58:28 2012 +0200
+++ b/iro/offer/smstrade.py	Fri Aug 10 14:42:26 2012 +0200
@@ -1,16 +1,4 @@
 # -*- coding: utf-8 -*-
-#Copyright (C) 2009  Georg Bischoff
-
-#This program is free software; you can redistribute it and/or modify it under the terms
-#of the GNU General Public License as published by the Free Software Foundation;
-#either version 3 of the License, or any later version.
-#This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-#without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#See the GNU General Public License for more details.
-
-#You should have received a copy of the GNU General Public License
-#along with this program; if not, see <http://www.gnu.org/licenses/>.
-
 
 import urllib
 from functools import partial
--- a/iro/offer/smtp.py	Fri Aug 10 13:58:28 2012 +0200
+++ b/iro/offer/smtp.py	Fri Aug 10 14:42:26 2012 +0200
@@ -1,15 +1,4 @@
 # -*- coding: utf-8 -*-
-#Copyright (C) 2009  Sandro Knauß <bugs@sandroknauss.de>
-
-#This program is free software; you can redistribute it and/or modify it under the terms
-#of the GNU General Public License as published by the Free Software Foundation;
-#either version 3 of the License, or any later version.
-#This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-#without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#See the GNU General Public License for more details.
-
-#You should have received a copy of the GNU General Public License
-#along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 import smtplib
 import copy
--- a/iro/telnumber.py	Fri Aug 10 13:58:28 2012 +0200
+++ b/iro/telnumber.py	Fri Aug 10 14:42:26 2012 +0200
@@ -1,16 +1,4 @@
 # -*- coding: utf-8 -*-
-#Copyright (C) 2009  Sandro Knauß <bugs@sandroknauss.de>
-
-#This program is free software; you can redistribute it and/or modify it under the terms
-#of the GNU General Public License as published by the Free Software Foundation;
-#either version 3 of the License, or any later version.
-#This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-#without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#See the GNU General Public License for more details.
-
-#You should have received a copy of the GNU General Public License
-#along with this program; if not, see <http://www.gnu.org/licenses/>.
-
 import re
 
 from .error import InvalidTel
--- a/iro/view/xmlrpc.py	Fri Aug 10 13:58:28 2012 +0200
+++ b/iro/view/xmlrpc.py	Fri Aug 10 14:42:26 2012 +0200
@@ -1,15 +1,4 @@
 # -*- coding: utf-8 -*-
-#Copyright (C) 2009  Sandro Knauß <bugs@sandroknauss.de>
-
-#This program is free software; you can redistribute it and/or modify it under the terms
-#of the GNU General Public License as published by the Free Software Foundation;
-#either version 3 of the License, or any later version.
-#This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-#without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#See the GNU General Public License for more details.
-
-#You should have received a copy of the GNU General Public License
-#along with this program; if not, see <http://www.gnu.org/licenses/>.
 from twisted.web import soap, xmlrpc
 
 from ..controller.viewinterface import Interface
--- a/iro/view/xmlrpc_old.py	Fri Aug 10 13:58:28 2012 +0200
+++ b/iro/view/xmlrpc_old.py	Fri Aug 10 14:42:26 2012 +0200
@@ -1,16 +1,4 @@
 # -*- coding: utf-8 -*-
-#Copyright (C) 2009  Sandro Knauß <bugs@sandroknauss.de>
-
-#This program is free software; you can redistribute it and/or modify it under the terms
-#of the GNU General Public License as published by the Free Software Foundation;
-#either version 3 of the License, or any later version.
-#This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-#without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#See the GNU General Public License for more details.
-
-#You should have received a copy of the GNU General Public License
-#along with this program; if not, see <http://www.gnu.org/licenses/>.
-
 """.. deprecated:: 1.0a"""
 
 import logging
--- a/setup.py	Fri Aug 10 13:58:28 2012 +0200
+++ b/setup.py	Fri Aug 10 14:42:26 2012 +0200
@@ -21,6 +21,7 @@
         package_data={
             'twisted': ['plugins/iro_plugin.py'],
         },
+        license = "MIT",
         classifiers=[
             "Development Status :: 3 - Alpha",
             "Environment :: No Input/Output (Daemon)",
@@ -29,6 +30,7 @@
             "Topic :: Communications :: Email",
             "Topic :: Communications :: Sms",
             "Programming Language :: Python",
+            "License :: OSI Approved :: MIT License",
             ]
         )