Añado lo que llevo sobre la web

	new file:   web/CygnusCloud/ABOUT
	new file:   web/CygnusCloud/LICENSE
	new file:   web/CygnusCloud/__init__.py
	new file:   web/CygnusCloud/cache/cache.lock
	new file:   web/CygnusCloud/cache/cache.shelve
	new file:   web/CygnusCloud/controllers/appadmin.py
	new file:   web/CygnusCloud/controllers/default.py.bak
	new file:   web/CygnusCloud/controllers/hijo.py.bak
	new file:   web/CygnusCloud/controllers/index.py.bak
	new file:   web/CygnusCloud/controllers/main.py
	new file:   web/CygnusCloud/controllers/main.py.bak
	new file:   web/CygnusCloud/controllers/plugin_translate.py
	new file:   web/CygnusCloud/controllers/plugin_translate.py.bak
	new file:   web/CygnusCloud/cron/crontab
	new file:   web/CygnusCloud/cron/crontab.example
	new file:   web/CygnusCloud/databases/061e7fe6f37aa3c49843eaaf42f77908_ClassGroup.table
	new file:   web/CygnusCloud/databases/061e7fe6f37aa3c49843eaaf42f77908_Subjects.table
	new file:   web/CygnusCloud/databases/061e7fe6f37aa3c49843eaaf42f77908_UserGroup.table
	new file:   web/CygnusCloud/databases/061e7fe6f37aa3c49843eaaf42f77908_VMByGroup.table
	new file:   web/CygnusCloud/databases/061e7fe6f37aa3c49843eaaf42f77908_auth_cas.table
	new file:   web/CygnusCloud/databases/061e7fe6f37aa3c49843eaaf42f77908_auth_event.table
	new file:   web/CygnusCloud/databases/061e7fe6f37aa3c49843eaaf42f77908_auth_group.table
	new file:   web/CygnusCloud/databases/061e7fe6f37aa3c49843eaaf42f77908_auth_membership.table
	new file:   web/CygnusCloud/databases/061e7fe6f37aa3c49843eaaf42f77908_auth_permission.table
	new file:   web/CygnusCloud/databases/061e7fe6f37aa3c49843eaaf42f77908_auth_user.table
	new file:   web/CygnusCloud/databases/3cd1f3db30e36a38add97c0dd167f731_ClassGroup.table
	new file:   web/CygnusCloud/databases/3cd1f3db30e36a38add97c0dd167f731_Subjects.table
	new file:   web/CygnusCloud/databases/3cd1f3db30e36a38add97c0dd167f731_UserGroup.table
	new file:   web/CygnusCloud/databases/3cd1f3db30e36a38add97c0dd167f731_VMByGroup.table
	new file:   web/CygnusCloud/databases/3cd1f3db30e36a38add97c0dd167f731_auth_cas.table
	new file:   web/CygnusCloud/databases/3cd1f3db30e36a38add97c0dd167f731_auth_event.table
Añado gestion de login y logout de usuarios, terminadas páginas de inicio de sesión y Acerca de. Creo barra de usuario iniciado
Voy a empezar con el arranque de máquinas para estudiantes
	modified:   web/CygnusCloud/controllers/main.py
	modified:   web/CygnusCloud/controllers/main.py.bak
	new file:   web/CygnusCloud/controllers/student.py
	new file:   web/CygnusCloud/controllers/student.py.bak
	modified:   web/CygnusCloud/languages/default.py
	modified:   web/CygnusCloud/languages/es.py
	modified:   web/CygnusCloud/models/db.py
	modified:   web/CygnusCloud/models/db.py.bak
	modified:   web/CygnusCloud/models/menu.py
	modified:   web/CygnusCloud/models/menu.py.bak
	modified:   web/CygnusCloud/models/plugin_translate.py
	modified:   web/CygnusCloud/models/plugin_translate.py.bak
	modified:   web/CygnusCloud/progress.log
	new file:   web/CygnusCloud/sessions/127.0.0.1-dee08b32-fb5f-41b9-92ab-ea89938c46b9
	new file:   web/CygnusCloud/static/info.html
	new file:   web/CygnusCloud/static/info.html.bak
	modified:   web/CygnusCloud/views/layout.html
	modified:   web/CygnusCloud/views/layout.html.bak
	new file:   web/CygnusCloud/views/main/about.html
	new file:   web/CygnusCloud/views/main/about.html.bak
	new file:   web/CygnusCloud/views/student/runVM.html
	new file:   web/CygnusCloud/views/student/runVM.html.bak
