Changeset 5d3f239

Timestamp:

Dec 1, 2008 3:39:51 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

12d7df6

Parents:

f816079

Message:

change package name to avoid conflicts with fedd on install

Location:

fedd

Files:

• Makefile (modified) (2 diffs)
• exp_access_db.py (modified) (1 diff)
• fedd.py (modified) (1 diff)
• fedd_client.py (modified) (1 diff)
• federation/__init__.py (moved) (moved from fedd/fedd/__init__.py)
• federation/access.py (moved) (moved from fedd/fedd/access.py)
• federation/access_project.py (moved) (moved from fedd/fedd/access_project.py)
• federation/allocate_project.py (moved) (moved from fedd/fedd/allocate_project.py)
• federation/asn1_raw.py (moved) (moved from fedd/fedd/asn1_raw.py)
• federation/authorizer.py (moved) (moved from fedd/fedd/authorizer.py)
• federation/config_parser.py (moved) (moved from fedd/fedd/config_parser.py)
• federation/deter_impl.py (moved) (moved from fedd/fedd/deter_impl.py)
• federation/experiment_control.py (moved) (moved from fedd/fedd/experiment_control.py)
• federation/fedid.py (moved) (moved from fedd/fedd/fedid.py)
• federation/fixed_resource.py (moved) (moved from fedd/fedd/fixed_resource.py)
• federation/parse_detail.py (moved) (moved from fedd/fedd/parse_detail.py)
• federation/remote_service.py (moved) (moved from fedd/fedd/remote_service.py)
• federation/server.py (moved) (moved from fedd/fedd/server.py)
• federation/service_error.py (moved) (moved from fedd/fedd/service_error.py)
• federation/split.py (moved) (moved from fedd/fedd/split.py)
• federation/util.py (moved) (moved from fedd/fedd/util.py)
• fedid.py (modified) (1 diff)
• fixed_resource.py (modified) (1 diff)
• setup.py (modified) (1 diff)

fedd/Makefile

@@ -1 +1 @@
 
-GENERATED_MODS= fedd/fedd_services.py fedd/fedd_internal_services.py \
-                fedd/fedd_services_types.py
+MODULE_DIR=federation
+
+GENERATED_MODS= ${MODULE_DIR}/fedd_services.py \
+                ${MODULE_DIR}/fedd_internal_services.py \
+                ${MODULE_DIR}/fedd_services_types.py
 WSDL_FILES= fedd.wsdl fedd_bindings.wsdl fedd_messages.wsdl fedd_types.xsd \
             fedd_internal.wsdl fedd_internal_bindings.wsdl \
@@ -14 +17 @@
 
 ${GENERATED_MODS}:      ${WSDL_FILES}
-        wsdl2py --file fedd.wsdl --complexType --output-dir=fedd
+        wsdl2py --file fedd.wsdl --complexType --output-dir=${MODULE_DIR}
         wsdl2py --file fedd_internal.wsdl --complexType \
-                --types=fedd_services_types --output-dir=fedd
+                --types=fedd_services_types --output-dir=${MODULE_DIR}
 
 clean:
-        rm -f ${GENERATED_MODS} fedd/*.pyc *.pyc
+        rm -f ${GENERATED_MODS} ${MODULE_DIR}/*.pyc *.pyc
         rm -rf build dist fedd.egg-info MANIFEST
 
 dist:   ${DISTFILES}
 
-dist/fedd-1.0.tar.gz: all
+dist/fedd-${VERSION}.tar.gz: all
         python ./setup.py sdist

fedd/exp_access_db.py

@@ -6 +6 @@
 from optparse import OptionParser
 
-from fedid import fedid
+from federation import fedid
 
 class opt_parser(OptionParser):

fedd/fedd.py

@@ -5 +5 @@
 from optparse import OptionParser
 
-from fedd import config_parser
-from fedd.server import server, xmlrpc_handler, soap_handler
-from fedd.util import fedd_ssl_context
-from fedd.deter_impl import new_feddservice
+from federation import config_parser
+from federation.server import server, xmlrpc_handler, soap_handler
+from federation.util import fedd_ssl_context
+from federation.deter_impl import new_feddservice
 
 from threading import Lock, Thread

fedd/fedd_client.py

@@ -5 +5 @@
 import pwd
 
-from fedd import fedid, service_error
-from fedd.util import fedd_ssl_context, pack_id, unpack_id
-from fedd.remote_service import service_caller
+from federation import fedid, service_error
+from federation.util import fedd_ssl_context, pack_id, unpack_id
+from federation.remote_service import service_caller
 
 from optparse import OptionParser, OptionValueError

fedd/fedid.py

@@ -1 +1 @@
 #!/usr/local/bin/python
 
-from fedd import fedid
+from federation import fedid
 from optparse import OptionParser
 

fedd/fixed_resource.py

@@ -3 +3 @@
 import sys
 import MySQLdb
-from fedd.fixed_resource import read_key_db, write_key_db, \
+from federation.fixed_resource import read_key_db, write_key_db, \
         read_project_db, write project_db
 from optparse import OptionParser

fedd/setup.py

@@ -9 +9 @@
         author_email='faber@isi.edu',
         url='http://fedd.isi.deterlab.net',
-        packages=['fedd'],
+        packages=['federation'],
         requires=['ZSI(>=2.0)', 'M2Crypto'],
-        provides=['fedd'],
-        scripts=['fedd.py', 'fedd_client.py', 'confirm_sshkey.py', 
+        provides=['federation'],
+        scripts=['fedd.py', 'fedd_client.py', 'fedid.py', 'confirm_sshkey.py', 
             'exp_access_db.py', 'fixed_resource.py'],
     )