diff --git a/build.py b/build.py
index 5a80c7b..57bb7dd 100755
--- a/build.py
+++ b/build.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 """
-   Copyright 2006-2011 SpringSource (http://springsource.com), All Rights Reserved 
+   Copyright 2006-2011 SpringSource (https://springsource.com), All Rights Reserved 
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -77,7 +77,7 @@ def usage():
     print "\t--package\t\tpackage everything up into a tarball for release to sourceforge in %s" % p["packageDir"]
     print "\t--build-stamp [tag]\tfor --package, this specifies a special tag, generating version tag '%s.<tag>. springpython.properties can override with build.stamp'" % p["version"]
     print "\t\t\t\tIf this option isn't used, default will be tag will be '%s.<current time>'" % p["version"]
-    print "\t--register\t\tregister this release with http://pypi.python.org/pypi"
+    print "\t--register\t\tregister this release with https://pypi.python.org/pypi"
     print "\t--docs-sphinx\t\tgenerate Sphinx documentation"
     print "\t--pydoc\t\t\tgenerate pydoc information"
     print
diff --git a/docs/sphinx/source/dao.rst b/docs/sphinx/source/dao.rst
index e7057dd..2d78c3c 100644
--- a/docs/sphinx/source/dao.rst
+++ b/docs/sphinx/source/dao.rst
@@ -19,27 +19,27 @@ SQL databases. Depending on which SQL connection factory you're about to use,
 you need to install following dependencies:
 
 * *springpython.database.factory.MySQLConnectionFactory* -
-  needs `MySQLdb <http://sourceforge.net/projects/mysql-python/>`_ for connecting to MySQL,
+  needs `MySQLdb <https://sourceforge.net/projects/mysql-python/>`_ for connecting to MySQL,
 
 * *springpython.database.factory.PgdbConnectionFactory* -
   needs `PyGreSQL <http://www.pygresql.org/>`_ for connecting to PostgreSQL,
 
 * *springpython.database.factory.Sqlite3ConnectionFactory* -
-  needs `PySQLite <http://pypi.python.org/pypi/pysqlite/>`_ for connecting to SQLite 3, note that PySQLite is part
+  needs `PySQLite <https://pypi.python.org/pypi/pysqlite/>`_ for connecting to SQLite 3, note that PySQLite is part
   of Python 2.5 and later so you need to install it separately only if you're
   using Python 2.4,
 
 * *springpython.database.factory.cxoraConnectionFactory* -
-  needs `cx_Oracle <http://pypi.python.org/pypi/cx_Oracle>`_ for connecting to Oracle,
+  needs `cx_Oracle <https://pypi.python.org/pypi/cx_Oracle>`_ for connecting to Oracle,
 
 * *springpython.database.factory.SQLServerConnectionFactory* -
-  needs `PyODBC <http://pypi.python.org/pypi/pyodbc>`_ for connecting to SQL Server.
+  needs `PyODBC <https://pypi.python.org/pypi/pyodbc>`_ for connecting to SQL Server.
 
 Traditional Database Query
 ++++++++++++++++++++++++++
 
 If you have written a database SELECT statement following Python's
-`DB-API 2.0 <http://www.python.org/dev/peps/pep-0249/>`_, it would something
+`DB-API 2.0 <https://www.python.org/dev/peps/pep-0249/>`_, it would something
 like this (MySQL example)::
 
     conn = MySQL.connection(username="me", password="secret", hostname="localhost", db="springpython")
@@ -168,7 +168,7 @@ What is a Connection Factory?
 +++++++++++++++++++++++++++++
 
 You may have noticed I didn't make a standard connection in the example above.
-That is because to support `Dependency Injection <http://en.wikipedia.org/wiki/Dependency_injection>`_,
+That is because to support `Dependency Injection <https://en.wikipedia.org/wiki/Dependency_injection>`_,
 I need to setup my credentials in an object before making the actual connection.
 *MySQLConnectionFactory* holds credentials specific to the MySQL DB-API, but
 contains a common function to actually create the connection. I don't have
@@ -196,7 +196,7 @@ You may have noticed in the first three example queries I wrote with the
 *binding variables*, and they require a tuple argument be included after the SQL
 statement. Do *NOT* include quotes around these variables. The database connection
 will handle that. This style of SQL programming is *highly recommended* to avoid
-`SQL injection attacks <http://en.wikipedia.org/wiki/SQL_injection>`_.
+`SQL injection attacks <https://en.wikipedia.org/wiki/SQL_injection>`_.
 
 For users who are familiar with Java database APIs, the binding variables are
 cited using "?" instead of "%s". To make both parties happy and help pave the
@@ -207,8 +207,8 @@ as you wish, and things will still work.
 Have you used Spring Framework's JdbcTemplate?
 ++++++++++++++++++++++++++++++++++++++++++++++
 
-If you are a user of Java's `Spring framework <http://www.springsource.org/>`_
-and have used the `JdbcTemplate <http://static.springsource.org/spring/docs/1.2.x/api/org/springframework/jdbc/core/JdbcTemplate.html>`_,
+If you are a user of Java's `Spring framework <https://www.springsource.org/>`_
+and have used the `JdbcTemplate <https://docs.spring.io/spring/docs/1.2.x/api/org/springframework/jdbc/core/JdbcTemplate.html>`_,
 then you will find this template has a familiar feel.
 
 =================================================================  ================================================================================================
diff --git a/docs/sphinx/source/jms.rst b/docs/sphinx/source/jms.rst
index 7e712c2..7f9a1c5 100644
--- a/docs/sphinx/source/jms.rst
+++ b/docs/sphinx/source/jms.rst
@@ -57,8 +57,8 @@ from IBM's site.
 
 :ref:`springpython.jms.listener.SimpleMessageListenerContainer <jms-simplemessagelistenercontainer>`, a Spring Python component which helps with
 running background JMS listeners, requires the installation of
-`Circuits 1.2+ <http://pypi.python.org/pypi/circuits>`_
-and `threadpool 1.2.7 or newer <http://pypi.python.org/pypi/threadpool>`_.
+`Circuits 1.2+ <https://pypi.python.org/pypi/circuits>`_
+and `threadpool 1.2.7 or newer <https://pypi.python.org/pypi/threadpool>`_.
 
 Quick start
 -----------
@@ -1176,7 +1176,7 @@ TextMessage's attributes along with their explanation and usage notes.
 | **jms_correlation_id**       | Equivalent to Java's JMSCorrelationID message header. It must be     |
 |                              | a string instance when set manually - a good way to produce          |
 |                              | correlation identifiers is to use the Python's                       |
-|                              | `uuid4 <http://docs.python.org/library/uuid.html>`_ type, e.g.::     |
+|                              | `uuid4 <https://docs.python.org/library/uuid.html>`_ type, e.g.::     |
 |                              |                                                                      |
 |                              |      # stdlib                                                        |
 |                              |      from uuid import uuid4                                          |
@@ -1393,7 +1393,7 @@ you should always check for their existence before making any use of them.
 Logging and troubleshooting
 ---------------------------
 
-Spring Python's JMS uses standard Python's `logging <http://docs.python.org/library/logging.html>`_
+Spring Python's JMS uses standard Python's `logging <https://docs.python.org/library/logging.html>`_
 module for emitting the messages.
 In general, you can expect JMS to behave sane, it won't overflow your logs with
 meaningless entries, e.g. if you configure it to log the messages at the *ERROR*
diff --git a/docs/sphinx/source/objects-other-formats.rst b/docs/sphinx/source/objects-other-formats.rst
index a35374f..7db3abc 100644
--- a/docs/sphinx/source/objects-other-formats.rst
+++ b/docs/sphinx/source/objects-other-formats.rst
@@ -93,7 +93,7 @@ Python platform.
     <beans xmlns="http://www.springframework.org/schema/beans"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.springframework.org/schema/beans
-               http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+               https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
         <bean id="MovieLister" class="springpythontest.support.testSupportClasses.MovieLister" scope="prototype">
             <property name="finder" ref="MovieFinder"/>
@@ -139,7 +139,7 @@ the *ApplicationContext*.
     feature set.
 
     How much of Spring Java will be supported? That is an open question, best
-    discussed on `Spring Python's community forum <http://forum.springsource.org/forumdisplay.php?f=45>`_.
+    discussed on `Spring Python's community forum <https://forum.spring.io/forumdisplay.php?f=45>`_.
     Basically, this is meant to ease current Java developers into Spring Python and/or
     provide a means to split up objects to support porting parts of your application
     into Python. There isn't any current intention of providing full blown support.
\ No newline at end of file
diff --git a/docs/sphinx/source/objects-xmlconfig.rst b/docs/sphinx/source/objects-xmlconfig.rst
index 1a12272..90bceb4 100644
--- a/docs/sphinx/source/objects-xmlconfig.rst
+++ b/docs/sphinx/source/objects-xmlconfig.rst
@@ -198,8 +198,8 @@ as well. The following configuration shows usage of *dict*, *list*, *props*, *se
 * some_dict is a Python dictionary with four entries.
 * some_list is a Python list with three entries.
 * some_props is also a Python dictionary, containing three values.
-* some_set is an instance of Python's `mutable set <http://docs.python.org/library/collections.html?highlight=mutableset#abcs-abstract-base-classes>`_.
-* some_frozen_set is an instance of Python's `frozen set <http://docs.python.org/library/stdtypes.html?#frozenset>`_.
+* some_set is an instance of Python's `mutable set <https://docs.python.org/library/collections.html?highlight=mutableset#abcs-abstract-base-classes>`_.
+* some_frozen_set is an instance of Python's `frozen set <https://docs.python.org/library/stdtypes.html?#frozenset>`_.
 * some_tuple is a Python tuple with three values.
 
 .. note::
@@ -293,7 +293,7 @@ the old :ref:`PyContainer <objects-other-formats-pycontainerconfig>` format woul
 While this is very succinct for expressing definitions using as much Python
 as possible, that format makes it very hard to embed referenced objects and
 inner objects, since PyContainerConfig uses Python's
-`eval <http://docs.python.org/library/functions.html#eval>`_ method to convert
+`eval <https://docs.python.org/library/functions.html#eval>`_ method to convert
 the material.
 
 The following configuration block shows how to configure the same thing for
diff --git a/docs/sphinx/source/objects-yamlconfig.rst b/docs/sphinx/source/objects-yamlconfig.rst
index 5329802..4c43b4a 100644
--- a/docs/sphinx/source/objects-yamlconfig.rst
+++ b/docs/sphinx/source/objects-yamlconfig.rst
@@ -4,7 +4,7 @@ YamlConfig - Spring Python's YAML format
 .. highlight:: yaml
 
 *YamlConfig* is a class that scans object definitions stored in a
-`YAML 1.1 <http://www.yaml.org/>`_ format using the `PyYAML <http://pyyaml.org/>`_
+`YAML 1.1 <https://yaml.org>`_ format using the `PyYAML <https://pyyaml.org/>`_
 project.
 
 The following is a simple definition of objects, including scope and lazy-init.
@@ -187,8 +187,8 @@ and *tuple*::
 * some_dict is a Python dictionary with four entries.
 * some_list is a Python list with three entries.
 * some_props is also a Python dictionary, containing three values.
-* some_set is an instance of Python's `mutable set <http://docs.python.org/library/collections.html?highlight=mutableset#abcs-abstract-base-classes>`_.
-* some_frozen_set is an instance of Python's `frozen set <http://docs.python.org/library/stdtypes.html?#frozenset>`_.
+* some_set is an instance of Python's `mutable set <https://docs.python.org/library/collections.html?highlight=mutableset#abcs-abstract-base-classes>`_.
+* some_frozen_set is an instance of Python's `frozen set <https://docs.python.org/library/stdtypes.html?#frozenset>`_.
 * some_tuple is a Python tuple with three values.
 
 .. note::
diff --git a/docs/sphinx/source/objects.rst b/docs/sphinx/source/objects.rst
index 6c9711d..a8974a9 100644
--- a/docs/sphinx/source/objects.rst
+++ b/docs/sphinx/source/objects.rst
@@ -2,7 +2,7 @@ The IoC container
 =================
 
 Inversion Of Control (IoC), also known as
-`dependency injection <http://en.wikipedia.org/wiki/Dependency_injection>`_
+`dependency injection <https://en.wikipedia.org/wiki/Dependency_injection>`_
 is more of an architectural concept than a simple coding pattern.
 
 The idea is to decouple classes that depend on each other from inheriting other
@@ -31,7 +31,7 @@ used by a container.
     (DI) principle.
 
     If you need a decent insight into IoC and DI, please do refer to said
-    article : http://martinfowler.com/articles/injection.html.
+    article : https://martinfowler.com/articles/injection.html.
 
 The following diagram demonstrates a key Spring concept: building useful
 services on top of simple objects, configured through a container's set
@@ -45,7 +45,7 @@ External dependencies
 XML-based IoC configuration formats use ElementTree which is a part of Python's
 stantard library in Python 2.5 and newer. If you use Python 2.4 you can
 download ElementTree from here. YamlConfig requires installation of PyYAML
-which may be found `here <http://pypi.python.org/pypi/elementtree>`_.
+which may be found `here <https://pypi.python.org/pypi/elementtree>`_.
 No additional dependencies needs be installed if you choose PythonConfig.
 
 Container
@@ -70,7 +70,7 @@ can be defined by extending the *ObjectContainer* class.
 The reason it is called a container is the idea that you are going to a
 central place to get your top level object. While it is also possible to
 get all your other objects, the core concept of
-`dependency injection <http://en.wikipedia.org/wiki/Dependency_injection>`_ is
+`dependency injection <https://en.wikipedia.org/wiki/Dependency_injection>`_ is
 that below your top-most object, all the other dependencies have been injected
 and thus not require container access. That is what we mean when we say most
 of your code does NOT have to be Spring Python-aware.
@@ -154,8 +154,8 @@ Configuration
 
 Spring Python supports different formats for defining objects.
 
-In the spirit of `Spring JavaConfig <http://www.springsource.org/javaconfig>`_
-and `a blog posting <http://blog.springsource.com/2006/11/28/a-java-configuration-option-for-spring/>`_
+In the spirit of `Spring JavaConfig <https://www.springsource.org/javaconfig>`_
+and `a blog posting <https://spring.io/blog/2006/11/28/a-java-configuration-option-for-spring/>`_
 by Rod Johnson, the :doc:`PythonConfig <objects-pythonconfig>` format has been defined. By extending
 :doc:`PythonConfig <objects-pythonconfig>` and using
 the @Object Python decorator, objects may be defined with pure Python code in a centralized class.
diff --git a/docs/sphinx/source/overview.rst b/docs/sphinx/source/overview.rst
index e9f3007..9256abe 100644
--- a/docs/sphinx/source/overview.rst
+++ b/docs/sphinx/source/overview.rst
@@ -84,7 +84,7 @@ So far, the demos have been based on CherryPy, but the idea is that these
 features should work with any python web framework. The Spring Python team is
 striving to make things reusable with any python-based web framework. There
 is always the goal of expanding the samples into other frameworks, whether
-they are web-based, `RIA <http://en.wikipedia.org/wiki/Rich_Internet_application>`_, or thick-client.
+they are web-based, `RIA <https://en.wikipedia.org/wiki/Rich_Internet_application>`_, or thick-client.
 
 
 Support
@@ -105,32 +105,32 @@ started, so it contains up-to-date information on the project.
 Forums and Email
 ----------------
 
-* You can read the messages on `Spring Python's forums <http://forum.springsource.org/forumdisplay.php?f=45>`_
+* You can read the messages on `Spring Python's forums <https://forum.spring.io/forumdisplay.php?f=45>`_
   at the official Spring forum site.
 
 * If you are interested, you can sign up for the
-  `springpython-developer mailing list <http://lists.springsource.com/listmanager/listinfo/springpython-users>`_.
+  `springpython-developer mailing list <https://lists.springsource.com/listmanager/listinfo/springpython-users>`_.
 
 * You can read the
-  `current archives of the spring-users mailing list <http://lists.springsource.com/archives/springpython-users/>`_.
+  `current archives of the spring-users mailing list <https://lists.springsource.com/archives/springpython-users/>`_.
 
 * You can also read the
-  `old archives of the retired spring-developer mailing list <http://sourceforge.net/mailarchive/forum.php?forum=springpython-developer>`_.
+  `old archives of the retired spring-developer mailing list <https://sourceforge.net/p/legacy_/mailarchive/forum.php?forum=springpython-developer>`_.
 
 * If you want to join this project, see :ref:`how to become a team member <how-to-become-a-team-member>`
 
 IRC
 ---
 
-Join us on the #springpython IRC channel at `Freenode <http://freenode.net>`_.
+Join us on the #springpython IRC channel at `Freenode <https://freenode.net>`_.
 
 Downloads / Source Code
 +++++++++++++++++++++++
 
 If you want a release, check out
-`Spring's download site for Spring Python <http://www.springsource.com/download/community?project=Spring%20Python>`_.
+`Spring's download site for Spring Python <https://www.springsource.com/download/community?project=Spring%20Python>`_.
 
-Spring Python has migrated to `git <http://book.git-scm.com/index.html>`_, the distributed version control system.
+Spring Python has migrated to `git <https://book.git-scm.com/index.html>`_, the distributed version control system.
 If you want the latest source code type::
 
   git clone git://git.springsource.org/spring-python/spring-python.git
@@ -148,7 +148,7 @@ Installation
 
 This section is focused on helping you set up Spring Python.
 
-#. Go to `Spring's download site for Spring Python <http://www.springsource.com/download/community?project=Spring%20Python>`_.
+#. Go to `Spring's download site for Spring Python <https://www.springsource.com/download/community?project=Spring%20Python>`_.
 #. Click on **Spring Python**.
 #. Download **springpython-[release].tar.gz** to get the core library.
 #. Unpack the tarball, and go to the directory containing setup.py. (NOTE: This has been tested on Mac OSX 10.5/10.6, and Ubuntu Linux 9.04+)
@@ -220,7 +220,7 @@ Before sending us a patch, we ask you to sign the
 After a few patches, if things are looking good, we may evaluate giving you
 committer rights.
 
-Spring Python is a `TDD-based <http://en.wikipedia.org/wiki/Test-driven_development>`_
+Spring Python is a `TDD-based <https://en.wikipedia.org/wiki/Test-driven_development>`_
 project, meaning if you are working on code,
 be sure to write an automated test case and write the test case FIRST. For
 insight into that, take a trip into the code repository's test section to
@@ -236,19 +236,19 @@ hold everyone to the same standard.
 .. rubric:: Getting started with contributing
 
 #. First of all, I suggest you sign up on our
-   `springpython-developer <http://lists.springsource.com/listmanager/listinfo/springpython-users>`_
+   `springpython-developer <https://lists.springsource.com/listmanager/listinfo/springpython-users>`_
    mailing list. That way, you'll get notified about big items as well be on the inside
    for important developments that may or may not get published to the web site.
    *NOTE: Use the springsource list, NOT the sourceforge one.*
 
-#. Second, I suggest you register for a `jira account <http://jira.springsource.org/>`_,
+#. Second, I suggest you register for a `jira account <https://jira.springsource.org/>`_,
    so you can leave comments, etc. on the ticket. I think that works (I don't manage
    jira, so if it doesn't let me know, and we will work from there) NOTE: I like
    notes and comments tracking what you have done, or what you think needs to be done.
    It gives us input in case someone else eventually has to complete the ticket.
    That would also be the place where you can append new files or patches to existing code.
 
-#. Third, register at the `SpringSource community forum <http://forum.springsource.org/>`_,
+#. Third, register at the `SpringSource community forum <https://forum.spring.io/>`_,
    and if you want to kick ideas around or float a concept, feel free to start a thread in our Spring
    Python forum.
 
diff --git a/docs/sphinx/source/plugins.rst b/docs/sphinx/source/plugins.rst
index e4895dc..6f59595 100644
--- a/docs/sphinx/source/plugins.rst
+++ b/docs/sphinx/source/plugins.rst
@@ -3,7 +3,7 @@ Spring Python's plugin system
 
 Spring Python's plugin system is designed to help you rapidly develop applications.
 Plugin-based solutions have been proven to enhance developer efficiency, with
-examples such as `Grails <http://grails.org/>`_ and `Eclipse <http://eclipse.org/>`_
+examples such as `Grails <https://grails.org/>`_ and `Eclipse <https://eclipse.org/>`_
 being market leaders in usage and productivity.
 
 This plugin solution was mainly inspired by the Grails demo presented by
@@ -29,7 +29,7 @@ for you to develop your own plugins as well.
 
     Have you considered submitting your plugin as a Spring Extension?
 
-    `Spring Extensions <http://www.springsource.org/extensions>`_ is the official
+    `Spring Extensions <https://www.springsource.org/extensions>`_ is the official
     incubator process for SpringSource. You can
     always maintain your own plugin separately, using whatever means you wish. But
     if want to get a larger adoption of your plugin, name association with
@@ -62,7 +62,7 @@ The results should list available commands::
 
     Coily - the command-line management tool for Spring Python
     ==========================================================
-    Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+    Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
     Licensed under the Apache License, Version 2.0
 
 
@@ -104,7 +104,7 @@ the *gen-cherrypy-app* plugin, you will see it listed::
 
     Coily - the command-line management tool for Spring Python
     ==========================================================
-    Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+    Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
     Licensed under the Apache License, Version 2.0
 
 
@@ -131,12 +131,12 @@ This section documents plugins that are developed by the Spring Python team.
 External dependencies
 +++++++++++++++++++++
 
-*gen-cherrypy-app* plugin requires the installation of `CherryPy 3 <http://cherrypy.org/>`_.
+*gen-cherrypy-app* plugin requires the installation of `CherryPy 3 <https://cherrypy.org/>`_.
 
 gen-cherrypy-app
 ++++++++++++++++
 
-This plugin is used to generate a skeleton `CherryPy <http://cherrypy.org/>`_
+This plugin is used to generate a skeleton `CherryPy <https://cherrypy.org/>`_
 application based on feeding it a command-line argument::
 
     % coily --gen-cherrypy-app twitterclone
@@ -198,7 +198,7 @@ The special things needed to define a plugin are as follows:
 Case Study - gen-cherrypy-app plugin
 ++++++++++++++++++++++++++++++++++++
 
-*gen-cherrypy-app* is a plugin used to build a `CherryPy <http://cherrypy.org/>`_ web application using
+*gen-cherrypy-app* is a plugin used to build a `CherryPy <https://cherrypy.org/>`_ web application using
 Spring Python's feature set. It saves the developer from having to re-configure
 Spring Python's security module, coding CherryPy's engine, and so forth. This
 allows the developer to immediately start writing business code against a
@@ -213,7 +213,7 @@ Source Code
 ::
 
     """
