Squashed commit of the following:

commit 3f6a42132af2f22d01fe2974511fa566a5d59cc6
Merge: 9313797 e26d3c8
Author: Denis Frolov <dfrolov@demax.ru>
Date:   Thu Feb 28 06:02:44 2013 -0800

    Merge pull request #399 from songsterr/integration

    Add name to node with primitive object.

commit e26d3c8f3df10d82e5c88f049e514d6b50001fbd
Author: Victor Petrenko <vpetrenko@gmail.com>
Date:   Thu Feb 28 17:55:20 2013 +0400

    Add name to node with primitive object.

    Before that we have such response:
    <tabTypes2 type="String">
    <null>123</null>
    <null>456</null>
    </tabTypes2>

    And after nodes have valuable names:
    <tabTypes2 type="String">
    <String>123</String>
    <String>456</String>
    </tabTypes2>

commit 9313797cff2d4c75ae6976fca4cb41f6de4eb0eb
Merge: 9bade1a d727d5c
Author: Johann Werner <jw@oyosys.de>
Date:   Thu Feb 28 01:01:41 2013 -0800

    Merge pull request #397 from darkv/cleanup_patch

    Some code cleanup

commit d727d5cb1939ab0c082cfb95c3a2ad86534bf164
Author: Johann Werner <jw@oyosys.de>
Date:   Thu Feb 28 09:58:27 2013 +0100

    remove some unnecessary code

commit 0fae974f6fe6be470edec6e57173263705d6286e
Author: Johann Werner <jw@oyosys.de>
Date:   Thu Feb 28 09:57:24 2013 +0100

    replace deprecated methods

commit 56c72f9d9f967b84007279c2bc94a1a623df1a49
Author: Johann Werner <jw@oyosys.de>
Date:   Thu Feb 28 09:56:17 2013 +0100

    add missing serialVersionUID

commit 5628aa0b88ef899ce95964fca9db7ad471387b92
Author: Johann Werner <jw@oyosys.de>
Date:   Thu Feb 28 09:55:43 2013 +0100

    remove unused imports

commit 9bade1a7a45e9c3140f6db3265ea252f73bbb250
Merge: 0a6219f fc8865e
Author: Paul Hoadley <paulh@logicsquad.net>
Date:   Wed Feb 27 00:49:08 2013 -0800

    Merge pull request #396 from recurve/HoverableWidthLimit

    Removed hard coded width limit

commit fc8865e87a48856fcb4dc94e22c69128528c3d61
Author: Aaron Rosenzweig <aaron@chatnbike.com>
Date:   Tue Feb 26 15:53:54 2013 -0500

    Removed hard coded width limit

    There was a hard coded limit on the width of the hoverable. Did not seem necessary and was stopping us from using a wider width. Removing this hard coded. limit

    Signed-off-by: Aaron Rosenzweig <aaron@chatnbike.com>

commit 0a6219fd9bb780a57f65122eddebcef390cff296
Merge: b73b2aa 428ef54
Author: Johann Werner <jw@oyosys.de>
Date:   Sun Feb 24 23:59:58 2013 -0800

    Merge pull request #390 from coralstoneco/sortable_ertags

    ERTaggable: sorting fetchTaggedWith

commit b73b2aa7d0096d9b6766eb52e549afa8babf1df4
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Feb 24 15:20:17 2013 -0500

    Fixing a mismatch between the properties name in Properties and the application class

commit 0a95d090b77986aaea711198881bed9bbd3494e9
Merge: 53da642 e8318b2
Author: Pascal Robert <probert@macti.ca>
Date:   Sat Feb 23 19:09:43 2013 -0500

    Merge branch 'integration' of github.com:projectwonder/wonder into integration

commit 53da6428a3250255378e7ff1c7528b32b3310dc3
Author: Pascal Robert <probert@macti.ca>
Date:   Sat Feb 23 19:09:11 2013 -0500

    Start the built-in SSH server of wotaskd when using the startup script from Wonder for RedHat

commit e8318b270051d0d154b0110d68218feb27ddfbc7
Merge: eb34268 eeab832
Author: Pascal Robert <probert@macti.ca>
Date:   Sat Feb 23 14:50:02 2013 -0800

    Merge pull request #395 from pascalrobert/wotaskd_ftp

    Built-in SSH server in wotaskd (take 2)

commit eb3426880548c89cc4faf89ea4b92b05165f4117
Merge: af157c1 df68d02
Author: Pascal Robert <probert@macti.ca>
Date:   Sat Feb 23 10:22:24 2013 -0500

    Merge branch 'integration' of github.com:projectwonder/wonder into integration

commit af157c15aee365f18ba198bef84b714b45d7fc8c
Author: Pascal Robert <probert@macti.ca>
Date:   Sat Feb 23 10:22:02 2013 -0500

    When installing the adaptor, the document root should be created

commit 9169439893484c2eb9e923714ca21b5582bf7426
Author: Pascal Robert <probert@macti.ca>
Date:   Sat Feb 23 10:20:01 2013 -0500

    Adding sed call to fix the cgi-bin alias in the adaptor for apache 2.4

commit 77c61ca375de60775c2cf4b0c0f8d50cbb8e2950
Author: Pascal Robert <probert@macti.ca>
Date:   Sat Feb 23 10:12:59 2013 -0500

    Adding RPM spec file for Apache 2.4

commit eeab832f779d08fd378be9763a0740eff98fcaa8
Author: Pascal Robert <probert@macti.ca>
Date:   Sat Feb 23 07:36:09 2013 -0500

    SSH server in wotaskd is now disabled by default

commit 7558633762f1eab05535e4bc86566c25777273f2
Author: Pascal Robert <probert@macti.ca>
Date:   Fri Feb 22 22:14:56 2013 -0500

    Adding a property to enable/disable the built-in SSH server

