squash of these commits

commit baedf913b632e3b3f0eec9346d7d99c323632821
Author: R Hayes <rhayes@usgs.gov>
Date:   Wed Jun 13 13:06:26 2012 -0500

    OPEN - issue GWDP-316: Password in Spring config file
    http://internal.cida.usgs.gov/jira/browse/GWDP-316

    Added comment, how to configure database password.

commit 24fcd12ea2d961a32148aba18928fe6d2e892540
Author: R Hayes <rhayes@usgs.gov>
Date:   Wed Jun 13 13:01:39 2012 -0500

    Database password search from JNDI or from properties file.

commit 9e0bfc853d83a3ad6854da12bf503fe223c3e633
Author: R Hayes <rhayes@usgs.gov>
Date:   Wed Jun 13 11:39:27 2012 -0500

    Add output in test.

commit 4ee16cb8f40fd455fd8817623936e055fa8e5f57
Author: R Hayes <rhayes@usgs.gov>
Date:   Wed Jun 13 11:21:39 2012 -0500

    Get password out of application context.
    Now read from JNDI binding java:comp/env/GWDP_Portal/GW_DATA_PORTAL_PW,
    which can be configured in Tomcat context.xml like this:
    <Environment name="GWDP_Portal/GW_DATA_PORTAL_PW" override="true"
     type="java.lang.String"
     value="PASSWORD_GOES_HERE"/>

commit 66d2a87fbfcf75b31786b955753b962c76a510fd
Author: R Hayes <rhayes@usgs.gov>
Date:   Tue Jun 12 16:44:30 2012 -0500

    Relax success conditions for BasicServletTest.

commit c0431313d900b61a208d36b38b78be133eba6e3e
Author: R Hayes <rhayes@usgs.gov>
Date:   Tue Jun 12 16:03:07 2012 -0500

    Increase time limit -- needs investigation.

commit 9a28c1cef96134e0957f5f271db609610e7debb2
Author: R Hayes <rhayes@usgs.gov>
Date:   Tue Jun 12 15:45:05 2012 -0500

    OPEN - issue GWDP-311: Multi-site download not using cached data
    http://internal.cida.usgs.gov/jira/browse/GWDP-311

    Fixed.

commit 67a98cbf3bea7e4899127e4ca1371a8504c8803f
Author: David Uselmann <duselmann@usgs.gov>
Date:   Tue Jun 12 12:00:44 2012 -0500

    more ALL datatype requirements given recent enhancements

commit fe3c971549411171f3578e9c311db10634277fb6
Author: David Uselmann <duselmann@usgs.gov>
Date:   Tue Jun 12 11:32:32 2012 -0500

    another change required for successful ALL datatype requests
    - response contentType must be set to ZIP

commit 904bc6879c9ec6743cb3ad5784bdf57ae5dd40cf
Author: David Uselmann <duselmann@usgs.gov>
Date:   Tue Jun 12 10:46:46 2012 -0500

    logging at trace level

commit bf03a952332b246a22557c721ae6d91b9953e235
Author: David Uselmann <duselmann@usgs.gov>
Date:   Mon Jun 11 17:37:27 2012 -0500

    data types aliasFor so Lithology and construction can use the LOG cache,
    log servlet exceptions/errors, datatypes can now have multiple row elements - LOG c
    an use both lith/con rows

commit 34fa100795b0aeaa9ffed1c7b64f2ac58d9bc742
Author: David Uselmann <duselmann@usgs.gov>
Date:   Mon Jun 11 17:33:52 2012 -0500

    fixed test related to added quotes to data in transformers and row element ids to data types

commit 79ca07cb794885886cd46d06cb641ccb347eeaaf
Author: David Uselmann <duselmann@usgs.gov>
Date:   Mon Jun 11 14:33:21 2012 -0500

    trim data during csv transform

commit d8c7b799bdd8bd0e3559a0c68aff2efd08ff2e6c
Author: David Uselmann <duselmann@usgs.gov>
Date:   Mon Jun 11 14:30:17 2012 -0500

    DRY CSV TSV impl