Subo lo que he hecho hoy
	new file:   web/CygnusCloud/controllers/administrator.py
	new file:   web/CygnusCloud/controllers/administrator.py.bak
	modified:   web/CygnusCloud/controllers/main.py
	modified:   web/CygnusCloud/controllers/main.py.bak
	modified:   web/CygnusCloud/languages/es.py
	new file:   web/CygnusCloud/modules/database/.directory
	new file:   web/CygnusCloud/modules/database/systemStatusDB/__init__.py
	new file:   web/CygnusCloud/modules/database/systemStatusDB/systemStatusDBReader.py
	new file:   web/CygnusCloud/modules/database/systemStatusDB/systemStatusDBWriter.py
	new file:   web/CygnusCloud/modules/database/utils/__init__.py
	new file:   web/CygnusCloud/modules/database/utils/configuration.py
	new file:   web/CygnusCloud/modules/database/utils/connector.py
	new file:   web/CygnusCloud/modules/databaseUpdateThread.py
	new file:   web/CygnusCloud/modules/mainServer/connector/__init__.py
	new file:   web/CygnusCloud/modules/mainServer/connector/databaseUpdateThread.py
	new file:   web/CygnusCloud/modules/mainServer/connector/mainServerConnector.py#
	new file:   web/CygnusCloud/modules/mainServer/packets.py
	new file:   web/CygnusCloud/modules/mainServerConnector.py.bak
	new file:   web/CygnusCloud/modules/network/manager.py
	modified:   web/CygnusCloud/progress.log
	modified:   web/CygnusCloud/sessions/127.0.0.1-dee08b32-fb5f-41b9-92ab-ea89938c46b9
	new file:   web/CygnusCloud/views/administrator/runVM.html
	new file:   web/CygnusCloud/views/administrator/runVM.html.bak
	new file:   web/CygnusCloud/views/administrator/servers.html
	new file:   web/CygnusCloud/views/administrator/servers.html.bak
	new file:   web/CygnusCloud/views/administrator/servers/add_remove_servers.html.bak
Subo:
- paquetes modificados para utilizar un nuevo formato más eficiente. Ahora
  todos los encabezados de paquete y separadores ocupan exactamente un byte.
- pruebas unitarias modificadas para utilizar el nuevo formato de paquete.

 On branch infrastructure-upstream
 Changes to be committed:

	modified:   src/CygnusCloud/network/packet.py
	modified:   src/CygnusCloud/network/tests/packet.py
Corrijo BUG en la red que impedía la terminación de los hilos de recepción
(lo que provocaba cuelgues en cualquier cosa que usara la red).

 On branch infrastructure-upstream
 Changes to be committed:

	modified:   src/CygnusCloud/network/connection.py
	modified:   src/CygnusCloud/network/threads/dataProcessing.py
Subo:
- red con dos mejoras:
  1) las conexiones quedan identificadas por su IP y por su puerto.
  2) cuando una conexión se cierra, sus paquetes salientes se descartarán.
- tests actualizados para utilizar el nuevo API de la red. Las modificaciones
  son menores, pero obligan a revisar todo el código que usa la red.
- paquetes de red estructurados de acuerdo a la memoria.

Seguiré haciendo modificaciones en la infraestructura para que utilice
la versión más reciente de este módulo.

 On branch infrastructure-upstream
 Changes to be committed:

	renamed:    network/tests/tmp.py -> network/manager/__init__.py
	renamed:    network/manager.py -> network/manager/networkManager.py
	new file:   network/packets/__init__.py
	renamed:    network/packet.py -> network/packets/packet.py
	modified:   network/tests/ConvCallback.py
	modified:   network/tests/MultiClients.py
	modified:   network/tests/client01.py
	modified:   network/tests/client03.py
	modified:   network/tests/client04.py
	modified:   network/tests/clientConversational.py
	modified:   network/tests/clientEmisor.py
	modified:   network/tests/clientReceptor.py
	modified:   network/tests/dummyCallback.py
	modified:   network/tests/packet.py
	modified:   network/tests/server01.py
	modified:   network/tests/server02.py
	modified:   network/tests/server03.py
	modified:   network/tests/server04.py
	modified:   network/tests/serverConversational.py
	modified:   network/tests/serverWridge.py
	modified:   network/threads/connectionMonitoring.py
	modified:   network/threads/dataProcessing.py
	new file:   network/twistedInteraction/__init__.py
	renamed:    network/connection.py -> network/twistedInteraction/connection.py
	renamed:    network/protocols.py -> network/twistedInteraction/protocols.py