commit d41909eef28e1e4603c9a93af92921bd33b4df0c
Merge: ec41588 df68d02
Author: Pascal Robert <probert@macti.ca>
Date:   Fri Feb 22 21:19:51 2013 -0500

    Merge branch 'integration' into wotaskd_ftp

commit df68d02726429e2a94737a85e209eec9c98bf0c4
Author: nullterminated <ramseygurley@gmail.com>
Date:   Thu Feb 21 08:22:29 2013 -0700

    Update ERXWOContext.relativeURLWithRequestHandlerKey to eliminate
    possible corner case where app extension is part of the domain or app
    name. Also check to see if the port is in the url already before
    replacing.

commit 40df909b9616c8213428390e005e91dea0d021cc
Author: nullterminated <ramseygurley@gmail.com>
Date:   Wed Feb 20 19:27:42 2013 -0700

    Append the port to the relative url for dev apps with direct connect
    disabled.

commit e8bbb569f6a76002268e58f8605387d61de662bf
Author: nullterminated <ramseygurley@gmail.com>
Date:   Wed Feb 20 19:26:00 2013 -0700

    Don't append a port number if the application if the app doesn't allow
    direct connect.

commit 3bb85a0dbda11fc6248a36408ebc963e73189839
Merge: b96cd1b 95cbcc6
Author: Pascal Robert <probert@macti.ca>
Date:   Wed Feb 20 04:04:57 2013 -0800

    Merge pull request #392 from gavineadie/integration

    Comment out the "ScriptAlias" on "httpd.conf" during LINUX RPM installations of "woadaptor"

commit 95cbcc603e91a501d24ac699a1641cecb1faa02f
Author: Gavin Eadie <gavineadie@me.com>
Date:   Tue Feb 19 23:15:16 2013 -0500

    Comment out the "ScriptAlias" on "httpd.conf" during LINUX RPM installations of "woadaptor"

commit b96cd1b784995fa703207ea6cf6fb5fbb65d9610
Author: Henrique Prange <hprange@gmail.com>
Date:   Tue Feb 19 22:43:12 2013 -0300

    Enable model migration using data source JNDI

    This patch adds the required verification in the canMigrateModel
    method enabling migrations over data source JNDI when possible.

commit 428ef54742be7f18526784414ca57a5d6d6679a5
Author: Kevin Hinkson <kh@coralstone.co>
Date:   Tue Feb 19 10:56:16 2013 -0400

    Refactor non sortable fetchedTaggedWith to use the new sortable method but to pass in a null for the sort ordering. Duplicate code avoided.

commit fab5dc4126aa70c91c450ec75573c8ac0d74cdea
Author: Kevin Hinkson <kh@coralstone.co>
Date:   Tue Feb 19 10:54:38 2013 -0400

    Add a new fetchTaggedWith method that allows sorting.

commit 0dc14148587279ba8d1cc3452adf1016bafbd04a
Author: Ray Kiddy <ray@ganymede.org>
Date:   Sun Feb 17 20:11:27 2013 -0800

    Remove reference to not-quite-ready test

commit e33209605c54d2edb0cce646d03a711da36f6925
Author: Ray Kiddy <ray@ganymede.org>
Date:   Sun Feb 17 17:16:44 2013 -0800

    More tests.

commit 3d6b23764bd0bb331ea9badcf024d8ea1f62477e
Author: Ray Kiddy <ray@ganymede.org>
Date:   Sun Feb 17 17:15:37 2013 -0800

    Getting class attributes and class relationships always seemed oddly difficult, and why should this be in a static method in ERXCopyable.

commit 832ecf7c029ae1912de6f1c20467d4e1c311f7b4
Author: Ray Kiddy <ray@ganymede.org>
Date:   Sun Feb 17 17:02:05 2013 -0800

    Convenience method for getting an EOFetchSpec, since one can never get auto-complete to supply a constructor.

commit dd9548ef946cc61bf9ea048829a80a8bdc6ec70e
Merge: 94ef62d 32a7c98
Author: Johann Werner <jw@oyosys.de>
Date:   Fri Feb 15 14:02:27 2013 -0800

    Merge pull request #383 from amagavi/ERXCopyable

    ERXCopyable

commit 32a7c9862c34371cc9013f25c808edf9aea5c058
Author: David Avendasora <avendasorada@me.com>
Date:   Sat Feb 16 05:24:27 2013 +0800

    Make static variables and methods that call and update them thread safe.

commit 676fc3f1bd1e0325ba817cf64c68b6dec2dbd694
Author: David Avendasora <avendasorada@me.com>
Date:   Sat Feb 16 05:22:59 2013 +0800

    Fix Javadoc mistakes.

commit 94ef62d32a38266172195615f2c8d51535347ba2
Merge: d5f1a64 ab92984
Author: Johann Werner <jw@oyosys.de>
Date:   Fri Feb 15 09:45:47 2013 -0800

    Merge pull request #376 from recurve/ExpiringCache

    Staleness buffer had error in ExpiringCache

commit ab9298401f783d0c4545ddab78db41b58238f913
Author: Aaron Rosenzweig <aaron@chatnbike.com>
Date:   Fri Feb 15 11:30:53 2013 -0500

    No "fudge factor" required

    It's wrong to add 10 seconds because short values (5) seconds expire immediately so they never work. Subtracting 10 seconds makes objects live longer (which was probably the original intent) but this really isn't necessary. It appears no "fudge factor" is needed.

    Signed-off-by: Aaron Rosenzweig <aaron@chatnbike.com>

commit d5f1a64dcc454734a59d5e8a1b30cb388ab1f5b8
Author: nullterminated <ramseygurley@gmail.com>
Date:   Wed Feb 13 19:12:23 2013 -0700

    Deprecated broken methods

commit 0eec6607d1f55ad74a97fa0c6875c2790599e6d7
Author: nullterminated <ramseygurley@gmail.com>
Date:   Wed Feb 13 19:05:36 2013 -0700

    Fix StringIndexOutOfBoundsException parsing host name from email

