ACAD-956 Squashed commit of the following:

commit cf0e80e2e59ba039122aa311c782142eef71cc0f
Author: Lance Speelmon <lance@speelmon.com>
Date:   Thu Apr 26 16:32:43 2012 -0700

    ACAD-956 temporary commit to allow the launchpad to build i.e. bind to old uxloader

commit 90878ef975f10d8eb763fa3cbb6f643b1fb1f15e
Author: Lance Speelmon <lance@speelmon.com>
Date:   Thu Apr 26 15:29:29 2012 -0700

    ACAD-956 copy release scripts from 120 tag

commit 12fbdd26d176dd0e828542951b2526141b6eb02a
Author: Lance Speelmon <lance@speelmon.com>
Date:   Thu Apr 26 15:13:21 2012 -0700

    ACAD-956 reconcile diffs for : bundles/upgrade/src/main/java/org/sakaiproject/nakamura/upgrade/servlet/TagMigrator.java

commit 2f87eca6d9e2208e603e91735b9d51a650780e63
Author: Lance Speelmon <lance@speelmon.com>
Date:   Thu Apr 26 15:08:51 2012 -0700

    ACAD-956 fixed some pom.xml bad version references

commit e2ba64125cdcfab35c0dedaaea493a939248f337
Author: Lance Speelmon <lance@speelmon.com>
Date:   Thu Apr 26 15:02:06 2012 -0700

    ACAD-956 fixed artifact version for captcha service