Actualizo las clases de la infraestructura para que utilicen el nuevo
API de la red.

 On branch infrastructure-upstream
 Changes to be committed:

	modified:   CygnusCloud/mainServer/callbacks.py
	modified:   CygnusCloud/mainServer/connector/mainServerConnector.py
	deleted:    CygnusCloud/mainServer/data.sql
	modified:   CygnusCloud/mainServer/reactor.py
	modified:   CygnusCloud/testing/dummyVMServer.py
	modified:   CygnusCloud/testing/mainServerTester.py
	modified:   CygnusCloud/testing/virtualMachineServerTester.py
	modified:   CygnusCloud/virtualMachineServer/libvirtConnector.py
	modified:   CygnusCloud/virtualMachineServer/vmClient.py
Subo:
- clases de la infraestructura modificadas para utilizar el nuevo API de la red.
- módulos reubicados de acuerdo al contenido de la memoria.

 On branch infrastructure-upstream
 Changes to be committed:

	renamed:    mainServer/__init__.py -> clusterServer/__init__.py
	renamed:    mainServer/connector/__init__.py -> clusterServer/connector/__init__.py
	renamed:    mainServer/connector/mainServerConnector.py -> clusterServer/connector/clusterServerConnector.py
	renamed:    mainServer/connector/databaseUpdateThread.py -> clusterServer/connector/databaseUpdateThread.py
	renamed:    mainServer/loadBalancing/__init__.py -> clusterServer/loadBalancing/__init__.py
	renamed:    mainServer/loadBalancing/loadBalancer.py -> clusterServer/loadBalancing/loadBalancer.py
	renamed:    mainServer/loadBalancing/simpleLoadBalancer.py -> clusterServer/loadBalancing/simpleLoadBalancer.py
	renamed:    mainServer/mainServer.py -> clusterServer/main.py
	new file:   clusterServer/networking/__init__.py
	renamed:    mainServer/callbacks.py -> clusterServer/networking/callbacks.py
	renamed:    mainServer/packets.py -> clusterServer/networking/packets.py
	new file:   clusterServer/reactor/__init__.py
	renamed:    mainServer/reactor.py -> clusterServer/reactor/clusterServerReactor.py
	modified:   database/SystemStatusDB.sql
	modified:   database/utils/configuration.py
	renamed:    virtualMachineServer/vmServer.py -> virtualMachineServer/main.py
	new file:   virtualMachineServer/virtualNetwork/__init__.py
	new file:   virtualMachineServer/virtualNetwork/virtualNetworkManager.py