commit ecfa4cf634605a7956bb0b7c94055f8c9e3001f0
Author: nullterminated <ramseygurley@gmail.com>
Date:   Wed Feb 13 18:58:25 2013 -0700

    Fix problem which causes regular expression matching to become
    exponentially slower on longer email addresses.

commit 161caca32733f8e5c1c2ebfb31449217bb7e72b4
Author: Henrique Prange <hprange@gmail.com>
Date:   Tue Feb 12 17:52:53 2013 -0200

    Prepare the Maven configuration for next development iteration

commit fb233acb699cb141861ef4c5c6c6b7e7e42e2371
Author: Henrique Prange <hprange@gmail.com>
Date:   Tue Feb 12 17:49:05 2013 -0200

    Remove duplicate dependency on JavaWOExtensions from Maven configuration

commit 493df4c6e582ce0b8f69fe62e651f621f30096d8
Author: Henrique Prange <hprange@gmail.com>
Date:   Tue Feb 12 17:48:28 2013 -0200

    Fix the MySQLPlugIn pom configuration

commit 8e082b7794f8f862a0a4597414217e53f9036053
Merge: 173dace c5b401e
Author: Johann Werner <jw@oyosys.de>
Date:   Tue Feb 12 04:17:07 2013 -0800

    Merge pull request #385 from darkv/Range_FetchSpec_patch

    Support for ranged fetch specifications

commit c5b401e81bda3a26d03a6c3f74b7cdc8e2f0b3af
Author: Johann Werner <jw@oyosys.de>
Date:   Tue Feb 12 13:08:04 2013 +0100

    javadoc and generics

commit 46814ce08e99595beac40000107aab6d6a4428d7
Author: Johann Werner <jw@oyosys.de>
Date:   Tue Feb 12 13:07:48 2013 +0100

    those changes should be done on the clone not the original

commit 401571964818515efda6816e4a1e3c7e33105c22
Author: Johann Werner <jw@oyosys.de>
Date:   Tue Feb 12 13:07:17 2013 +0100

    when doing a fetch with specific start and end row number remove range setting from fetch specification

commit 66ebcd7cb6767a41242cec634b01ef70d9c0374a
Author: Johann Werner <jw@oyosys.de>
Date:   Tue Feb 12 13:06:19 2013 +0100

    add support of fetch specifications with range

commit 173dacee7ee290e36a5d0cbae08797009d7edd05
Author: Michael Hast <mhast@desertsky.com>
Date:   Tue Dec 4 13:26:10 2012 -0700

    Added CELL_TYPE_BOOLEAN support to ExcelGenerator

commit 4d2bbf6064247c21503204deef31ad15c88b7af3
Merge: 0db7a6b 81869ab
Author: Pascal Robert <probert@macti.ca>
Date:   Mon Feb 11 05:04:32 2013 -0800

    Merge pull request #384 from markusstoll/wostart

    Improvments for Windows WOStart

commit 81869abacc805f85db07f81275b4edcc28f1bd3b
Author: Markus Stoll <markus.stoll@junidas.de>
Date:   Mon Feb 11 13:57:46 2013 +0100

    binaries removed

commit 93c6354bdcae82838153081c298f6ba82308f69b
Author: Markus Stoll <markus.stoll@junidas.de>
Date:   Mon Feb 11 12:56:22 2013 +0100

    Makefile improved for seamless compiling with MIngw32/Mingw64
    Supports Java 7
    Supportings running as Windows Service
    Parses all options from Windows/CLSSPATH.TXT
    Docu updated
    Binaries added

commit f431b5ac851becbb17082d8d195e19d36af50fb7
Author: David Avendasora <avendasorada@me.com>
Date:   Mon Feb 11 09:13:24 2013 +0800

    ERXCopyable Initial Commit

commit 0db7a6b03ce1c5efb646c592d474e6ec0b6d03d0
Merge: 42bfe50 373cd81
Author: Paul Hoadley <paulh@logicsquad.net>
Date:   Fri Feb 8 13:31:37 2013 -0800

    Merge pull request #379 from recurve/DisableComponents

    Adds "disabled" bindings to two components.

commit 373cd81119272b1f6619cd2daf9a836f617b9fed
Author: Aaron Rosenzweig <aaron@chatnbike.com>
Date:   Fri Feb 8 10:23:06 2013 -0500

    Forgot to add "disabled" to .api file in recent commit.

    Signed-off-by: Aaron Rosenzweig <aaron@chatnbike.com>

commit 42bfe507edeb49158f6855ae7ab479792fd0c05b
Merge: 7e9c8ed 1e6adf0
Author: Kieran Kelleher <kelleherk@gmail.com>
Date:   Fri Feb 8 05:32:19 2013 -0800

    Merge pull request #374 from recurve/HandfulComponentFixes

    Small important bug fixes to handful of components

commit 7e9c8ed2a704bbeefc5f00cbf8c522bfd076f4da
Merge: fc67e8f 5dfdc5e
Author: Pascal Robert <probert@macti.ca>
Date:   Thu Feb 7 16:44:07 2013 -0800

    Merge pull request #380 from recurve/AjaxUpload

    Latest "vallum ajaxupload.js" that is in vallum's old repository.

commit fc67e8fb94b949178dd9cd8e1f7842871fadb372
Merge: 0a3ba7f 3f67d56
Author: Pascal Robert <probert@macti.ca>
Date:   Thu Feb 7 16:43:21 2013 -0800

    Merge pull request #377 from recurve/ERXStringUtilities

    Two helper methods

commit 0a3ba7f76ea8483071f45a2144bf2991f15c9ca3
Merge: e762b02 84c1237
Author: Pascal Robert <probert@macti.ca>
Date:   Thu Feb 7 16:40:49 2013 -0800

    Merge pull request #373 from recurve/ToolTip

    New Tool Tip Widget

