URL Cleanup

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

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.
 
 =================================================================  ================================================================================================

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*

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.

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

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::

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.

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.