commit cc3d6652ac1fd62be8fadb30d0d48c437c04929c
Author: Lance Speelmon <lance@speelmon.com>
Date:   Thu Apr 26 14:47:01 2012 -0700

    ACAD-956 [ERROR] Failed to execute goal on project org.sakaiproject.nakamura.postgresqlwrapper: Could not resolve dependencies for project org.sakaiproject.nakamura:org.sakaiproject.nakamura.postgresqlwrapper:bundle:1.2.0-rsmart-SNAPSHOT: Could not find artifact postgresql:postgresql:jar:9.1-902.jdbc4 in rsmart-dev (https://nexus.rsmart.com/nexus/content/groups/public/) -> [Help 1]

commit 9859ca01e2a373793be1506fa09b6b2ba49e0ef2
Author: Lance Speelmon <lance@speelmon.com>
Date:   Thu Apr 26 14:25:46 2012 -0700

    ACAD-956 fixed compiler error missing import

commit c45657e030a04d31cfec729ee3d092ab9b609681
Author: Lance Speelmon <lance@speelmon.com>
Date:   Thu Apr 26 14:24:03 2012 -0700

    ACAD-956 [ERROR] Failed to execute goal on project org.sakaiproject.nakamura.basiclti: Could not resolve dependencies for project org.sakaiproject.nakamura:org.sakaiproject.nakamura.basiclti:bundle:1.2.0-rsmart-SNAPSHOT: Failure to find org.sakaiproject.basiclti:basiclti-util:jar:1.2.0-rsmart-SNAPSHOT in https://nexus.rsmart.com/nexus/content/groups/public/ was cached in the local repository, resolution will not be reattempted until the update interval of rsmart-dev has elapsed or updates are forced -> [Help 1]

commit 4d7de9c6eec98e5dcdfbbb33e5110c250514cba0
Author: Lance Speelmon <lance@speelmon.com>
Date:   Thu Apr 26 14:08:44 2012 -0700

    ACAD-956 [ERROR] /Develop/k2/rsmart/nakamura/bundles/user/src/main/java/org/sakaiproject/nakamura/user/search/AuthorizableIndexingHandler.java:[186,26] doc is already defined in getDocuments(org.sakaiproject.nakamura.api.solr.RepositorySession,org.osgi.service.event.Event)

commit 6fd921f0ecb5519e9309e99eacd4aafd6c572dfc
Author: Lance Speelmon <lance@speelmon.com>
Date:   Thu Apr 26 11:40:48 2012 -0700

    ACAD-956 reconcile from release tag: app/pom.xml

commit 9f1178ecdabca8dde900b1c8ec8a518ceb63365a
Author: Lance Speelmon <lance@speelmon.com>
Date:   Thu Apr 26 11:39:41 2012 -0700

    ACAD-956 reconcile from release tag: app/pom.xml

commit a50c3d20a88b90dc27964a894ff6554f6b34fd85
Author: Lance Speelmon <lance@speelmon.com>
Date:   Thu Apr 26 11:17:22 2012 -0700

    ACAD-956 reconcile from release tag: pom.xml

commit 54725416871b580d2e323854aee975b9e02e171e
Author: Lance Speelmon <lance@speelmon.com>
Date:   Thu Apr 26 11:14:46 2012 -0700

    ACAD-956 reconcile from release tag: bundles/activity/api/pom.xml

commit 901e95ca1c188a15971f480f0353684744350f53
Author: Lance Speelmon <lance@speelmon.com>
Date:   Thu Apr 26 11:09:49 2012 -0700

    ACAD-956 reconcile app/src/main/bundles/list.xml from release tag

commit aedacc9b73750aaa208632bbccc219edf0f5f9d2
Author: Lance Speelmon <lance@speelmon.com>
Date:   Thu Apr 26 11:06:51 2012 -0700

    ACAD-956 reconcile app/src/main/bundles/list.xml from release tag

commit 044e97896b1a9d58226ef46dbe421c633fdaedfe
Author: Lance Speelmon <lance@speelmon.com>
Date:   Thu Apr 26 11:03:19 2012 -0700

    ACAD-956 reconcile app/src/main/bundles/list.xml from release tag

commit 58d388aacd77eda6a6ba7882c1b4240fea9bdd31
Merge: 8b3ae73 33d7e98
Author: Lance Speelmon <lance@speelmon.com>
Date:   Thu Apr 26 10:59:14 2012 -0700

    ACAD-956 Merge tag 'nakamura-1.2.0' into ACAD-956

    tagging release 1.2.0

    * tag 'nakamura-1.2.0': (300 commits)
      [maven-release-plugin] prepare release 1.2.0
      release_pre_process: Moving config files from 1.2-SNAPSHOT to 1.2.0
      NOJIRA tweak the way version numbers are replaced in list.xml
      KERN-2796 Read source content as admin to ensure ltiKeys node is migrated. Also, lock down ltiKeys node after migration
      KERN-2759 fix the output of 'width' for fractional column widths
      KERN-2788 comment out sonatype <parent>
      KERN-2789 add nversion parameter
      KERN-2781 update sparse and solr dependencies to 1.3.4 and 1.4.2
      KERN-2777 Provide the ability to granularly "@Ignore"
      KERN-2771 Creating a special operation for publishing sakaidoc pages: SakaiDocPagePublishOperation.
      KERN-2763 Move structure0 to files API
      KERN-2766 fix regressions that popped up with the kern-2766 fix
      Unit tests no longer needed, so Revert "KERN-2763 and KERN-2765 Unit tests to demonstrate how corrupt sakaidocs get migrated"
      KERN-2763 Finish impl of undefined-node fixer
      KERN-2763 Partial implementation of the undefined node fixer
      KERN-2763 Sparse upgrader to fix sakai docs with 'undefined' nodes
      KERN-2769 Unbind POST operation in the LiteBasicLTIConsumerServlet
      KERN-2766 keep html blocks and widgets in order
      KERN-2753 Build fixes for sparse changes. Add note on how some methods should be refactored in the next release.
      KERN-2753 Add option to :merge content when updating. :replace works like "continue if exists" and so :merge is needed to control whether the update merges or replaces the existing content. Use replace(..) in sparse when :replace=true && :merge=false.
      ...

    Conflicts:
    	app/pom.xml
    	app/src/main/bundles/list.xml
    	bundles/activation-mail/pom.xml
    	bundles/activemq/pom.xml
    	bundles/activity/impl/pom.xml
    	bundles/authz/pom.xml
    	bundles/basiclti/pom.xml
    	bundles/basiclti/src/main/java/org/sakaiproject/nakamura/basiclti/LiteDefaultContextIdResolver.java
    	bundles/batch/pom.xml
    	bundles/calendar/pom.xml
    	bundles/captcha/pom.xml
    	bundles/chat/pom.xml
    	bundles/cluster/pom.xml
    	bundles/configuration/pom.xml
    	bundles/connections/pom.xml
    	bundles/content-packaging/pom.xml
    	bundles/directory/pom.xml
    	bundles/discussion/pom.xml
    	bundles/doc/pom.xml
    	bundles/docproxy/pom.xml
    	bundles/email-outgoing/pom.xml
    	bundles/events/pom.xml
    	bundles/files/api/pom.xml
    	bundles/files/impl/pom.xml
    	bundles/formauth/pom.xml
    	bundles/http/pom.xml
    	bundles/image/pom.xml
    	bundles/jaxp-api/pom.xml
    	bundles/jcr/pom.xml
    	bundles/jetty-config/pom.xml
    	bundles/jetty-config/src/main/java/org/sakaiproject/nakamura/jetty/OSGiGZipFilter.java
    	bundles/jetty-config/src/main/resources/OSGI-INF/metatype/metatype.xml
    	bundles/jetty-config/src/main/resources/OSGI-INF/scr-plugin/scrinfo.xml
    	bundles/jetty-config/src/main/resources/OSGI-INF/serviceComponents.xml
    	bundles/locking/pom.xml
    	bundles/lom/pom.xml
    	bundles/memory/pom.xml
    	bundles/meservice/pom.xml
    	bundles/messaging/pom.xml
    	bundles/pages/pom.xml
    	bundles/personal/pom.xml
    	bundles/presence/pom.xml
    	bundles/profile/api/pom.xml
    	bundles/profile/impl/pom.xml
    	bundles/proxy/pom.xml
    	bundles/resource/pom.xml
    	bundles/search/api/pom.xml
    	bundles/search/impl/pom.xml
    	bundles/securityloader/pom.xml
    	bundles/server/pom.xml
    	bundles/smtp/pom.xml
    	bundles/templates/pom.xml
    	bundles/tika/pom.xml
    	bundles/trustedauth/pom.xml
    	bundles/upgrade/pom.xml
    	bundles/upgrade/src/main/java/org/sakaiproject/nakamura/upgrade/servlet/TagMigrator.java
    	bundles/user/pom.xml
    	bundles/user/src/main/java/org/sakaiproject/nakamura/user/lite/servlet/LiteAuthorizablePostProcessServiceImpl.java
    	bundles/user/src/main/java/org/sakaiproject/nakamura/user/lite/servlet/LiteCreateSakaiUserServlet.java
    	bundles/user/src/main/java/org/sakaiproject/nakamura/user/search/AuthorizableIndexingHandler.java
    	bundles/version/pom.xml
    	bundles/webconsole-plugins/solr/pom.xml
    	bundles/woodstox/pom.xml
    	bundles/world/pom.xml
    	contrib/casauth/pom.xml
    	contrib/csu/pom.xml
    	contrib/filters/pom.xml
    	contrib/import/pom.xml
    	contrib/ldap/pom.xml
    	contrib/ldapauth/pom.xml
    	contrib/mailman/pom.xml
    	contrib/migratecustommimetype/pom.xml
    	contrib/migratejcr/pom.xml
    	contrib/migratesparseuuid/pom.xml
    	contrib/mysql-jdbc/pom.xml
    	contrib/nyu/pom.xml
    	contrib/oracle-jdbc-6/pom.xml
    	contrib/oracle-jdbc/pom.xml
    	contrib/persondirectory/pom.xml
    	contrib/remotefiles/pom.xml
    	contrib/restauth/pom.xml
    	contrib/robots.txt/pom.xml
    	contrib/rootconfig/pom.xml
    	contrib/samlauth/pom.xml
    	contrib/sitejoin/pom.xml
    	contrib/ucam/pom.xml
    	integration/pom.xml
    	libraries/testutils/pom.xml
    	libraries/utils/pom.xml
    	modelling/pom.xml
    	pom.xml
    	samples/antixss/pom.xml
    	samples/fileinstall/hellofromfileinstall/pom.xml
    	samples/fileinstall/pom.xml
    	samples/fileinstall/slingrunner/pom.xml
    	samples/guice/pom.xml
    	samples/guiceuser/pom.xml
    	samples/helloworld/pom.xml
    	samples/jpa/pom.xml
    	samples/jpacore/pom.xml
    	samples/jpaexample/pom.xml
    	samples/jpahelloworld/pom.xml
    	samples/jpaprovider/pom.xml
    	samples/lifecycle/pom.xml
    	samples/persistence/pom.xml
    	samples/registry/pom.xml
    	samples/session/pom.xml
    	samples/shindig/pom.xml
    	sandbox/aggregate/pom.xml
    	sandbox/contenttest/test1/pom.xml
    	sandbox/contenttest/test2/pom.xml
    	sandbox/drools/drools-engine/pom.xml
    	sandbox/drools/drools-maven-plugin/pom.xml
    	sandbox/drools/drools-repository/pom.xml
    	sandbox/drools/example-rules/pom.xml
    	sandbox/drools/pom.xml
    	sandbox/eventexplorer/app/pom.xml
    	sandbox/eventexplorer/bundles/cassandrathrift/pom.xml
    	sandbox/eventexplorer/bundles/listeners/pom.xml
    	sandbox/eventexplorer/bundles/storage/jdbc/pom.xml
    	sandbox/eventexplorer/bundles/ui/pom.xml
    	sandbox/eventexplorer/pom.xml
    	sandbox/imap/pom.xml
    	sandbox/jaxrs/pom.xml
    	sandbox/opensso/pom.xml
    	sandbox/scriptrunner/pom.xml
    	sandbox/sessiontest/pom.xml
    	sandbox/site/pom.xml
    	sandbox/sitetemplates/pom.xml
    	scripts/preview_processor.rb
    	testscripts/SlingRuby/kerns/kern-1874.rb
    	testscripts/SlingRuby/kerns/kern-2243.rb
    	testscripts/SlingRuby/kerns/kern-308.rb
    	testscripts/SlingRuby/kerns/kern-939.rb
    	testscripts/pom.xml
    	tools/release_pre_process_files.sh
    	tools/version
    	tools/version.bat
    	webstart/pom.xml
    	webstart/src/main/jnlp/template.vm

commit 33d7e9816fcd33ca29b3896bb9e3452b9b516db1
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Apr 24 17:04:50 2012 -0500

    [maven-release-plugin] prepare release 1.2.0

commit a8095868a742023bce266c8649d4ebc6cadb59e6
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Apr 24 16:03:24 2012 -0500

    release_pre_process: Moving config files from 1.2-SNAPSHOT to 1.2.0

commit b05040f0d309628e3eb41a271fc356cac4f9a0eb
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Apr 24 16:02:31 2012 -0500

    NOJIRA tweak the way version numbers are replaced in list.xml

commit d657ef8ed68d20029706ef6bc52a8bd5aa5c19f3
Merge: 0811f4f 972c292
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Apr 24 11:56:02 2012 -0700

    Merge pull request #761 from zathomas/kern-2759

     fixed the 'width' property for fractional widths

commit 0811f4fc52c79888a3a5076a444962877ec64bf3
Merge: 1b20f3f 00131ee
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Apr 24 08:33:54 2012 -0700

    Merge pull request #759 from mrvisser/kern-2796

     Migrated basiclti widget displays ltisecret cannot be null (500)

commit 00131ee2a97a5005869129774b3da721373afa75
Author: Branden Visser <mrvisser@gmail.com>
Date:   Mon Apr 23 18:14:41 2012 -0400

    KERN-2796 Read source content as admin to ensure ltiKeys node is migrated. Also, lock down ltiKeys node after migration

commit 972c2924519142c5b16f2a7e9bbb225f7d4a9ee9
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Mon Apr 23 11:30:03 2012 -0500

    KERN-2759 fix the output of 'width' for fractional column widths

commit 1b20f3f765b3cc3f862252ce49678854eeee1c98
Author: Anthony Whyte <arwhyte@umich.edu>
Date:   Wed Apr 18 23:35:50 2012 -0400

    KERN-2788 comment out sonatype <parent>

commit 4c442ca6da5cdba211e27d87abe1ae8c7a2ba0d4
Merge: b67b6f0 8eafb49
Author: Branden Visser <mrvisser@gmail.com>
Date:   Wed Apr 18 19:58:41 2012 -0700

    Merge pull request #753 from arwhyte/KERN-2789

    KERN-2789 add nversion parameter

commit 8eafb490edbcf3d0e2bd0d66177fdd29c9d440d5
Author: Anthony Whyte <arwhyte@umich.edu>
Date:   Wed Apr 18 21:29:07 2012 -0400

    KERN-2789 add nversion parameter

commit b67b6f0bc59c26b843163b16928fa83a54436eaf
Merge: f4d4cfe 4ecee58
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Apr 18 13:12:13 2012 -0700

    Merge pull request #750 from arwhyte/KERN-2781

     update sparse and solr dependencies to 1.3.4 and 1.4.2

commit 4ecee58c2c8550c5329a97ab54326ba2a4e8925f
Author: Anthony Whyte <arwhyte@umich.edu>
Date:   Wed Apr 18 13:54:01 2012 -0400

    KERN-2781 update sparse and solr dependencies to 1.3.4 and 1.4.2

commit f4d4cfec894fc82af17e0868b6603e66a4c7d85e
Merge: ed9a3e2 c2d954c
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Apr 17 10:26:18 2012 -0700

    Merge pull request #746 from mrvisser/kern-2777

     Provide the ability to granularly "@Ignore"

commit ed9a3e2526526e419c6b4376a1286af4a9761241
Merge: 1959e14 0da5e3b
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Apr 17 08:27:57 2012 -0700

    Merge pull request #745 from mrvisser/kern-2771

     Creating a special operation for publishing sakaidoc pages

commit c2d954ce36981a06f1f193de27b2233a203b2a2b
Author: Branden Visser <mrvisser@gmail.com>
Date:   Mon Apr 16 18:58:19 2012 -0400

    KERN-2777 Provide the ability to granularly "@Ignore"

    This change allows UI devs to specify @Ignore as a key suffix in a JSON import that instructs the server to completely ignore that tree of content. No content below that node (including the node itself) should be updated or deleted.

    An example import of content can be:

    {
      "id3973361": {
        "comments": {
          "message": {
            "sling:resourceType": "sakai/messagestore",
            "_created": 1334613157826,
            "_id": "e1pKIIgOEeG4WfQRwKgBAw+",
            "_lastModifiedBy": "admin",
            "_lastModified": 1334613157859,
            "_createdBy": "admin",
            "_path": "l6yabccQGq/id9487514/id3973361/comments/message",
            "inbox@Ignore": true
          }
        }
      }
    }

    Where everything below id3973361/comments/message/inbox, including 'inbox' itself will not be modified or deleted. Note that the following are considered equivalent:

    "inbox@Ignore": true
    "inbox@Ignore": {}
    "inbox@Ignore": []

    As the value of the content is not important below this point.

commit 0da5e3bf9e3d3525269d401302be5243185efd04
Author: Branden Visser <mrvisser@gmail.com>
Date:   Mon Apr 16 16:15:01 2012 -0400

    KERN-2771 Creating a special operation for publishing sakaidoc pages: SakaiDocPagePublishOperation.

    This was created to overcome issues with replacing sakai messages when page is published. This Operation will maintain a history of sakai/message nodes that existed prior to the draft being published, and be overlaid onto the final content after the draft has been published.

commit 1959e14ceb17d0ab6f7f488121e13d51c122671d
Merge: ab87983 da6c53f
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Mon Apr 16 09:39:03 2012 -0700

    Merge pull request #740 from ctweney/kern-2763

    Kern 2763

commit da6c53fc1f57cdb18c9faf15ca24fc2e556bde63
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Mon Apr 16 09:17:02 2012 -0700

    KERN-2763 Move structure0 to files API

commit ab879836a393a0beb184816209520848890df725
Merge: 30ae501 31b0b8a
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Apr 16 06:43:30 2012 -0700

    Merge pull request #741 from zathomas/kern-2766

     migration: some migrated elements out of order

commit 31b0b8a94e70cca044238853961edd872d202ff3
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Mon Apr 16 00:47:40 2012 -0500

    KERN-2766 fix regressions that popped up with the kern-2766 fix

commit ca469edb58fc3e5bf1aa991d23234888e1ddc2df
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Apr 13 14:35:43 2012 -0700

    Unit tests no longer needed, so Revert "KERN-2763 and KERN-2765 Unit tests to demonstrate how corrupt sakaidocs get migrated"

    This reverts commit ec906f6ee446afb4a0e3848e6350db97e782eed8.

commit 47f9a3f9f80c0c101d0d9bd80663633e8baadc7e
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Apr 13 14:31:47 2012 -0700

    KERN-2763 Finish impl of undefined-node fixer

commit 195ecc7606d98277a3bdd191ff14b9ef3382a9bb
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Apr 13 13:54:03 2012 -0700

    KERN-2763 Partial implementation of the undefined node fixer

commit 2481d016fa72def6b242406c718c107164cf5bc4
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Apr 13 13:33:40 2012 -0700

    KERN-2763 Sparse upgrader to fix sakai docs with 'undefined' nodes

commit 30ae501e098e956c8fad9c10641359f596d49f88
Merge: b20109c c825e5a
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Apr 13 07:54:38 2012 -0700

    Merge pull request #739 from mrvisser/KERN-2769

     Unbind POST operation from basiclti servlet

commit c825e5a67f83fd253975067d4a212074a765dfc9
Author: Branden Visser <mrvisser@gmail.com>
Date:   Fri Apr 13 09:48:16 2012 -0400

    KERN-2769 Unbind POST operation in the LiteBasicLTIConsumerServlet

    KERN-2769 Updating servlet service docs and removing deprecated methods.

commit 6f6cdccd91ee8e34ecb23ab5af4534184226631e
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Apr 12 18:02:58 2012 -0500

    KERN-2766 keep html blocks and widgets in order

commit b20109c140161ea5b062ace876eeacc0bbb0b444
Merge: 3848461 ce1a5ef
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Apr 12 15:12:24 2012 -0700

    Merge pull request #737 from thecarlhall/kern-2753

    KERN-2753 Add option to :merge content when updating.

commit ce1a5ef708eb3e2d496d46a224b906cb7ca55134
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Apr 12 18:00:42 2012 -0400

    KERN-2753 Build fixes for sparse changes. Add note on how some methods should be refactored in the next release.

commit e2323e5fef43bee5157a2dd4b79c2512caf986b2
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Apr 12 17:06:12 2012 -0400

    KERN-2753 Add option to :merge content when updating. :replace works like "continue if exists" and so :merge is needed to control whether the update merges or replaces the existing content.
    Use replace(..) in sparse when :replace=true && :merge=false.

commit 3848461eb16ae173979903d16a8830a2b47796b4
Merge: 0396dfe a96ae60
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Apr 12 13:29:14 2012 -0700

    Merge pull request #736 from zathomas/kern-2759

    KERN-2759 fix the support for block_image_left widgets

commit a96ae609fe08c2ec8468eeb28841eba2bed8c6bb
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Apr 12 15:05:21 2012 -0500

    KERN-2759 ensure block_image_left widgets are added in migration

commit ec906f6ee446afb4a0e3848e6350db97e782eed8
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Apr 11 16:44:41 2012 -0700

    KERN-2763 and KERN-2765 Unit tests to demonstrate how corrupt sakaidocs get migrated

commit 0396dfe764dd9b592b5c5829d87b8f09eb44a7d6
Merge: 147bb3d 19f4487
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Wed Apr 11 07:34:35 2012 -0700

    Merge pull request #734 from mrvisser/kern-2761

    KERN-2761 Discussion topics are doubled when editing, or editing/cancelling quickly

commit 19f44878775a04a917ec0cbe34b14b2fe5f0f0b5
Merge: 147bb3d 72bfc27
Author: Branden Visser <mrvisser@gmail.com>
Date:   Wed Apr 11 08:49:26 2012 -0400

    Merge commit '72bfc275ce55e178c6f851af4e546979234c3854' into kern-2761

commit 147bb3dcd81e43c8c9252a57e98085afd99312b7
Merge: c7a6875 6536b30
Author: Lance Speelmon <lance@speelmon.com>
Date:   Tue Apr 10 16:33:01 2012 -0700

    Merge pull request #733 from ctweney/kern-2755

    Kern 2755

commit 6536b3015e891e51bfe39bb9a5697dec5069462a
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Tue Apr 10 16:22:21 2012 -0700

    KERN-2755 Correct FileMigratorFilter's regex so it deals with unusual usernames better

commit c7a68750db9fb218250435098a7af9c2690455df
Merge: 9d99523 15b9c38
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Apr 10 14:19:22 2012 -0700

    Merge pull request #732 from mrvisser/kern-2756

     Indexing sakai/message objects by sakai:created

commit 15b9c380d370216c52647f5c5d8a992383cb6edd
Author: Branden Visser <mrvisser@gmail.com>
Date:   Tue Apr 10 16:28:46 2012 -0400

    KERN-2756 Indexing sakai/message objects by sakai:created instead of _created

commit 9d99523ed16fba98ba64a18aa4b74c36696b704a
Merge: 40ed907 7b5c421
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Tue Apr 10 11:20:47 2012 -0700

    Merge pull request #731 from arwhyte/KERN-2746-1.2

    KERN-2746 add sonatype <parent> to 1.2 branch

commit 7b5c42135c8b652c1c378f499ff263f354e98c80
Author: Anthony Whyte <arwhyte@umich.edu>
Date:   Tue Apr 10 10:58:11 2012 -0400

    KERN-2746 add sonatype <parent> to 1.2 branch

commit 40ed90700f684c2acdc26c60c9c34048b9b00703
Merge: 3ade91c ca8a36b
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Mon Apr 9 13:59:36 2012 -0700

    Merge pull request #727 from zathomas/kern-2738-test

    KERN-2738 add a unit test which covers the TypeHint scenario

commit ca8a36b7838e160174609f754fdd36c151c034c5
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Mon Apr 9 15:09:16 2012 -0500

    KERN-2738 add a test case that demonstrates the use of Sling TypeHint

commit 3ade91ca5ee7ca4a14c026443eaf263598e4ccfc
Merge: b2ceb71 099763b
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Mon Apr 9 10:14:58 2012 -0700

    Merge pull request #721 from thecarlhall/kern-2748

    KERN-2748 Reduce message level to info instead of warn to match severity of processing state.

commit 099763b3457778f218f2668ba7f26b105e035783
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Apr 9 13:07:16 2012 -0400

    KERN-2748 Reduce message level to info instead of warn to match severity of processing state.

commit b2ceb7121a0aabd5a1c3d2f8227617cbd6a8502f
Merge: eeee054 d2cb8fa
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Apr 6 13:57:29 2012 -0700

    Merge pull request #713 from thecarlhall/kern-2732

    KERN-2732 Use sparse 1.3.4 for fixes to moving.

commit eeee0546ebeb567f988d7dd170ba738f72a32684
Merge: bbf1d4d b04ea40
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Apr 5 15:40:16 2012 -0700

    Merge pull request #718 from zathomas/kern-2738

    KERN-2738 fix LiteJsonImporter to respect some-property@TypeHint convention

commit b04ea40dd07cc0b44bc9cf2a6e64068b68792f76
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Apr 5 16:13:36 2012 -0500

    KERN-2738 fix LiteJsonImporter to respect some-property@TypeHint convention

commit bbf1d4de21488d0fecfb5fce5f205fbe81334216
Merge: 05b1cc3 b851fdf
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Tue Apr 3 16:30:38 2012 -0700

    Merge pull request #714 from lancespeelmon/120

    Update postgres driver

commit b851fdfd901a0cce16287d051e76f1cdde227e60
Author: Lance Speelmon <lance@speelmon.com>
Date:   Tue Apr 3 11:08:20 2012 -0700

    KERN-2735 Upgrade postgres driver to latest GA version

commit d2cb8fa45e11fe8a978c221d4d333af9600963d7
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Apr 3 00:50:40 2012 -0400

    KERN-2732 Use sparse 1.3.4 for fixes to moving.

commit 05b1cc33dc4eef5c921ec5b5a4c02083a59501b8
Merge: 2233e55 4941ee9
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Mar 29 14:40:01 2012 -0700

    Merge pull request #710 from zathomas/KERN-2721

     better telemetry tracking of CacheControlFilter

commit 4941ee91979f6f13e1b2ce298c264bf704a68700
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Mar 29 15:48:02 2012 -0500

    KERN-2721 add finer-grained telemetry counter in CacheControlFilter

commit 2233e555e441984a721f89916d6086d51f5a4fa5
Merge: c736bbf 1749162
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Mar 28 07:08:55 2012 -0700

    Merge pull request #703 from arwhyte/1.2.0

    KERN-2700 update solr bundle version in list.xml

commit 174916217f6c8617383ae727507efe2a6714e7a3
Author: Anthony Whyte <arwhyte@umich.edu>
Date:   Wed Mar 28 07:55:35 2012 -0400

    KERN-2700 update solr bundle version in list.xml

commit c736bbf72c44951d1bbc99106f1fe557cc70e83e
Merge: bdc3236 3ad3e61
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Mar 27 14:52:46 2012 -0700

    Merge pull request #698 from thecarlhall/kern-2707

    KERN-2707 Add parameter to keep destination history when moving. Bump sparse version for functionality.

commit bdc32364b7d4bf57c80f879b4a8cf31629b25846
Merge: ac6dbfa 3070cb1
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Mar 27 11:38:48 2012 -0700

    Merge pull request #702 from arwhyte/1.2.0

    KERN-2700 update dependencies sparse (to 1.3.2) and solr (to 1.4.1) versions

commit 3070cb181d4771796692c683bf436062fceb7855
Author: Anthony Whyte <arwhyte@umich.edu>
Date:   Tue Mar 27 14:28:48 2012 -0400

    KERN-2700 update sparse and solr versions

commit 72bfc275ce55e178c6f851af4e546979234c3854
Author: Branden Visser <mrvisser@gmail.com>
Date:   Tue Mar 27 11:26:36 2012 -0400

    KERN-2706 Ignore indexing messages that exist within a "temporary" directory

commit 3ad3e6128dbf486c7038afbf8f6b1fb4841687ec
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Mar 27 00:06:52 2012 -0400

    KERN-2707 Add parameter to keep destination history when moving. Bump sparse version for functionality.

commit ac6dbfa084bf8575837d9c31085c33a6eb01c5a7
Merge: bafead2 0858d40
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Mar 23 16:40:41 2012 -0700

    Merge pull request #697 from zathomas/kern-2661

    KERN-2661 fix repeated widgets in groups

commit bafead2bed4c8e19ea712f5905c47729b3bd61d6
Merge: 8661907 3684051
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Fri Mar 23 16:36:35 2012 -0700

    Merge pull request #696 from ctweney/kern-2702

    Kern 2702

commit 0858d404a5ae119ffd97bb15883fb7aa923ea6d0
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Fri Mar 23 18:26:17 2012 -0500

    KERN-2661 make special case to suppress htmlblock when top-level-element is widget

commit 3684051b883665e73165c759f31bda21cd8c94fe
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Mar 23 16:13:12 2012 -0700

    KERN-2702 Rewrite TagMigrator so it doesn't break when tags start with whitespace

commit 8661907b4eb0b53191a2f0514dd840cf8bc16c65
Merge: d3d1b30 c23283a
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Mar 23 10:54:48 2012 -0700

    Merge pull request #695 from arwhyte/KERN-2689

     update *.core <version> to 1.3.2

commit d3d1b307e77498345157ee782204dc2df5903c76
Merge: 06d3751 93f097b
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Mar 23 09:25:11 2012 -0700

    Merge pull request #692 from thecarlhall/kern-2628

    KERN-2697 Add handling of basiclti secret node.

commit c23283a505b89590bf48d709af9cc9300dd8a126
Author: Anthony Whyte <arwhyte@umich.edu>
Date:   Fri Mar 23 10:58:12 2012 -0400

    KERN-2689 update *.core <version> to 1.3.2

commit 93f097bb76d8c8224e2abbf93c17e50373635b36
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Mar 23 01:04:43 2012 -0400

    KERN-2697 Add handling of basiclti secret node.
    Rename move cleaner to reflect that it handles a page not a document.
    Change MoveOperation binding of cleaners to not require resource type.
    Add unit test to cover basic lti node move.

commit 06d375141b18d170a09ae8be299659ea7b92c53a
Merge: 845223a cd25f52
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Mar 22 13:50:00 2012 -0700

    Merge pull request #691 from zathomas/kern-2638

    KERN-2638 need to replace the new 'page' property with the old one.

commit cd25f521f1e56e99a11ad29ebe6b3e9a09a6fd5a
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Mar 22 14:34:07 2012 -0500

    KERN-2638 need to overwrite page property with the older revision

commit 845223aea1cfa97003d6591a0e7c76146e3bf379
Merge: a5977aa dd8d73b
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Mar 22 10:42:57 2012 -0700

    Merge pull request #686 from thecarlhall/kern-2628

    KERN-2628 Change 'force' param to ':replace' to match sling's move op

commit a5977aa6d676e5485eee51c7a268c75b5f8c979f
Merge: 3e7d697 3cadfe2
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Mar 22 10:34:31 2012 -0700

    Merge pull request #685 from zathomas/kern-2638

    KERN-2638 migrate document revisions

commit 3cadfe211ba1bd3c8bd480ef8ee2d1c0d009ab95
Merge: 08d5036 4872f86
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Mar 22 11:44:01 2012 -0500

    KERN-2638 resolve merge conflict from upstream 1.2.0

commit 3e7d6975d3c705aaf5842c1c97114cd487ee4947
Merge: cb6f763 54a552b
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Mar 22 00:40:53 2012 -0700

    Merge pull request #689 from zathomas/kern-2678

commit cb6f7636021e3ce341b72071c4d34f213a5bd861
Merge: 4872f86 0f2b2ac
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Mar 22 00:34:38 2012 -0700

    Merge pull request #688 from zathomas/kern-2672

     ensure HTML parent of a widget gets added to page

commit 08d5036d510ad968b3f2649fbbf3149c9d7bf516
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Mar 14 15:52:28 2012 -0700

    KERN-2638 incorporate ctweney's isPageNode test

commit 54a552b631defb0655fb4f8c342a8fa9591bbebc
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Mar 22 01:52:23 2012 -0500

    KERN-2678 do not try to process a discussion widget's messages if it has no 'inbox'

commit 0f2b2ac2430b26bbc0ae67cddbdb035b557d4453
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Mar 22 00:43:42 2012 -0500

    KERN-2672 ensure HTML parent of a widget (e.g. <ol>) is added to the page

commit 4872f86d4eb220de49849d1df2f395fe1d056769
Merge: b240470 0b5cb67
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Mar 21 21:58:56 2012 -0700

    Merge pull request #687 from zathomas/kern-2687

     keeps the migrator from blowing up if a non-existent widget is referenced

commit 0b5cb67039b4175bec88baef9ebef48af0ca281d
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Wed Mar 21 23:39:24 2012 -0500

    KERN-2687 ensure we don't try to process a page ref which isn't present

commit dd8d73bdbb366f8e2153a4ada7173eae0dfd073a
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Mar 21 19:52:59 2012 -0400

    KERN-2628 Change 'force' param to ':replace' to match sling's move op

commit c54a493472bae552918366c5875bf107e25d158e
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Wed Mar 21 18:00:53 2012 -0500

    KERN-2638 add protection for duplicate 'version' key in output

commit ad3d7df2b97448f71ca2780148a16e0f64ed518a
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Wed Mar 21 15:05:48 2012 -0500

    KERN-2638 add method to FileMigrationService to migrate a single page, use in version

commit b24047048a9920f8894f6d35706f51f462950303
Merge: 5d952b3 9de4029
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Mar 21 10:34:13 2012 -0700

    Merge pull request #684 from ctweney/kern-2687

commit 9de402997ac0a2023ddfbcce5721b366ed0c9c8d
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Mar 21 09:55:18 2012 -0700

    KERN-2687 Provide test data and skeleton test case for Berkeley data bug

commit 5d952b3e3d5797250ad690d042196e5d4b44f8a2
Merge: 78ad7d1 ec1c342
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Mar 20 14:43:36 2012 -0700

    Merge pull request #670 from lancespeelmon/120

    https://jira.sakaiproject.org/browse/

commit 78ad7d150ba9b5fbbaf4935d1e715abe0dfb555b
Merge: 2f38e81 673c108
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Tue Mar 20 09:54:44 2012 -0700

    Merge pull request #679 from mrvisser/1.2.0

    KERN-2680 Sorting A-Z in the Search Page All Types/Content not working

commit 673c108dd3c9290598cf83d1f8d6da9155d04bd6
Author: Branden Visser <mrvisser@gmail.com>
Date:   Tue Mar 20 12:45:52 2012 -0400

    KERN-2680 Sorting A-Z in the Search Page All Types/Content not working

    Cleaning up code to eliminate an 'if' block and change usage of toString() to String.valueOf()

commit c0b783e93f18099d6db02cf3e0a7b08d4ab93cd0
Author: Branden Visser <mrvisser@gmail.com>
Date:   Tue Mar 20 07:25:18 2012 -0400

    KERN-2680 Sorting A-Z in the Search Page All Types/Content not working

    Problem was that general_sort is not set for content sakai/widget-data, resulting in their parent content being displayed out of order. Also content could appear more than once, for each widget that had content that matched the search criteria. Solution is to apply general_sort to sakai/widget-data and to group by the returnpath of the document when searching.

commit 2f38e8117858514368ebf09b3e4612400fa2f2cc
Merge: 767d87f d3eb867
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Mon Mar 19 11:36:22 2012 -0700

    Merge pull request #672 from thecarlhall/kern-2628

    KERN-2628

commit 767d87f14ecef9042db2f0f99908e4b4c2fce702
Merge: 170d830 ef6a1b0
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Mar 19 10:19:38 2012 -0700

    Merge pull request #678 from zathomas/1.2.0

    NOJIRA fix integration test failure due to daylight savings

commit ef6a1b0b21e1c4d48f6efba82ccdd4656b4b677b
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Mon Mar 19 12:14:38 2012 -0500

    NOJIRA fix test failure due to daylight savings

commit 170d830ce515fbe26a3337f0187ec3e548e1f4d3
Merge: eb4bcbf abc0dc2
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Mar 19 09:24:19 2012 -0700

    Merge pull request #677 from ctweney/migratorPomFix

    Migrator pom fix

commit abc0dc28b719897fb64ecf0bfb2e238ce970c1a5
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Mon Mar 19 09:14:11 2012 -0700

    NOJIRA Fix whitespace

commit eb4bcbfd4109e4a694b89a1fdd6d60d49f5abf15
Merge: 6ff32e7 0c6f723
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Mar 19 07:15:00 2012 -0700

    Merge pull request #676 from ctweney/kern-2681

commit 6ff32e7e3351f23e6ed03a8f279aa54d29886bd7
Merge: 162b970 0e4cf4b
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Mar 19 07:09:41 2012 -0700

    Merge pull request #675 from ctweney/kern-2679

commit 162b9700fb7f473b0c0385aaaf95efd549c536bd
Merge: 6223f3d b951961
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Mar 19 06:52:41 2012 -0700

    Merge pull request #674 from ctweney/migratorTests

     Migrator tests

commit 2f7f2f808b5a66e947a58c5a89abba633b12cd91
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Sun Mar 18 14:49:41 2012 -0700

    NOJIRA Fix parent spec for migrator bundle's pom

commit 0c6f7237938b4f84376fe8860569c811de49eeb5
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Sun Mar 18 14:25:13 2012 -0700

    KERN-2681 Null check before logging path of user space

commit 0e4cf4b475edc93a75c9c9616d80be59ee96b0a1
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Sun Mar 18 13:07:55 2012 -0700

    KERN-2679 Delete count props from authorizables when doing sparse upgrade

commit b9519612da60fcf49fa002ee8bfa2a6f19583db0
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Sun Mar 18 12:18:40 2012 -0700

    KERN-2674 Add json file for test case

commit b4d6e6f16e16c315fcf33c0e507931cbf2d4de2b
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Sun Mar 18 12:18:09 2012 -0700

    KERN-2674 KERN-2675 Add more migrator test cases

commit 6223f3dc8208d1783ecfe9ea0fd3746840a83840
Merge: 698d2c2 e05cff9
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Mar 16 15:00:03 2012 -0700

    Merge pull request #671 from raydavis/KERN-2676

commit d3eb8676f22cba09dd1f11ce5daa7a07adfaebd5
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Mar 16 15:48:36 2012 -0400

    KERN-2628 Set sparse version to match changes there.

commit 94dbe2fb64ecb967d788318da2675dea1061d474
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Mar 16 15:31:58 2012 -0400

    KERN-2628 Add impl for sakai doc cleaner. Add unit tests to cover.

commit 16f4a9ee691238ec29e0fa2b0d3b7c899863d43f
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Mar 16 11:18:13 2012 -0700

    KERN-2672 Slightly more elaborate test case

commit 770c633400f3b092f9e5f084a50cdcda0ed51396
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Mar 16 10:35:00 2012 -0700

    KERN-2672 Move json test data into pretty files to make it easier to test

commit 13e69dfbe7de6c1162fd1eaa003aef58011cd14d
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Mar 15 21:45:37 2012 -0400

    KERN-2628 Change MoveOperation to an osgi service so we can more easily add move cleaners.
    Add move cleaner interface to handle post-processors that need to clean up some data after it has been moved.

commit e05cff967b9a3c4ed5df87997f5a7a605f5faa48
Author: Ray Davis <ray@media.berkeley.edu>
Date:   Wed Mar 14 13:53:24 2012 -0700

    KERN-2676 Fix null-empty check on Authorizable Group property

commit 698d2c2138ede0de9f842f99a11a97ab9347fbf4
Merge: ed8e99c f84f1a8
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Mar 14 10:45:08 2012 -0700

    Merge pull request #669 from zathomas/kern-2627

    KERN-2627

commit ec1c3423827d3ff3aa817db60f7562e593c866f7
Author: Lance Speelmon <lance@speelmon.com>
Date:   Wed Mar 14 10:40:50 2012 -0700

    SAKIII-5297 LiteBasicLTIConsumerServlet results in a 500 error

commit f84f1a86ca284409bd484de63935bb2c1417105c
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Wed Mar 14 11:59:16 2012 -0500

    KERN-2627 add processing for images in IMS-CP documents

commit ed8e99c001de9dac7f4da752e9e3f0014027f111
Merge: 3c3119e 71d89a4
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Mar 14 06:55:49 2012 -0700

    Merge pull request #665 from ctweney/docReview

    Doc review

commit 3c3119e6b4c96580f759df8cc37411ea35f72c5e
Merge: ead1475 cea28da
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Mar 14 06:25:14 2012 -0700

    Merge pull request #667 from arwhyte/sp-1.2.0

     add <distributionManagement> to deploy bundle to Sakai Maven repo

commit cea28da8ff01d0a618ed91145b8d9404fc2c6414
Author: Anthony Whyte <arwhyte@umich.edu>
Date:   Wed Mar 14 15:23:08 2012 +0200

    KERN-2658 add <d658 fix jact whitespace

commit 97918791630d79a9a12ab50dac345cbc8efbe38c
Author: Anthony Whyte <arwhyte@umich.edu>
Date:   Wed Mar 14 15:14:49 2012 +0200

    KERN-2658 add <distributionManagement>

commit ead147574f49fb27635062525a5a909fa5981f81
Merge: 10098a4 b2821a1
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Mar 13 20:12:28 2012 -0700

    Merge pull request #666 from zathomas/kern-2639

     stop writing extraneous htmlblock widgets

commit b2821a148a84765ed20699240c057c8ffd9b457a
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Mar 13 18:53:16 2012 -0500

    KERN-2639 stop extraneous htmlblock widgets from being written

commit 71d89a4c8704306276184ab359d1da3ffe86547c
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Tue Mar 13 15:07:45 2012 -0700

    NOJIRA Update more version numbers after reviewing documentation

commit 10098a46c5ff0b666b5be55393b4e9f681578cf3
Merge: 18c1821 66dcdaa
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Mar 13 14:45:36 2012 -0700

    Merge pull request #664 from zathomas/kern-2653

     get the 'page' property from the right object

commit 66dcdaa564aa6fb2331b1261b9cdfdbb4bfa3810
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Mar 13 16:33:48 2012 -0500

    KERN-2653 get 'page' property from the right JSONObject. Fixes tests.

commit 18c18218fc160260d9eccc1e45522b62c45fa87b
Merge: 9fa7ffc cb5653a
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Mar 13 14:13:38 2012 -0700

    Merge pull request #663 from zathomas/kern-2648

     keep content timestamps from being overwritten during migration

commit cb5653a16b9cadb8e3708e971b4d795818af0d49
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Mar 13 16:08:01 2012 -0500

    KERN-2653 handle a missing 'page' element on a document being migrated

commit 5f9cdf621dadf493f3ba4c4e93091ccf91d00fe1
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Mon Mar 12 16:35:54 2012 -0700

    NOJIRA Update documentation version numbers after review

commit aa45a2a0e0362d143b6c44dd7448efea6c7bbc5d
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Mar 13 15:44:28 2012 -0500

    KERN-2648 do not overwrite createdBy, createdAt, lastModifiedBy, and lastModifiedAt

commit 9fa7ffc6ef1ccc7959765843377d7f79424c6ded
Merge: f71df72 3f919f9
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Tue Mar 13 11:53:14 2012 -0700

    Merge pull request #656 from thecarlhall/kern-2658-maven-jar

    KERN-2658 Add project to serve project notice, license files as a remote resource.

commit f71df72787263f9faaf2525a56b0fbeaf3234eb5
Merge: 5780d7c 72f907d
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Tue Mar 13 11:32:14 2012 -0700

    Merge pull request #662 from thecarlhall/kern-2664

    KERN-2664 Update the webstart final location to match the expected location for 1.2.0.

commit 5780d7c0a535b35037fe2223e99e3b135d850097
Merge: 0cd4cc2 7c0fa18
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Tue Mar 13 10:52:56 2012 -0700

    Merge pull request #661 from thecarlhall/kern-2663

    KERN-2663 Correct string used in tests to match files.

commit 72f907d12ea916aa2ec0bd11eeb470ed5108e288
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Mar 13 13:29:37 2012 -0400

    KERN-2664 Update the webstart final location to match the expected location for 1.2.0.

commit 7c0fa18afce2162c4a6616722c7c764b95b455ce
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Mar 13 13:23:41 2012 -0400

    KERN-2663 Correct string used in tests to match files.

commit 0cd4cc26a203720c1d5fb4ea515eada3529ae7ac
Merge: 3ffa4f7 885f504
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Tue Mar 13 08:52:07 2012 -0700

    Merge pull request #659 from thecarlhall/kern-2659

    KERN-2659 Updated readme files to replace k2->nakamura and update paths.

commit 885f5045485efc8a6c518f62ea866388e66f1b82
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Mar 13 11:42:36 2012 -0400

    KERN-2659 Updated readme files to replace k2->nakamura and update paths.

commit 3ffa4f71322673d68e3e9342079ffcc17c8386b5
Merge: 098d1a6 9fccc20
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Mar 13 08:41:33 2012 -0700

    Merge pull request #658 from ctweney/kern-2646-followup

     followup

commit 9fccc202f841000da96e27469ba851c527372b37
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Tue Mar 13 07:59:51 2012 -0700

    KERN-2646 Call the ContentReloader from the SparseUpgradeServlet

commit 3f919f9f35d81a4fb2208716300c2c82e3fc5acf
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Mar 13 09:18:57 2012 -0400

    KERN-2658 Remove LICENSE, NOTICE. Rely on upstream jar to add those file.
    Update COMMITTERS

commit a39e8f4229d45c4731ea24d9e24e6e5ff0190eaa
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Mar 13 09:15:23 2012 -0400

    KERN-2658 Add project to serve project files as a remote resource.

commit 098d1a6ce22c8024f8ed8eb5bea35be447d96865
Merge: e1b4571 d19f8b9
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Mon Mar 12 16:16:30 2012 -0700

    Merge pull request #655 from thecarlhall/kern-2652

    KERN-2562 Fix changed api in tests.

commit d19f8b9ee37d7de421d86690a8d24c18b89248a9
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Mar 12 15:39:03 2012 -0400

    KERN-2562 Fix changed api in tests.

commit e1b4571c3b14052ab44ecfcfa23ac6d25780033f
Merge: 06333a3 499a1f8
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Mon Mar 12 09:47:51 2012 -0700

    Merge pull request #653 from thecarlhall/kern-2646

    KERN-2646 Add service to remove content-loaded property and restart the content loader service.

commit 06333a39b81d3ce9c3f7d7affea82b7f630a6ae8
Merge: 960d82f 773a7d7
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Mar 12 06:37:41 2012 -0700

    Merge pull request #654 from zathomas/kern-2641

    fix for

commit 773a7d789d87667f0d0b27d57468597899953e84
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Mon Mar 12 00:57:57 2012 -0500

    KERN-2641 refactoring and add tolerance for _ref=<empty string>

commit 499a1f894cf1bb908e20d0faca814c46439f8e16
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Mar 9 21:24:29 2012 -0500

    KERN-2646 Add service to remove content-loaded property and restart the content loader service.
    Add web console plugin to expose content reload service functionality.
    Add unit test coverage.

commit 960d82ff2eff0f54dfb6790d36a4e3e91f312ac1
Merge: 494950e 391d68f
Author: Carl Hall <carl@hallwaytech.com>
Date:   Sat Mar 10 11:47:42 2012 -0800

    Merge pull request #652 from zathomas/migration-duplicates

    fix duplicate widgets in migrated docs and privspace

commit 494950eb06a071749b1e35308b247386211415a0
Merge: 81c1d17 411bad6
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Sat Mar 10 09:57:38 2012 -0800

    Merge pull request #649 from ctweney/kern-2445

    Kern 2445 Investigate leaks from JDBCStorageClient

commit 81c1d17657c4238f2e874dd8dbc067b786bce040
Merge: 4e503cd 432025d
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Sat Mar 10 09:57:30 2012 -0800

    Merge pull request #634 from zathomas/kern-2603

    KERN-2603 add includeSubree option when saving a version

commit 391d68f0fef4ad1844bcd08f2fad02e19d9b2f13
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Sat Mar 10 11:41:14 2012 -0600

    various JIRAs. fix duplication of widgets in migrated docs AND migrated dashboard.

commit 4e503cde7bd5aea54bbcdc79bf9b961d6e8f32ac
Merge: 52ffc5c 017f74d
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Fri Mar 9 21:03:51 2012 -0800

    Merge pull request #640 from thecarlhall/kern-2613

    KERN-2613

commit b98d3bc5458106e5f1cc88e9ea5f3581997fe741
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Fri Mar 9 22:21:13 2012 -0600

    various JIRAs. stops duplication of widgets on sakai docs.

commit 52ffc5c0f175f32e999f30bb0a0eb13d14864668
Merge: da0fbb5 1d2a144
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Mar 9 17:07:59 2012 -0800

    Merge pull request #650 from thecarlhall/kern-2645

    KERN-2645 Add sakai/widget-data as a searched resource type in general.json

commit 1d2a144278ab31029ac8aff8f0c4bd30c04ee7c4
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Mar 9 19:08:47 2012 -0500

    KERN-2645 Add sakai/widget-data as a searched resource type in general.json
    Correct profile indexing error I happened to see.

commit 411bad6cdd7228309b03b7071e92cc5bc37687dc
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Mar 9 13:15:32 2012 -0800

    KERN-2445 Point at sparsemapcontent v1.3.1 (sakai's 1.3 branch)

commit 8395eebdbf3a9b0b1d3443ada33d99f493c9e3c3
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Mar 9 11:33:14 2012 -0800

    KERN-2445 Point to sparsemap v1.3-20120309

commit da0fbb5b9be4a9deb4c6c01ae884c124ddb31994
Merge: bf296e2 d2517ff
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Mar 9 09:18:17 2012 -0800

    Merge pull request #647 from thecarlhall/kern-2633

    KERN-2633 Enable (uncomment) autoCommit settings for maxTime=1000ms, maxDocs=10000docs (default)

commit bf296e29f19b71121fbf83d63740f4ee325e183c
Merge: 082a6f4 bbf54e0
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Mar 8 21:45:15 2012 -0800

    Merge pull request #648 from zathomas/kern-2630_and_kern-2625

     and

commit bbf54e0d789e7d051147ebbc3765bec021cad8fd
Merge: 082a6f4 69adbf5
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Mar 8 22:42:18 2012 -0600

    Merge branch 'kern-2630' into kern-2630_and_kern-2625

    * kern-2630:
      KERN-2630 ensure that 'rows' is always an array, and never an object
      KERN-2625 modify sakai:messagestore when migrating a discussion widget in a doc
      KERN-2625 improve the formatting of migration output

commit 69adbf52cfff21e5bd879ee24ee9210cef8bf8d8
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Mar 8 22:35:35 2012 -0600

    KERN-2630 ensure that 'rows' is always an array, and never an object

commit 082a6f4376f4e8575f17381ac209acb5380412af
Merge: a55a1c1 4eab587
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Mar 8 20:20:01 2012 -0800

    Merge pull request #644 from ctweney/kern-2621

     Can't tag myself with "Biological Sciences" top-level tag

commit a55a1c139f3b705c07ffff808215640796cd91d5
Merge: 2f9f0a0 b810304
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Mar 8 19:52:05 2012 -0800

    Merge pull request #643 from ctweney/kern-2629

     Category filter used in combination with search term returns 0 results

commit d2517ff64d2c131761e7bf89a07fa395941714ee
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Mar 8 22:32:53 2012 -0500

    KERN-2633 Enable (uncomment) autoCommit settings for maxTime=1000ms, maxDocs=10000docs (default)

commit 5a1b0bfe43b70324023e11b4f1097b15df964a20
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Mar 8 19:03:03 2012 -0600

    KERN-2625 modify sakai:messagestore when migrating a discussion widget in a doc

commit 2f9f0a0597194b48b56ae46f3f1404f2fbe2f741
Merge: d8f7539 c58aa1e
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Mar 8 17:03:00 2012 -0800

    Merge pull request #645 from thecarlhall/kern-2619

    KERN-2619 Remove hashing from discussion transport.

commit f75c3240de866007a2f826ef77623f4fb6397d4d
Merge: 4e6e672 d8f7539
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Mar 8 18:30:59 2012 -0600

    Merge branch '1.2.0' of github.com:sakaiproject/nakamura into kern-2625

    * '1.2.0' of github.com:sakaiproject/nakamura:
      KERN-2619 Add conjunction term with unhashed path. Add comment to explain why a hashed path is needed.

commit c58aa1ef1c51bedb5ae0f23554b2cca1fe19182b
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Mar 8 18:09:10 2012 -0500

    KERN-2619 Remove hashing from discussion transport.

commit d8f753996aa195732a901df75133a752afa5eec2
Merge: 7e45d0b 8505d38
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Mar 8 14:57:32 2012 -0800

    Merge pull request #642 from thecarlhall/kern-2619

    KERN-2619 Add conjunction term with unhashed path.

commit 4e6e672a7ba104d91976f7092b8e76af81a1cb49
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Mar 8 16:05:44 2012 -0600

    KERN-2625 improve the formatting of migration output

commit 4eab587b34120fae017a478b26a5364c10276fe7
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Mar 8 14:01:29 2012 -0800

    KERN-2621 Migrator plus integration test for incomplete tags

commit b810304ac3267e50954cb3a418f9c7262e44cff6
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Mar 8 13:01:58 2012 -0800

    KERN-2629 Update 3 more search feeds to support the TagRefined search

commit 2c7e6635199ed8ad66d162e899df33109b1f1abe
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Mar 8 11:53:41 2012 -0800

    KERN-2621 Create the parents of missing tags as full-fledged tags

commit 8505d38d009638652c15dcff84c703f04fb5b159
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Mar 6 17:27:44 2012 -0500

    KERN-2619 Add conjunction term with unhashed path.
    Add comment to explain why a hashed path is needed.

commit 7e45d0b2f4061e403cbdfabe1002f5614b0076ac
Merge: 989d2fe fcbcf59
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Wed Mar 7 19:39:03 2012 -0800

    Merge pull request #641 from ctweney/kern-2622

    Kern 2622 Category filter used in combination with search term returns 0 results

commit 989d2feef172de8e75e401fe04dd67134a881788
Merge: 7c1d0f2 61ac529
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Wed Mar 7 17:14:58 2012 -0800

    Merge pull request #637 from thecarlhall/kern-2626

    KERN-2626 Changed handling of query options to include them in search.

commit fcbcf5938cbc7528dbfbfb481be67032ab8f924f
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Mar 7 16:41:31 2012 -0800

    KERN-2622 Change search endpoint so you can properly refine by tags while doing a query

commit 017f74dc5ab38f0c7e454d68ab8a6ed22966859c
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Mar 7 18:56:02 2012 -0500

    KERN-2613 Fix lookup to find page content in new content-authoring structure. This involves walking a matrix (row-by-column) and collecting content from elements in the matrix.
    Change lookup of children to be deterministic and not walk all children.
    Copy input stream to output stream using commons-io.
    Add license header.
    Create zip in temp space and delete on exit since the file on disk isn't needed after processing.

commit 7c1d0f2153d27338a005d59ccfcb6a71f49d6a93
Merge: 36f3121 df21c66
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Mar 7 14:53:33 2012 -0800

    Merge pull request #639 from zathomas/kern-2623

    KERN-2623

commit df21c662c2660c0a216b2ae5bf759aeefa3aaf9c
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Wed Mar 7 13:11:52 2012 -0600

    KERN-2623 invert the logic of contentHasUpToDateStructure

commit 6f20b5f7d3b216d180eb38cfe93589608826c667
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Wed Mar 7 11:47:31 2012 -0600

    KERN-2623 embed the jsoup dependency in the bundle. add sakai:schemaversion property when migrating.

commit 739875a5bfb18b32e2d39a0477a60ba35b6c5aac
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Wed Mar 7 11:23:04 2012 -0600

    KERN-2623 remove javascript. fix conversion of arrays to object format.

commit 768fff5781a8d839d4874d82a8f367befb43ed32
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Wed Mar 7 07:13:33 2012 -0600

    KERN-2623 replace javascript implementation with pure java

commit b9349fee5cdc2488864d7c637b53b4dcb2e78a81
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Mar 6 15:29:57 2012 -0600

    KERN-2605 fix problem where migrated content's children could not be read until a follow-on request

commit 135825c1b4629c6f11e13be1945682ef87db3cda
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Mar 6 14:57:16 2012 -0600

    KERN-2605 make the filter act before resource resolution

commit 61ac52997d336b2fc59b6e267d7b47ab95ec8b30
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Mar 6 13:29:44 2012 -0500

    KERN-2626 Changed handling of query options to include them in search.

commit 36f31215297640ab617cb68037c34b515989f3e4
Merge: cf267b6 1bb0f47
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Tue Mar 6 08:43:05 2012 -0800

    Merge pull request #636 from zathomas/migrate_privspace_and_pubspace

    Migrate privspace and pubspace

commit cf267b6583013e93590b97ad2fba06da71a371d3
Merge: 60a65e7 9fef801
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Mon Mar 5 16:28:55 2012 -0800

    Merge pull request #633 from thecarlhall/kern-2589

    KERN-2589 Add test to cover aa_NNN format

commit 60a65e70bc3726ee154519a453e282dd52441dc7
Merge: 9340316 04866f2
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Mon Mar 5 16:24:27 2012 -0800

    Merge pull request #635 from croby/SAKIII-5157

    SAKIII-5157 Adding schemaVersion support to the world creation servlet

commit 04866f26c1396422205c1dbe2395fe168db70bcc
Author: Chris Roby <christopher.roby@gmail.com>
Date:   Mon Mar 5 14:04:44 2012 -0800

    SAKIII-5157 Adding schemaVersion support to the world creation servlet

commit 1bb0f478e520b1e5e8791bb1d3ac9960a75a9e8c
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Mon Mar 5 18:01:17 2012 -0600

    KERN-2605 add request filter that can migrate privspace and pubspace

commit 432025da366e666e628c0d7156f00b82aba96576
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Mon Mar 5 11:24:04 2012 -0600

    KERN-2603 add includeSubree option when saving a version

commit 9fef801086f68535dffe131b0568117778256c88
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Mar 2 13:43:04 2012 -0500

    KERN-2589 Add test to cover aa_NNN format

commit 934031682ea59243f6cf95101e077c918d8c30a4
Merge: ad44a2d 99d6c53
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Mar 2 10:38:06 2012 -0800

    Merge pull request #631 from zathomas/kern-2505

     get our integrations tests back on track

commit ad44a2d3118de6ed1589c4c332213bf451eec9ae
Merge: 202b4a6 730f8d5
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Fri Mar 2 10:14:16 2012 -0800

    Merge pull request #629 from thecarlhall/kern-1989

    KERN-1989

commit 202b4a6f0a8702ec0153b2c963cccd9aaec1943a
Merge: 826051c eb08abb
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Fri Mar 2 09:54:42 2012 -0800

    Merge pull request #628 from thecarlhall/kern-2589

    KERN-2589 Add better handling of user supplied locale settings.

commit 826051c575479fe65055d0ac9950919a23a0a955
Merge: cbc6a05 77a43d0
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Mar 2 09:36:00 2012 -0800

    Merge pull request #624 from zathomas/kern-2605

     server-side doc migrator

commit 730f8d52d5ef1de5bd3354e5b43b355c960f4e36
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Mar 2 12:23:57 2012 -0500

    KERN-1989 Correct regex in xml to be safe for Java consumption.

commit eb08abb2b8263c9b7910441e2e1fe75759a09954
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Mar 2 11:47:07 2012 -0500

    KERN-2589 Add unit test to cover getting locale. Use better variable names.

commit 77a43d000b66a716bf3a695adfafaa97828ba1a7
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Fri Mar 2 10:39:57 2012 -0600

    KERN-2605 small whitespace change

commit 508326a0fb374b708d19c8eeacbeb206c373e9f4
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Fri Mar 2 10:36:13 2012 -0600

    KERN-2605 make 'sakai:schemaversion' a constant

commit cbc6a057380a40b89488931cd80213cb36e24094
Merge: 16ac79e b0108bb
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Fri Mar 2 07:52:09 2012 -0800

    Merge pull request #630 from thecarlhall/kern-2609

    KERN-2609 Add .txt to list of extensions that only want the first page for previewing

commit b0108bbb206ac87917ded816141b8f7b6a065c07
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Mar 2 10:08:09 2012 -0500

    KERN-2609 Add .txt to list of extensions that only want the first page for previewing

commit 2a0f8075bdbd565c5e91394723b0d9e785f2a54d
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Mar 1 23:14:01 2012 -0500

    KERN-1989 Add activate/deactivate methods.

commit 60969f434b80c8354341878c8843319f2ec218a3
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Mar 1 23:07:56 2012 -0500

    KERN-1989 Add property to allow gzip filter to be disabled using configuration since this isn't an OSGi feature.
    Add annotations that can be used to generate the osgi files.
    Add metatype files for console configuring.

commit 3a5a2c82399ca059616bb7a78de97eb1713bc9b8
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Mar 1 21:34:32 2012 -0500

    KERN-2589 Add better handling of user supplied locale settings.
    Add safe checks for ISO3 since that can throw an exception.

commit 99d6c53c670fe7d44d59aa17bec5a3f630fe9aaf
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Mar 1 17:11:04 2012 -0600

    get these two tests running again
    kern-1874 is sensitive to test isolation. I would rather disable
    that part of the test than have false negatives in our test suite,
    which are like poison.

    kern-1998 simply needed to refer to a property called
    'sakai:description' instead of simply 'description'

commit dc4a187556f142948330bca9b4ebbb2212cf45df
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Mar 1 16:30:58 2012 -0600

    KERN-2505 fix integration test using old method of updating basic profile info

commit 78319d6d4ea669a5215194b51311ed9cdde2aad2
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Mar 1 15:45:49 2012 -0600

    KERN-2605 consolidate file migration interfaces. better package/artifact name.

commit 16ac79e53f7d7c49e719dcf1d5fc41e6a84b6ddc
Merge: d5f7142 7a7aeaa
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Mar 1 13:15:06 2012 -0800

    Merge pull request #627 from raydavis/KERN-2612

    Kern 2612

commit 7a7aeaa6ddf88333d29398a960c6b44c7654cad2
Author: Ray Davis <ray@media.berkeley.edu>
Date:   Thu Mar 1 12:26:22 2012 -0800

    KERN-2612 Postgres needs parental guidance

commit d5f7142dc5507e88dffe8991eb0ecd4d2d683744
Merge: 81ee5af 554ee34
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Mar 1 09:51:44 2012 -0800

    Merge pull request #626 from zathomas/kern-2610

     remove redundant Telemetry classes

commit 554ee348fbea0afdc640f5d7e5dea501514d7db3
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Mar 1 11:33:30 2012 -0600

    KERN-2610 get rid of the redundant copies of telemetry classes

commit 812bb6d1f92b3e992b16c0476a5f4f60adcdb575
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Wed Feb 29 23:54:29 2012 -0600

    KERN-2605 add sakai-doc migrator in server-side JavaScript

commit 81ee5afab3ce60e043ec277b4b997ada4df5a20c
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Feb 29 11:36:14 2012 -0500

    KERN-2604 Stopped deleting txt file after generating tags as this deletes the content file if it is a txt file.

commit 9823e4a12db7656b2e4ba8f86aa400230ad282d9
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Feb 28 11:24:35 2012 -0500

    KERN-2577 Check for JSONObject.NULL and short circuit it.

commit 9bd9eb1b0a9e753ff2ac34c7f9ebb23c96072f19
Merge: 185fd84 7e51bc9
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Feb 28 17:12:58 2012 -0600

    Merge branch 'master' into 1.2.0

    * master:
      kern-2603 use better error message when not enough version history found.
      KERN-2603 enable getting of a version where sling:resourceType is null

commit 7e51bc953e732e237d65b7fc0317aeb95c9cb0ef
Merge: 5d05b3a d8d13f0
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Feb 28 15:10:26 2012 -0800

    Merge pull request #622 from zathomas/kern-2603

     can't GET a version on anything without a resourceType

commit d8d13f059424d285d12ce54f1920a84514246ebd
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Feb 28 17:09:35 2012 -0600

    kern-2603 use better error message when not enough version history found.

commit 185fd840299fdace42e0216422ade8af1e0bb907
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Feb 28 16:13:37 2012 -0600

    rolling back nakamura code changes for sparse 1.5

commit 750eb9c5073230d30bd6968ffd5426996263127d
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Feb 15 13:50:55 2012 -0800

    KERN-2534 Create a wrapper bundle for postgres driver

commit 25dcddd9c872b1b2eb1d8e7b5a76988872560d4a
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Feb 28 16:07:11 2012 -0600

    binding to 20120228 tag of sparse

commit 953be9b437435a0d45d9ad641043ce6127bd24b8
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Feb 28 15:04:31 2012 -0600

    KERN-2603 enable getting of a version where sling:resourceType is null

commit 5d05b3abfb701cbc9ee45a1a18281e0419330879
Merge: 5b574c4 e7e462f
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Feb 28 07:23:12 2012 -0800

    Merge pull request #618 from ctweney/kern-2600

    Kern 2600 - telemetry for cache hits, gets, and misses

commit 5b574c485bcf20476d9ee09fcb41d7d09406f9ac
Merge: 876898d 7d6e02a
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Mon Feb 27 14:24:40 2012 -0800

    Merge pull request #620 from lancespeelmon/master

    upgrade maven-release-plugin to 2.2.2 release version

commit 7d6e02af10b58b794d3b1d4e6a2940a5c415924b
Author: Lance Speelmon <lance@speelmon.com>
Date:   Mon Feb 27 15:15:54 2012 -0700

    NOJIRA upgrade maven-release-plugin to 2.2.2 release version

commit e7e462fd046a83fab8b7a7fd7e729737e221eb7b
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Mon Feb 27 11:02:39 2012 -0800

    KERN-2600 Gets equals hits plus misses, so it's not necessary to track separately

commit 876898dc3efec70df5d56f2d7c2321f4ad73d600
Merge: fef93ce 899d6e1
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Feb 27 10:44:35 2012 -0800

    Merge pull request #619 from ctweney/kern-2584

    KERN-2584 Exception in server log when user attempts to change password with incorrect current password

commit 899d6e15da0ae37350860a5780fc3290f118180b
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Feb 17 15:07:51 2012 -0800

    KERN-2584 Don't log user-error conditions at info level, but do log anything unexpected at error level

commit fef93ce1550b21026f160279791b9dca78d3d963
Merge: a969c61 3294926
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Mon Feb 27 09:06:24 2012 -0800

    Merge pull request #616 from thecarlhall/kern-2589

    KERN-2589 Added catch for es_419 to force es_ES.

commit 32949267213339b7542f00ae2371eb4750197f04
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Feb 24 17:08:38 2012 -0800

    KERN-2589 Added property for default locale rather than getting it from the request. This more closely follows the UI code. We will get this value from config.js once it is stored in a structured way.

commit 47251fcaf6fb915aa1f4284285a2990bdf2834c7
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Feb 24 16:38:59 2012 -0800

    KERN-2589 Corrected getting of locale field. Changed toString to String.valueOf

commit 340876a6a40232042f7bc0e8c6315c534893103d
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Feb 24 15:37:57 2012 -0800

    KERN-2589 Added check for array size before operating on it. Fall back to language if language_COUNTRY fails.

commit a969c61f1ee503dc25b99313e4531f09980cf378
Merge: 44b943d e552760
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Feb 24 15:16:07 2012 -0800

    Merge pull request #617 from lancespeelmon/KERN-2599

    Kern 2599 Improve log output from release_*_process.sh scripts

commit f5e03639f9347be59b9959ee6958c54932382441
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Feb 24 14:51:13 2012 -0800

    KERN-2600 Fix whitespace

commit 8ed8f52763ad7665d7c82fb6f8928f15a55e7485
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Feb 24 14:50:29 2012 -0800

    KERN-2600 Telemetry for cache gets, hits, and misses

commit e552760386bfd3a83a15797063ea415c18755314
Author: Lance Speelmon <lance@speelmon.com>
Date:   Fri Feb 24 13:44:59 2012 -0700

    KERN-2599 Improve log output from release_*_process.sh scripts

commit 44b943d8ab6b6c3776b4cd6e4bc93cd386241b18
Merge: 601ba56 36a5086
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Fri Feb 24 12:24:26 2012 -0800

    Merge pull request #614 from thecarlhall/kern-2590

    KERN-2590 KERN-2591 Add configuration to disable default html output.

commit 601ba56035cb1050357e6798e860788e86b3614d
Merge: 9be9270 1727bed
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Fri Feb 24 12:01:01 2012 -0800

    Merge pull request #615 from ctweney/kern-2595

    Kern 2595

commit 0de523e552b6e4145a3ea738e6f9a8ae358151b3
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Feb 24 10:09:16 2012 -0800

    KERN-2589 Added catch for es_419 to force es_ES.

commit 1727bedc59ccdffdc421729f96ccb58fbe1ad481
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Feb 24 09:58:42 2012 -0800

    KERN-2595 Bind to sparsemap 1.5-20120223 and solr 1.4; remove postgresqlwrapper since the postgres-driver SPI replaces it

commit 36a50864f87869e023911f80e48ebc52654e40b4
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Feb 24 07:55:21 2012 -0800

    KERN-2590 KERN-2591 Add configuration to disable default html output.

commit 9be9270334374abb3d6bb5b7df072f9a7b893ce0
Merge: 268bce7 29abd7c
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Feb 23 15:33:42 2012 -0800

    Merge pull request #613 from ctweney/kern-2598

    KERN-2598

commit 47fdf4613beafd01536d9d8ea4c76aed8bca3b48
Merge: 5e28c24 268bce7
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Feb 23 15:31:15 2012 -0800

    Merge remote branch 'central/master' into kern-2595

    * central/master:
      KERN-2597 move the Telemetry classes into their own package
      KERN-2592 Invoke the authorizable count changer so that counts update on group join and leave actions
      KERN-2597 first commit of a utility for recording telemetry
      KERN-2321 Relocated FileUtilsTest to files/api and added appropriate unit test for FileUtils
      KERN-2553: ProfileServiceImpl scans wastefully for external profile providers
      KERN-2321: Content comments are not coming back in /var/search/public/random-content.json
      KERN-2534 Inherit from base pom
      KERN-2534 Create a wrapper bundle for postgres driver

commit 268bce77d8e1e3099b1dc3808f8f7b5bff9bb7f6
Merge: a4236f2 b0a2f05
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Feb 23 12:47:25 2012 -0800

    Merge pull request #611 from zathomas/telemetry

    KERN-2597 add utility for recording telemetry counts

commit 29abd7ccca7ec98b57e88c07204c82fddf710b5e
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Feb 23 12:45:04 2012 -0800

    KERN-2598 When creating a members-only world, the main group should be a viewer of subgroups

commit a4236f21a96c36930b3065a8008be04f41634fd9
Merge: 8ecae2f b8fe122
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Feb 23 09:12:04 2012 -0800

    Merge pull request #612 from ctweney/kern-2592

commit b0a2f05a6c0e40d91ddb6e06af633e2c358fa588
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Feb 23 11:01:01 2012 -0600

    KERN-2597 move the Telemetry classes into their own package

commit 8ecae2f10b4ec90548afb72017c6ccb87e9a115b
Merge: 8486152 f599f23
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Feb 22 23:35:46 2012 -0800

    Merge pull request #606 from savithap/KERN-2321-squash

     squash

commit b8fe122c357b9368a9a71a0d30ecb430678997ed
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Feb 22 15:53:21 2012 -0800

    KERN-2592 Invoke the authorizable count changer so that counts update on group join and leave actions

commit 5e28c24373521da8ec0ea4116db4789c08585b1b
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Feb 22 14:34:06 2012 -0800

    KERN-2595 Bind to sakaiproject's sparsemapcontent 1.5-20120222, based on ieb's 1.5 release, and tweak code so it builds under sparse 1.5

commit a9ea074b985ff04a9ab305d3754780025f18b174
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Wed Feb 22 15:22:49 2012 -0600

    KERN-2597 first commit of a utility for recording telemetry

commit 84861529a0945eaf2fb8adebdb8c4d2daaa0b4c1
Merge: c65e2ba b379690
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Wed Feb 22 10:56:25 2012 -0800

    Merge pull request #609 from savithap/KERN-2553

    KERN-2553: ProfileServiceImpl scans wastefully for external profile prov...

commit c65e2ba6ff7803dc7d92752038adb3b663a2ff91
Merge: aa8cafd 1deadbb
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Wed Feb 22 10:28:22 2012 -0800

    Merge pull request #600 from ctweney/kern-2534

    KERN-2534 Create a wrapper bundle for postgres driver

commit f599f2359c6423d331fa7145ed682bda9350695b
Author: Savitha Prakash <savithap@umich.edu>
Date:   Tue Feb 21 12:29:57 2012 -0500

    KERN-2321 Relocated FileUtilsTest to files/api and added appropriate unit test for FileUtils

commit b37969014c81fd503aa722408436c30f97b388a3
Author: Savitha Prakash <savithap@umich.edu>
Date:   Wed Feb 22 10:16:18 2012 -0500

    KERN-2553: ProfileServiceImpl scans wastefully for external profile providers

commit aa8cafdbe0c6a55508357547b3443976aa75c56c
Merge: de50a7b 33518b5
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Wed Feb 22 08:05:09 2012 -0800

    Merge pull request #608 from thecarlhall/kern-2565

    KERN-2565 Changed logging to debug to save massive log files during import.

commit 1da02eb4c8ffc69cc1e749c16c782832bab2e832
Author: Savitha Prakash <savithap@umich.edu>
Date:   Thu Feb 16 10:59:14 2012 -0500

    KERN-2321: Content comments are not coming back in /var/search/public/random-content.json

commit 33518b5c257eb3bd4c0aec7b75cb61bf157ac874
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Feb 21 22:00:18 2012 -0800

    KERN-2565 Changed logging to debug to save massive log files during import.

commit de50a7be72ed1cd0b82917fd206b2af5bdfb9845
Merge: 476f3a2 b1df518
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Feb 21 15:55:23 2012 -0800

    Merge pull request #605 from raydavis/KERN-2588

     Add ":sakai:authorizableOnly" parameter to userManager.

commit 476f3a2a52bc7aa3feb19ddb3b30c6e0315d25eb
Merge: b1bbd74 b324594
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Feb 21 12:28:18 2012 -0800

    Merge pull request #607 from efroese/KERN-2593

     Ad support for image/pjpeg in the preview processor.

commit b1bbd74a5068ab2b48808e84c45eeeea24139253
Merge: 12360d7 51bfaff
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Tue Feb 21 11:19:39 2012 -0800

    Merge pull request #602 from croby/KERN-2558

    KERN-2558 Allow customStyle to be set in a world template

commit 51bfaffb0b9b93b2810942f1b9f58cd686822e3a
Author: Chris Roby <christopher.roby@gmail.com>
Date:   Tue Feb 21 11:10:22 2012 -0800

    KERN-2558 chmod a+x kern-2558.rb

commit b324594a80e019faef63f492c52db3420dd9a04c
Author: Erik Froese <erik.froese@gmail.com>
Date:   Tue Feb 21 14:09:44 2012 -0500

    KERN-2593 Ad support for image/pjpeg in the preview processor.

commit b1df518802fe8840c1310c035cfa76d2b2cc5419
Author: Ray Davis <ray@media.berkeley.edu>
Date:   Fri Feb 17 15:54:28 2012 -0800

    KERN-2588 Add ":sakai:authorizableOnly" parameter to userManager.
    Allows management of Sparse Authorizable records without touching OAE Home folders.

commit d55e77acf92385f18cf1882aa419d03e7faec807
Author: Chris Roby <christopher.roby@gmail.com>
Date:   Mon Feb 20 13:27:28 2012 -0800

    KERN-2558 Add integration tests to verify proper setting of sakai:customStyle

commit 0da24494bcec85746139fa483c91ddf80815b3fe
Author: Chris Roby <christopher.roby@gmail.com>
Date:   Wed Feb 15 16:16:23 2012 -0800

    KERN-2558 Allow customStyle to be set in a world template

commit 12360d75dda160ed96998f6f89413d333f9b7d27
Merge: b624051 e1c9bfa
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Feb 16 11:37:36 2012 -0800

    Merge pull request #599 from thecarlhall/kern-2576

    KERN-2576 Added check for null.

commit b62405178435cc5911cdff5d1f2c928310442d98
Merge: 5e8b2a6 4860c40
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Feb 16 11:17:05 2012 -0800

    Merge pull request #604 from ctweney/kern-2582

    KERN-2582

commit 4860c40e1f8dc7fdf9a11e9eb66cec8271144666
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Feb 16 10:44:56 2012 -0800

    KERN-2582 Use an admin authorizable manager to perform group joinability check to prevent 403

commit 5e8b2a698ca65596033a892ebf5a2d82595396b8
Merge: 1894aef f287b94
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Feb 16 10:00:18 2012 -0800

    Merge pull request #564 from thecarlhall/kern-2103

    KERN-2103 Changed profile output of /system/me to only use basic info.

commit f287b948350228bcfda92d6aad592e56ae33e536
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Feb 16 12:42:10 2012 -0500

    KERN-2103 Cleaned up code and removed unused variables per code review.

commit 1894aef2437e2dba9a085df44eac7fe2496c7b7b
Merge: dad14d9 e781afb
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Feb 16 09:14:25 2012 -0800

    Merge pull request #593 from zathomas/messing-with-release

    fix gap in version replacement scripts

commit dad14d9afa49bda2e00fc8d6cfacab12cf89f7db
Merge: 66633af 286c7b1
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Feb 15 17:03:04 2012 -0800

    Merge pull request #601 from johnfking2/KERN-2581-squash

commit 286c7b12aec20a71a676515cc0d04b32ab8489fe
Author: John King <johnk@media.berkeley.edu>
Date:   Wed Feb 15 15:34:36 2012 -0800

    KERN-2581 - added logEmail method to dump the contents of an email to the server log

commit 1deadbb467c564e3a8fe2dacb09af9a0fa960db2
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Feb 15 14:26:47 2012 -0800

    KERN-2534 Inherit from base pom

commit a962519e97051f8b9a5b39fc6273ac49dce1ab28
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Feb 15 13:50:55 2012 -0800

    KERN-2534 Create a wrapper bundle for postgres driver

commit 66633af553e16c8ebfe98ae514264521ad2c7992
Merge: c8c5d7a 14acc6a
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Feb 14 15:55:36 2012 -0800

    Merge pull request #598 from h4l/KERN-2579

    : Improvements for iCal proxy post processor

commit e1c9bfab0a3a6d8892238aa2c53ab059ba833c23
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Feb 14 16:24:41 2012 -0500

    KERN-2576 Added check for null.

commit 14acc6a6e180ad14f7d638f1ba3c36743a0827f0
Author: Hal Blackburn <hal.blackburn@gmail.com>
Date:   Tue Feb 14 15:44:16 2012 +0000

    Removed obsolete comment in ICalProxyPostProcessor.

commit aa3e146e05ac28a4d5aab046917f9b79b2bd3571
Author: Hal Blackburn <hal.blackburn@gmail.com>
Date:   Tue Feb 14 15:42:47 2012 +0000

    Fix typo introduced in previous commit.

commit 5523d40371ae7ed62c1cecde73b833a81f085576
Author: Hal Blackburn <hal.blackburn@gmail.com>
Date:   Tue Feb 14 15:36:52 2012 +0000

    Resolved some dependancy version issues.

    Code was expecting commons-io >= 2, but looks like everything else is using
    1.4. Changed code to eliminate commons-io 2.0 dependancy.

commit a7291128cb17dc5b8a02724c50aa7dc4ecf2487f
Author: Hal Blackburn <hal.blackburn@gmail.com>
Date:   Tue Feb 14 14:06:02 2012 +0000

    Updated ical.json proxy config to reflect new params.

commit dd1acff632ae7493bcf6d993d1e5683037911527
Author: Hal Blackburn <hal.blackburn@gmail.com>
Date:   Tue Feb 14 14:01:51 2012 +0000

    Allowed a few more mime types in the ICalProxyPostProcessor.

commit c47a080007d41069f2d5ba6ee01692e582ce1cf7
Author: Hal Blackburn <hal.blackburn@gmail.com>
Date:   Tue Feb 14 12:34:41 2012 +0000

    Added tests for ICalProxyPostProcessor.

    Also added hamcrest-all test dependency to the proxy's pom.xml, and added test
    scope to the mockito dependency. I assume it must have been mistakenly omitted.

commit d8d5e54f95dbd94415a8eef9996648334a7a30ab
Author: Hal Blackburn <hal.blackburn@gmail.com>
Date:   Tue Feb 14 12:29:16 2012 +0000

    Default templateParams to empty map if null.

    Also added a note about other limit input stream implementations.

commit 5be320081b02233018b9c234f8c4c9cb77a42f79
Author: Hal Blackburn <hal.blackburn@gmail.com>
Date:   Mon Feb 13 17:57:42 2012 +0000

    Refactored ICalProxyPostProcessor to report errors.

    It also supports outputting iCalendar as well as JSON data. Also validation can
    be turned on. JSON output is unchanged from previous version.

commit c8c5d7a08c49770f3a55be71664218f50fe4dc53
Merge: 8d98d47 dafe487
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Mon Feb 13 15:45:43 2012 -0800

    Merge pull request #597 from thecarlhall/kern-2424

    KERN-2424 Added -Dfile.encoding=UTF8 to everywhere I could find that calls java -jar

commit dafe4877069347247b0434b2a0da3907a43f864b
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Feb 13 17:40:28 2012 -0500

    KERN-2424 Added -Dfile.encoding=UTF8 to everywhere I could find that calls java -jar

commit 8d98d47d3b5a3381663c9822bdefe68abe0e0af9
Merge: 9f59611 5e8f21e
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Feb 13 15:19:47 2012 -0500

    Merge branch 'pull-request-594' into new-master

commit 9f59611bbbf04ea43483d3fc30dc4b45b65d2884
Merge: b4d9d75 d7cbbbc
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Feb 13 15:19:46 2012 -0500

    Merge branch 'pull-request-591' into new-master

commit 5e8f21e6b7215d00b740cdd591922a1f140b361b
Merge: db3866b e3fc001
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Feb 13 15:17:43 2012 -0500

    Merge branch 'master' of https://github.com/zathomas/nakamura into pull-request-594

commit db3866b8aa8a9d615d82d141c5038b6e0da4c355
Merge: b4d9d75 d7cbbbc
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Feb 13 15:17:07 2012 -0500

    Merge branch 'pull-request-591'

commit b4d9d75845e1d345f254c5235af0780153783678
Merge: 9988c02 663e9a0
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Feb 13 11:57:26 2012 -0800

    Merge pull request #596 from croby/rvmrc

    NOJIRA adding .rvmrc to .gitignore for rvm support

commit 9988c02ac743d0db2ebbc0b09e33ba01c00894d4
Merge: 10dd1dc a73b9cf
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Mon Feb 13 11:19:59 2012 -0800

    Merge remote branch 'thecarlhall/kern-2563'

    * thecarlhall/kern-2563:
      KERN-2563 Corrected logic in determining if an authorizable is user facing. Wrapped logic up into simpler terms for readability. Updated that logic to be useful for users or groups. Fixed ruby scripts to be more flexible in finding ruby exec.

commit 663e9a00e6369468b1050387de97fe30a0df2650
Author: Chris Roby <christopher.roby@gmail.com>
Date:   Mon Feb 13 11:15:15 2012 -0800

    NOJIRA adding .rvmrc to .gitignore for rvm support

commit 10dd1dc42f4766346d6f975f83032beeb4d2012b
Merge: 0e6df7d 0a93d16
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Feb 13 07:17:03 2012 -0800

    Merge pull request #595 from lancespeelmon/kern2569

    Kern2569

commit 0a93d16452b625bc9f366b39b74d2db5a14d8855
Author: Lance Speelmon <lance@speelmon.com>
Date:   Fri Feb 10 15:57:38 2012 -0700

    KERN-2569 LiteDefaultContextIdResolver missing NPE check

commit 0e6df7dd65343fa5a251cabd0348c03fb8aa6ef4
Merge: a4c1629 12ae312
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Feb 10 14:07:03 2012 -0800

    Merge pull request #588 from savithap/KERN-2540

    : IMSCP explodes any uploaded zip files

commit a4c1629d99ab5ff61a0484da23c5f8e414a1cdcd
Merge: 2b0a113 7c5e6db
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Feb 10 13:04:14 2012 -0800

    Merge pull request #592 from lancespeelmon/kern2566

    Kern2566

commit 7c5e6db581e31dd0db53a3651e49ad24d6d2f08f
Author: Lance Speelmon <lance@speelmon.com>
Date:   Fri Feb 10 13:33:38 2012 -0700

    KERN-2566 jackrabbit content loader race condition

commit e3fc001632bd18e631e1e5394902db157f506a91
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Fri Feb 10 12:58:29 2012 -0600

    KERN-2529 add back the Repository reference which was removed in 8a1c9a6

commit c4fab8b8b82975106a3f9ae320bd6ed7dd3ea088
Merge: 19736df a73b9cf
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Feb 10 09:36:07 2012 -0800

    Merge pull request #589 from thecarlhall/kern-2563

    KERN-2563 Corrected logic in determining if an authorizable is user facing.

commit e781afb4f8c948f925bf65af77cbd722cc722723
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Fri Feb 10 11:32:57 2012 -0600

    update release_pre_process and release_post_process with usage info and functions to deal with jetty-config

commit 19736df54a5168b4cdd9c52fea426666db7271ff
Merge: 2b0a113 d7cbbbc
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Feb 10 09:21:37 2012 -0800

    Merge pull request #591 from savithap/KERN-2562

    : Native document "rich paste" example can be 404 on download

commit cc4bd7e0a0c4f9d3548869cc6c117ba5aeeacc5a
Author: Lance Speelmon <lance@speelmon.com>
Date:   Fri Feb 10 10:05:28 2012 -0700

    KERN-2566 jackrabbit content loader race condition

commit d7cbbbc582154cc4fba1a3ff593c79f2abd80d29
Author: Savitha Prakash <savithap@umich.edu>
Date:   Fri Feb 10 12:00:23 2012 -0500

    KERN-2562 Removed unwanted com.ctc.wstx.util.StringUtil package

commit 7cc74e1e0bd79f4f5967d2edcef25db7bed27670
Author: Savitha Prakash <savithap@umich.edu>
Date:   Fri Feb 10 11:57:33 2012 -0500

    KERN-2562 Updated conditions to check path in handlePage method

commit 3af778d88d3d32c767033a655c70713a975fba37
Author: Savitha Prakash <savithap@umich.edu>
Date:   Fri Feb 10 11:30:23 2012 -0500

    KERN-2562 Updating the loop to break, once it finds the page resource

commit 2c74757c52ef51b22ef93812ecdde3dc7b512f95
Author: Savitha Prakash <savithap@umich.edu>
Date:   Fri Feb 10 10:07:01 2012 -0500

    KERN-2562: Native document "rich paste" example can be 404 on download

commit 2b0a1133141498d9a9acc5f7120c3ccb3c9d325e
Merge: 4f82ade 257af45
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Feb 9 15:39:38 2012 -0800

    Merge pull request #590 from lancespeelmon/kern2316

    Kern2316

commit 257af45384994cf2ae0773f509f9e01ea6bc3a08
Author: Lance Speelmon <lance@speelmon.com>
Date:   Thu Feb 9 16:33:52 2012 -0700

    KERN-2316 properly require rubygems and bundler everywhere

commit 4f82ade7a98118cdc4d8a638fe882485b186b4a9
Merge: 10e5883 6a293d3
Author: Lance Speelmon <lance@rsmart.com>
Date:   Thu Feb 9 15:30:54 2012 -0800

    Merge pull request #584 from ctweney/kern-2560

    Kern 2560

commit a73b9cfb1e68eb3ca2151bd277d56cf5d399bdf0
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Feb 9 17:46:53 2012 -0500

    KERN-2563 Corrected logic in determining if an authorizable is user facing.
    Wrapped logic up into simpler terms for readability.
    Updated that logic to be useful for users or groups.
    Fixed ruby scripts to be more flexible in finding ruby exec.

commit 12ae312eacddff5517636a40786d06f939b6cb4d
Author: Savitha Prakash <savithap@umich.edu>
Date:   Thu Feb 9 16:29:20 2012 -0500

    KERN-2540: IMSCP explodes any uploaded zip files

commit 10e588315333cf2182f024980eff1b44e95b7acd
Merge: 266eefe 63778c3
Author: Lance Speelmon <lance@rsmart.com>
Date:   Thu Feb 9 12:42:15 2012 -0800

    Merge pull request #560 from zathomas/automate_integration_testing

    Automate integration testing

commit 266eefe5bc2ddc442eace1209b41ac3e42e712cb
Merge: 8c0e803 61dee21
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Feb 9 12:01:49 2012 -0800

    Merge pull request #587 from stuartf/KERN-2316

     properly require rubygems and bundler everywhere

commit 61dee212eb4cc300ac3860583566931b3d1dbb86
Author: D. Stuart Freeman <stuart.freeman@et.gatech.edu>
Date:   Thu Feb 9 14:06:29 2012 -0500

    KERN-2316 properly require rubygems and bundler everywhere

commit 8c0e8030378f97a8f8848ec3e799807ef988f233
Author: Lance Speelmon <lance@speelmon.com>
Date:   Wed Feb 8 16:01:21 2012 -0700

    NOJIRA fixed ruby runtime errors by requiring rubygems dependency

    Signed-off-by: Zach A. Thomas <zach@aeroplanesoftware.com>

commit 8c3a00e3273afe229b487b5519152897e6f264ad
Merge: da9d98f 890ce83
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Feb 8 17:05:10 2012 -0800

    Merge pull request #585 from ctweney/kern-2550-reop

     reopened

commit 890ce838081c49bcd81e0c02935982cc4fe7b677
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Feb 8 16:28:07 2012 -0800

    KERN-2550 Refactor duplicate get-joinable code into util class

commit 855db8ea8b538f1b982de792199082d1a75ec45f
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Feb 8 15:43:48 2012 -0800

    KERN-2550 Use the authorizable, not the authprofile content object, for joinability info

commit da9d98f23665911eb752c181f27c1176cc063685
Merge: 4fd13db 8bcdcb6
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Feb 8 15:25:04 2012 -0800

    Merge pull request #576 from h4l/KERN-2551

    Added iCal proxy using existing iCal post processor.

commit 6a293d34e06d1414738a4b96a6c78902d618084e
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Feb 8 13:28:28 2012 -0800

    Squashed commit of the following:

    commit 92ce358fa0dc17212a6f42d5d32445e19ccaa974
    Author: Chris Tweney <chris@media.berkeley.edu>
    Date:   Wed Feb 8 13:27:42 2012 -0800

        KERN-2560 Integration test for world template id fixer

    commit c069a00c0a142a5a46def02b7e99efbbd249e600
    Author: Chris Tweney <chris@media.berkeley.edu>
    Date:   Wed Feb 8 11:40:01 2012 -0800

        KERN-2560 Migrator for old world template ids to new ones

commit 4fd13dbefb7828fe5f5942ff6b2b305bf48f60df
Merge: 2da326f 44d2103
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Feb 8 12:35:57 2012 -0800

    Merge pull request #583 from savithap/KERN-2543

    : We can't download a native document with IMSCP when it has a ...

commit 2da326f3cc5039ace37e372c18e1b12c8f537152
Merge: 2993865 fe42e6b
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Feb 8 12:02:30 2012 -0800

    Merge pull request #582 from ctweney/kern-2550

commit 44d21037d2321d600f9fc000258325e6123a395e
Author: Savitha Prakash <savithap@umich.edu>
Date:   Wed Feb 8 14:14:31 2012 -0500

    KERN-2543: We can't download a native document with IMSCP when it has a "/" in it.

commit 2993865ae76f1eb2f86fd52d2a9fd95dfe71af34
Merge: bba5218 e752119
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Feb 8 10:50:19 2012 -0800

    Merge pull request #581 from thecarlhall/kern-2458

    KERN-2458 Added checks for collections when performing or resetting content counts.

commit fe42e6b796203547f7b9f81028bebd3ba1e3d763
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Tue Feb 7 14:58:00 2012 -0800

    KERN-2550 When joining a pseudogroup, use the parent group to determine joinability

commit e7521196b3208f3115044f36702d9577b80401c5
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Feb 7 17:39:14 2012 -0500

    KERN-2458 Added checks for collections when performing or resetting content counts.
    Changed authorizable indexing to index excludeSearch=true auths but to exclude them when searching. The server needs to see them though the UI doesn't
    Added methods to AuthorizableUtil and consolidated some logic.

commit bba5218511c5df24d64df2396a8e4aa19b0be7a9
Merge: 6c819e9 c1d7651
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Feb 7 10:11:49 2012 -0800

    Merge pull request #580 from savithap/KERN-2552

     Casting Boolean to String is causing error

commit c1d765172a697137bfdcb323362843186a6ead37
Author: Savitha Prakash <savithap@umich.edu>
Date:   Tue Feb 7 12:47:27 2012 -0500

    KERN-2552 Casting Boolean to String is causing error

commit 6c819e9b11f51ba54fd4f0104e821a1ffb8d4cb0
Merge: a30b346 b979019
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Feb 7 09:16:40 2012 -0800

    Merge pull request #574 from thecarlhall/kern-2547

    KERN-2547 Changed query call to Solr to use POST so we aren't limited on...

commit a30b34632f148fd60fb4e37a0d3a109d5ce92f3c
Merge: d84961b dfd65c7
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Feb 7 08:10:58 2012 -0800

    Merge pull request #579 from savithap/KERN-2552

    Kern 2552

commit dfd65c704965c900fbf83f1dc24391a49927a8f9
Merge: 1589a35 d84961b
Author: Savitha Prakash <savithap@umich.edu>
Date:   Tue Feb 7 09:14:30 2012 -0500

    Merge branch 'KERN-2552', remote branch 'sakaiproject/master' into KERN-2552

commit 1589a35c6b9a37dbceaddc26cb42f89ad11f86b6
Author: Savitha Prakash <savithap@umich.edu>
Date:   Mon Feb 6 13:56:52 2012 -0500

    KERN-2552 Updated to include boolean and DebugMimeType changes

commit d84961b30d181ab551eb0e3a2754034a377d89d7
Merge: 0ab0b1c 2071a5f
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Mon Feb 6 10:24:22 2012 -0800

    Merge pull request #578 from savithap/KERN-2552

    Kern 2552

commit 2071a5fb6ee9788c284714906db51e484a566afd
Author: Savitha Prakash <savithap@umich.edu>
Date:   Mon Feb 6 13:07:46 2012 -0500

    KERN-2552: Critical Null pointer issues found on the sonar build of Sakai Nakamura Project code

commit 0ab0b1c11e8132973139885b38b1ebc1120f0e3e
Merge: d9f3b2c 7672987
Author: D. Stuart Freeman <stuart.freeman@et.gatech.edu>
Date:   Mon Feb 6 10:05:44 2012 -0800

    Merge pull request #568 from thecarlhall/kern-2510

    KERN-2510 Changed rm calls to rm_f to ignore when file doesn't exist

commit d9f3b2c19dc8789cc46f0f29d5c00b456a9f5d9b
Merge: 23dc0ff 6b3a356
Author: D. Stuart Freeman <stuart.freeman@et.gatech.edu>
Date:   Mon Feb 6 10:00:29 2012 -0800

    Merge pull request #566 from thecarlhall/kern-2536

    KERN-2536 Moved non-breaking space replacement to happen before term extraction

commit 23dc0ff38e02beb03da2d9b7b3283052a175775b
Merge: 1df894c 8fe380f
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Feb 6 09:52:17 2012 -0800

    Merge pull request #577 from stuartf/KERN-2554

     fix ruby syntax error

commit 8fe380f92b38a78b332c819c41905533bd1aadac
Author: D. Stuart Freeman <stuart.freeman@et.gatech.edu>
Date:   Mon Feb 6 12:46:09 2012 -0500

    KERN-2554 fix ruby syntax error

commit b9790197ef16ba746a141437d6512d050cfe8096
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Feb 6 10:54:24 2012 -0500

    KERN-2547 Removed setting of socket timeout since that requires an impl that isn't visible.

commit 1df894c3462a0e00f1f088cd18a49f26a39edb63
Merge: e159b72 38efeff
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Mon Feb 6 07:46:47 2012 -0800

    Merge pull request #567 from thecarlhall/kern-2496

    KERN-2496 Added checks for nil before processing.

commit e159b72b8cb51b658c217896b637149d5d33a6fe
Merge: 182878f 606a013
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Mon Feb 6 07:45:04 2012 -0800

    Merge pull request #569 from thecarlhall/kern-2511

    KERN-2511 Added check for code 204 as that is acceptable.

commit 4081de1b93780dfc866686fda3fc05ce72130ec0
Author: Savitha Prakash <savithap@umich.edu>
Date:   Mon Feb 6 10:42:32 2012 -0500

    KERN-2552 Resolved:Correctness-Null pointer dereference

commit 182878fe767f99997b3e79aaaff623d4adc0ec50
Merge: 8474e70 0571741
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Mon Feb 6 07:41:38 2012 -0800

    Merge pull request #575 from thecarlhall/kern-2548

    KERN-2548 Removed unused max records var in servlet.

commit 8bcdcb6e2750c4dd456bcf4c7f9d2497461fcdcc
Author: Hal Blackburn <hal.blackburn@gmail.com>
Date:   Mon Feb 6 10:38:15 2012 +0000

    Added iCal proxy using existing iCal post processor.

    ical.json is a new proxy configuration which allows fetching remote iCalendar
    feeds. It uses the existing
    org.sakaiproject.nakamura.proxy.ICalProxyPostProcessor which converts the
    iCalendar feed into JSON.

    This proxy needs to allow users to specify the remote host in the URL, which
    requires that the post processor used is listed as safe (in the same way
    that the rss post processor is). As such, the "iCal" post processor has been
    added to the safe list in
    org.sakaiproject.nakamura.proxy.ProxyClientServiceImpl.

commit 05717412222523f23d0e88a17ec52773a0fd736d
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Feb 3 21:27:09 2012 -0500

    KERN-2548 Removed unused max records var in servlet.
    Started using the max records var in SolrRSF.

commit 7f6d14e8d0ea06f2db5f5bd6e15873919d333d3c
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Feb 3 21:13:57 2012 -0500

    KERN-2547 Changed query call to Solr to use POST so we aren't limited on size.
    Added a configurable socket timeout so we don't go down with the Solr server. This is set arbitrarily at 10 seconds.

commit 8474e70044eb862d24c8ba3ad35a51a01ccf9e12
Merge: 1e33f7c af69d01
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Feb 3 12:37:36 2012 -0800

    Merge pull request #573 from raydavis/KERN-2542

     One and only one _source is required in Profile index document

commit 1e33f7cf139976ff38dd106c83160679f322ccf5
Merge: e65cf63 df2285d
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Feb 3 08:15:52 2012 -0800

    Merge pull request #572 from raydavis/KERN-2539

     Update monitorserver to match preview_processor

commit af69d010ed4d46362ff172c6b8cdd3380ffce08c
Author: Ray Davis <ray@media.berkeley.edu>
Date:   Thu Feb 2 10:40:31 2012 -0800

    KERN-2542 One and only one _source is required in Profile index document

commit df2285d8902f3fd0f62fa421e857570af195e94d
Author: Ray Davis <ray@media.berkeley.edu>
Date:   Tue Jan 31 15:11:23 2012 -0800

    KERN-2539 Update monitorserver to match preview_processor

commit e65cf6379b165a22a0679098fe502f67bf5a71cb
Merge: 2b2da95 8a1c9a6
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Jan 27 15:46:45 2012 -0800

    Merge pull request #571 from stuartf/static-code-review

    NOJIRA fix a bunch of static code review issues

commit 8a1c9a6c0bcc06f6eeef9e75882fb1946b6a7c26
Author: D. Stuart Freeman <stuart.freeman@et.gatech.edu>
Date:   Fri Jan 27 12:33:03 2012 -0500

    NOJIRA fix a bunch of static code review issues

commit 2b2da9565c11d8e21f136bcfb44fcdb00b2121df
Merge: 2a1f9e5 6cdca40
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Jan 27 10:00:09 2012 -0800

    Merge pull request #570 from stuartf/stringcompare

    NOJIRA String comparisons should use .equals()

commit 6cdca400148bfa8482479403b6f492fbac013c0c
Author: D. Stuart Freeman <stuart.freeman@et.gatech.edu>
Date:   Fri Jan 27 12:18:19 2012 -0500

    NOJIRA String comparisons should use .equals()

commit 606a013ffc7e7aaab9aa0b1736883428abbd9ffa
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Jan 26 17:57:05 2012 -0500

    KERN-2511 Changed syntax to be more compact as suggested in code review.

commit 38efeff4a5d007891bc53b0c645107e2fce6164e
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Jan 26 17:51:46 2012 -0500

    KERN-2496 Fixed up condition check as suggested by code review.

commit 01579b2814a017e3a71302ac2400977b8161a4b8
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Jan 26 17:33:32 2012 -0500

    KERN-2511 Added check for code 204 as that is acceptable.

commit 76729871ca8c5936e13d50dd80d0fb13a4518f67
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Jan 26 17:27:41 2012 -0500

    KERN-2510 Changed rm calls to rm_f to ignore when file doesn't exist

commit 96183ffe697996bf383d2b7974f10398856a9236
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Jan 26 17:16:49 2012 -0500

    KERN-2496 Added checks for nil before processing.
    Added to_s to argument to make sure nil isn't handled to include?.

commit 6b3a35607298640448c5e94ecb39291729a4afdb
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Jan 26 13:26:50 2012 -0500

    KERN-2536 Moved non-breaking space replacement to happen before term extraction. Did a little cleaning.

commit 2a1f9e57ee77c48149b86709335ab69bc2b88f90
Merge: 2bc342a 21d772b
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Jan 25 16:51:23 2012 -0800

    Merge pull request #565 from dgillman/master

     Reindex May Be Losing Courses

commit 21d772bc6ab254df5d97e6bce661ab1f22369a9c
Author: Duffy Gillman <duffy@rsmart.com>
Date:   Wed Jan 25 14:16:16 2012 -0700

    ACAD-653 migrate sakai:category property from 'courses' to 'course'

    Signed-off-by: Duffy Gillman <duffy@rsmart.com>

commit 63778c3913f186ee4fa9cc91adb8beab1175e620
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Wed Jan 25 16:58:37 2012 -0600

    add some ant tasks for checking port 8080 and ensuring nakamura shuts down

commit dc7159ecaf2c49b7ab2a4b24458fde1b02501e13
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Jan 25 08:31:35 2012 -0500

    KERN-2103 Changed profile output of /system/me to only use basic info.

commit 2bc342a90d89f292b1add520da049488316a9dd2
Merge: 4f0cfbc 9505ee3
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Jan 24 19:12:51 2012 -0800

    Merge pull request #563 from thecarlhall/fix-gemfile-lock

    NOJIRA Correct indentation for rbtagger to fix 'Malformed version number...

commit 4f0cfbcfee2d12ed91554ff045e7583020ae7b2a
Merge: a1b2a11 875de41
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Jan 24 19:12:01 2012 -0800

    Merge pull request #562 from thecarlhall/kern-1808-fix

    KERN-1808 Dialing back the group filtering a bit to only exclude contact...

commit 9505ee3d6b9cc2a609a8693a9a02532f057c9a09
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Jan 24 19:50:40 2012 -0500

    NOJIRA Correct indentation for rbtagger to fix 'Malformed version number string' error.

commit 875de411e861745f7590545bdbd346f14fd3a20c
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Jan 24 19:41:58 2012 -0500

    KERN-1808 Dialing back the group filtering a bit to only exclude contact groups but still include pseudo groups as was pointed out by kern-2183.rb and kern-2263.rb.

commit a1b2a11b45486a7cdbbab7f7e545ff6902253d0b
Merge: 5714a53 74d1fb7
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Jan 24 10:02:45 2012 -0800

    Merge pull request #553 from savithap/KERN-2486

    Kern 2486

commit 5714a53808bba7c80b52d924055d1fafb950cdcf
Merge: c47212f c565cc2
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Jan 24 08:25:04 2012 -0800

    Merge pull request #561 from thecarlhall/kern-1808

    KERN-1808 Added check for real group before outputting.

commit c47212fc12fdde8cc48a33279440befac1a8fd0f
Merge: e88e829 5ad8e1f
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Jan 24 08:23:27 2012 -0800

    Merge pull request #547 from thecarlhall/kern-2462

    Kern 2462

commit c565cc2ebbc5b5d80722810ea9c2c90b4637881a
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Jan 23 23:43:16 2012 -0500

    KERN-1808 Added check for real group before outputting.

commit be4f76b9876fc59d934ed3cabe5ba38d14aa8a61
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Mon Jan 23 11:42:14 2012 -0600

    fix a couple of typos in the README file

commit 0722d16394d83b9bd74a106099547a49e60be4b4
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Mon Jan 23 11:39:40 2012 -0600

    add a README file for the integration module

commit 27d967c33681c0396c0720aa650d42cd635b22cb
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Mon Jan 23 11:23:18 2012 -0600

    give shutdown the correct sling.home setting. Add timeout capability to wait_for_startup script.

commit ea106c81d4df8e9143597f21c7d87cc2ce8e6f1a
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Fri Jan 20 17:31:47 2012 -0600

    adding the integration module I overlooked before

commit 6b233511fb28dc069f1d7c042290c10e5ea19c5b
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Fri Jan 20 17:24:45 2012 -0600

    add maven project to automate integration testing

commit e88e829223fef15357a6e3546f390712921e1086
Merge: aa2f6ac 43d89b6
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Jan 20 15:03:47 2012 -0800

    Merge pull request #559 from sgithens/KERN-2480-3

    Kern 2480 3

commit 43d89b6e43c9db52f2fc1e33bd7bca98c733183b
Merge: aa2f6ac 2bfc422
Author: Steven Githens <swgithen@mtu.edu>
Date:   Fri Jan 20 17:06:38 2012 -0500

    Merge branch 'KERN-2480' into KERN-2480-3

commit 5ad8e1f2a90177a0cb4b109281f7827f6b52b764
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Jan 13 18:22:52 2012 -0500

    KERN-2462 Remove code.py.

commit 6e86224c5bd5c5247e63cf8863ab13d77ee4e578
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Jan 13 16:50:45 2012 -0500

    KERN-2462 Converted code.py term extraction service to the ruby library that implements the same algorithm.

commit aa2f6ac337dc02260421f6bdc7d823fb6c7980ad
Merge: 199f718 04ec425
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Jan 20 11:51:19 2012 -0800

    Merge pull request #558 from stuartf/KERN-2530

     replace urlencode with CGI::escape

commit 04ec42554054d4b64e38f94018726794f80b2e03
Author: D. Stuart Freeman <stuart.freeman@et.gatech.edu>
Date:   Fri Jan 20 14:49:06 2012 -0500

    KERN-2530 replace urlencode with CGI::escape

commit 199f71871a6ef1fc10d1a1b55dd50955c9bd2592
Merge: f6c7b49 812a928
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Jan 19 15:09:10 2012 -0800

    Merge pull request #557 from zathomas/kern-2529

     fix mysterious unbinding of SparseTagOperation during integration testing

commit 812a928f3f6db02ee6929b7e5549cdbf20a374eb
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Jan 19 16:57:27 2012 -0600

    KERN-2529 save SparseTagOperation from becoming unbound when kern-2196.rb runs

commit 74d1fb702bd7bae466564a2ec6e0831be4581ff0
Author: Savitha Prakash <savithap@umich.edu>
Date:   Thu Jan 19 15:12:03 2012 -0500

    KERN-2486 Static code review, updated try catch for DiskDocumentResult

commit f6c7b4943e692ae242889b1f76a45eacd5bc7b61
Merge: 19276be 474aa55
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Jan 19 11:43:59 2012 -0800

    Merge pull request #554 from lancespeelmon/KERN-2525

    Kern 2525

commit 19276be7ea98f18d4482699071b6907f2d23ef94
Merge: 7cc2299 11be87f
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Jan 19 11:36:56 2012 -0800

    Merge pull request #556 from stuartf/KERN-2528

     put a reasonable size on new arrays for toArray calls

commit 7cc2299177ef10da0a927d9cef998a2ba5cb6c3e
Merge: 08f93eb 5ea7fc1
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Jan 19 10:35:25 2012 -0800

    Merge pull request #552 from stuartf/KERN-2524

    KERN-2524 fix Impossible downcast of toArray() result

commit 11be87fd341609ea5a5044ad3ec76205659f39fd
Author: D. Stuart Freeman <stuart.freeman@et.gatech.edu>
Date:   Thu Jan 19 13:00:33 2012 -0500

    KERN-2528 put a reasonable size on new arrays for toArray calls

commit 84c9949df036a085df75d24da400f3c212febc26
Author: Savitha Prakash <savithap@umich.edu>
Date:   Thu Jan 19 12:56:20 2012 -0500

    KERN-2486 Resolved conflict for MediaRangeList

commit 08f93ebe0e2be78dcfe1243042b922d37e860d00
Merge: ce56ca5 02b4c7d
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Jan 19 09:38:01 2012 -0800

    Merge pull request #555 from stuartf/KERN-2526

    KERN-2526 change keySet iterators to entrySet iterators

commit 7768810ea2619cdcaec8e6591b741c9c1cb23f56
Author: Savitha Prakash <savithap@umich.edu>
Date:   Thu Jan 19 12:27:27 2012 -0500

    KERN-2486 Static code review

commit 02b4c7da14b19e8a47aa4041dc68bfa0eab7222e
Author: D. Stuart Freeman <stuart.freeman@et.gatech.edu>
Date:   Thu Jan 19 12:07:25 2012 -0500

    KERN-2526 change keySet iterators to entrySet iterators

commit 474aa55e043af2cc2756cdeb33caf9300f17794b
Author: Lance Speelmon <lance@speelmon.com>
Date:   Thu Jan 19 10:05:10 2012 -0700

    KERN-2525 NPE at LiteGroupMemberServlet.getName(LiteGroupMemberServlet.java:322)

commit 53c9864260276a5e9883f814a3336eb9b2f56a69
Author: Lance Speelmon <lance@speelmon.com>
Date:   Thu Jan 19 09:46:04 2012 -0700

    KERN-2525 NPE at LiteGroupMemberServlet.getName(LiteGroupMemberServlet.java:322)

commit f6b85eac439bb95a31d1387504130397fd352786
Merge: 96d7af5 ce56ca5
Author: Savitha Prakash <savithap@umich.edu>
Date:   Thu Jan 19 11:19:37 2012 -0500

    Merging KERN-2486 branch to latest sakaiproject/master, and resolving conflicts

commit 96d7af5a8ceba511c89f3d609b45c8e0db0d8ce1
Author: Savitha Prakash <savithap@umich.edu>
Date:   Thu Jan 19 10:58:34 2012 -0500

    KERN-2486: Static code review of Sakai OAE 1.1.0 binary finds defects.

commit 5ea7fc194ba33bab621112ebe6e4f024a8e670dc
Author: D. Stuart Freeman <stuart.freeman@et.gatech.edu>
Date:   Thu Jan 19 10:22:32 2012 -0500

    KERN-2524 fix Impossible downcast of toArray() result

commit ce56ca56236e294edbceaaa4b00815ec8024ffa3
Merge: 0c6ce77 a9e6deb
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Wed Jan 18 14:56:32 2012 -0800

    Merge pull request #551 from thecarlhall/kern-2504

    Kern 2504

commit a9e6deb65b41c2fa3c3f653e0937aabeb208eb5d
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Jan 18 16:16:52 2012 -0500

    KERN-2504 Corrected how File objects are created when using a URL.

commit cba82534c267a097372f925dcb0e5cdb34fc5bfd
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Jan 16 21:21:55 2012 -0500

    KERN-2504 Added quotes for spots where spaces might be problematic for bash.

commit 0c6ce77d49b23cb077bc0dd9971391a8fa7516d3
Merge: 81c229b 201a240
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Jan 17 13:15:55 2012 -0800

    Merge pull request #550 from stuartf/KERN-2520

    KERN-2520 remove curb from dependencies and doc

commit 81c229bcd1be0f92d3959185266ed1811f076b16
Merge: 58e1ca7 896c38d
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Jan 17 11:33:47 2012 -0800

    Merge pull request #549 from sgithens/testall-sh-prune-target

    NOJIRA Pruning target directories.

commit 201a240617898eec38a2dc6fe0842aabc0b3ffbe
Author: D. Stuart Freeman <stuart.freeman@et.gatech.edu>
Date:   Tue Jan 17 14:26:08 2012 -0500

    KERN-2520 remove curb from dependencies and doc

commit 896c38de39f7ff8d9b9a0d79c86f1e248e6bacff
Author: Steven Githens <swgithen@mtu.edu>
Date:   Tue Jan 17 13:58:03 2012 -0500

    NOJIRA Pruning target directories.

commit 58e1ca749d9c25272a1299d8d703c0db41a378d2
Merge: 81e6190 9373c42
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Jan 17 09:10:35 2012 -0800

    Merge pull request #548 from thecarlhall/kern-2518

    KERN-2518 Move creation of json object to when we know we can access the...

commit 9373c42cc6fea1c2a8fc2132ad15a3062aa31361
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Jan 16 21:16:43 2012 -0500

    KERN-2518 Move creation of json object to when we know we can access the authorizable that we're outputting details of.

commit 81e61904bd969d0c1c1c98d11b87060f106dcbde
Merge: 4e8fca7 f56b500
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Jan 13 14:14:24 2012 -0800

    Merge pull request #544 from stuartf/KERN-2515

     implement hashCode for objects that override equals

commit 4e8fca73a9b54f2f179b20e1a1cf1caa07b328d3
Merge: 2dc1d05 13dd5ec
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Jan 13 14:08:35 2012 -0800

    Merge pull request #546 from stuartf/KERN-2517

     put brackets around 'if' and 'for' bodies

commit 13dd5ec26d1433afe37eb36b03d3a69601d79e2c
Author: D. Stuart Freeman <stuart.freeman@et.gatech.edu>
Date:   Fri Jan 13 15:42:06 2012 -0500

    KERN-2517 put brackets around 'if' and 'for' bodies

commit 2dc1d053d8b1b101d13867a53c8c398571373a3c
Merge: 002bdc3 f2b2bc6
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Fri Jan 13 09:31:48 2012 -0800

    Merge pull request #545 from thecarlhall/kern-2501-squish

    KERN-2501 Integration test fixes

commit f2b2bc67a29c54c31d673af9012934bef0f766a7
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Jan 13 11:51:05 2012 -0500

    KERN-2501 Removing erroneous file.

commit 8c39d6be502aef1305b254c6e368278c45335899
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Jan 10 13:45:27 2012 -0600

    KERN-2501 kern-292.rb fix assertions of the test to account for our pseudo-groups

    KERN-2501 kern-308.rb remove obsolete test

    KERN-2501 fix for kern-483.rb

    KERN-2501 fix kern-538.rb Do not trust contentManager.exists()

    KERN-2501 fix kern-759.rb, place proper viewer restrictions on test group

    KERN-2501 fix kern-797.rb, /tags no longer behaves like a JCR node

    KERN-2501 fix kern-891.rb tags must be created beneath /tags

    KERN-2501 fix kern-926.rb, the semantics of doing the /var/search/pool/me/viewer.json have changed since we added the levels parameter

    KERN-2501 fix kern-929.rb use 201 as expected code, rather than 200

    KERN-2501 fix kern-933.rb use 201 as expected code, rather than 200

    KERN-2501 fix for kern-935.rb, make group more private

    KERN-2501 remove kern-939.rb, because we don't use ~/somegroup/pages anymore

    KERN-2051 fix kern-2027.rb, use an admin user for easier group setup

    KERN-2501 fix kern-2034.rb, remove anonymous as viewer from the outset

    KERN-2501 fix kern-2205.rb, we no longer have a memberCount property on a Group

    KERN-2501 fix kern-2274.rb, don't use memberCount property now

    KERN-2501 fix contact counting and use lowercase for me service connection states.

    KERN-2501 fix node-create-test.rb, remove an obsolete test case.

    KERN-2501 fix basiclti-test.rb, we need to add the creator as manager of the group

    KERN-2501 restore tests I commented out.

commit bcc01c2dc4f0f31f0dc2ebcf42deabd6b8fc5239
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Jan 10 13:13:15 2012 -0500

    KERN-2501 Changed exists to get != null when checking for node.

    KERN-2501 Fixed and added to search func test.

    KERN-2501 Added messages, checks and fixes for integration tests.

    KERN-2501 Fixed and added to search func test.

    KERN-2501 Added messages, checks and fixes for integration tests.

    KERN-2501 Fixed kern-2243 by correcting the timezone in the assertion.

    KERN-2501 Removing potentially dangerous and unused search nodes found while reviewing integrations test.

    KERN-2501 Correct who tries to delete whom in test.

    KERN-2501 Corrected count since some dependent bug has been fixed.

    KERN-2501 NPE fix while running tests.

    KERN-2501 Removed unneeded steps (create tag, etc). Cleaned up some formatting.

commit f56b500ca66734fbbcc8f61595489931b36ac57b
Author: D. Stuart Freeman <stuart.freeman@et.gatech.edu>
Date:   Thu Jan 12 09:08:38 2012 -0500

    KERN-2515 implement hashCode for objects that override equals

commit 002bdc308aecef456729b5723e798948b2324110
Merge: 59b7660 c995075
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Wed Jan 11 13:09:41 2012 -0800

    Merge pull request #543 from stuartf/KERN-2514

    KERN-2514 don't directly store arrays

commit c995075a9d086b3520a672294159cdc56c2cd840
Author: D. Stuart Freeman <stuart.freeman@et.gatech.edu>
Date:   Wed Jan 11 13:32:41 2012 -0500

    KERN-2514 don't directly store arrays

commit 59b7660d5ceb4f3f2a366a961a9a3b6acce1a743
Merge: 8dece3b d5d5ddc
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Jan 10 09:58:02 2012 -0800

    Merge pull request #542 from zathomas/quieter-tests

    Quieter tests

commit d5d5ddc02d6b0127df26a37dccd17c7c66f55646
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Jan 10 11:37:09 2012 -0600

    NOJIRA make the ruby tests quiet, so we don't get output we don't want while running all tests.

commit 8dece3b579ef958d5085cab45abfefa9a2f521e5
Merge: cb349d6 30b6214
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Jan 10 07:45:55 2012 -0800

    Merge pull request #541 from thecarlhall/kern-2450-fix

    KERN-2450

commit 30b6214b9981905830a0566c1589671a983b4093
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Jan 9 17:31:41 2012 -0500

    KERN-2450 Changed widget data indexing to look for parent doc rather than authorizable.
    Added returnpath to pooled content index doc so it can be grouped when returned with widget data docs.
    Removed widget data searching from groups.json, usersgroups.json.
    Added widget data searching to all.json, manager.json, viewer.json.

commit cb349d68f43cf316740e6cd2a2acad01a19e8cf0
Merge: 04ba8a6 402a979
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Jan 6 12:49:56 2012 -0800

    Merge pull request #540 from stuartf/sonar-cleanup

    NOJIRA cleanup some sonar criticals

commit 402a97959256581b3ed5870d63ba6fd704c7a237
Author: D. Stuart Freeman <stuart.freeman@et.gatech.edu>
Date:   Fri Jan 6 12:25:01 2012 -0500

    NOJIRA cleanup some sonar criticals

commit 04ba8a6a852d515e0eec1ee75757789bf811b226
Merge: b039ac9 a507a92
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Jan 5 16:12:53 2012 -0800

    Merge pull request #539 from thecarlhall/kern-2493

    KERN-2493 Added check for array length before accessing.

commit b039ac941336f711a4243184cba9791157b42310
Merge: c282d7e 1861ae2
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Jan 5 14:20:40 2012 -0800

    Merge pull request #537 from raydavis/KERN-2487

     Standardize uniqueness mechanism.

commit c282d7e782ed0c609000bbf645db5ea33210ba38
Merge: b01b4c5 98cc443
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Jan 5 13:42:20 2012 -0800

    Merge pull request #536 from ctweney/kern-2433

    Kern 2433

commit a507a929379a608fffc0f0828df8926674d07aae
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Jan 5 16:39:27 2012 -0500

    KERN-2493 Added check for array length before accessing.

commit b01b4c5b9087c3a69da954bd7e067317618c70b5
Merge: bf83daf 761ae1c
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Jan 5 13:01:31 2012 -0800

    Merge pull request #523 from savithap/KERN-2473

    KERN-2473: The world permissions of a content, does not trickle down to ...

commit bf83daff5eb28aac22b2d94b7a2abcccf013b430
Merge: 8befb4a cfce842
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Jan 5 12:52:07 2012 -0800

    Merge pull request #538 from stuartf/warn-cleanup

    Warn cleanup

commit cfce8422b18efe3f46f6ff4ef62593eee9aae24e
Author: D. Stuart Freeman <stuart.freeman@et.gatech.edu>
Date:   Thu Jan 5 11:48:29 2012 -0500

    NOJIRA cleanup warnings for unneccesary SerialVersionUID

    also overrides of managed versions in poms, and some raw types

commit 761ae1c218cb17f6551678fab418037e5dd8f930
Author: Savitha Prakash <savithap@umich.edu>
Date:   Thu Jan 5 14:32:14 2012 -0500

    KERN-2473 Additionally updated GroupMembershipCounter to use methods from AuthorizableUtil, while retrieving the list of absolute groups

commit fb654cd40c00f72cf222c5d7561ba15108cfd972
Author: D. Stuart Freeman <stuart.freeman@et.gatech.edu>
Date:   Wed Jan 4 14:07:58 2012 -0500

    NOJIRA cleanup unused imports and duplicate groupIds

commit 0cb15f22de48e31644c7fbb74bb2945d50b8b008
Merge: 7178170 8befb4a
Author: Savitha Prakash <savithap@umich.edu>
Date:   Thu Jan 5 14:09:20 2012 -0500

    Merge branch 'KERN-2473', remote branch 'sakaiproject/master' into KERN-2473

commit 8befb4a819286206de9cda9c81a4919de6c443d2
Merge: 09b416e f5fa848
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Jan 5 11:06:44 2012 -0800

    Merge pull request #528 from savithap/KERN-2489

    KERN-2489: Add util functions to determine if the groups are absolute gr...

commit 98cc44374c8fa4440c24c734ce86bdc98dfc07ca
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Thu Jan 5 10:55:25 2012 -0800

    KERN-2433 When deleting a group, notify AuthorizableCountChanger for each member so their membership counts will get updated

commit 1861ae2406a7c64e018663e69ac28056aa6da8c5
Author: Ray Davis <ray@media.berkeley.edu>
Date:   Tue Jan 3 16:43:40 2012 -0800

    KERN-2487 Standardize uniqueness mechanism.
    Eliminate use of Time.now.to_i.
    Fix some scripting bugs.

commit 717817099791a97129f944b6552f494bf9f66532
Author: Savitha Prakash <savithap@umich.edu>
Date:   Thu Jan 5 13:31:19 2012 -0500

    KERN-2473 Updated imports

commit 17bc2eee1b462d72e50928b70d075404e35d58bc
Merge: f88661a 09b416e
Author: Savitha Prakash <savithap@umich.edu>
Date:   Thu Jan 5 13:21:54 2012 -0500

    Merge branch 'KERN-2473', remote branch 'sakaiproject/master' into KERN-2473

commit f88661ae4ecd01ca18bb41bf057229e9ce6d3ba3
Author: Savitha Prakash <savithap@umich.edu>
Date:   Thu Jan 5 13:15:20 2012 -0500

    KERN-2473 Updated code to use AuthorizableUtil methods to get the groups

commit f5fa84810a73eaba78666152f0184430dc3e6450
Author: Savitha Prakash <savithap@umich.edu>
Date:   Thu Jan 5 10:39:29 2012 -0500

    KERN-2489 Modified to two space indentation

commit 09b416eab817ec231cc5d4f37428b740993d3167
Merge: efba45d f5a3c31
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Jan 4 15:33:28 2012 -0800

    Merge pull request #534 from ctweney/kern-2490

    Kern 2490 defensive improvement

commit efba45dedfe1a400d2e3be258ef18ab4572e3128
Merge: ad40113 74d38ac
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Jan 4 15:32:35 2012 -0800

    Merge pull request #535 from raydavis/KERN-2468

     Missed the second copy of a configuration default.

commit 74d38ac89cd3f2da470950cbf4737cd42b7f7095
Author: Ray Davis <ray@media.berkeley.edu>
Date:   Wed Jan 4 15:29:47 2012 -0800

    KERN-2468 Missed the second copy of a configuration default.

commit f5a3c317a7099737bf69d5a3517df3dbc1ae46c9
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Jan 4 15:25:11 2012 -0800

    KERN-2490 Be even more defensive in case the tag comes up empty after stripping out /tags/

commit 553a0184e2bdf338d7df7ac9d01ffc047be8d2f6
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Jan 4 15:18:41 2012 -0800

    KERN-2490 Deal with tags that start with / or /tags

commit ad401132c0e2c7e41dcc870a8367f4f053e5108b
Merge: 3032014 d9dc2e2
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Jan 4 15:05:49 2012 -0800

    Merge pull request #533 from ctweney/kern-2490

    Kern 2490

commit d9dc2e2643787961af9f38c31ff1d2551ba6f0e1
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Jan 4 14:24:43 2012 -0800

    KERN-2490 Use JcrUtils.deepGetOrCreateNode so we create intermediate directories in multi-level tags

commit 30320149b1b9398b1e91d7b5fcc55d71f76195bb
Merge: de6e4ac 0c1b529
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Jan 4 14:05:53 2012 -0800

    Merge pull request #532 from thecarlhall/build_fix

    NOJIRA Fix compilation error on oae-builds.

commit de6e4aca9a767e872aa84d900573539709536772
Merge: 7c723db 38fd866
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Jan 4 13:54:52 2012 -0800

    Merge pull request #529 from stuartf/KERN-2482

    Kern 2482

commit 0c1b529f2853a1243eb4be28084d4ac9fd72f10f
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Jan 4 16:50:55 2012 -0500

    NOJIRA Fix compilation error on oae-builds.

commit 7c723db9355a752ab94a0744594629b932f2c2c8
Merge: e6dc771 67451dd
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Jan 4 12:00:59 2012 -0800

    Merge pull request #531 from zathomas/kern-2492

    KERN-2492 fix tika build breakage

commit 67451ddee762d3336bfae497bdd08e8eda14304c
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Wed Jan 4 13:56:55 2012 -0600

    KERN-2492 adding dependency for bndlib, so build doesn't fail when creating javadoc for tika bundle

commit e6dc77148035c4e5634541ecca3b9bc2041297cd
Merge: 17e2a1a d33ba77
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Wed Jan 4 09:35:42 2012 -0800

    Merge pull request #530 from ctweney/kern-2491

    Kern 2491

commit d33ba7795115e3eb041c2b9fb4da4cf47c7fdb7b
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Wed Jan 4 09:10:10 2012 -0800

    KERN-2491 Fix relativePath so activity bundles will build on a clean maven repo

commit 38fd866f2d86af4e2bfd4a6bcdc66f8f65260735
Author: D. Stuart Freeman <stuart.freeman@et.gatech.edu>
Date:   Wed Jan 4 10:02:46 2012 -0500

    NOJIRA fix usage message

commit c786146101f18d839f416770cafaa3f599192c5b
Author: D. Stuart Freeman <stuart.freeman@et.gatech.edu>
Date:   Wed Jan 4 10:02:04 2012 -0500

    KERN-2482 Fix backwards compatibility to ruby 1.8.7

commit 17e2a1aa92931802caa3fb311905c4969ddbfd6c
Merge: 20108a5 40b2329
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Jan 4 06:02:56 2012 -0800

    Merge pull request #526 from raydavis/KERN-2468

     Check post-alias resource paths in Server Protection Service.

commit 40b23291e4e1a1927478ae62a5d4f4c8b6438028
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Jan 3 17:12:13 2012 -0800

    KERN-2468 Document existing code as side effect of review

commit 20108a510999889476e32b0f1ecef55b712f4230
Merge: dd20218 f91d66d
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Jan 3 12:56:34 2012 -0800

    Merge pull request #527 from thecarlhall/kern-2488

    KERN-2488 Split activity into api, impl bundles. Moved util method to bundle from utils. Adjusted references.

commit dd20218b2e459bcca8b8de54ba91b5232a25eca8
Merge: 27fbb3e d49b4a4
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Jan 3 12:20:11 2012 -0800

    Merge pull request #525 from thecarlhall/kern-2431

    KERN-2431 Added indexing handler to generate a document per profile sect...

commit 27fbb3e61ce47edd19a40b5c15c9dcccfc97e511
Merge: 5ac9630 f880458
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Jan 3 11:51:32 2012 -0800

    Merge pull request #521 from ctweney/kern-2375-squash

    Kern 2375 Make My Library counts more correct in realtime

commit 6391da3e74a06f82fcef6a54e6dc0dc84cda5856
Author: Savitha Prakash <savithap@umich.edu>
Date:   Tue Jan 3 14:28:23 2012 -0500

    KERN-2489: Add util functions to determine if the groups are absolute groups

commit f880458b6b0f8fdfea04aba588a435c79ab4bf1f
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Tue Jan 3 10:46:17 2012 -0800

    KERN-2375 Make ContentCounter agree more closely with manager-viewer.json by only including indirect memberships if the doc's showalways field is true

commit 2bfc422aacf8d60c003bc08637e3d46bda9710c2
Merge: a3b5b81 5ac9630
Author: Steven Githens <swgithen@mtu.edu>
Date:   Tue Jan 3 13:44:18 2012 -0500

    Merge branch 'master' of github.com:sakaiproject/nakamura into KERN-2480

commit f91d66dc3811b8f524f38ada0aa136e76b6675cc
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Jan 3 12:18:10 2012 -0500

    KERN-2488 Split activity into api, impl bundles. Moved util method to bundle from utils. Adjusted references.

commit d49b4a40988678bbe8434b4172df1ae6be2ee0c0
Author: Carl Hall <carl@hallwaytech.com>
Date:   Tue Jan 3 12:19:43 2012 -0500

    KERN-2431 Compilation fix.

commit e251d8e0cb07a09c28c6772ec9d7c4b17ed3b73b
Author: Ray Davis <ray@media.berkeley.edu>
Date:   Tue Jan 3 08:26:01 2012 -0800

    KERN-2468 Check post-alias resource paths in Server Protection Service.
     Do not give free pass to Jackrabbit storage.
     Reduce maintenance cost of safe exact path list.

commit 973a375f4ba51cabd62954822165f3f4c2d81169
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Mon Jan 2 10:00:53 2012 -0800

    KERN-2375 Fix broken unit test

commit 41485add6ef52e9b49dc3cf828d42750290a8ceb
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Dec 29 21:15:51 2011 -0500

    KERN-2431 Added indexing handler to generate a document per profile section excluding 'basic' since it is indexed as part of the authorizable.
    Added indexing of basic fields as part of the authorizable's Solr doc.
    Added property provider that responds to 'fullprofile=true' in the URL. This has been added to users, usersgroups and general search nodes.
    Added 'profile' to the solr schema to hold profile information as a single field.

commit 5ac9630c45dc1b740900b72f54c9ba4882b82d93
Merge: 9e67caf 462b156
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Dec 28 15:56:10 2011 -0800

    Merge pull request #524 from ctweney/kern-2477-squash

    Kern 2477 Migrator for old worlds

commit 462b156ab8a1eb34ebea55a631e22bba663f54fc
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Dec 23 11:27:03 2011 -0800

    KERN-2477: Write a migrator to convert old world data

    Squashed commit of the following:

    commit 0e28f0ebe917bff5e4d3204061cd4d0af78c6f9c
    Author: Chris Tweney <chris@media.berkeley.edu>
    Date:   Fri Dec 23 11:26:26 2011 -0800

        KERN-2477 Cleanup; don't alter main group unless it's really changed; make log less chatty

    commit 209216f4298739096f0e212eb3f05c8842dd4a67
    Author: Chris Tweney <chris@media.berkeley.edu>
    Date:   Thu Dec 22 16:23:46 2011 -0800

        KERN-2477 Get pseudogroup's role-title-plural from parent group's roles structure, if available

    commit 7c63b6102e8e76d5a472bc12373eea1939926b6b
    Author: Chris Tweney <chris@media.berkeley.edu>
    Date:   Thu Dec 22 15:38:46 2011 -0800

        KERN-2477 Manipulate the sakai:roles prop of main groups per migration mapping

    commit b177b055bf1524d346ed2ee68a20712e9b93218c
    Author: Chris Tweney <chris@media.berkeley.edu>
    Date:   Tue Dec 20 14:12:38 2011 -0800

        KERN-2477 Migrate old pseudogroups to new world data structure

commit 9e67caf32c3ad79ec63d66cffd5814f4e599ef50
Merge: 1689984 a013c2d
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Dec 21 12:39:12 2011 -0800

    Merge pull request #522 from lancespeelmon/KERN-2369

    https://jira.sakaiproject.org/browse/

commit a013c2dd0551c20df405f4c8bce91def2fcc74eb
Author: Lance Speelmon <lance@speelmon.com>
Date:   Wed Dec 21 10:43:44 2011 -0700

    KERN-2369 let's see if I can get the annotations right this time! :) Thanks, L

commit 156feeadac0c867f0ed02ded184d940fb49dda06
Author: Savitha Prakash <savithap@umich.edu>
Date:   Wed Dec 21 12:35:02 2011 -0500

    KERN-2473: The world permissions of a content, does not trickle down to the user (member of the world), for /var/search/pool/me/viewer.json and /var/search/pool/me/manager.json feeds

commit ff536c321c3107f7153e443e1b77284d3a048b69
Author: Lance Speelmon <lance@speelmon.com>
Date:   Tue Dec 20 19:15:11 2011 -0700

    KERN-2369 thecarlhall: What about adding a target value of "(!default=true)" to the Reference annotation for authorizablePostProcessor so you don't have to make this check?

commit 7b6b51c5467ab7d126571ea650e9cd10b0be804c
Author: Lance Speelmon <lance@speelmon.com>
Date:   Tue Dec 20 11:26:15 2011 -0700

    KERN-2369 LiteAuthorizablePostProcessor does not allow service registrations by other post processors

commit 16899840655aa0ce0b7d9c3c92d77dd73fba4eb0
Merge: 27e863d 6064b43
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Tue Dec 20 09:14:17 2011 -0800

    Merge pull request #512 from thecarlhall/kern-2403-fix

    KERN-2403 Move solr config to our search bundle, bind to ieb/solr v1.3

commit 6064b43994b0a5bf80a1ef07305da4abd4a86e8e
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Dec 19 18:38:26 2011 -0500

    KERN-2403 Updated schema.xml to be the latest from the solr project.

commit 9f25edc0947e0360a4d73e4f32f16b7f6e306499
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Mon Dec 19 15:20:35 2011 -0800

    Squashed commit of the following:

    commit c2daef0543eec40525c824a871d1d4ff465ae83e
    Author: Chris Tweney <chris@media.berkeley.edu>
    Date:   Mon Dec 19 14:59:16 2011 -0800

        KERN-2375 Remove old code, cleanup

    commit 46098e7ef4efcf3e1634dbb7db1844615fe1a32b
    Author: Chris Tweney <chris@media.berkeley.edu>
    Date:   Mon Dec 19 14:52:24 2011 -0800

        KERN-2375 Count group memberships and members in the new synchronous way

    commit 193d4098e29b1f01d88dcb597c9bdc68f47ee8ab
    Author: Chris Tweney <chris@media.berkeley.edu>
    Date:   Mon Dec 19 13:57:02 2011 -0800

        KERN-2375 When a g-contacts- group changes membership, update the corresponding user's contact count synchronously

    commit 88cceaea184f6712c2d6201962fd2ba1ca2b4e52
    Author: Chris Tweney <chris@media.berkeley.edu>
    Date:   Fri Dec 16 16:22:37 2011 -0800

        KERN-2375 When creating or updating pooled content, notify the counting system of the change, synchronously

    commit fc0f4128a44d535958743e6cff369b567f80b998
    Author: Chris Tweney <chris@media.berkeley.edu>
    Date:   Fri Dec 16 15:09:06 2011 -0800

        KERN-2375 Update an authorizable's counts whenever they are missing

commit 27e863df75c6ec726dfcd153aabd2129ba443833
Merge: cc41f2f 404cf2e
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Mon Dec 19 14:59:04 2011 -0800

    Merge pull request #513 from thecarlhall/kern-2463-fix

    KERN-2463 refactoring of SparseTagOperation

commit a3b5b813deb97dd950d16edc782c4b5db08929c0
Author: Steven Githens <swgithen@mtu.edu>
Date:   Mon Dec 19 17:28:25 2011 -0500

    KERN-2480 Rather than just adding all the admin settings, running them through effectiveSettings so they don't override the user settings unless the lock for that setting is applied.

commit cc41f2f655fc3380ae5450d797c64e1c8aae5cfc
Merge: df5cb9e 07a346a
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Mon Dec 19 11:07:51 2011 -0800

    Merge pull request #518 from savithap/KERN-2472

    KERN-2472: The description of "Pooled Content - Me - Viewer" and "Pooled...

commit df5cb9e7c0e270b36e28b26d19bfd9e0646cf50c
Merge: 53a63d5 9498b46
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Mon Dec 19 10:54:54 2011 -0800

    Merge pull request #519 from stuartf/KERN-2386

    KERN-2386 only generate a preview of the first page of html docs

commit 9498b466adacdd8beb2c2eebd49bedfd6324f0c4
Author: D. Stuart Freeman <stuart.freeman@et.gatech.edu>
Date:   Mon Dec 19 13:46:24 2011 -0500

    KERN-2386 only generate a preview of the first page of html docs

commit 07a346a454c2e269bc13de645c11de7d192b9326
Author: Savitha Prakash <savithap@umich.edu>
Date:   Mon Dec 19 13:41:36 2011 -0500

    KERN-2472 Text modified for viewer-all

commit 1f8d889e4b43ba5aa21d9e0ffce5d085c169ecec
Author: Savitha Prakash <savithap@umich.edu>
Date:   Mon Dec 19 13:28:24 2011 -0500

    KERN-2472: The description of "Pooled Content - Me - Viewer" and "Pooled Content - Me - Viewer - All" in system/doc is not accurate

commit 53a63d5475170e3320d17a64e3b9a35c5dd27264
Merge: 631dc14 4fc033c
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Mon Dec 19 10:08:42 2011 -0800

    Merge pull request #517 from thecarlhall/tika-bundle-fix

    NOJIRA Fix javadoc to point to existing variable.

commit 631dc14ee3d453d088850f9ab6f2c9b35fdcc099
Merge: 08d8ae9 a74670b
Author: Carl Hall <carl@hallwaytech.com>
Date:   Sat Dec 17 08:48:30 2011 -0800

    Merge pull request #515 from savithap/KERN-2384

    : /var/search/pool/me/viewer.infinity.json is not returning cor...

commit 4fc033cd51b0210b629d5cde452b66f345ee10b2
Author: Carl Hall <carl@hallwaytech.com>
Date:   Sat Dec 17 11:18:03 2011 -0500

    NOJIRA Fix javadoc to point to existing variable.

commit 404cf2e6830cf3bb20a0fdb33a93233a0375af9a
Author: Carl Hall <carl@hallwaytech.com>
Date:   Sat Dec 17 11:03:28 2011 -0500

    KERN-2463 Changed thenReturn to thenAnswer for iterators so the iterator is fresh on each call.
    Changed assertion to match impl.

commit 010f7b564c4d878946de56b56061c16ac4824951
Author: Carl Hall <carl@hallwaytech.com>
Date:   Sat Dec 17 10:10:06 2011 -0500

    KERN-2403 Removed comment pointing to external issue tracker.

commit 08d8ae90d2b6c2b3e47a4062d056dec13f87b38e
Merge: 7c4ba4b d40c23c
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Dec 16 16:33:47 2011 -0800

    Merge pull request #516 from zathomas/kern-2470

    KERN-2470 make authorizable post processors able to work without an http request

commit d40c23cda3968a6a197df1d2a02f8a485a1fef35
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Fri Dec 16 16:07:54 2011 -0600

    KERN-2470 change authorizable post processor to not need an http request

commit a74670bad2b48a5d2914a623c6fd62946de29ad9
Author: Savitha Prakash <savithap@umich.edu>
Date:   Fri Dec 16 16:30:11 2011 -0500

    KERN-2384: /var/search/pool/me/viewer.infinity.json is not returning correct information

commit 9e452f0f2f12112e98e4cec1fdf21c02a271c50b
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Dec 15 08:26:35 2011 -0600

    KERN-2470 remove obsolete /pages code in DefaultPostProcessor

commit 7c4ba4b7739a960e279517c2f185fdb5b590b258
Merge: f8a0e8c a646d32
Author: Chris Tweney <chris@media.berkeley.edu>
Date:   Fri Dec 16 11:07:05 2011 -0800

    Merge pull request #514 from sakaiproject/rc7-branch

    Move all the version numbers from 1.1-SNAPSHOT to 1.2-SNAPSHOT

commit a646d32cc6d63dadbe5cfefc821d032d5ab7045f
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Fri Dec 16 12:43:44 2011 -0600

    NOJIRA clean up a few more version numbers for move to 1.2-SNAPSHOT

commit 31844f901c328e3fd1cdd235446f8500c77878bb
Merge: e1e79f5 f8a0e8c
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Fri Dec 16 12:25:30 2011 -0600

    KERN-2452 resolve conflicts in merging tika changes

commit e1e79f54b4c153df677cf718f085d10a69b1a12a
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Fri Dec 16 12:23:06 2011 -0600

    switching from version to next SNAPSHOT in config files

commit f8a0e8cf4cdd348f7cf0e9ac305c4ab5ed4e9b18
Merge: 8ac507e 4081067
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Fri Dec 16 09:13:27 2011 -0800

    Merge pull request #511 from thecarlhall/kern-2452-fix

    Kern 2452 Upgrade Tika to 1.0

commit 8ac507eb2463186cf4cb921d5498fde040985210
Merge: ee93f6e 3cba627
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Dec 16 06:31:11 2011 -0800

    Merge pull request #510 from sgithens/KERN-2471

      Removing sakai.dropbox from the default set of too...

commit 39663b10750e842ab424fcea1e56b28a535201cf
Author: Carl Hall <carl@hallwaytech.com>
Date:   Mon Dec 12 14:07:27 2011 -0500

    KERN-2463 Major refactoring of SparseTagOperation and adding unit tests.
    Added unit tests for TagUtils and adjusted code to handle bugs found.

commit dca129e00ccd3e4e7ea72c1c190f224e7f536ebc
Author: Carl Hall <carl@hallwaytech.com>
Date:   Fri Dec 9 18:08:55 2011 -0500

    KERN-2463 Formatting. Get it over with now before the refactoring.

commit af627f98a8c94f9a85a8ced5561c4ac9c4ff1f4a
Author: Carl Hall <carl@hallwaytech.com>
Date:   Thu Dec 1 15:17:24 2011 -0500

    KERN-2403 Updated NakamuraMain to unpack home & static entries (copied code from ieb).
    Switched to solr-1.3 as released by ieb.
    Added config and schema files to search.impl bundle for deployment on server start.

commit 408106789762c1c3a84b8b9165f0c32a124ff28b
Author: Carl Hall <carl@hallwaytech.com>
Date:   Wed Dec 14 22:11:27 2011 -0500

    KERN-2452 Upgraded tika to 1.0 using the readme. Updated the readme as needed for changes in tika.
    Added use of tika osgi services in TikaService. Updated methods.
    Corrected 1 line of code to use var assignment.

commit df81e23f9b230b0dac1435c52b179712caa5a143
Author: Zach A. Thomas <zach@aeroplanesoftware.com>
Date:   Thu Dec 15 16:01:28 2011 -0600

    [maven-release-plugin] prepare for next development iteration

commit 3cba6270b8920c3cf5f73c32d8cca6fe16215340
Author: Steven Githens <swgithen@mtu.edu>
Date:   Thu Dec 15 14:29:49 2011 -0500

    KERN-2471 SAKIII-4560 Removing sakai.dropbox from the default set of tools.