commit 40dae8d2008496619b8f4ae0e812e4114bfbe48f
Author: Aaron Rosenzweig <aaron@chatnbike.com>
Date:   Thu Feb 7 19:08:48 2013 -0500

    Staleness buffer had error in ExpiringCache

    Signed-off-by: Aaron Rosenzweig <aaron@chatnbike.com>

commit 84c12373fc411e16eaaf89ba422efd98619e33f8
Author: Aaron Rosenzweig <aaron@chatnbike.com>
Date:   Thu Feb 7 19:06:55 2013 -0500

    New Tool Tip Widget

    You hover your mouse and a message appears. Like a tool tip.

    Signed-off-by: Aaron Rosenzweig <aaron@chatnbike.com>

commit 5dfdc5e8b48ad745ede7fda5b1e879c5a457d725
Author: Aaron Rosenzweig <aaron@chatnbike.com>
Date:   Thu Feb 7 19:04:33 2013 -0500

    Latest "vallum ajaxupload.js" that is in vallum's old repository.

    The version of this we had been using was not compatible with Firefox! Replacing with the latest version solved this and still works in Safari and IE. This version of vallum's uploader is old news and will no longer be updated by him. He has a new "pay for" version. We may have to revisit this in the future or look for alternatives down the road.

    Signed-off-by: Aaron Rosenzweig <aaron@chatnbike.com>

commit 1e6adf0a5889014164b9d325c289e7c135f29859
Author: Aaron Rosenzweig <aaron@chatnbike.com>
Date:   Thu Feb 7 19:01:46 2013 -0500

    Small important bug fixes to handful of components

    Signed-off-by: Aaron Rosenzweig <aaron@chatnbike.com>

commit 7f13a517dc4976ab022174c7b2e317d80a57f04a
Author: Aaron Rosenzweig <aaron@chatnbike.com>
Date:   Thu Feb 7 18:59:18 2013 -0500

    "disabled" feature

    These components can now be disabled.

    Signed-off-by: Aaron Rosenzweig <aaron@chatnbike.com>

commit 3f67d56a1b3acfbb17555e666b9be985212b3d03
Author: Aaron Rosenzweig <aaron@chatnbike.com>
Date:   Thu Feb 7 18:40:50 2013 -0500

    Two helper methods

    These two helper methods are in some other open source libraries but we don't always include those. It bugged me enough that I added them here.

    Signed-off-by: Aaron Rosenzweig <aaron@chatnbike.com>

commit e762b025d2a7d6e641982a308c6f9dc5c4556665
Author: Johann Werner <jw@oyosys.de>
Date:   Fri Feb 1 11:05:11 2013 +0100

    prevent NPE

commit a197207c9372d8158755fd6bb9eb1422e1818f8b
Merge: cb9fa1b d12d78f
Author: Pascal Robert <probert@macti.ca>
Date:   Thu Jan 31 06:02:31 2013 -0800

    Merge pull request #370 from jsobanski/integration

    Adding EONeo4JPrototypes to ERPrototypes entities

commit d12d78f7f508390ba9895951de198d2d48cb6567
Author: Jedrzej Sobanski <jsobanski@dev-jsobanski.upcit.ds.upc.biz>
Date:   Thu Jan 31 15:01:35 2013 +0100

    Adding EONeo4JPrototypes to ERPrototypes entities

commit cb9fa1bdd1b9651517eae917a9e4b17eeeb6de11
Merge: 42b69f2 5df162f
Author: Paul Hoadley <paulh@logicsquad.net>
Date:   Wed Jan 30 15:28:50 2013 -0800

    Merge pull request #369 from btriller/tests-gitignore

    Adds .gitignore files for Tests/{ERRestTest,TestAdaptor}

commit 5df162f716846e4c8cdcee7284818870ef2f81c3
Author: Bastian Triller <bastian.triller@gmail.com>
Date:   Thu Jan 31 00:10:14 2013 +0100

    gitignore files for Tests/{ERRestTest,TestAdaptor}

commit 42b69f2bb95b4c4e51eb36a939de175e68792a69
Author: Pascal Robert <probert@macti.ca>
Date:   Tue Jan 29 08:58:33 2013 -0500

    Ignore dist directory, in case someone generates the JavaDoc and commit the resulting files

commit b92a4aeca0bd5defcdea5afeb9e3119c495a7a72
Author: Johann Werner <jw@oyosys.de>
Date:   Tue Jan 29 02:35:12 2013 -0800

    Merge pull request #342 from smarthealth/hotfix-erxec

    Attempt to fix issues with disappearing snapshots when using nested ecs

commit 529a29409b31b724ba233885a6e376864461cdc4
Merge: b1128e9 d139997
Author: Johann Werner <jw@oyosys.de>
Date:   Tue Jan 29 02:33:51 2013 -0800

    Merge pull request #368 from btriller/adaptor-compiler-warning

    use format string in ap_log_error

commit d13999716a7dcc46546955ce95c5d3c4012e3960
Author: Bastian Triller <bastian.triller@gmail.com>
Date:   Sat Jan 26 00:33:29 2013 +0100

    use format string in ap_log_error

    Debian/Ubuntu's gcc uses -Werror=format-security as default option, which
    makes this warning a fatal error.
    <http://wiki.debian.org/Hardening#DEB_BUILD_HARDENING_FORMAT_.28gcc.2Fg.2B-.2B-_-Wformat_-Wformat-security_-Werror.3Dformat-security.29>

commit b1128e9d05fa8b7e73362747e449ffbc0a55afe0
Merge: 1cc1dec 1c8fa3b
Author: Pascal Robert <probert@macti.ca>
Date:   Fri Jan 25 15:33:21 2013 -0800

    Merge pull request #367 from btriller/adaptor-apache2.4

    adds adaptor support for Apache2.4:

