[Mpuls-commits] r1549 - in wasko/branches/2.0: mpulsweb waskaweb

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-15 14:34:15 +0100 (Mon, 15 Feb 2010)
New Revision: 1549

Added:
   wasko/branches/2.0/mpulsweb/websetup.py
Removed:
   wasko/branches/2.0/waskaweb/websetup.py
Log:
Moved websetup to mpulsbase.


Copied: wasko/branches/2.0/mpulsweb/websetup.py (from rev 1535, wasko/branches/2.0/waskaweb/websetup.py)
===================================================================
--- wasko/branches/2.0/waskaweb/websetup.py	2010-02-12 14:02:54 UTC (rev 1535)
+++ wasko/branches/2.0/mpulsweb/websetup.py	2010-02-15 13:34:15 UTC (rev 1549)
@@ -0,0 +1,37 @@
+# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
+# 
+# This file is part of mpuls WASKA (CoMPUter-based case fiLeS - 
+# Web-Anwendungs-Server fuer Kompetenzagenturen).
+# 
+# mpuls WASKA is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+# 
+# mpuls WASKA 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 Affero General Public
+# License for more details.
+# 
+# You should have received a copy of the GNU Affero General Public
+# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
+# 
+# mpuls WASKA has been developed on behalf of the 
+# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
+# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
+# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and 
+# European Social Fund resources.
+"""Setup the waskaweb application"""
+import logging
+
+from paste.deploy import appconfig
+from pylons import config
+
+from mpulsweb.config.environment import load_environment
+
+log = logging.getLogger(__name__)
+
+def setup_config(command, filename, section, vars):
+    """Place any commands to setup waskaweb here"""
+    conf = appconfig('config:' + filename)
+    load_environment(conf.global_conf, conf.local_conf)


Property changes on: wasko/branches/2.0/mpulsweb/websetup.py
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: wasko/branches/2.0/waskaweb/websetup.py
===================================================================
--- wasko/branches/2.0/waskaweb/websetup.py	2010-02-15 13:33:50 UTC (rev 1548)
+++ wasko/branches/2.0/waskaweb/websetup.py	2010-02-15 13:34:15 UTC (rev 1549)
@@ -1,37 +0,0 @@
-# Copyright 2007, 2008 Intevation GmbH, Germany, <info at intevation.de>
-# 
-# This file is part of mpuls WASKA (CoMPUter-based case fiLeS - 
-# Web-Anwendungs-Server fuer Kompetenzagenturen).
-# 
-# mpuls WASKA is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Affero General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or (at your
-# option) any later version.
-# 
-# mpuls WASKA 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 Affero General Public
-# License for more details.
-# 
-# You should have received a copy of the GNU Affero General Public
-# License along with mpuls WASKA. If not, see <http://www.gnu.org/licenses/>.
-# 
-# mpuls WASKA has been developed on behalf of the 
-# Projekttraeger im Deutschen Zentrum fuer Luft- und Raumfahrt e.V. (PT-DLR)
-# within the programme Kompetenzagenturen (Durchfuehrungsphase) funded by
-# the Bundesministerium fuer Familie, Senioren, Frauen und Jugend and 
-# European Social Fund resources.
-"""Setup the waskaweb application"""
-import logging
-
-from paste.deploy import appconfig
-from pylons import config
-
-from waskaweb.config.environment import load_environment
-
-log = logging.getLogger(__name__)
-
-def setup_config(command, filename, section, vars):
-    """Place any commands to setup waskaweb here"""
-    conf = appconfig('config:' + filename)
-    load_environment(conf.global_conf, conf.local_conf)