Subo lo que llevo de hoy
	modified:   web/CygnusCloud/controllers/administrator.py
	modified:   web/CygnusCloud/controllers/administrator.py.bak
	modified:   web/CygnusCloud/controllers/main.py
	modified:   web/CygnusCloud/controllers/main.py.bak
	modified:   web/CygnusCloud/controllers/plugin_translate.py
	modified:   web/CygnusCloud/controllers/plugin_translate.py.bak
	modified:   web/CygnusCloud/languages/default.py
	modified:   web/CygnusCloud/languages/es.py
	modified:   web/CygnusCloud/languages/fr.py
	modified:   web/CygnusCloud/models/menu.py
	modified:   web/CygnusCloud/models/menu.py.bak
	modified:   web/CygnusCloud/models/plugin_translate.py
	modified:   web/CygnusCloud/models/plugin_translate.py.bak
	modified:   web/CygnusCloud/modules/__init__.py
	new file:   web/CygnusCloud/modules/database/__init__.py
	new file:   web/CygnusCloud/modules/database/mainServer/__init__.py
	new file:   web/CygnusCloud/modules/database/mainServer/mainServerDB.py
	new file:   web/CygnusCloud/modules/database/mainServer/mainServerDB.py.bak
	new file:   web/CygnusCloud/modules/mainServer/__init__.py
	modified:   web/CygnusCloud/modules/mainServer/connector/databaseUpdateThread.py#
	new file:   web/CygnusCloud/modules/mainServer/connector/databaseUpdateThread.py.1
	new file:   web/CygnusCloud/modules/mainServer/connector/databaseUpdateThread.py.bak
	modified:   web/CygnusCloud/modules/mainServer/connector/mainServerConnector.py
	new file:   web/CygnusCloud/modules/mainServer/connector/mainServerConnector.py.bak
	new file:   web/CygnusCloud/modules/mainServer/connector/webCallback.py
	new file:   web/CygnusCloud/modules/mainServer/connector/webCallback.py.bak
	modified:   web/CygnusCloud/modules/mainServer/packets.py
	new file:   web/CygnusCloud/modules/mainServer/packets.py.bak
	new file:   web/CygnusCloud/modules/network/__init__.py
	new file:   web/CygnusCloud/modules/network/connection.py
	new file:   web/CygnusCloud/modules/network/connection.py.bak
	new file:   web/CygnusCloud/modules/network/exceptions/__init__.py
	new file:   web/CygnusCloud/modules/network/exceptions/networkManager.py
	new file:   web/CygnusCloud/modules/network/exceptions/packetException.py
	new file:   web/CygnusCloud/modules/network/interfaces/__init__.py
	new file:   web/CygnusCloud/modules/network/interfaces/ipAddresses.py
	modified:   web/CygnusCloud/modules/network/manager.py
	new file:   web/CygnusCloud/modules/network/manager.py.bak
	new file:   web/CygnusCloud/modules/network/packet.py
	new file:   web/CygnusCloud/modules/network/packet.py.bak
	new file:   web/CygnusCloud/modules/network/protocols.py
	new file:   web/CygnusCloud/modules/network/protocols.py.bak
	new file:   web/CygnusCloud/modules/network/tests/ConvCallback.py
	new file:   web/CygnusCloud/modules/network/tests/MultiClients.py
	new file:   web/CygnusCloud/modules/network/tests/__init__.py
	new file:   web/CygnusCloud/modules/network/tests/client01.py
	new file:   web/CygnusCloud/modules/network/tests/client03.py
	new file:   web/CygnusCloud/modules/network/tests/client04.py
	new file:   web/CygnusCloud/modules/network/tests/clientConversational.py
	new file:   web/CygnusCloud/modules/network/tests/clientEmisor.py
	new file:   web/CygnusCloud/modules/network/tests/clientReceptor.py
	new file:   web/CygnusCloud/modules/network/tests/dummyCallback.py
	new file:   web/CygnusCloud/modules/network/tests/packet.py
	new file:   web/CygnusCloud/modules/network/tests/server01.py
	new file:   web/CygnusCloud/modules/network/tests/server02.py
	new file:   web/CygnusCloud/modules/network/tests/server03.py
	new file:   web/CygnusCloud/modules/network/tests/server04.py
	new file:   web/CygnusCloud/modules/network/tests/serverConversational.py
	new file:   web/CygnusCloud/modules/network/tests/serverWridge.py
	new file:   web/CygnusCloud/modules/network/tests/tmp.py
	new file:   web/CygnusCloud/modules/network/threads/__init__.py
	new file:   web/CygnusCloud/modules/network/threads/connectionMonitoring.py
	new file:   web/CygnusCloud/modules/network/threads/connectionMonitoring.py.bak
	new file:   web/CygnusCloud/modules/network/threads/dataProcessing.py
	new file:   web/CygnusCloud/modules/network/threads/dataProcessing.py.bak
	new file:   web/CygnusCloud/modules/network/threads/server.py
	new file:   web/CygnusCloud/modules/network/threads/twistedReactor.py
	new file:   web/CygnusCloud/modules/utils1/__init__.py
	new file:   web/CygnusCloud/modules/utils1/commands.py
	new file:   web/CygnusCloud/modules/utils1/enums.py
	new file:   web/CygnusCloud/modules/utils1/multithreadingCounter.py
	new file:   web/CygnusCloud/modules/utils1/multithreadingDictionary.py
	new file:   web/CygnusCloud/modules/utils1/multithreadingList.py
	new file:   web/CygnusCloud/modules/utils1/multithreadingPriorityQueue.py
	new file:   web/CygnusCloud/modules/utils1/threads.py
	modified:   web/CygnusCloud/progress.log
	new file:   web/CygnusCloud/sessions/127.0.0.1-7eca9292-75b1-4a63-9d55-e6f3d609f996
	new file:   web/CygnusCloud/static/Certificados/Readme.txt
	new file:   web/CygnusCloud/static/Certificados/server.crt
	new file:   web/CygnusCloud/static/Certificados/server.csr
	new file:   web/CygnusCloud/static/Certificados/server.key
	new file:   web/CygnusCloud/static/Certificados/server_original.crt
	new file:   web/CygnusCloud/static/Certificados/server_original.key
	modified:   web/CygnusCloud/views/administrator/servers.html
	modified:   web/CygnusCloud/views/administrator/servers.html.bak
	new file:   web/CygnusCloud/views/administrator/users.html
	new file:   web/CygnusCloud/views/administrator/users.html.bak