-       Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+       Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
diff --git a/docs/sphinx/source/remoting.rst b/docs/sphinx/source/remoting.rst
index b852691..e4139df 100644
--- a/docs/sphinx/source/remoting.rst
+++ b/docs/sphinx/source/remoting.rst
@@ -31,7 +31,7 @@ Spring Python currently supports and requires the installation of at least one o
 
 * `Pyro <http://pyro.sourceforge.net/>`_ (Python Remote Objects) - a pure Python transport mechanism
 
-* `Pyro4 <http://www.razorvine.net/python/Pyro/>` - (Python Remote Object v.4) - an updated version of the Pyro API.
+* `Pyro4 <https://www.razorvine.net/python/Pyro/>` - (Python Remote Object v.4) - an updated version of the Pyro API.
 
 * `Hessian <http://hessian.caucho.com/>`_ - support for Hessian has just started. So far, you can call
   Python-to-Java based on libraries released from Caucho.
@@ -711,13 +711,13 @@ SSLServer
 >>>>>>>>>
 
 SSLServer is a subclass of Python's
-`SimpleXMLRPCServer.SimpleXMLRPCServer <http://docs.python.org/library/simplexmlrpcserver.html#module-SimpleXMLRPCServer>`_
+`SimpleXMLRPCServer.SimpleXMLRPCServer <https://docs.python.org/library/simplexmlrpcserver.html#module-SimpleXMLRPCServer>`_
 which accepts arguments related to SSL in addition to those inherited from
 the base class. You expose XML-RPC services by extending SSLServer in your
 own subclass which is required to override one method, *register_functions*.
 *register_functions* may in turn use *self.register_function* for exposing those
 methods that should be accessible via XML-RPC, see
