modpython stuff has removed
authorTony Mack <tmack@cs.princeton.edu>
Tue, 6 Apr 2010 15:35:36 +0000 (15:35 +0000)
committerTony Mack <tmack@cs.princeton.edu>
Tue, 6 Apr 2010 15:35:36 +0000 (15:35 +0000)
sfa/server/SfaAggregateModPython.py [deleted file]
sfa/server/SfaRegistryModPython.py [deleted file]
sfa/server/SfaSliceMgrModPython.py [deleted file]
sfa/server/sfa.aggregate.httpd.conf [deleted file]
sfa/server/sfa.registry.httpd.conf [deleted file]
sfa/server/sfa.slicemgr.httpd.conf [deleted file]

diff --git a/sfa/server/SfaAggregateModPython.py b/sfa/server/SfaAggregateModPython.py
deleted file mode 100755 (executable)
index e1ab86d..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# Apache mod_python interface
-#
-# Aaron Klingaman <alk@absarokasoft.com>
-# Mark Huang <mlhuang@cs.princeton.edu>
-#
-# Copyright (C) 2004-2006 The Trustees of Princeton University
-#
-
-import sys
-import traceback
-import xmlrpclib
-from mod_python import apache
-
-from sfa.plc.api import SfaAPI
-from sfa.util.debug import log
-
-api = SfaAPI(interface='aggregate')
-
-class unbuffered:
-    """\r
-    Write to /var/log/httpd/error_log. See\r
-\r
-    http://www.modpython.org/FAQ/faqw.py?req=edit&file=faq02.003.htp\r
-    """\r
-\r
-    def write(self, data):\r
-        sys.stderr.write(data)\r
-        sys.stderr.flush()\r
-\r
-#log = unbuffered()
-
-def handler(req):
-    try:
-        if req.method != "POST":
-            req.content_type = "text/html"
-            req.send_http_header()
-            req.write("""
-<html><head>
-<title>SFA Aggregate API XML-RPC/SOAP Interface</title>
-</head><body>
-<h1>SFA Aggregate API XML-RPC/SOAP Interface</h1>
-<p>Please use XML-RPC or SOAP to access the SFA API.</p>
-</body></html>
-""")
-            return apache.OK
-
-        # Read request
-        request = req.read(int(req.headers_in['content-length']))
-
-        # mod_python < 3.2: The IP address portion of remote_addr is
-        # incorrect (always 0.0.0.0) when IPv6 is enabled.
-        # http://issues.apache.org/jira/browse/MODPYTHON-64?page=all
-        (remote_ip, remote_port) = req.connection.remote_addr
-        remote_addr = (req.connection.remote_ip, remote_port)
-
-        # Handle request
-        response = api.handle(remote_addr, request)
-
-        # Write response
-        req.content_type = "text/xml; charset=" + api.encoding
-        req.send_http_header()
-        req.write(response)
-
-        return apache.OK
-
-    except Exception, err:
-        # Log error in /var/log/httpd/(ssl_)?error_log
-        print >> log, err, traceback.format_exc()
-        return apache.HTTP_INTERNAL_SERVER_ERROR
diff --git a/sfa/server/SfaRegistryModPython.py b/sfa/server/SfaRegistryModPython.py
deleted file mode 100755 (executable)
index a9044eb..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# Apache mod_python interface
-#
-# Aaron Klingaman <alk@absarokasoft.com>
-# Mark Huang <mlhuang@cs.princeton.edu>
-#
-# Copyright (C) 2004-2006 The Trustees of Princeton University
-#
-
-import sys
-import traceback
-import xmlrpclib
-from mod_python import apache
-from sfa.util.debug import log
-from sfa.plc.api import SfaAPI
-
-api = SfaAPI(interface='registry')
-
-class unbuffered:
-    """\r
-    Write to /var/log/httpd/error_log. See\r
-\r
-    http://www.modpython.org/FAQ/faqw.py?req=edit&file=faq02.003.htp\r
-    """\r
-\r
-    def write(self, data):\r
-        sys.stderr.write(data)\r
-        sys.stderr.flush()\r
-\r
-#log = unbuffered()
-
-def handler(req):
-    try:
-        if req.method != "POST":
-            req.content_type = "text/html"
-            req.send_http_header()
-            req.write("""
-<html><head>
-<title>SFA Registry API XML-RPC/SOAP Interface</title>
-</head><body>
-<h1>SFA Registry API XML-RPC/SOAP Interface</h1>
-<p>Please use XML-RPC or SOAP to access the SFA API.</p>
-</body></html>
-""")
-            return apache.OK
-
-        # Read request
-        request = req.read(int(req.headers_in['content-length']))
-
-        # mod_python < 3.2: The IP address portion of remote_addr is
-        # incorrect (always 0.0.0.0) when IPv6 is enabled.
-        # http://issues.apache.org/jira/browse/MODPYTHON-64?page=all
-        (remote_ip, remote_port) = req.connection.remote_addr
-        remote_addr = (req.connection.remote_ip, remote_port)
-
-        # Handle request
-        response = api.handle(remote_addr, request)
-
-        # Write response
-        req.content_type = "text/xml; charset=" + api.encoding
-        req.send_http_header()
-        req.write(response)
-
-        return apache.OK
-
-    except Exception, err:
-        # Log error in /var/log/httpd/(ssl_)?error_log
-        print >> log, err, traceback.format_exc()
-        return apache.HTTP_INTERNAL_SERVER_ERROR
diff --git a/sfa/server/SfaSliceMgrModPython.py b/sfa/server/SfaSliceMgrModPython.py
deleted file mode 100755 (executable)
index 7ad8e0d..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# Apache mod_python interface
-#
-# Aaron Klingaman <alk@absarokasoft.com>
-# Mark Huang <mlhuang@cs.princeton.edu>
-#
-# Copyright (C) 2004-2006 The Trustees of Princeton University
-#
-
-import sys
-import traceback
-import xmlrpclib
-from mod_python import apache
-
-from sfa.plc.api import SfaAPI
-from sfa.util.debug import log
-
-api = SfaAPI(interface='slicemgr')
-
-class unbuffered:
-    """\r
-    Write to /var/log/httpd/error_log. See\r
-\r
-    http://www.modpython.org/FAQ/faqw.py?req=edit&file=faq02.003.htp\r
-    """\r
-\r
-    def write(self, data):\r
-        sys.stderr.write(data)\r
-        sys.stderr.flush()\r
-\r
-#log = unbuffered()
-
-def handler(req):
-    try:
-        if req.method != "POST":
-            req.content_type = "text/html"
-            req.send_http_header()
-            req.write("""
-<html><head>
-<title>SFA SliceMgr API XML-RPC/SOAP Interface</title>
-</head><body>
-<h1>SFA SliceMgr API XML-RPC/SOAP Interface</h1>
-<p>Please use XML-RPC or SOAP to access the SFA API.</p>
-</body></html>
-""")
-            return apache.OK
-
-        # Read request
-        request = req.read(int(req.headers_in['content-length']))
-
-        # mod_python < 3.2: The IP address portion of remote_addr is
-        # incorrect (always 0.0.0.0) when IPv6 is enabled.
-        # http://issues.apache.org/jira/browse/MODPYTHON-64?page=all
-        (remote_ip, remote_port) = req.connection.remote_addr
-        remote_addr = (req.connection.remote_ip, remote_port)
-
-        # Handle request
-        response = api.handle(remote_addr, request)
-
-        # Write response
-        req.content_type = "text/xml; charset=" + api.encoding
-        req.send_http_header()
-        req.write(response)
-
-        return apache.OK
-
-    except Exception, err:
-        # Log error in /var/log/httpd/(ssl_)?error_log
-        print >> log, err, traceback.format_exc()
-        return apache.HTTP_INTERNAL_SERVER_ERROR
diff --git a/sfa/server/sfa.aggregate.httpd.conf b/sfa/server/sfa.aggregate.httpd.conf
deleted file mode 100644 (file)
index 2e6f4f4..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-Listen 12346
-
-<VirtualHost *:12346>
-    ErrorLog logs/sfa_ssl_error_log
-    TransferLog logs/sfa_ssl_access_log
-    CustomLog logs/ssl_request_log \
-          "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b
-    LogLevel warn
-
-    SSLEngine on
-    SSLProtocol all -SSLv2
-
-    SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW
-    SSLCertificateFile /etc/sfa/authorities/server.cert
-    SSLCertificateKeyFile /etc/sfa/authorities/server.key
-    SetEnvIf User-Agent ".*MSIE.*" \
-         nokeepalive ssl-unclean-shutdown \
-         downgrade-1.0 force-response-1.0
-
-    SetHandler mod_python
-    PythonPath "sys.path + ['/usr/lib/python2.5/site-packages/sfa/', '/usr/lib/python2.5/site-packages/sfa/server/']"
-    PythonHandler SfaAggregateModPython
-
-</VirtualHost> 
diff --git a/sfa/server/sfa.registry.httpd.conf b/sfa/server/sfa.registry.httpd.conf
deleted file mode 100644 (file)
index 714fe55..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-Listen 12345
-
-<VirtualHost *:12345>
-    ErrorLog logs/sfa_ssl_error_log
-    TransferLog logs/sfa_ssl_access_log
-    CustomLog logs/ssl_request_log \
-          "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b
-    LogLevel warn
-
-    SSLEngine on
-    SSLProtocol all -SSLv2
-
-    SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW
-    SSLCertificateFile /etc/sfa/authorities/server.cert
-    SSLCertificateKeyFile /etc/sfa/authorities/server.key
-    SetEnvIf User-Agent ".*MSIE.*" \
-         nokeepalive ssl-unclean-shutdown \
-         downgrade-1.0 force-response-1.0
-
-    SetHandler mod_python
-    PythonPath "sys.path + ['/usr/lib/python2.5/site-packages/sfa/', '/usr/lib/python2.5/site-packages/sfa/server/']"
-    PythonHandler SfaRegistryModPython
-
-</VirtualHost> 
diff --git a/sfa/server/sfa.slicemgr.httpd.conf b/sfa/server/sfa.slicemgr.httpd.conf
deleted file mode 100644 (file)
index 6e3a8e8..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-Listen 12347
-
-<VirtualHost *:12347>
-    ErrorLog logs/sfa_ssl_error_log
-    TransferLog logs/sfa_ssl_access_log
-    CustomLog logs/ssl_request_log \
-          "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b
-    LogLevel warn
-
-    SSLEngine on
-    SSLProtocol all -SSLv2
-
-    SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW
-    SSLCertificateFile /etc/sfa/authorities/server.cert
-    SSLCertificateKeyFile /etc/sfa/authorities/server.key
-    SetEnvIf User-Agent ".*MSIE.*" \
-         nokeepalive ssl-unclean-shutdown \
-         downgrade-1.0 force-response-1.0
-
-    SetHandler mod_python
-    PythonPath "sys.path + ['/usr/lib/python2.5/site-packages/sfa/', '/usr/lib/python2.5/site-packages/sfa/server/']"
-    PythonHandler SfaSliceMgrModPython
-
-</VirtualHost>