commit fa3f3524abdb67e617eebf353067c68fc0fab85d
Author: David Uselmann <duselmann@usgs.gov>
Date:   Mon Jun 11 14:26:03 2012 -0500

    new datatypes lithology and construction,
    UrlFactory throws error when urls are not mapped to the datatypes,
    csv test now includes all base datatypes log/level/quality

commit 54d27db4d78c397c20d7c53c92cb61fd114b8dff
Author: David Uselmann <duselmann@usgs.gov>
Date:   Mon Jun 11 14:16:48 2012 -0500

    add quotations to CSV data

commit 4bdec7063f87a421b009ef20e675f31e6de62691
Author: David Uselmann <duselmann@usgs.gov>
Date:   Mon Jun 11 11:21:24 2012 -0500

    enhanced bundling detection on DataManagerServlet param parsing

commit 8f6e2c269c2722131a6ede0a900b61c0c230c55b
Author: David Uselmann <duselmann@usgs.gov>
Date:   Mon Jun 11 10:31:12 2012 -0500

    listOfWells replaced with the original featureID

commit fbc45e656ed5bf2c9b9be9bd97d2ad0069b2a1e3
Author: David Uselmann <duselmann@usgs.gov>
Date:   Mon Jun 11 10:28:39 2012 -0500

    listOfWells replaced with the original featureID

commit fc4463ed6524f49f2914dd40c7789d326a9b7aaf
Author: David Uselmann <duselmann@usgs.gov>
Date:   Sat Jun 9 08:11:21 2012 -0500

    revert a minimum of ALL data type back for tests to pass
    and revisit the ALL removal as a team.

commit 3fb9879e0cd219c9670bd9cb1c716248492c947f
Author: David Uselmann <duselmann@usgs.gov>
Date:   Sat Jun 9 01:36:36 2012 -0500

    repairs discovered when running all tests. fixes to mutli-site download.
    currently we are haveing a cache issue where the ALL is gone
    so the filecache is not playing nice

commit 43e07659faba8e3593c38c4f84451f5bb8e3c2c8
Author: David Uselmann <duselmann@usgs.gov>
Date:   Fri Jun 8 23:47:20 2012 -0500

    warning cleanup

commit 95d9c992bb6018ee4800d7741be8f7e2b066835f
Merge: 9ed4309 8f4a632
Author: David Uselmann <duselmann@usgs.gov>
Date:   Fri Jun 8 23:41:58 2012 -0500

    merge resolution

commit 9ed430905fa2b2691f93ea7d145ce6ed1ecc8f21
Author: David Uselmann <duselmann@usgs.gov>
Date:   Fri Jun 8 23:33:26 2012 -0500

    initial integration of multi-site download (SequentialJoiningAggregater)
    into DataManagerServlet AND the removal of the ALL data type
    - it is now implemented as a list of all existing rather than a type of its own.

commit 8f4a632516e1342d1ddd6a52a74b4b38b7d4ee54
Author: R Hayes <rhayes@usgs.gov>
Date:   Fri Jun 8 18:49:33 2012 -0500

    IN PROGRESS - issue GWDP-300: Hook-Up Multi-Site Download to Portal UI
    http://internal.cida.usgs.gov/jira/browse/GWDP-300

    Logging.

commit 2486728c09a7fe1b5ef32fd4087e7e3c61716757
Author: R Hayes <rhayes@usgs.gov>
Date:   Fri Jun 8 13:54:05 2012 -0500

    OPEN - issue GWDP-308: Prefetch servlet not reporting results
    http://internal.cida.usgs.gov/jira/browse/GWDP-308

    Configure JDBC connection in Spring, rather than using JNDI to get it
    from Tomcat (since javadevp tomcat has an out-of-date Oracle driver).

commit e7a033d44e7eb20e94b4b350e9fdfdb416ae53c7
Merge branch 'master' of github.com:USGS-CIDA/ngwmn