-`Python's documentation <http://docs.python.org/library/simplexmlrpcserver.html#SimpleXMLRPCServer.SimpleXMLRPCServer.register_function>`_
+`Python's documentation <https://docs.python.org/library/simplexmlrpcserver.html#SimpleXMLRPCServer.SimpleXMLRPCServer.register_function>`_
 for details of using *self.register_function*.
 
 SSLServer.__init__'s default arguments::
@@ -736,15 +736,15 @@ SSLServer.__init__'s default arguments::
   of Certificate Authorities signing the certificates of clients you deal with,
   e.g. "./ca-chain.pem",
 * *cert_reqs* - whether the client is required to authenticate itself with a certificate,
-  see `Python's documentation <http://docs.python.org/library/ssl.html#ssl.wrap_socket>`_
+  see `Python's documentation <https://docs.python.org/library/ssl.html#ssl.wrap_socket>`_
   for supported values,
 * *ssl_version* - the SSL/TLS version to use, see
-  `Python's documentation <http://docs.python.org/library/ssl.html#ssl.wrap_socket>`_
+  `Python's documentation <https://docs.python.org/library/ssl.html#ssl.wrap_socket>`_
   for supported values, note that the same value **must** be used by the client
   application,
-* *do_handshake_on_connect* - `same as in Python <http://docs.python.org/library/ssl.html#ssl.wrap_socket>`_,
-* *suppress_ragged_eofs* - `same as in Python <http://docs.python.org/library/ssl.html#ssl.wrap_socket>`_,
-* *ciphers* - `same as in Python <http://docs.python.org/library/ssl.html#ssl.wrap_socket>`_,
+* *do_handshake_on_connect* - `same as in Python <https://docs.python.org/library/ssl.html#ssl.wrap_socket>`_,
+* *suppress_ragged_eofs* - `same as in Python <https://docs.python.org/library/ssl.html#ssl.wrap_socket>`_,
+* *ciphers* - `same as in Python <https://docs.python.org/library/ssl.html#ssl.wrap_socket>`_,
   the value will be silently ignored if not running Python 2.7 or newer,
 * *log_requests* - whether requests should be logged on stdout, the value is actually
   passed directly to the request handler and that's why in current version
@@ -754,7 +754,7 @@ SSLServer.__init__'s default arguments::
 * *\**kwargs* - an open-ended list of keyword arguments, currently the only
   argument being recognized is *verify_fields* which must be a dictionary
   containing fields and values of the client certificate that must exist when the client's
-  connecting. Fields names should be in the format given in `Appendix A of RFC 3280 <http://tools.ietf.org/html/rfc3280>`_,
+  connecting. Fields names should be in the format given in `Appendix A of RFC 3280 <https://tools.ietf.org/html/rfc3280>`_,
   which means using long names instead of short ones (commonName not CN, organizationName not O, etc.),
   for instance, setting verify_fields to:
 
@@ -811,7 +811,7 @@ SSLClient
 >>>>>>>>>
 
 SSLClient extends Python's built-in
-`xmlrpclib.ServerProxy <http://docs.python.org/library/xmlrpclib.html#xmlrpclib.ServerProxy>`_
+`xmlrpclib.ServerProxy <https://docs.python.org/library/xmlrpclib.html#xmlrpclib.ServerProxy>`_
 class and, unlike :ref:`SSLServer <remoting-secure-xml-config-sslserver>`,
 can be used directly without the need for subclassing. You can simply create
 an instance and start invoking server's methods.
@@ -832,18 +832,18 @@ SSLClient.__init__’s default arguments::
 * *keyfile* - path to a PAM-encoded private key of the client, e.g. "./client-key.pem",
 * *certfile* - path to a PAM-encoded certificate of the client, e.g. "./client-key.pem",
 * *cert_reqs* - whether a server is required to have a certificate,
-  see `Python's documentation <http://docs.python.org/library/ssl.html#ssl.wrap_socket>`_
+  see `Python's documentation <https://docs.python.org/library/ssl.html#ssl.wrap_socket>`_
   for supported values,
 * *ssl_version* - the SSL/TLS version to use, see
-  `Python's documentation <http://docs.python.org/library/ssl.html#ssl.wrap_socket>`_
+  `Python's documentation <https://docs.python.org/library/ssl.html#ssl.wrap_socket>`_
   for supported values, note that the same value **must** be used by the server,
-* *transport* - `same as in Python <http://docs.python.org/library/xmlrpclib.html#xmlrpclib.ServerProxy>`_,
-* *encoding* - `same as in Python <http://docs.python.org/library/xmlrpclib.html#xmlrpclib.ServerProxy>`_,
-* *verbose* - `same as in Python <http://docs.python.org/library/xmlrpclib.html#xmlrpclib.ServerProxy>`_,
-* *allow_none* - `same as in Python <http://docs.python.org/library/xmlrpclib.html#xmlrpclib.ServerProxy>`_,
-* *use_datetime* - `same as in Python <http://docs.python.org/library/xmlrpclib.html#xmlrpclib.ServerProxy>`_,
-* *timeout* - `same as in Python <http://docs.python.org/library/httplib.html#httplib.HTTPConnection>`_,
-* *strict* - `same as in Python <http://docs.python.org/library/httplib.html#httplib.HTTPConnection>`_
+* *transport* - `same as in Python <https://docs.python.org/library/xmlrpclib.html#xmlrpclib.ServerProxy>`_,
+* *encoding* - `same as in Python <https://docs.python.org/library/xmlrpclib.html#xmlrpclib.ServerProxy>`_,
+* *verbose* - `same as in Python <https://docs.python.org/library/xmlrpclib.html#xmlrpclib.ServerProxy>`_,
+* *allow_none* - `same as in Python <https://docs.python.org/library/xmlrpclib.html#xmlrpclib.ServerProxy>`_,
+* *use_datetime* - `same as in Python <https://docs.python.org/library/xmlrpclib.html#xmlrpclib.ServerProxy>`_,
+* *timeout* - `same as in Python <https://docs.python.org/library/httplib.html#httplib.HTTPConnection>`_,
+* *strict* - `same as in Python <https://docs.python.org/library/httplib.html#httplib.HTTPConnection>`_
 
 Sample SSL XML-RPC client which uses a private key and a certificate, can be
 used for invoking the :ref:`server <remoting-secure-xml-config-sslserver-sample>`
@@ -874,7 +874,7 @@ SSLServer
 >>>>>>>>>
 
 Your subclass of SSLServer can be configured to use Python's
-standard `logging <http://docs.python.org/library/logging.html>`_ module.
+standard `logging <https://docs.python.org/library/logging.html>`_ module.
 Currently, logging events are emitted at *logging.DEBUG* and *logging.ERROR* levels.
 
 At ERROR level all failed attempts at validating of client certificates will