Subo:
- servidores y testers revisados para utilizar la nueva red
- servidor de máquinas virtuales con BUG corregido: el método stopNetworkService se llamaba desde el hilo de recepción de paquetes,
  lo que provocaba un bucle infinito de joins al terminar. Ese método DEBE llamarse siempre desde el hilo principal.
- servidor principal con apagado muy simple implementado. Cuando introduzca la mejora prevista, meteré un apagado decente.
- testers y, en general, todo el código que utilizaba la red, revisado para utilizar el nuevo API.
- hilos de la red modificados para tener nombre (lo que facilita la depuración).
- módulos con todos los warnings que he visto eliminados.

Ahora revisaré los comentarios del paquete clusterServer.

 On branch infrastructure-upstream
 Changes to be committed:

	modified:   clusterServer/connector/databaseUpdateThread.py
	modified:   clusterServer/main.py
	modified:   clusterServer/networking/packets.py
	modified:   clusterServer/reactor/clusterServerReactor.py
	modified:   database/VMServerDB.sql
	modified:   network/manager/networkManager.py
	modified:   network/packets/packet.py
	modified:   network/threads/connectionMonitoring.py
	modified:   network/threads/dataProcessing.py
	modified:   network/threads/server.py
	modified:   network/threads/twistedReactor.py
	new file:   testing/clusterServerTester.py
	modified:   testing/dummyVMServer.py
	modified:   testing/virtualMachineServerTester.py
	modified:   utils/threads.py
	modified:   virtualMachineServer/constantes.py
	modified:   virtualMachineServer/main.py
	modified:   virtualMachineServer/vmClient.py
	deleted:    virtualNetwork/__init__.py
	deleted:    virtualNetwork/virtualNetworkManager.py
Subo:
- código del servidor de cluster comentado al 60%. Sigo después de comer.

 On branch infrastructure-upstream
 Changes to be committed:

	modified:   src/CygnusCloud/clusterServer/connector/clusterServerConnector.py
	modified:   src/CygnusCloud/clusterServer/connector/databaseUpdateThread.py
	modified:   src/CygnusCloud/clusterServer/loadBalancing/loadBalancer.py
	modified:   src/CygnusCloud/clusterServer/loadBalancing/simpleLoadBalancer.py
	modified:   src/CygnusCloud/clusterServer/networking/callbacks.py
	modified:   src/CygnusCloud/clusterServer/networking/packets.py
	modified:   src/CygnusCloud/clusterServer/reactor/clusterServerReactor.py
	modified:   src/CygnusCloud/network/manager/networkManager.py
Subo los ficheros comentados que me quedaban.

 On branch infrastructure-upstream
 Changes to be committed:

	modified:   src/CygnusCloud/clusterServer/connector/clusterServerConnector.py
	modified:   src/CygnusCloud/clusterServer/reactor/clusterServerReactor.py
	modified:   src/CygnusCloud/network/manager/networkManager.py
Termino de hacer renombramientos.

 On branch infrastructure-upstream
 Changes to be committed:

	modified:   src/CygnusCloud/clusterServer/main.py
	modified:   src/CygnusCloud/clusterServer/networking/packets.py
	modified:   src/CygnusCloud/clusterServer/reactor/clusterServerReactor.py
	renamed:    src/CygnusCloud/database/MainServerDB.sql -> src/CygnusCloud/database/ClusterServerDB.sql
	renamed:    src/CygnusCloud/database/mainServer/__init__.py -> src/CygnusCloud/database/clusterServer/__init__.py
	renamed:    src/CygnusCloud/database/mainServer/mainServerDB.py -> src/CygnusCloud/database/clusterServer/clusterServerDB.py
	renamed:    src/CygnusCloud/database/tests/MainServerDB.sql -> src/CygnusCloud/database/tests/ClusterServerDBTest.sql
	modified:   src/CygnusCloud/database/tests/SystemStatusDBTest.sql
	modified:   src/CygnusCloud/database/tests/VMServerDBTest.sql
	modified:   src/CygnusCloud/database/tests/WebServerDBTest.sql
	new file:   src/CygnusCloud/database/tests/clusterServerDBTests.py
	renamed:    src/CygnusCloud/database/tests/mainServerDBTests.py -> src/CygnusCloud/database/tests/clusterServerDBTests.sql
	modified:   src/CygnusCloud/database/tests/vmServerDBTests.py
	modified:   src/domU config/Squeeze_AMD64.xml
Merge branch 'infrastructure-upstream' into web_development