commit 1c8fa3bf25a70fdd894a350d0743a5aa1f1d093e
Author: Bastian Triller <bastian.triller@gmail.com>
Date:   Sat Jan 26 00:26:22 2013 +0100

    adds adaptor support for Apache2.4:
    - API changes conn_rec->remote_{addr,ip}, ap_get_server_version()
      <http://httpd.apache.org/docs/2.4/developer/new_api_2_4.html>

commit 1cc1decb587e0a215daab02e181a508e4a1dc272
Author: Ray Kiddy <ray@ganymede.org>
Date:   Fri Jan 25 13:12:24 2013 -0800

    ERXImage does not implement data. It would be helpful for it to let the user know.

commit 42c09ed265c7d18eb95023e22b03b5b91da22982
Merge: 7c57b65 27c5882
Author: Johann Werner <jw@oyosys.de>
Date:   Fri Jan 25 07:22:27 2013 -0800

    Merge pull request #366 from tedpet/integration

    ERDEditDatePopupCommon.java

commit 27c5882428e575f3df22f3a75220372d25fe12da
Author: Theodore Petrosky <tpetrosky@agencysacks.com>
Date:   Thu Jan 24 14:41:54 2013 -0500

    ERDEditDatePopupCommon.java
    the NSArrays need to be parameterized. Still needs resolution of the deprecated NSTimestampFormatter

commit 7c57b652cbdadd45a6c47872a7c4c57e0529ea24
Merge: 6586cf0 0da6a4e
Author: Ken Ishimoto <ken@ksroom.com>
Date:   Tue Jan 22 08:21:01 2013 -0800

    Merge pull request #365 from wlfaltera/customS3host

    Looks great

commit 0da6a4ea25990158a40442440f6633b0a5dcf2fd
Author: Matteo Centro <mcentro@altera.it>
Date:   Tue Jan 22 17:16:02 2013 +0100

    made s3 host configurable via Property er.attachment.s3.host. Useful for buckets not in the default region.

commit 6586cf0ce8c034b75eb038e0a9eb38cdc51c986e
Merge: 35ee8c8 9bda13c
Author: Ken Ishimoto <ken@ksroom.com>
Date:   Mon Jan 21 04:13:23 2013 -0800

    Merge pull request #364 from ishimoto/Xiss

    removed some SJIS Encoded String and remove Warnings in Compiler

commit 9bda13c234c7486ad02787415b6fc01f9e6fe1e5
Author: Ken ISHIMOTO <ken@ksroom.com>
Date:   Mon Jan 21 13:12:11 2013 +0100

    removed some SJIS Encoded String

    remove Warning for Compiler

commit 35ee8c8f0e2326782d327e6ff2db7f74a9dbe63a
Author: Pascal Robert <probert@macti.ca>
Date:   Mon Jan 21 03:52:02 2013 -0500

    Another batch of JavaDoc fixes

commit 78330a480d209f20e93b2de2ff4ce9d40b6d166b
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 20:45:35 2013 -0500

    More JavaDoc fixes

commit c683740dc1dc30e9ae2650ec71023314a4bb034f
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 19:33:21 2013 -0500

    Fixed a fair amount of JavaDoc errors

commit 1087bc7c509d1773c912dfc4a1e72fbe7fe121f3
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 17:01:02 2013 -0500

    Removing @Override annotations on interface implementations

commit 1ea19a996858d21c544c7777481367e3325ca983
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 16:45:21 2013 -0500

    Overriding interfaces is not permitted with Java 1.5

commit 25ea7e3a3d44bf06daef3ce498147fdd6dd3d2f1
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 16:27:54 2013 -0500

    Missing import statement for ERXStringUtilities

commit c124aad8df3926b22f37dad46e4ed4f29bd949e9
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 16:24:39 2013 -0500

    ERXUtilities.intersectingElements is deprecated

commit 3b850ec3a83d197b6f9e0c598b3da35570e92c62
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 15:51:49 2013 -0500

    Moving part of strippedValue from ERXFixedLengthString to ERXStringUtilities

commit 3719803662d9c467b4ad01b9a50f77be714bf8e3
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 15:40:26 2013 -0500

    Moved cleanString method from ERXExtensions  ERXStringUtilities

commit 0601f8fb97a2d72e4cea8e5cd709d62e4bef652c
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 15:20:00 2013 -0500

    Moving removeHTMLTagsFromString from ERXExtensions to ERXStringUtilities

commit da497e4977b30268dd24fa4b43722effd7bc118e
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 15:08:33 2013 -0500

    JavaDoc and tasks cleanup

commit e51c5b0ad6c2db3685c752b2fe4e33b0f89d2123
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 14:41:51 2013 -0500

     Replace a REMOVEME task with a @deprecated tag instead

commit 0c11f94bcf35ae7f80e6d3ff4eb9e5b20d242d5c
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 14:39:12 2013 -0500

    Cleanup in DELETEME tags

commit 4cfa12c5cb1f5212c4d1f7f94bbb63242960366e
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 13:08:22 2013 -0500

    JavaDoc fixes for ERCalendar

commit 073627afc99a3d0a71d1513a60ce89ec0bc694b7
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 13:02:36 2013 -0500

    JavaDoc fixes for ERCayenne

commit 0492108121603cc78fc4b8803ea5259f0024a93d
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 12:56:23 2013 -0500

    JavaDoc fixes in ERJQuery

commit 5624769e802b7e2c9a0131a92d5272dbdb3e673e
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 12:51:54 2013 -0500

    JavaDoc fixes in JavaNeo4JAdaptor

commit 4c8993ef6609942e9aa414ba83db5de82b569026
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 12:48:25 2013 -0500

    JavaDoc fixes in ERModernLook

commit dae73f976415875047f7fc2b2fe7d016117f8cad
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 12:42:41 2013 -0500

    JavaDoc fixes for ERDirectToWeb

commit 011d2b39ac36c133f27750ddb5d5ad474db9cd94
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 12:17:40 2013 -0500

    JavaDoc fixes for ERPDFGeneration