@@ -943,7 +943,7 @@ SSLClient
 Although SSLClient does define a self.logger object it isn't currently used
 internally in any situation (subject to change without notice so you shouldn't
 rely on the current status). On the other hand, as a subclass of
-`xmlrpclib.ServerProxy <http://docs.python.org/library/xmlrpclib.html#xmlrpclib.ServerProxy>`_,
+`xmlrpclib.ServerProxy <https://docs.python.org/library/xmlrpclib.html#xmlrpclib.ServerProxy>`_,
 the client may be configured to run in a *verbose* mode which means all HTTP traffic
 will be printed onto *standard output*.
 
diff --git a/docs/sphinx/source/samples.rst b/docs/sphinx/source/samples.rst
index 731dbac..473ea71 100644
--- a/docs/sphinx/source/samples.rst
+++ b/docs/sphinx/source/samples.rst
@@ -6,7 +6,7 @@ PetClinic
 
 PetClinic is a sample application demonstrating the usage of Spring Python.
 
-* It uses `CherryPy <http://cherrypy.org/>`_ as the web server object.
+* It uses `CherryPy <https://cherrypy.org/>`_ as the web server object.
 
 * A `detailed design document <https://fisheye.springsource.org/browse/se-springpython-py/samples/petclinic/cherrypy/html/petclinic.html>`_
   (NOTE: find latest version, and click on raw) is
@@ -32,7 +32,7 @@ After that, it will have setup database *petclinic*::
   bash$ cd cherrypy
   bash$ python petclinic.py
 
-This assumes you have `CherryPy 3 <http://cherrypy.org/>`_  installed. It probably
+This assumes you have `CherryPy 3 <https://cherrypy.org/>`_  installed. It probably
 *won't* work if you are still using CherryPy 2. NOTE: If you are using Python 2.5.2+, you must install
 CherryPy 3.1.2+. The older version of CherryPy (3.1.0) only works pre-2.5.2.
 
@@ -61,7 +61,7 @@ Why write a bot?
 ++++++++++++++++
 
 I read an article,
-`Building a community around your open source project <http://www.redhatmagazine.com/2007/09/21/building-a-community-around-your-open-source-project/>`_,
+`Building a community around your open source project <https://magazine.redhat.com/2007/09/21/building-a-community-around-your-open-source-project/>`_,
 that talked about setting up an IRC channel for your project. This is a route
 to support existing users, and allow them to work with each other.
 
@@ -80,7 +80,7 @@ For Ubuntu users::
 
   % sudo apt-get install python-irclib
 
-This bot also sports a web page using `CherryPy <http://cherrypy.org/>`_.
+This bot also sports a web page using `CherryPy <https://cherrypy.org/>`_.
 You also need to install that as well.
 
 Articles
@@ -102,11 +102,11 @@ What I built
 Using this, I managed to get something primitive running. It took me a while
 to catch on that posting private messages on a channel name instead of a user
 is the way to publicly post to a channel. I guess it helped to trip through
-the `IRC RFC <http://www.irchelp.org/irchelp/rfc/rfc.html>`_ manual, before catching on to this.
+the `IRC RFC <https://www.irchelp.org/irchelp/rfc/rfc.html>`_ manual, before catching on to this.
 
-At this stage, you may wish to get familiar with `regular expressions in Python <http://www.amk.ca/python/howto/regex/>`_.
+At this stage, you may wish to get familiar with `regular expressions in Python <https://www.amk.ca/python/howto/regex/>`_.
 You will certainly need this in order to make intelligent looking patterns.
-Anything more sophisticated would probably require `PLY <http://www.dabeaz.com/ply/>`_.
+Anything more sophisticated would probably require `PLY <https://www.dabeaz.com/ply/>`_.
 
 What I really like is that fact that I built this application in approximately
 24 hours, counting the time to learn how to use python-irclib. I already knew
@@ -116,7 +116,7 @@ article should demonstrate how long it took.
 NOTE: This whole script is contained in one file, and marked up as::
 
   """
-     Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+     Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -268,14 +268,14 @@ Spring-based web app::
             <hr>
             <table style="width:100%"><tr>
                     <td><A href="/">Home</A></td>
-                    <td style="text-align:right;color:silver">Coily :: a <a href="http://springpython.webfactional.com">Spring Python</a> IRC bot (powered by <A HREF="http://www.cherrypy.org">CherryPy</A>)</td>
+                    <td style="text-align:right;color:silver">Coily :: a <a href="http://springpython.webfactional.com">Spring Python</a> IRC bot (powered by <A HREF="https://www.cherrypy.org">CherryPy</A>)</td>
             </tr></table>
 
             </body>
             """
 
     def markup(text):
-        """Convert any http://xyz references into real web links."""
+        """Convert any https://xyz references into real web links."""
         httpR = re.compile(r"(http://[\w.:/?-]*\w)")
         alteredText = httpR.sub(r'<A HREF="\1">\1</A>', text)
         return alteredText
@@ -515,4 +515,4 @@ Unfortunately, at this time, I don't have a mechanism to make it run persistentl
 External Links
 ++++++++++++++
 
-`See this article reported in LinuxToday <http://www.linuxtoday.com/news_story.php3?ltsn=2007-10-12-009-26-OS-DV-NT>`_
\ No newline at end of file
+`See this article reported in LinuxToday <https://www.linuxtoday.com/news_story.php3?ltsn=2007-10-12-009-26-OS-DV-NT>`_
\ No newline at end of file
diff --git a/docs/sphinx/source/security.rst b/docs/sphinx/source/security.rst
index d7e63aa..05c0678 100644
--- a/docs/sphinx/source/security.rst
+++ b/docs/sphinx/source/security.rst
@@ -17,7 +17,7 @@ for a background on this module.
 External dependencies
 ---------------------
 
-*springpython.security.cherrypy3* package depends on `CherryPy 3 <http://cherrypy.org/>`_
+*springpython.security.cherrypy3* package depends on `CherryPy 3 <https://cherrypy.org/>`_
 being installed prior to using it. Other than that, there are no specific external libraries
 required by Spring Python's security system, however the IoC configuration
 format that you'll be using may need some, check IoC documentation
diff --git a/generate_site.bash b/generate_site.bash
index daaccce..13cdd36 100755
--- a/generate_site.bash
+++ b/generate_site.bash
@@ -1,6 +1,6 @@
 #!/bin/bash
 ###################################################################################
-#   Copyright 2006-2011 SpringSource (http://springsource.com), All Rights Reserved
+#   Copyright 2006-2011 SpringSource (https://springsource.com), All Rights Reserved
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
diff --git a/samples/petclinic/cherrypy/controller.py b/samples/petclinic/cherrypy/controller.py
index 455a1a2..8a5e6d5 100644
--- a/samples/petclinic/cherrypy/controller.py
+++ b/samples/petclinic/cherrypy/controller.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/samples/petclinic/cherrypy/html/petclinic.html b/samples/petclinic/cherrypy/html/petclinic.html
index 8781082..170a941 100644
--- a/samples/petclinic/cherrypy/html/petclinic.html
+++ b/samples/petclinic/cherrypy/html/petclinic.html
@@ -17,7 +17,7 @@ <H1 ALIGN=CENTER>The Spring Python PetClinic Application</H1>
 &nbsp;&nbsp;&nbsp; 16-AUG-2003 - Ken Krebs</FONT></P>
 <H2>Introduction</H2>
 <P><A HREF="https://springpython.webfactional.com">Spring Python</A> is a collection of small, well-focused, loosely
-coupled <A HREF="http://www.python.org/">Python</A> frameworks that
+coupled <A HREF="https://www.python.org/">Python</A> frameworks that
 can be used independently or collectively to build industrial
 strength applications of many different types. The PetClinic sample
 application is designed to show how the Spring Python application
@@ -42,12 +42,12 @@ <H2>Introduction</H2>
 <UL>
 	<LI><P STYLE="margin-bottom: 0in"><B><U>concise</U></B> by handling
 	a lot of the complex control flow that is needed to use certain
-	Python API's, such as <A HREF="http://www.python.org/dev/peps/pep-0249">DB-2
+	Python API's, such as <A HREF="https://www.python.org/dev/peps/pep-0249">DB-2
 	API</A>, remoting through <A HREF="http://pyro.sourceforge.net/">PYRO</A>
 		</P>
 	<LI><P STYLE="margin-bottom: 0in"><B><U>flexible</U></B> by
 	simplifying the process of external application configuration
-	through the use of <A HREF="http://diveintopython.org/power_of_introspection/index.html">Introspection</A>
+	through the use of <A HREF="/UcONZ/power_of_introspection/index.html">Introspection</A>
 	and object creation. This allows the developer to achieve a clean
 	separation of configuration data from application code. All
 	application objects, including database connection factories,
@@ -61,7 +61,7 @@ <H2>Introduction</H2>
 	presentation framework that can work seamlessly with many different
 	types of view technologies. The Petclinic web application
 	demonstrates &quot;plugging in&quot; to one popular Python web
-	framework, <A HREF="http://www.cherrypy.org/">CherryPy</A>, while
+	framework, <A HREF="https://www.cherrypy.org/">CherryPy</A>, while
 	keeping the database layer and the model definitions neatly
 	separated. This helps developers to implement their Presentation as
 	a clean and thin layer focused on its main missions of translating
@@ -116,11 +116,11 @@ <H2>PetClinic Sample Application Requirements</H2>
 </OL>
 <H2>PetClinic Sample Application Design &amp; Implementation</H2>
 <P><B><U>Server Technology</U></B><BR>The sample application is
-written using <A HREF="http://www.cherrypy.org/">CherryPy</A> as the
+written using <A HREF="https://www.cherrypy.org/">CherryPy</A> as the
 web container. CherryPy applications are self-contained web servers
 utilizing Python's built in HTTPServer objects. CherryPy
 applications do not require a 3rd party web server, such as Apache or
-IIS. However, it is possible to <A HREF="http://cherrypy.org/wiki/BehindApache">configure
+IIS. However, it is possible to <A HREF="https://cherrypy.org/wiki/BehindApache">configure
 the CherryPy web application</A> to be fronted by a web server, and
 even spawned.<BR>In order to run the application, you must install
 CherryPy. You can download the package from their web site and
@@ -131,7 +131,7 @@ <H2>PetClinic Sample Application Design &amp; Implementation</H2>
 uses a relational database for data storage. To reset the database,
 it is probably easiest to just re-run the setup.py script.</P>
 <UL>