commit 47d36ca3562143a173ee5a1c65e4622d8419baa9
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 11:59:14 2013 -0500

    JavaDoc fixes in DRGrouping

commit a02356e81732585f90a17a8a2a21dc8e36b4d498
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 11:52:54 2013 -0500

    JavaDoc fixes in ERJavaMail

commit 26776b55acd1833920595d5ce98f50eff5786615
Author: Pascal Robert <probert@macti.ca>
Date:   Sun Jan 20 11:44:26 2013 -0500

    JavaDoc fixes in ERQuartzScheduler

commit eedfed24e54d53864770a721a206e3268a0608f5
Merge: cca6f71 5069fd3
Author: Ken Ishimoto <ken@ksroom.com>
Date:   Sat Jan 19 10:46:11 2013 -0800

    Merge pull request #362 from ishimoto/TargetFix

    Add 'target' Binding to ERAttachmentLink

commit 5069fd32bf25e4d0db2039af6c1cc3f46578374c
Author: Ken ISHIMOTO <ken@ksroom.com>
Date:   Sat Jan 19 19:43:46 2013 +0100

    fix Binding to viewTarget

    because that was a requirment from JW.

commit 0972dab0c791b7e7f864a11bb80054769a99476c
Author: Ken ISHIMOTO <ken@ksroom.com>
Date:   Sat Jan 19 19:40:03 2013 +0100

    Add 'viewTarget' Binding to ERAttchmentFlixibleEditor

commit 6d53376d19db672e0a90f389349263df5517d436
Author: Ken ISHIMOTO <ken@ksroom.com>
Date:   Sat Jan 19 19:35:00 2013 +0100

    add 'target' Binding to ERAttachment

commit cca6f71636e58dd809cdbdbf677a9eb49bd5d5d2
Merge: 5d4c762 7f2178c
Author: Johann Werner <jw@oyosys.de>
Date:   Fri Jan 18 06:04:31 2013 -0800

    Merge pull request #360 from darkv/code_cleanup

    Code cleanup

commit 7f2178c486a99b89a77830376c0411878c0dbcaf
Author: Johann Werner <jw@oyosys.de>
Date:   Fri Jan 18 14:56:35 2013 +0100

    add missing deprecated annotations

commit 330c519c1409dd23a5134f538a4a1359a80132c2
Author: Johann Werner <jw@oyosys.de>
Date:   Fri Jan 18 14:54:39 2013 +0100

    add all missing overrides... really all

commit cbe49cc0595d360252ff7c3759a40ac075ba9631
Author: Johann Werner <jw@oyosys.de>
Date:   Fri Jan 18 13:45:28 2013 +0100

    remove unnecessary casts

commit a726494724c10f25ffb5bef5b4c535b4a25c037b
Author: Johann Werner <jw@oyosys.de>
Date:   Fri Jan 18 13:40:19 2013 +0100

    get rid of "this." where it is not necessary

commit 744cee776dfadae791bc6ace6733bf342a54bf4e
Author: Johann Werner <jw@oyosys.de>
Date:   Fri Jan 18 13:33:01 2013 +0100

    fix imports

    this cleans up the imports by replacing asterisk imports (which is considered bad practice), removing unused ones, adding needed ones and letting Eclipse do auto-ordering

commit 5d4c762e29bfd1d7416c6ad2d162d7471e4a6f58
Author: Johann Werner <jw@oyosys.de>
Date:   Fri Jan 18 10:09:41 2013 +0100

    javadocs, overrides and some whitespace

commit 0d977825bc85afb91741bd0bd5b2a269b154e454
Author: Johann Werner <jw@oyosys.de>
Date:   Fri Jan 18 10:09:17 2013 +0100

    small cleanup

    remove unused variables, use boolean instead of Boolean

commit d2adae02f6938ae14b8f98288891b62e96b0ade5
Author: Johann Werner <jw@oyosys.de>
Date:   Fri Jan 18 10:05:22 2013 +0100

    remove eclipse project override settings

commit f391ba10b521321bf44ca91d7566bef3601388d5
Author: Johann Werner <jw@oyosys.de>
Date:   Fri Jan 18 10:05:13 2013 +0100

    replace deprecated/old method calls

commit 7c347cfd62cc34be0321ee742ef4b81438ab7ad7
Author: Johann Werner <jw@oyosys.de>
Date:   Fri Jan 18 10:02:51 2013 +0100

    should call super

commit 46baf84e143913e945de59364b5f7ec1f2b9c630
Author: Johann Werner <jw@oyosys.de>
Date:   Fri Jan 18 09:56:24 2013 +0100

    remove methods like synchronizesVariablesWithBindings where not necessary

commit eeef3931952bdbdaa7ab9514d69e59d19a44402f
Merge: 32f2202 7a02779
Author: Johann Werner <jw@oyosys.de>
Date:   Thu Jan 17 12:35:37 2013 -0800

    Merge pull request #319 from btriller/uimode-erd2wcustomqueryboolean

    uiMode configuration for ERD2WCustomQueryBoolean, so one can query with ...

commit 7a02779fbb5a2453b218e0783c5b358714dabfa3
Author: Bastian Triller <bastian.triller@gmail.com>
Date:   Thu Jan 17 21:06:43 2013 +0100

    uiMode configuration for ERD2WCustomQueryBoolean, so one can query with a
    popup, defaults to radio mode for backward compatibility.

commit 32f22025398ffb0cc5a977bef8973c77d74f1932
Author: Johann Werner <jw@oyosys.de>
Date:   Thu Jan 17 15:44:55 2013 +0100

    some javadocs, suppress some unused warnings, remove constructors that are not necessary

commit 6c4b94ddba443aedba64cb10f91a8a9611516fcb
Author: Johann Werner <jw@oyosys.de>
Date:   Thu Jan 17 15:43:27 2013 +0100

    replace deprecated elements

commit 5110f2e57fa1c203482c3d4a0602f1b6a2462f55
Merge: 153024f 730eb7f
Author: Johann Werner <jw@oyosys.de>
Date:   Wed Jan 16 04:21:35 2013 -0800

    Merge pull request #359 from swklein/integration

    Added 'id' bindings to jQueryMobile

commit 730eb7f4c4eece2704c45e7e41e9b2e56a852a11
Author: stefanklein <stefan.klein@buero-sde.de>
Date:   Wed Jan 16 12:27:26 2013 +0100

    Revert Movies.h2.db in JqueryMobileExample

    After some test the database double its size. So I revert to the
    original file.

commit 14ae5b7aa09fb348853019d762c2921e286e4b0c
Merge: 12f8f2a 153024f
Author: stefanklein <stefan.klein@buero-sde.de>
Date:   Wed Jan 16 11:56:25 2013 +0100

    Merge remote-tracking branch 'upstream/integration' into integration

commit 12f8f2a109ed9ec6bd55e2817f9c0edad27a0a35
Author: stefanklein <stefan.klein@buero-sde.de>
Date:   Wed Jan 16 11:55:34 2013 +0100

    Added 'id' binding to input elements
    Replaced jquery.mobile-1.2.0.css with jquery.mobile-1.2.0.min.css

commit 153024fb630f4f329b7943785c17fb2f0fa7ad3b
Author: Johann Werner <jw@oyosys.de>
Date:   Tue Jan 15 08:56:52 2013 +0100

    no need for that cover method

    to quote Chuck: "Probably an old compatibility method. In Objective-C description is the message that performs a toString() like function."

    The replacement of this method call will be done for Wonder 7 as some people could have overridden that method to produce a different output as toString.

commit 7c4969def5c81386c6e62b8a34225622e124a014
Merge: 9325cc6 309f6a6
Author: Johann Werner <jw@oyosys.de>
Date:   Mon Jan 14 10:48:45 2013 -0800

    Merge pull request #358 from darkv/modern_d2w_cleanup

    remove non-functional D2W components

commit 309f6a6803cb2a8e82a17cfc12e3186bf1aa543d
Author: Johann Werner <jw@oyosys.de>
Date:   Mon Jan 14 16:21:48 2013 +0100

    remove non-functional D2W components

commit 9325cc6e321083de04f5546b857cd64ab948bbec
Merge: d930bf9 02c9b2a
Author: Johann Werner <jw@oyosys.de>
Date:   Mon Jan 14 03:51:52 2013 -0800

    Merge pull request #357 from darkv/image_shrink_patch

    batch optimizing image resources

commit 02c9b2a4be0d8502dccea6ba28e51e4a21c78221
Author: Johann Werner <jw@oyosys.de>
Date:   Mon Jan 14 11:48:12 2013 +0100

    batch optimizing image resources

commit d930bf9082315a5bb610f4021ed3216a894c9120
Author: Ray Kiddy <ray@ganymede.org>
Date:   Sun Jan 13 13:33:25 2013 -0800

    First version of Tools, targeted to Mac OS X but may work for others.

commit 32fa30dd08122347fffff1ff0fdc0fb4fd316ed6
Merge: ae446f4 8806784
Author: Johann Werner <jw@oyosys.de>
Date:   Sat Jan 12 01:40:31 2013 -0800

    Merge pull request #354 from ishimoto/integration

    change resopurces.include.patternset to current correct implementation

commit 880678498e3650fda9e7101f28ba4b5aee228a54
Author: Ken ISHIMOTO <ken@ksroom.com>
Date:   Sat Jan 12 10:14:15 2013 +0100

    change resopurces.include.patternset to current correct implementation

    some Framworks after building with Ant has not all Data in the deployment Package and the deployment was broken. like the .wo Components are created but no HTML or WOD was inside

commit ae446f4fbdd54f1aa95ff8b826539ce3c07bb3e0
Merge: 95a9a7b 96621bf
Author: Ken Ishimoto <ken@ksroom.com>
Date:   Sat Jan 12 01:10:38 2013 -0800

    Merge pull request #353 from ishimoto/integration

    add missing binding - it is only a missing binding, so no review has need

commit 96621bf54d897d00cb44ea459d77cdc5520f90dd
Author: Ken ISHIMOTO <ken@ksroom.com>
Date:   Sat Jan 12 10:08:40 2013 +0100

    add missing binding

commit 95a9a7bd80039dc1f0a16fb56ce13b0c0d4312cf
Author: Johann Werner <jw@oyosys.de>
Date:   Thu Jan 10 21:09:09 2013 +0100

    some javadoc fixes

commit 64fc30aecc74517a0f1c24d350c3550806274c07
Merge: 5621fb0 798f6ff
Author: Johann Werner <jw@oyosys.de>
Date:   Thu Jan 10 11:44:52 2013 -0800

    Merge pull request #352 from darkv/JavaFSAdaptor_patch

    Some updates to JavaFSAdaptor

commit 798f6ff6b46b1aa7300dc63b5a01805efd13f939
Author: Johann Werner <jw@oyosys.de>
Date:   Thu Jan 10 20:39:28 2013 +0100

    add generics

commit 7a459f0554bc61716153a74bd558a66ef0c0c9b1
Author: Johann Werner <jw@oyosys.de>
Date:   Thu Jan 10 20:38:59 2013 +0100

    use non deprecated constructor

commit e01e94833c7c1a5f82476280589120bddcf04ef8
Author: Johann Werner <jw@oyosys.de>
Date:   Thu Jan 10 20:37:42 2013 +0100

    better stream handling

commit e068393c915008de2bf53899bf85c528fa020ae0
Author: Johann Werner <jw@oyosys.de>
Date:   Thu Jan 10 20:35:54 2013 +0100

    remove unnecessary parts