-	<LI><P>Support is provided for <A HREF="http://mysql.com/">MySQL</A>.
+	<LI><P>Support is provided for <A HREF="https://mysql.com/">MySQL</A>.
 	Setup requires the user to provide the MySQL &quot;root&quot;
 	password, in order to setup to the &quot;springpython&quot; user and
 	&quot;petclinic&quot; database. You need to have MySQL python module
diff --git a/samples/petclinic/cherrypy/model.py b/samples/petclinic/cherrypy/model.py
index 7a0dd0c..38b07c9 100644
--- a/samples/petclinic/cherrypy/model.py
+++ b/samples/petclinic/cherrypy/model.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/samples/petclinic/cherrypy/noxml.py b/samples/petclinic/cherrypy/noxml.py
index 5686675..bc5c6e1 100644
--- a/samples/petclinic/cherrypy/noxml.py
+++ b/samples/petclinic/cherrypy/noxml.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/samples/petclinic/cherrypy/petclinic-client-xml.py b/samples/petclinic/cherrypy/petclinic-client-xml.py
index 04bf1bb..493ac25 100644
--- a/samples/petclinic/cherrypy/petclinic-client-xml.py
+++ b/samples/petclinic/cherrypy/petclinic-client-xml.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/samples/petclinic/cherrypy/petclinic-client.py b/samples/petclinic/cherrypy/petclinic-client.py
index d0765f8..dc906ae 100644
--- a/samples/petclinic/cherrypy/petclinic-client.py
+++ b/samples/petclinic/cherrypy/petclinic-client.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/samples/petclinic/cherrypy/petclinic-server-xml.py b/samples/petclinic/cherrypy/petclinic-server-xml.py
index cae5d84..6a4fc16 100644
--- a/samples/petclinic/cherrypy/petclinic-server-xml.py
+++ b/samples/petclinic/cherrypy/petclinic-server-xml.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/samples/petclinic/cherrypy/petclinic-server.py b/samples/petclinic/cherrypy/petclinic-server.py
index a230b4c..912fd85 100644
--- a/samples/petclinic/cherrypy/petclinic-server.py
+++ b/samples/petclinic/cherrypy/petclinic-server.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/samples/petclinic/cherrypy/petclinic-xml.py b/samples/petclinic/cherrypy/petclinic-xml.py
index 885b27a..6df9252 100644
--- a/samples/petclinic/cherrypy/petclinic-xml.py
+++ b/samples/petclinic/cherrypy/petclinic-xml.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/samples/petclinic/cherrypy/petclinic.py b/samples/petclinic/cherrypy/petclinic.py
index 8652dca..646045d 100644
--- a/samples/petclinic/cherrypy/petclinic.py
+++ b/samples/petclinic/cherrypy/petclinic.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/samples/petclinic/cherrypy/view.py b/samples/petclinic/cherrypy/view.py
index 63e2a48..5a2522d 100644
--- a/samples/petclinic/cherrypy/view.py
+++ b/samples/petclinic/cherrypy/view.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@ def footer():
         <hr>
         <table style="width:100%"><tr>
                 <td><A href="/">Home</A></td>
-                <td style="text-align:right;color:silver">PetClinic :: a <a href="http://springpython.webfactional.com">Spring Python</a> demonstration (powered by <A HREF="http://www.cherrypy.org">CherryPy</A>)</td>
+                <td style="text-align:right;color:silver">PetClinic :: a <a href="http://springpython.webfactional.com">Spring Python</a> demonstration (powered by <A HREF="https://www.cherrypy.org">CherryPy</A>)</td>
         </tr></table>
         </body>
         """
diff --git a/samples/petclinic/configure.py b/samples/petclinic/configure.py
index cc30c8c..ff0ef5a 100644
--- a/samples/petclinic/configure.py
+++ b/samples/petclinic/configure.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/samples/setup-template.py b/samples/setup-template.py
index fde6cb9..097a515 100644
--- a/samples/setup-template.py
+++ b/samples/setup-template.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/samples/springirc/coily b/samples/springirc/coily
index cf34690..c7a754f 100755
--- a/samples/springirc/coily
+++ b/samples/springirc/coily
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -59,14 +59,14 @@ def footer():
         <hr>
         <table style="width:100%"><tr>
                 <td><A href="/">Home</A></td>
-                <td style="text-align:right;color:silver">Coily :: a <a href="http://springpython.webfactional.com">Spring Python</a> IRC bot (powered by <A HREF="http://www.cherrypy.org">CherryPy</A>)</td>
+                <td style="text-align:right;color:silver">Coily :: a <a href="http://springpython.webfactional.com">Spring Python</a> IRC bot (powered by <A HREF="https://www.cherrypy.org">CherryPy</A>)</td>
         </tr></table>
         
         </body>
         """
 
 def markup(text):
-    """Convert any http://xyz references into real web links."""
+    """Convert any https://xyz references into real web links."""
     httpR = re.compile(r"(http://[\w.:/?-]*\w)")
     alteredText = httpR.sub(r'<A HREF="\1">\1</A>', text)
     return alteredText
diff --git a/samples/springirc/springbot.py b/samples/springirc/springbot.py
index 4da3425..65437ed 100644
--- a/samples/springirc/springbot.py
+++ b/samples/springirc/springbot.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/samples/springwiki/controller.py b/samples/springwiki/controller.py
index 6d4cf0e..749fa27 100644
--- a/samples/springwiki/controller.py
+++ b/samples/springwiki/controller.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@
 What do you think?
 
 ==== Level 4 Header ====