commit 5621fb04aabae5df71d6c2bb15694b39a01c41d8
Merge: 1cd5b4b 3acb9e1
Author: Johann Werner <jw@oyosys.de>
Date:   Thu Jan 10 03:12:08 2013 -0800

    Merge pull request #333 from ishimoto/integration

    Change Load Sequence for Properties

commit 1cd5b4be9fae10ce682ebc3b576a16c7247418a7
Merge: 605afb0 a0f1eab
Author: Pascal Robert <probert@macti.ca>
Date:   Wed Jan 9 11:50:20 2013 -0800

    Merge pull request #351 from daveeed/pull_request

    Add missing fragmentIdentifier binding to ERXOptionalForm and allow the ...

commit a0f1eab23b52474a0d58251908e6a79c9ba302eb
Author: David Holt <programmingosx@mac.com>
Date:   Wed Jan 9 11:47:42 2013 -0800

    Add missing fragmentIdentifier binding to ERXOptionalForm and allow the value to be set in ERMODRequiredWrapper

commit 3acb9e1e40f44287ad4583690a159225cc6d6d81
Merge: 5b3aee6 f7a3ce4
Author: Ken ISHIMOTO <ken@ksroom.com>
Date:   Thu Jan 3 18:56:13 2013 +0100

    Merge branch 'integration' of https://github.com/projectwonder/wonder into integration

commit 5b3aee6117cb2ec874d611ba77094b32536849e5
Merge: c16422e e7f6753
Author: Ken ISHIMOTO <ken@ksroom.com>
Date:   Wed Jan 2 19:35:31 2013 +0100

    Merge branch 'integration' of https://github.com/projectwonder/wonder into integration

commit c16422e756195199f2fd6c0f837e463c9fb124c9
Merge: 4ce647a 1c37116
Author: Ken ISHIMOTO <ken@ksroom.com>
Date:   Thu Dec 13 20:38:36 2012 +0100

    Merge branch 'integration' of https://github.com/projectwonder/wonder into integration

commit 4ce647a8d0f4539af649c7a298ec32e4242ebc53
Author: Ken ISHIMOTO <ken@ksroom.com>
Date:   Tue Dec 4 22:14:27 2012 +0900

    Remove ERDirectToRest from ClassPath

    * ERDirectToRest is deprecated
    * PartialApp don't need it

commit 34b89188e6e82d25b648c1d8b11edbc86793192c
Merge: 56b9bf9 5230b31
Author: Ken ISHIMOTO <ken@ksroom.com>
Date:   Tue Dec 4 22:12:22 2012 +0900

    Merge branch 'integration' of https://github.com/projectwonder/wonder into integration

commit 56b9bf90bd3ddf2f20b1f91407b56a7dbae2571b
Merge: 33624df 334783a
Author: Ken ISHIMOTO <ken@ksroom.com>
Date:   Tue Dec 4 17:25:01 2012 +0900

    Merge branch 'integration' of https://github.com/projectwonder/wonder into integration

commit 33624dfdca8cd0dfccab924976efffb7b60ef23f
Merge: efccfc6 75da817
Author: Ken ISHIMOTO <ken@ksroom.com>
Date:   Tue Dec 4 01:55:08 2012 +0900

    Merge branch 'integration' of https://github.com/projectwonder/wonder into integration

commit efccfc6f73c8c1f7409068839f6b76612b01a8dc
Merge: 2fa1883 842f2d8
Author: Ken ISHIMOTO <ken@ksroom.com>
Date:   Mon Dec 3 09:32:01 2012 +0900

    Merge branch 'integration' of https://github.com/projectwonder/wonder into integration

commit 2fa1883c0107acbfcd87fc5b30102d3a771949d9
Merge: 4f3ad5b 4febb1c
Author: Ken ISHIMOTO <ken@ksroom.com>
Date:   Fri Nov 30 05:58:18 2012 +0900

    Merge branch 'integration' of https://github.com/projectwonder/wonder into integration

commit 4f3ad5b026dbe67c366ec48beaa3276cd63965b1
Author: Ken ISHIMOTO <ken@ksroom.com>
Date:   Tue Nov 27 20:29:28 2012 +0100

    Change Load Sequence for Properties

    The new optional Properties Loader has to come before the Server ones, so it want override the Server Properties

commit ec415880a3567276e381329b3b6f7e65afb1d7f1
Merge: 189f805 ede787f
Author: Pascal Robert <probert@macti.ca>
Date:   Tue Oct 16 14:52:27 2012 -0400

    Merge branch 'integration' into wotaskd_ftp

commit 189f80555f093cc288cf2f4b473fd6f83a8ba8fa
Author: Pascal Robert <probert@macti.ca>
Date:   Fri Aug 24 19:22:20 2012 -0400

    Allowing empty passwords is a bad idea. If you wish to use the built-in SSH server, set a password for wotaskd

commit c8960f064d7fb9c1144efbc1e24147025224aacc
Author: Pascal Robert <probert@macti.ca>
Date:   Fri Aug 24 15:55:53 2012 -0400

    Adding the TCP port number for wotaskds built-in SSH server as a property

commit 284111afa8f41a6d5661808bd29c48631a888555
Merge: 1eafcb4 f1daef1
Author: Pascal Robert <probert@macti.ca>
Date:   Fri Aug 24 15:48:02 2012 -0400

    Merge branch 'integration' into wotaskd_ftp

commit 1eafcb454ff388d3f6403073dcacded9fa963b25
Author: Pascal Robert <probert@macti.ca>
Date:   Fri Aug 24 14:55:06 2012 -0400

    Adding shell support so that we can do things like symbolic links

commit c7ad865d04badceb0a3c6489ba28eb992cc2d557
Author: Pascal Robert <probert@macti.ca>
Date:   Fri Aug 10 18:20:49 2012 -0400

    Added SFTP support in wotaskd, in preparation of a Jenkins plugin

    The SFTP server will run on port 6022. Only password authentication will work, you need to provide the password of your wotaskd installation.