-Personally, I think this is cool. This is a wiki engine that uses the same wiki-text as [http://en.wikipedia.org Wikipedia].
+Personally, I think this is cool. This is a wiki engine that uses the same wiki-text as [https://en.wikipedia.org Wikipedia].
 
 There are many features:
 * You can make intrawiki links
@@ -58,7 +58,7 @@
 * And finally, [[CherryPy]] finishes it up by offering lightning fast web development time.
     """, [("Original", "This is the initial entry", "20:02, 6 October 2006", "User:Gregturn"), ("First edit", "This is an edit", "20:12, 12 October 2006", "User:Gregturn")]],
     "Spring Wiki":["""Spring Wiki is a demonstration application that shows how to write a wiki engine using Spring Python and [[CherryPy]].""", []],
-    "CherryPy":["""[http://www.cherrypy.org CherryPy] is a web application framework.""", []],
+    "CherryPy":["""[https://www.cherrypy.org CherryPy] is a web application framework.""", []],
     "Springwiki Sidebar": ["""
 Single-star entries define boxes in the sidebar. Double-star boxes define the links listed underneath the boxes.
 
diff --git a/samples/springwiki/css/commonPrint.css b/samples/springwiki/css/commonPrint.css
index 76b054c..04281e5 100644
--- a/samples/springwiki/css/commonPrint.css
+++ b/samples/springwiki/css/commonPrint.css
@@ -2,11 +2,11 @@
 ** MediaWiki Print style sheet for CSS2-capable browsers.
 ** Copyright Gabriel Wicke, http://www.aulinx.de/
 **
-** Derived from the plone (http://plone.org/) styles
+** Derived from the plone (https://plone.org/) styles
 ** Copyright Alexander Limi
 */
 
-/* Thanks to A List Apart (http://alistapart.com/) for useful extras */
+/* Thanks to A List Apart (https://alistapart.com/) for useful extras */
 a.stub,
 a.new{ color:#ba0000; text-decoration:none; }
 
diff --git a/samples/springwiki/css/main.css b/samples/springwiki/css/main.css
index c6c5a21..cd332ee 100644
--- a/samples/springwiki/css/main.css
+++ b/samples/springwiki/css/main.css
@@ -1,10 +1,10 @@
 /*
 ** MediaWiki 'monobook' style sheet for CSS2-capable browsers.
-** Copyright Gabriel Wicke - http://wikidev.net/
-** License: GPL (http://www.gnu.org/copyleft/gpl.html)
+** Copyright Gabriel Wicke - https://sites.google.com/site/wickelandschaft//
+** License: GPL (https://www.gnu.org/copyleft/gpl.html)
 **
 ** Loosely based on http://www.positioniseverything.net/ordered-floats.html by Big John
-** and the Plone 2.0 styles, see http://plone.org/ (Alexander Limi,Joe Geldart & Tom Croucher,
+** and the Plone 2.0 styles, see https://plone.org/ (Alexander Limi,Joe Geldart & Tom Croucher,
 ** Michael Zeltner and Geir Bækholt)
 ** All you guys rock :)
 */
@@ -40,8 +40,8 @@ td { padding:3px; }
 
 /* Font size:
 ** We take advantage of keyword scaling- browsers won't go below 9px
-** More at http://www.w3.org/2003/07/30-font-size
-** http://style.cleverchimp.com/font_size_intervals/altintervals.html
+** More at https://www.w3.org/2003/07/30-font-size
+** https://style.cleverchimp.com/font_size_intervals/altintervals.html
 */
 
 body {
diff --git a/samples/springwiki/css/sticky.js b/samples/springwiki/css/sticky.js
index cf248c3..17d893b 100644
--- a/samples/springwiki/css/sticky.js
+++ b/samples/springwiki/css/sticky.js
@@ -1,6 +1,6 @@
 // Make a layer that stays in the same place on screen when scrolling the browser window.
 // Version 1.2
-// See http://www.mark.ac/help for browser support.
+// See https://www.mark.ac/help for browser support.
 
 var mySticky;
 var theLayer;
@@ -63,7 +63,7 @@ lastY=10;YOffset=0;staticYOffset=10;refreshMS=25;
 
 // -------------------------
 // DHTML menu sliding. Requires checkBrowser()
-// Based on source at http://www.simplythebest.net/
+// Based on source at https://www.simplythebest.net/
 	function layerSlide(layerID) {
 		if(bw.dhtml){
 			if(!mySticky){mySticky=new makeLayerObj(layerID);}
diff --git a/samples/springwiki/model.py b/samples/springwiki/model.py
index ff3e65b..6304d98 100644
--- a/samples/springwiki/model.py
+++ b/samples/springwiki/model.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -234,7 +234,7 @@ def footer(self, selected = "article"):
                         </div><!-- f-poweredbyico -->
                         <ul id="f-list">
                             <li id="f-about">
-                                SpringWiki :: a <a href="http://springpython.webfactional.com">Spring Python</a> demonstration (powered by <A HREF="http://www.cherrypy.org">CherryPy</A>)
+                                SpringWiki :: a <a href="http://springpython.webfactional.com">Spring Python</a> demonstration (powered by <A HREF="https://www.cherrypy.org">CherryPy</A>)
                             </li>
                         </ul>
                     </div><!-- footer -->
@@ -360,7 +360,7 @@ def wikiToHtml(self):
                 addButton('../images/button_bold.png','Bold text','\'\'\'','\'\'\'','Bold text');
                 addButton('/images/button_italic.png','Italic text','\'\'','\'\'','Italic text');
                 addButton('images/button_link.png','Internal link','[[',']]','Link title');
-                addButton('images/button_extlink.png','External link (remember http:// prefix)','[',']','http://www.example.com link title');
+                addButton('images/button_extlink.png','External link (remember http:// prefix)','[',']','https://www.example.com link title');
                 addButton('images/button_headline.png','Level 2 headline','\n== ',' ==\n','Headline text');
                 addButton('images/button_image.png','Embedded image','[[Image:',']]','Example.jpg');
                 addButton('images/button_media.png','Media file link','[[Media:',']]','Example.ogg');
diff --git a/samples/springwiki/noxml.py b/samples/springwiki/noxml.py
index 998b340..cca1060 100644
--- a/samples/springwiki/noxml.py
+++ b/samples/springwiki/noxml.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/samples/springwiki/springwiki-noxml.py b/samples/springwiki/springwiki-noxml.py
index eb26b8d..47b1a86 100644
--- a/samples/springwiki/springwiki-noxml.py
+++ b/samples/springwiki/springwiki-noxml.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/samples/springwiki/springwiki.py b/samples/springwiki/springwiki.py
index c0a3326..37d95f5 100644
--- a/samples/springwiki/springwiki.py
+++ b/samples/springwiki/springwiki.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/samples/springwiki/view.py b/samples/springwiki/view.py
index 2c69602..086e0fd 100644
--- a/samples/springwiki/view.py
+++ b/samples/springwiki/view.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/plugins/coily-template b/src/plugins/coily-template
index 54d8c78..7a28f66 100755
--- a/src/plugins/coily-template
+++ b/src/plugins/coily-template
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 """
-   Copyright 2006-2009 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2009 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -87,7 +87,7 @@ def get_modules_from_s3():
     """Read the S3 site for information about existing modules."""
     info = ""
     for bucket in ["milestone", "release"]:
-        url = "http://s3browse.springsource.com/browse/dist.springframework.org/%s/EXTPY" % bucket
+        url = "https://s3browse.springsource.com/browse/dist.springframework.org/%s/EXTPY" % bucket
         info += urllib.urlopen(url).read()
     #print info
     #return []
@@ -103,7 +103,7 @@ def get_modules_from_s3():
         converted.append(item)
         #t = time.strptime(item[3], "%Y-%m-%d %H:%M")
         #d = datetime(year=t.tm_year, month=t.tm_mon, day=t.tm_mday, hour=t.tm_hour, minute=t.tm_min)
-        #converted.append(("http://s3.amazonaws.com/" + item[0], item[1], item[2]+"K", item[3], d))
+        #converted.append(("https://s3.amazonaws.com/" + item[0], item[1], item[2]+"K", item[3], d))
     modules = {}
     baseR = re.compile("springpython-plugin-([a-zA-Z-]*)[-.]([0-9a-zA-Z]+.*).tar.gz")
     for item in converted:
@@ -190,7 +190,7 @@ def usage():
 
 print "Coily v%s - the command-line management tool for Spring Python, http://springpython.webfactional.com" % __version__
 print "==============================================================================="
-print "Copyright 2006-2009 SpringSource (http://springsource.com), All Rights Reserved"
+print "Copyright 2006-2009 SpringSource (https://springsource.com), All Rights Reserved"
 print "Licensed under the Apache License, Version 2.0"
 print
 
diff --git a/src/plugins/gen-cherrypy-app/__init__.py b/src/plugins/gen-cherrypy-app/__init__.py
index 3cc4f7e..ef8a2b1 100644
--- a/src/plugins/gen-cherrypy-app/__init__.py
+++ b/src/plugins/gen-cherrypy-app/__init__.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/plugins/gen-cherrypy-app/app_context.py b/src/plugins/gen-cherrypy-app/app_context.py
index 1dbb31a..21d7bfa 100644
--- a/src/plugins/gen-cherrypy-app/app_context.py
+++ b/src/plugins/gen-cherrypy-app/app_context.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/plugins/gen-cherrypy-app/cherrypy-app.py b/src/plugins/gen-cherrypy-app/cherrypy-app.py
index e94aa1e..f2dc9f7 100755
--- a/src/plugins/gen-cherrypy-app/cherrypy-app.py
+++ b/src/plugins/gen-cherrypy-app/cherrypy-app.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/plugins/gen-cherrypy-app/controller.py b/src/plugins/gen-cherrypy-app/controller.py
index e61723e..c6d916b 100644
--- a/src/plugins/gen-cherrypy-app/controller.py
+++ b/src/plugins/gen-cherrypy-app/controller.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/plugins/gen-cherrypy-app/view.py b/src/plugins/gen-cherrypy-app/view.py
index 96a3f6e..8a6f759 100644
--- a/src/plugins/gen-cherrypy-app/view.py
+++ b/src/plugins/gen-cherrypy-app/view.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -58,7 +58,7 @@ def footer():
         <hr>
         <table style="width:100%"><tr>
                 <td><A href="/">Home</A></td>
-                <td style="text-align:right;color:silver">${properName} Application :: A <a href="http://cherrypy.org">CherryPy</a>-based ${properName} application-creating template</td>
+                <td style="text-align:right;color:silver">${properName} Application :: A <a href="https://cherrypy.org">CherryPy</a>-based ${properName} application-creating template</td>
         </tr></table>
         </body>
         """
diff --git a/src/setup-template.py b/src/setup-template.py
index 0daa6a3..d52837f 100644
--- a/src/setup-template.py
+++ b/src/setup-template.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/COPYRIGHT b/src/springpython/COPYRIGHT
index b8e254c..ad82469 100644
--- a/src/springpython/COPYRIGHT
+++ b/src/springpython/COPYRIGHT
@@ -1,4 +1,4 @@
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
    limitations under the License.       
 *****************************************************************************************
 
-Spring Python is inspired by the Spring framework (http://www.springframework.org)
+Spring Python is inspired by the Spring framework (https://www.springframework.org)
 which is released under the Apache Foundation License. Spring Python does NOT require
 redistribution of Spring's software modules, nor any of its dependencies (binary or source code).
 However, you are free to download their source code to understand the basis of this product.
@@ -54,7 +54,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGE.
 
 *****************************************************************************************
-Spring Python includes software developed by Fourthought, Inc. (http://www.fourthought.com).
+Spring Python includes software developed by Fourthought, Inc. (https://www.pinkertonpw.com/).
 
 License and copyright info for 4Suite software License and copyright info for 4Suite
 software Mike Olson Fourthought, Inc. Uche Ogbuji Fourthought, Inc. License and copyright
@@ -77,7 +77,7 @@ reproduce the above copyright notice, this list of conditions and the following
 in the documentation and/or other materials provided with the distribution. The end-user
 documentation included with the redistribution, if any, must include the following
 acknowledgment: "This product includes software developed by Fourthought, Inc.
-(http://www.fourthought.com)." Alternately, this acknowledgment may appear in the software
+(https://www.pinkertonpw.com/)." Alternately, this acknowledgment may appear in the software
 itself, if and wherever such third-party acknowledgments normally appear. The names "4Suite",
 "4Suite Server" and "Fourthought" must not be used to endorse or promote products derived from
 this software without prior written permission. For written permission, please contact
@@ -98,7 +98,7 @@ This license is based on the Apache Software License, Version 1.1,
 Copyright (c) 2000 The Apache Software Foundation. All rights reserved. 
 
 *****************************************************************************************
-Spring Python includes software developed by Uche Ogbuji (http://uche.ogbuji.net).
+Spring Python includes software developed by Uche Ogbuji (https://uche.ogbuji.net).
 
 Redistribution and use in source and binary forms, with or without modification, are permitted
 provided that the following conditions are met:
@@ -110,7 +110,7 @@ provided that the following conditions are met:
       with the distribution.
    3. The end-user documentation included with the redistribution, if any, must include the
       following acknowledgment: "This product includes software developed by Uche Ogbuji
-      (http://uche.ogbuji.net)." Alternately, this acknowledgment may appear in the software
+      (https://uche.ogbuji.net)." Alternately, this acknowledgment may appear in the software
       itself, if and wherever such third-party acknowledgments normally appear.
    4. The names "Amara" and "Uche Ogbuji" must not be used to endorse or promote products derived
       from this software without prior written permission of Uche Ogbuji (uche@ogbuji.net).
diff --git a/src/springpython/__init__.py b/src/springpython/__init__.py
index e61723e..c6d916b 100644
--- a/src/springpython/__init__.py
+++ b/src/springpython/__init__.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/aop/__init__.py b/src/springpython/aop/__init__.py
index faef576..8dbd501 100644
--- a/src/springpython/aop/__init__.py
+++ b/src/springpython/aop/__init__.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/aop/utils.py b/src/springpython/aop/utils.py
index acfe834..f556ece 100644
--- a/src/springpython/aop/utils.py
+++ b/src/springpython/aop/utils.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/config/__init__.py b/src/springpython/config/__init__.py
index f7b9398..8c9e8dc 100644
--- a/src/springpython/config/__init__.py
+++ b/src/springpython/config/__init__.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/config/_config_base.py b/src/springpython/config/_config_base.py
index 8126a82..62846f1 100644
--- a/src/springpython/config/_config_base.py
+++ b/src/springpython/config/_config_base.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/config/_python_config.py b/src/springpython/config/_python_config.py
index 2e8fb57..c1adf98 100644
--- a/src/springpython/config/_python_config.py
+++ b/src/springpython/config/_python_config.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/config/_xml_config.py b/src/springpython/config/_xml_config.py
index 0e28f72..1b6b9f2 100644
--- a/src/springpython/config/_xml_config.py
+++ b/src/springpython/config/_xml_config.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/config/_yaml_config.py b/src/springpython/config/_yaml_config.py
index 8f02902..afbe64d 100644
--- a/src/springpython/config/_yaml_config.py
+++ b/src/springpython/config/_yaml_config.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/config/decorator.py b/src/springpython/config/decorator.py
index 5c81350..6cc03d9 100644
--- a/src/springpython/config/decorator.py
+++ b/src/springpython/config/decorator.py
@@ -24,7 +24,7 @@
 ##   DAMAGE.
 
 """
-Decorator module, see http://pypi.python.org/pypi/decorator
+Decorator module, see https://pypi.python.org/pypi/decorator
 for the documentation.
 """
 
diff --git a/src/springpython/container/__init__.py b/src/springpython/container/__init__.py
index 2ddfad8..f5be7de 100644
--- a/src/springpython/container/__init__.py
+++ b/src/springpython/container/__init__.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/context/__init__.py b/src/springpython/context/__init__.py
index 790e7ee..4981d63 100644
--- a/src/springpython/context/__init__.py
+++ b/src/springpython/context/__init__.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/context/scope.py b/src/springpython/context/scope.py
index 45a0238..c6fc9d1 100644
--- a/src/springpython/context/scope.py
+++ b/src/springpython/context/scope.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/database/__init__.py b/src/springpython/database/__init__.py
index e37353b..a04aaed 100644
--- a/src/springpython/database/__init__.py
+++ b/src/springpython/database/__init__.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/database/core.py b/src/springpython/database/core.py
index 034744e..c5e04f7 100644
--- a/src/springpython/database/core.py
+++ b/src/springpython/database/core.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/database/factory.py b/src/springpython/database/factory.py
index 57e280d..8a32b5e 100644
--- a/src/springpython/database/factory.py
+++ b/src/springpython/database/factory.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/database/transaction.py b/src/springpython/database/transaction.py
index 5e31401..5cd1e90 100644
--- a/src/springpython/database/transaction.py
+++ b/src/springpython/database/transaction.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/factory/__init__.py b/src/springpython/factory/__init__.py
index b532f77..6cf630c 100644
--- a/src/springpython/factory/__init__.py
+++ b/src/springpython/factory/__init__.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/jms/__init__.py b/src/springpython/jms/__init__.py
index fc4abaf..0111d23 100644
--- a/src/springpython/jms/__init__.py
+++ b/src/springpython/jms/__init__.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/jms/core.py b/src/springpython/jms/core.py
index e17256f..85eeab3 100644
--- a/src/springpython/jms/core.py
+++ b/src/springpython/jms/core.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/jms/factory.py b/src/springpython/jms/factory.py
index cd93a04..8ba6346 100644
--- a/src/springpython/jms/factory.py
+++ b/src/springpython/jms/factory.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/jms/listener.py b/src/springpython/jms/listener.py
index 2469cf5..bb160ad 100644
--- a/src/springpython/jms/listener.py
+++ b/src/springpython/jms/listener.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/remoting/__init__.py b/src/springpython/remoting/__init__.py
index 6e5dffa..836ffd0 100644
--- a/src/springpython/remoting/__init__.py
+++ b/src/springpython/remoting/__init__.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/remoting/hessian/__init__.py b/src/springpython/remoting/hessian/__init__.py
index 2f14fc2..dd58004 100644
--- a/src/springpython/remoting/hessian/__init__.py
+++ b/src/springpython/remoting/hessian/__init__.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/remoting/hessian/hessianlib.py b/src/springpython/remoting/hessian/hessianlib.py
index 9efbc44..1025521 100644
--- a/src/springpython/remoting/hessian/hessianlib.py
+++ b/src/springpython/remoting/hessian/hessianlib.py
@@ -29,7 +29,7 @@
 # 3. The end-user documentation included with the redistribution, if
 #    any, must include the following acknowlegement:
 #       "This product includes software developed by the
-#        Caucho Technology (http://www.caucho.com/)."
+#        Caucho Technology (https://www.caucho.com/)."
 #    Alternately, this acknowlegement may appear in the software itself,
 #    if and wherever such third-party acknowlegements normally appear.
 #
@@ -399,7 +399,7 @@ def __call__(self, *args):
 # Hessian is the main class.  A Hessian proxy is created with the URL
 # and then called just as for a local method
 #
-# proxy = Hessian("http://www.caucho.com/hessian/test/basic")
+# proxy = Hessian("http://hessian.caucho.com/test/basic")
 # print proxy.hello()
 #
 class Hessian:
diff --git a/src/springpython/remoting/http.py b/src/springpython/remoting/http.py
index 76a89f9..57f5d69 100644
--- a/src/springpython/remoting/http.py
+++ b/src/springpython/remoting/http.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-   Copyright 2006-2011 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2011 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/remoting/pyro/Pyro4DaemonHolder.py b/src/springpython/remoting/pyro/Pyro4DaemonHolder.py
index d0c2b59..7bf1d7d 100644
--- a/src/springpython/remoting/pyro/Pyro4DaemonHolder.py
+++ b/src/springpython/remoting/pyro/Pyro4DaemonHolder.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/remoting/pyro/PyroDaemonHolder.py b/src/springpython/remoting/pyro/PyroDaemonHolder.py
index 220bc2a..7c6ca68 100644
--- a/src/springpython/remoting/pyro/PyroDaemonHolder.py
+++ b/src/springpython/remoting/pyro/PyroDaemonHolder.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/remoting/pyro/__init__.py b/src/springpython/remoting/pyro/__init__.py
index cfad165..981973b 100644
--- a/src/springpython/remoting/pyro/__init__.py
+++ b/src/springpython/remoting/pyro/__init__.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/remoting/xmlrpc.py b/src/springpython/remoting/xmlrpc.py
index 010e4ce..5e5a9ba 100644
--- a/src/springpython/remoting/xmlrpc.py
+++ b/src/springpython/remoting/xmlrpc.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """
-   Copyright 2006-2011 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2011 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/security/__init__.py b/src/springpython/security/__init__.py
index 8ef526c..5b671f5 100644
--- a/src/springpython/security/__init__.py
+++ b/src/springpython/security/__init__.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/security/cherrypy3.py b/src/springpython/security/cherrypy3.py
index 4a547be..7050b18 100644
--- a/src/springpython/security/cherrypy3.py
+++ b/src/springpython/security/cherrypy3.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/security/context/SecurityContextHolder.py b/src/springpython/security/context/SecurityContextHolder.py
index 4ee4b49..fb17501 100644
--- a/src/springpython/security/context/SecurityContextHolder.py
+++ b/src/springpython/security/context/SecurityContextHolder.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/security/context/__init__.py b/src/springpython/security/context/__init__.py
index 514e544..7398d73 100644
--- a/src/springpython/security/context/__init__.py
+++ b/src/springpython/security/context/__init__.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/security/intercept.py b/src/springpython/security/intercept.py
index 22d9765..634e8a4 100644
--- a/src/springpython/security/intercept.py
+++ b/src/springpython/security/intercept.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/security/providers/Ldap.py b/src/springpython/security/providers/Ldap.py
index 18f5219..ddc50f1 100644
--- a/src/springpython/security/providers/Ldap.py
+++ b/src/springpython/security/providers/Ldap.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/security/providers/_Ldap_cpython.py b/src/springpython/security/providers/_Ldap_cpython.py
index 66331be..014b03c 100644
--- a/src/springpython/security/providers/_Ldap_cpython.py
+++ b/src/springpython/security/providers/_Ldap_cpython.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2009 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2009 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/security/providers/_Ldap_jython.py b/src/springpython/security/providers/_Ldap_jython.py
index 27fd74c..dc3fa90 100644
--- a/src/springpython/security/providers/_Ldap_jython.py
+++ b/src/springpython/security/providers/_Ldap_jython.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2009 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2009 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@
 WARNING WARNING WARNING WARNING
 ===============================
 This doesn't yet work. There is some issue with Jython.
-See http://bugs.jython.org/issue1489 and http://jira.springframework.org/browse/SESPRINGPYTHONPY-121 for more details.
+See https://bugs.jython.org/issue1489 and https://jira.springframework.org/browse/SESPRINGPYTHONPY-121 for more details.
 ===============================
 WARNING WARNING WARNING WARNING
 """
diff --git a/src/springpython/security/providers/__init__.py b/src/springpython/security/providers/__init__.py
index 83ea345..5b06973 100644
--- a/src/springpython/security/providers/__init__.py
+++ b/src/springpython/security/providers/__init__.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/security/providers/dao.py b/src/springpython/security/providers/dao.py
index f9374d2..f33d285 100644
--- a/src/springpython/security/providers/dao.py
+++ b/src/springpython/security/providers/dao.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/security/providers/encoding.py b/src/springpython/security/providers/encoding.py
index 691c409..bd77f93 100644
--- a/src/springpython/security/providers/encoding.py
+++ b/src/springpython/security/providers/encoding.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/security/userdetails/__init__.py b/src/springpython/security/userdetails/__init__.py
index e664e60..5f351df 100644
--- a/src/springpython/security/userdetails/__init__.py
+++ b/src/springpython/security/userdetails/__init__.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/security/userdetails/dao.py b/src/springpython/security/userdetails/dao.py
index 809ab30..fe89b57 100644
--- a/src/springpython/security/userdetails/dao.py
+++ b/src/springpython/security/userdetails/dao.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/security/vote.py b/src/springpython/security/vote.py
index aac51e7..9746f79 100644
--- a/src/springpython/security/vote.py
+++ b/src/springpython/security/vote.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/security/web.py b/src/springpython/security/web.py
index e51faf8..cc9b6d1 100644
--- a/src/springpython/security/web.py
+++ b/src/springpython/security/web.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/springpython/util.py b/src/springpython/util.py
index 5166172..3a50d56 100644
--- a/src/springpython/util.py
+++ b/src/springpython/util.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
 logging.addLevelName(TRACE1, "TRACE1")
 
 # Original code by Anand Balachandran Pillai (abpillai at gmail.com)
-# http://code.activestate.com/recipes/533135/
+# https://code.activestate.com/recipes/533135/
 class synchronized(object):
     """ Class enapsulating a lock and a function allowing it to be used as
     a synchronizing decorator making the wrapped function thread-safe """
diff --git a/test.bash b/test.bash
index e338c19..4a1324b 100755
--- a/test.bash
+++ b/test.bash
@@ -1,6 +1,6 @@
 #!/bin/bash
 ###################################################################################
-#   Copyright 2006-2011 SpringSource (http://springsource.com), All Rights Reserved
+#   Copyright 2006-2011 SpringSource (https://springsource.com), All Rights Reserved
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
diff --git a/test/springpythontest/__init__.py b/test/springpythontest/__init__.py
index e61723e..c6d916b 100644
--- a/test/springpythontest/__init__.py
+++ b/test/springpythontest/__init__.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test/springpythontest/allTests.py b/test/springpythontest/allTests.py
index 0f8c0c0..5b45ad5 100644
--- a/test/springpythontest/allTests.py
+++ b/test/springpythontest/allTests.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test/springpythontest/aopTestCases.py b/test/springpythontest/aopTestCases.py
index 5ad5f86..a788b49 100644
--- a/test/springpythontest/aopTestCases.py
+++ b/test/springpythontest/aopTestCases.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test/springpythontest/contextTestCases.py b/test/springpythontest/contextTestCases.py
index 22e87af..90663bb 100644
--- a/test/springpythontest/contextTestCases.py
+++ b/test/springpythontest/contextTestCases.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test/springpythontest/databaseCoreTestCases.py b/test/springpythontest/databaseCoreTestCases.py
index 59ddbf1..815c94e 100644
--- a/test/springpythontest/databaseCoreTestCases.py
+++ b/test/springpythontest/databaseCoreTestCases.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -883,7 +883,7 @@ def createTables(self):
             print("""
                 !!! Can't run SQLServerDatabaseTemplateTestCase !!!
 
-                This assumes you have installed pyodbc (http://code.google.com/p/pyodbc/).
+                This assumes you have installed pyodbc (https://code.google.com/p/pyodbc/).
 
                 And then created an SQL Server database for the 'springpython' 
                 login and user.
diff --git a/test/springpythontest/databaseTransactionTestCases.py b/test/springpythontest/databaseTransactionTestCases.py
index 347d4ff..ab0a187 100644
--- a/test/springpythontest/databaseTransactionTestCases.py
+++ b/test/springpythontest/databaseTransactionTestCases.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -575,7 +575,7 @@ def createTables(self):
             print("""
                 !!! Can't run SQLServerDatabaseTemplateTestCase !!!
 
-                This assumes you have installed pyodbc (http://code.google.com/p/pyodbc/).
+                This assumes you have installed pyodbc (https://code.google.com/p/pyodbc/).
 
                 And then created an SQL Server database for the 'springpython' 
                 login and user.
diff --git a/test/springpythontest/jms_websphere_mq_test_cases.py b/test/springpythontest/jms_websphere_mq_test_cases.py
index 3a65d12..53e0a80 100644
--- a/test/springpythontest/jms_websphere_mq_test_cases.py
+++ b/test/springpythontest/jms_websphere_mq_test_cases.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test/springpythontest/org/springframework/springpython/HessianJavaServer.java b/test/springpythontest/org/springframework/springpython/HessianJavaServer.java
index 51b504d..ac2500c 100644
--- a/test/springpythontest/org/springframework/springpython/HessianJavaServer.java
+++ b/test/springpythontest/org/springframework/springpython/HessianJavaServer.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2006-2008 SpringSource (http://springsource.com, All Rights Reserved
+ *  Copyright 2006-2008 SpringSource (https://springsource.com, All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/test/springpythontest/org/springframework/springpython/Person.java b/test/springpythontest/org/springframework/springpython/Person.java
index 6b9db85..2708871 100644
--- a/test/springpythontest/org/springframework/springpython/Person.java
+++ b/test/springpythontest/org/springframework/springpython/Person.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2006-2008 SpringSource (http://springsource.com, All Rights Reserved
+ *  Copyright 2006-2008 SpringSource (https://springsource.com, All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/test/springpythontest/org/springframework/springpython/SampleService.java b/test/springpythontest/org/springframework/springpython/SampleService.java
index 357b12d..31400b6 100644
--- a/test/springpythontest/org/springframework/springpython/SampleService.java
+++ b/test/springpythontest/org/springframework/springpython/SampleService.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2006-2008 SpringSource (http://springsource.com, All Rights Reserved
+ *  Copyright 2006-2008 SpringSource (https://springsource.com, All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/test/springpythontest/remotingTestCases.py b/test/springpythontest/remotingTestCases.py
index 42e11a2..41fa245 100644
--- a/test/springpythontest/remotingTestCases.py
+++ b/test/springpythontest/remotingTestCases.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test/springpythontest/remoting_xmlrpc.py b/test/springpythontest/remoting_xmlrpc.py
index ba97bde..7c839ac 100644
--- a/test/springpythontest/remoting_xmlrpc.py
+++ b/test/springpythontest/remoting_xmlrpc.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test/springpythontest/securityEncodingTestCases.py b/test/springpythontest/securityEncodingTestCases.py
index 5b57168..375d839 100644
--- a/test/springpythontest/securityEncodingTestCases.py
+++ b/test/springpythontest/securityEncodingTestCases.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test/springpythontest/securityLdapTestCases.py b/test/springpythontest/securityLdapTestCases.py
index 4fc3838..7e6ed4f 100644
--- a/test/springpythontest/securityLdapTestCases.py
+++ b/test/springpythontest/securityLdapTestCases.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test/springpythontest/securityProviderTestCases.py b/test/springpythontest/securityProviderTestCases.py
index 5f43569..6df7b96 100644
--- a/test/springpythontest/securityProviderTestCases.py
+++ b/test/springpythontest/securityProviderTestCases.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test/springpythontest/securityUserDetailsTestCases.py b/test/springpythontest/securityUserDetailsTestCases.py
index fd15ee0..b16bd9a 100644
--- a/test/springpythontest/securityUserDetailsTestCases.py
+++ b/test/springpythontest/securityUserDetailsTestCases.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test/springpythontest/securityVoteTestCases.py b/test/springpythontest/securityVoteTestCases.py
index 3f05a96..ec6bc11 100644
--- a/test/springpythontest/securityVoteTestCases.py
+++ b/test/springpythontest/securityVoteTestCases.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test/springpythontest/securityWebTestCases.py b/test/springpythontest/securityWebTestCases.py
index 95edc3f..3ec451a 100644
--- a/test/springpythontest/securityWebTestCases.py
+++ b/test/springpythontest/securityWebTestCases.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test/springpythontest/support/__init__.py b/test/springpythontest/support/__init__.py
index e61723e..c6d916b 100644
--- a/test/springpythontest/support/__init__.py
+++ b/test/springpythontest/support/__init__.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test/springpythontest/support/setupPostGreSQLSpringPython.sql b/test/springpythontest/support/setupPostGreSQLSpringPython.sql
index 3436a32..c36ecb6 100644
--- a/test/springpythontest/support/setupPostGreSQLSpringPython.sql
+++ b/test/springpythontest/support/setupPostGreSQLSpringPython.sql
@@ -1,6 +1,6 @@
 /*
 ######################################################################################
-#   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+#   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
diff --git a/test/springpythontest/support/testSecurityClasses.py b/test/springpythontest/support/testSecurityClasses.py
index 594127e..97fa9e6 100644
--- a/test/springpythontest/support/testSecurityClasses.py
+++ b/test/springpythontest/support/testSecurityClasses.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test/springpythontest/support/testSupportClasses.py b/test/springpythontest/support/testSupportClasses.py
index ee69a5e..66cae0e 100644
--- a/test/springpythontest/support/testSupportClasses.py
+++ b/test/springpythontest/support/testSupportClasses.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test/springpythontest/util_test_cases.py b/test/springpythontest/util_test_cases.py
index 1cfa7b9..046d3d1 100644
--- a/test/springpythontest/util_test_cases.py
+++ b/test/springpythontest/util_test_cases.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test/standalone/pyro_thread_test.py b/test/standalone/pyro_thread_test.py
index fd0d6e2..e176a78 100644
--- a/test/standalone/pyro_thread_test.py
+++ b/test/standalone/pyro_thread_test.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 ########################################################################
 # This is a stand-alone test, meaning it doesn't run well in automated
-# scenarios. This script exposed bug http://jira.springframework.org/browse/SESPRINGPYTHONPY-99,
+# scenarios. This script exposed bug https://jira.springframework.org/browse/SESPRINGPYTHONPY-99,
 # which showed _PyroThread having a name collisions with python2.6's threading.Thread
 # class. By renaming _PyroThread's self.daemon as self.pyro_daemon, this code
 # now works with python2.6. It was also used to confirm python2.5, and jython2.5.1.FINAL.
diff --git a/test/standalone/xsd_test_cases.py b/test/standalone/xsd_test_cases.py
index 21f9847..626e682 100644
--- a/test/standalone/xsd_test_cases.py
+++ b/test/standalone/xsd_test_cases.py
@@ -1,5 +1,5 @@
 """
-   Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
+   Copyright 2006-2008 SpringSource (https://springsource.com), All Rights Reserved
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/test_and_package.bash b/test_and_package.bash
index 2f8f7c6..14d6633 100755
--- a/test_and_package.bash
+++ b/test_and_package.bash
@@ -1,6 +1,6 @@
 #!/bin/bash
 ###################################################################################
-#   Copyright 2006-2011 SpringSource (http://springsource.com), All Rights Reserved
+#   Copyright 2006-2011 SpringSource (https://springsource.com), All Rights Reserved
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
diff --git a/xml/schema/context/spring-python-context-1.0.xsd b/xml/schema/context/spring-python-context-1.0.xsd
index 030cf79..ea42b08 100644
--- a/xml/schema/context/spring-python-context-1.0.xsd
+++ b/xml/schema/context/spring-python-context-1.0.xsd
@@ -6,7 +6,7 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+	<xsd:import namespace="https://www.w3.org/XML/1998/namespace"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/xml/schema/context/spring-python-context-1.1.xsd b/xml/schema/context/spring-python-context-1.1.xsd
index fb2a4d2..a3a36cb 100644
--- a/xml/schema/context/spring-python-context-1.1.xsd
+++ b/xml/schema/context/spring-python-context-1.1.xsd
@@ -6,7 +6,7 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+	<xsd:import namespace="https://www.w3.org/XML/1998/namespace"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
diff --git a/xml/schema/context/spring-python-pycontainer-context-1.0.xsd b/xml/schema/context/spring-python-pycontainer-context-1.0.xsd
index 6e3ee4b..2865101 100644
--- a/xml/schema/context/spring-python-pycontainer-context-1.0.xsd
+++ b/xml/schema/context/spring-python-pycontainer-context-1.0.xsd
@@ -6,7 +6,7 @@
 		elementFormDefault="qualified"
 		attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+	<xsd:import namespace="https://www.w3.org/XML/1998/namespace"/>
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[