]> git.aero2k.de Git - tmp/jakarta-migration.git/log
tmp/jakarta-migration.git
13 years agoAdded new life cycle definitions - {active and deleted) and {active, deleted, and...
Richard Millet [Tue, 10 Apr 2012 23:55:24 +0000 (16:55 -0700)]
Added new life cycle definitions - {active and deleted) and {active, deleted, and locked}.

13 years agoSupport for workflow by transition ID now working. Also, more permission related...
Richard Millet [Tue, 10 Apr 2012 23:07:52 +0000 (16:07 -0700)]
Support for workflow by transition ID now working.  Also, more permission related bug fixes added.

13 years agoDimension service tests now passing again.
Richard Millet [Mon, 9 Apr 2012 15:18:33 +0000 (08:18 -0700)]
Dimension service tests now passing again.

13 years agoChanged Permission CSIDs from opaque UUID to something more refname-like.
Richard Millet [Mon, 9 Apr 2012 06:51:44 +0000 (23:51 -0700)]
Changed Permission CSIDs from opaque UUID to something more refname-like.

13 years agoCSPACE-4964: Implemented first stage of dynamic (post boot) permission creation ...
Richard Millet [Fri, 30 Mar 2012 06:04:50 +0000 (23:04 -0700)]
CSPACE-4964: Implemented first stage of dynamic (post boot) permission creation -still dealing with class loader issues with AuthZ modules.

13 years agoCSPACE-4964: Added stubs for creating lifecycle permissions at init time.
Richard Millet [Wed, 28 Mar 2012 23:23:49 +0000 (16:23 -0700)]
CSPACE-4964: Added stubs for creating lifecycle permissions at init time.

13 years agoCSPACE-4964: A shuffling of methods from ServiceMain.java to AuthorizationCommon...
Richard Millet [Wed, 28 Mar 2012 00:24:46 +0000 (17:24 -0700)]
CSPACE-4964: A shuffling of methods from ServiceMain.java to AuthorizationCommon.java in preparation for dynamic creation of workflow/lifecycle permissions.

14 years agoMerge branch 'master' of github.com:collectionspace/services
Richard Millet [Tue, 27 Mar 2012 07:15:34 +0000 (00:15 -0700)]
Merge branch 'master' of github.com:collectionspace/services

14 years agoCSPACE-4928: Slightly generalized how logical datatypes are configured, when modifyin...
Aron Roberts [Tue, 27 Mar 2012 01:05:26 +0000 (18:05 -0700)]
CSPACE-4928: Slightly generalized how logical datatypes are configured, when modifying datatypes for database columns during post-init process. Did this otherwise long-intended cleanup in part to experiment with setting date-only datatypes. Dates are stored correctly in the database as date-only, but are still returned with timestamps in UTC, without additional changes to services code.

14 years agoCSPACE-4883: In Nuxeo XSD schema for Intake records in the services, corrected dataty...
Aron Roberts [Fri, 23 Mar 2012 04:08:18 +0000 (21:08 -0700)]
CSPACE-4883: In Nuxeo XSD schema for Intake records in the services, corrected datatype for fieldCollectionDate to xs:date from xs:string.

14 years agoCSPACE-4919: Add index on locationDate field in Location / Movement / Inventory recor...
Aron Roberts [Fri, 23 Mar 2012 03:37:04 +0000 (20:37 -0700)]
CSPACE-4919: Add index on locationDate field in Location / Movement / Inventory records, to support ordering of records on that field's values.

14 years agoMerge pull request #10 from aronr/cspace-4633
Aron Roberts [Thu, 22 Mar 2012 23:40:28 +0000 (16:40 -0700)]
Merge pull request #10 from aronr/cspace-4633

CSPACE-4633: When changing field (column) datatypes in the database during services post-init phase, get database name from JDBC URL used in current connection, rather than from configuration in tenant bindings, where it is no longer present.

14 years agoCSPACE-4633: When changing field (column) datatypes in the database during services...
Aron Roberts [Thu, 22 Mar 2012 23:38:06 +0000 (16:38 -0700)]
CSPACE-4633: When changing field (column) datatypes in the database during services post-init phase, get database name from JDBC URL used in current connection, rather than from configuration in tenant bindings, where it is no longer present.

14 years agoMerge pull request #9 from aronr/cspace-4945
Aron Roberts [Thu, 22 Mar 2012 03:25:36 +0000 (20:25 -0700)]
Merge pull request #9 from aronr/cspace-4945

CSPACE-4945: Change character case in test data used by services MovementSortByTest, to ensure that tests succeed regardless of locale-based case variations in sort order, since tests have no control over this configuration.  Mixed case text was being ordered differently on Linux / Windows systems and on Mac OS X systems.

14 years agoCSPACE-4945: Fix trivial typo in comments in MovementSortByTest.
Aron Roberts [Thu, 22 Mar 2012 03:00:35 +0000 (20:00 -0700)]
CSPACE-4945: Fix trivial typo in comments in MovementSortByTest.

14 years agoCSPACE-4945: Once again make MovementSortByTest case-insensitive. The underlying...
Aron Roberts [Thu, 22 Mar 2012 02:57:46 +0000 (19:57 -0700)]
CSPACE-4945: Once again make MovementSortByTest case-insensitive. The underlying issue appears to be that sort order is non-deterministic across platforms, and varies depending on the configured locale, and perhaps even the OS vendor's implementation of locale-related configuration. For now, work around this by setting values in relevant fields in test records to use a single character case, to reduce the probability that case-specific ordering differences across platforms will cause sortBy tests to fail.

14 years agoCSPACE-4945: Restore case-sensitivity in comparisons in sortBy tests in Movement...
Aron Roberts [Wed, 21 Mar 2012 21:12:01 +0000 (14:12 -0700)]
CSPACE-4945: Restore case-sensitivity in comparisons in sortBy tests in Movement service; mismatch between sorting order out of the database and checked-for sort order was breaking these tests in Mac OS X, with left-over record(s) from the MovementServiceTest.

14 years agoMerge remote-tracking branch 'remotes/upstream/master'
Patrick Schmitz [Tue, 20 Mar 2012 19:49:02 +0000 (12:49 -0700)]
Merge remote-tracking branch 'remotes/upstream/master'

14 years agoCSPACE-4943 - fixed problem with refObjs call and extended schemas. Added tests to...
Patrick Schmitz [Tue, 20 Mar 2012 19:46:04 +0000 (12:46 -0700)]
CSPACE-4943 - fixed problem with refObjs call and extended schemas. Added tests to cover this, which includes adding an extension to the Person schema in the lifesci tenant.

14 years agoMerge pull request #8 from collectionspace/Place-authority
Aron Roberts [Tue, 20 Mar 2012 01:13:56 +0000 (18:13 -0700)]
Merge pull request #8 from collectionspace/Place-authority

CSPACE-4390: Addition of the PlaceAuthority service, per Rick's work. All services tests pass, including tests in the new 'place' module.

14 years agoMerge pull request #7 from aronr/cspace-3911
Aron Roberts [Tue, 20 Mar 2012 00:56:15 +0000 (17:56 -0700)]
Merge pull request #7 from aronr/cspace-3911

CSPACE-3911: Preserve ampersands as XML entities in multipart/form-data Imports path.

14 years agoCSPACE-4391: Merge .gitignore changes from services master into services Place-author...
Aron Roberts [Mon, 19 Mar 2012 23:56:37 +0000 (16:56 -0700)]
CSPACE-4391: Merge .gitignore changes from services master into services Place-authority branch.

14 years agoCSPACE-3911: Removed unused variable, added only during testing.
Aron Roberts [Mon, 19 Mar 2012 20:04:38 +0000 (13:04 -0700)]
CSPACE-3911: Removed unused variable, added only during testing.

14 years agoCSPACE-3911: Workaround - at best - for problem where ampersand character entities...
Aron Roberts [Mon, 19 Mar 2012 19:47:47 +0000 (12:47 -0700)]
CSPACE-3911: Workaround - at best - for problem where ampersand character entities are turned into 'bare' ampersands during import, this time during the multipart/form-data import path (see CSPACE-4866).

14 years agoMerge branch 'master' of github.com:collectionspace/services
Richard Millet [Sun, 18 Mar 2012 23:01:40 +0000 (16:01 -0700)]
Merge branch 'master' of github.com:collectionspace/services

14 years agoNOJIRA: Deleting obsolete files/artifacts.
Richard Millet [Sun, 18 Mar 2012 23:01:02 +0000 (16:01 -0700)]
NOJIRA: Deleting obsolete files/artifacts.

14 years agoMerge remote-tracking branch 'upstream/master' into Place-authority
Rick Jaffe [Sun, 18 Mar 2012 00:59:42 +0000 (17:59 -0700)]
Merge remote-tracking branch 'upstream/master' into Place-authority

14 years agoMerge pull request #5 from aronr/cspace-4925
Aron Roberts [Fri, 16 Mar 2012 19:35:36 +0000 (12:35 -0700)]
Merge pull request #5 from aronr/cspace-4925

CSPACE-4925: Added the six-field Inventory Information Group to Location / Movement / Inventory records.

14 years agoMerge pull request #4 from aronr/cspace-4866
Aron Roberts [Fri, 16 Mar 2012 05:43:43 +0000 (22:43 -0700)]
Merge pull request #4 from aronr/cspace-4866

CSPACE-4866: Allowing uploading of UTF-8-containing XML files to the Imports service, via multipart forms based submission, by accepting 'application/xml' MIME type uploads as well as 'text/xml' uploads.

14 years agoCSPACE-4925: Services tenant bindings config changes, designating three fields as...
Aron Roberts [Fri, 16 Mar 2012 04:10:31 +0000 (21:10 -0700)]
CSPACE-4925: Services tenant bindings config changes, designating three fields as holding authRefs/termRefs in the new Inventory Control information group in Location / Movement / Inventory records.

14 years agoCSPACE-4866,CSPACE-4818: In Imports service, allow multipart/form-data upload of...
Aron Roberts [Fri, 16 Mar 2012 02:23:42 +0000 (19:23 -0700)]
CSPACE-4866,CSPACE-4818: In Imports service, allow multipart/form-data upload of XML files using 'text/xml' MIME type, as well as 'application/xml', to support upload form functionality of that service. Minor cleanup of error and success messages, and of the HTML upload form.

14 years agoCSPACE-4925: Added the six-field Inventory Information Group to Location / Movement...
Aron Roberts [Thu, 15 Mar 2012 02:38:53 +0000 (19:38 -0700)]
CSPACE-4925: Added the six-field Inventory Information Group to Location / Movement / Inventory records in services schema.

14 years agoCSPACE-4866: Changed MIME type expected by multipart form upload path in Imports...
Aron Roberts [Wed, 14 Mar 2012 23:47:20 +0000 (16:47 -0700)]
CSPACE-4866: Changed MIME type expected by multipart form upload path in Imports service to 'application/xml' from 'text/xml'.

14 years agoCSPACE-4391: Adding dependency on Place in pom file
Rick Jaffe [Wed, 14 Mar 2012 20:06:16 +0000 (13:06 -0700)]
CSPACE-4391: Adding dependency on Place in pom file

14 years agoCSPACE-4391: Adding place <ant> tag in three spots
Rick Jaffe [Wed, 14 Mar 2012 19:52:23 +0000 (12:52 -0700)]
CSPACE-4391: Adding place <ant> tag in three spots

14 years agoCSPACE-4391: Adding Place module to pom.
Rick Jaffe [Wed, 14 Mar 2012 19:48:43 +0000 (12:48 -0700)]
CSPACE-4391: Adding Place module to pom.

14 years agoCSPACE-4391: Adding PlaceAuthorityClient to import, adding Placeitem to getCommonSche...
Rick Jaffe [Wed, 14 Mar 2012 06:57:53 +0000 (23:57 -0700)]
CSPACE-4391: Adding PlaceAuthorityClient to import, adding Placeitem to getCommonSchemaNameForDocType

14 years agoCSPACE-391: Adding placeauthority service and place service meta-data
Rick Jaffe [Wed, 14 Mar 2012 06:49:23 +0000 (23:49 -0700)]
CSPACE-391: Adding placeauthority service and place service meta-data

14 years agoCSPACE-4391: Adding PlaceAuthorityResource to import, addResourceToMapAndSingletons
Rick Jaffe [Wed, 14 Mar 2012 06:30:27 +0000 (23:30 -0700)]
CSPACE-4391: Adding PlaceAuthorityResource to import, addResourceToMapAndSingletons

14 years agoCSPACE-4391: Adding Place as collectionspace dependency
Rick Jaffe [Wed, 14 Mar 2012 06:18:29 +0000 (23:18 -0700)]
CSPACE-4391: Adding Place as collectionspace dependency

14 years agoCSPACE-4391: Adding Place service (entire folder)
Rick Jaffe [Wed, 14 Mar 2012 05:09:27 +0000 (22:09 -0700)]
CSPACE-4391: Adding Place service (entire folder)

14 years agoNOJIRA: Merging collectionspace master into my local repo, 13Mar2012
Rick Jaffe [Wed, 14 Mar 2012 00:52:24 +0000 (17:52 -0700)]
NOJIRA: Merging collectionspace master into my local repo, 13Mar2012

14 years agoNOJIRA - Fixed config for groups objectName and objectNumber to specify schema. Title...
Patrick Schmitz [Tue, 13 Mar 2012 16:07:59 +0000 (09:07 -0700)]
NOJIRA - Fixed config for groups objectName and objectNumber to specify schema. Title property without schema gets confused with dc:title, which returns the CSID.

14 years agoMerge pull request #3 from aronr/cspace-4911
Aron Roberts [Tue, 13 Mar 2012 04:30:56 +0000 (21:30 -0700)]
Merge pull request #3 from aronr/cspace-4911

CSPACE-4911: Added inventory and location ID number patterns for Location, Movement and Inventory records.

14 years agoCSPACE-4911: Added inventory and location ID number patterns for Location, Movement...
Aron Roberts [Mon, 12 Mar 2012 23:10:39 +0000 (16:10 -0700)]
CSPACE-4911: Added inventory and location ID number patterns for Location, Movement and Inventory records.

14 years agoCSPACE-4192 - Ensure tenant ID values are unique at startup.
Patrick Schmitz [Mon, 12 Mar 2012 20:23:38 +0000 (13:23 -0700)]
CSPACE-4192 - Ensure tenant ID values are unique at startup.

14 years agoCSPACE-4783 - Applied a partial fix (hack) that will work until we put in a proper...
Patrick Schmitz [Mon, 12 Mar 2012 04:51:54 +0000 (21:51 -0700)]
CSPACE-4783 - Applied a partial fix (hack) that will work until we put in a proper fix using a base schema for all authority items. Also fixed typo in tenant-bindings-proto.xml fix for authority perf problems. Placed taxonFullName declaration under authority, rather than item, service declaration.

14 years agoNOJIRA - Fixed performance problems with some authorities by ensuring that required...
Patrick Schmitz [Mon, 12 Mar 2012 03:46:37 +0000 (20:46 -0700)]
NOJIRA - Fixed performance problems with some authorities by ensuring that required fields for app config list functions are included in list results.

14 years agoMerge branch 'master' of github.com:collectionspace/services
Patrick Schmitz [Fri, 9 Mar 2012 23:55:31 +0000 (15:55 -0800)]
Merge branch 'master' of github.com:collectionspace/services

14 years agoCSPACE-4875 Fixed bug that would include soft-deleted objects in search all.
Patrick Schmitz [Fri, 9 Mar 2012 23:55:10 +0000 (15:55 -0800)]
CSPACE-4875 Fixed bug that would include soft-deleted objects in search all.

14 years agoReally?
remillet [Fri, 9 Mar 2012 01:52:57 +0000 (17:52 -0800)]
Really?

14 years agoJust a test of git commands.
remillet [Fri, 9 Mar 2012 01:35:53 +0000 (17:35 -0800)]
Just a  test of git commands.

14 years agotest edit to troubleshoot git diff.
rjaffe [Fri, 9 Mar 2012 00:45:51 +0000 (16:45 -0800)]
test edit to troubleshoot git diff.

14 years agoCSPACE-4875 Fixed typo in pagination handling.
Patrick Schmitz [Thu, 8 Mar 2012 23:05:10 +0000 (15:05 -0800)]
CSPACE-4875 Fixed typo in pagination handling.

14 years agoCSPACE-4875 - Adding missing resource file. Not sure why Git refused to add this.
Patrick Schmitz [Thu, 8 Mar 2012 21:37:09 +0000 (13:37 -0800)]
CSPACE-4875  - Adding missing resource file. Not sure why Git refused to add this.

14 years agoCSPACE-4875 Marked more services as utility so they are not searched in "common"...
Patrick Schmitz [Thu, 8 Mar 2012 20:35:52 +0000 (12:35 -0800)]
CSPACE-4875 Marked more services as utility so they are not searched in "common" group.

14 years agoMerge branch 'master' of github.com:collectionspace/services into CSPACE-4875
Patrick Schmitz [Thu, 8 Mar 2012 00:52:16 +0000 (16:52 -0800)]
Merge branch 'master' of github.com:collectionspace/services into CSPACE-4875

14 years agoCSPACE-4875 Added missing class, and tweaked utils to manage group configuration.
Patrick Schmitz [Thu, 8 Mar 2012 00:12:54 +0000 (16:12 -0800)]
CSPACE-4875 Added missing class, and tweaked utils to manage group configuration.

14 years agoMerge pull request #2 from aronr/master
Aron Roberts [Wed, 7 Mar 2012 17:46:55 +0000 (09:46 -0800)]
Merge pull request #2 from aronr/master

CSPACE-4777: Add a default, top-level .gitignore file to the services layer source code tree, akin to those in the application and ui layers.

14 years agoCSPACE-4777: Add default .gitignore file for the services layer.
Aron Roberts [Wed, 7 Mar 2012 01:30:51 +0000 (17:30 -0800)]
CSPACE-4777: Add default .gitignore file for the services layer.

14 years agoRevert "NOJIRA: adding generic path 'target/' to services top-level .gitignore file...
Aron Roberts [Wed, 7 Mar 2012 00:44:01 +0000 (16:44 -0800)]
Revert "NOJIRA: adding generic path 'target/' to services top-level .gitignore file, mirroring the app layer's practice."

This reverts commit 7bb70f543e0a20dd22ec6886bcd5f69ec76644ba.

14 years agoNOJIRA: adding generic path 'target/' to services top-level .gitignore file, mirrorin...
Aron Roberts [Wed, 7 Mar 2012 00:41:28 +0000 (16:41 -0800)]
NOJIRA: adding generic path 'target/' to services top-level .gitignore file, mirroring the app layer's practice.

14 years agoCSPACE-4875 Filled out the kw search support, returning list of items by serviceGroup...
Patrick Schmitz [Tue, 6 Mar 2012 01:08:30 +0000 (17:08 -0800)]
CSPACE-4875 Filled out the kw search support, returning list of items by serviceGroup. Also supports the meta-group "common". Added security filter to this and to the refObjs call so only searches in services the current user has rights to.

14 years agoMerge pull request #1 from ray-lee/CSPACE-4775
Aron Roberts [Mon, 5 Mar 2012 19:48:23 +0000 (11:48 -0800)]
Merge pull request #1 from ray-lee/CSPACE-4775

CSPACE-4775: Implement Structured dates in 4 fields in Cataloging. Merging in Ray's updates to CollectionObject / Cataloging schema in the Services. No code changes or test changes were required.

14 years agoNOJIRA: Modified the Services log4j.properties file to show all ERROR and WARN level...
Richard Millet [Sat, 3 Mar 2012 00:25:26 +0000 (16:25 -0800)]
NOJIRA: Modified the Services log4j.properties file to show all ERROR and WARN level log messages in the console.  Also, added back the "cspace-services-perf.log" log file for showing performance profiling.  Added some documentation comments as well.

14 years agoNOJIRA - some diagnostic logging to determine how Nuxeo handles xs:date vs. xs:datetime.
Patrick Schmitz [Fri, 2 Mar 2012 21:59:54 +0000 (13:59 -0800)]
NOJIRA - some diagnostic logging to determine how Nuxeo handles xs:date vs. xs:datetime.

14 years agoCSPACE-4875 Added support to get the list of docTypes associated to a given service...
Patrick Schmitz [Fri, 2 Mar 2012 21:58:53 +0000 (13:58 -0800)]
CSPACE-4875 Added support to get the list of docTypes associated to a given service group.

14 years agoMerge branch 'master' into CSPACE-4775
Ray Lee [Fri, 2 Mar 2012 19:29:03 +0000 (11:29 -0800)]
Merge branch 'master' into CSPACE-4775

14 years agoCSPACE-4862: Needed to call post-init handlers AFTER tenant workspace folders get...
Richard Millet [Fri, 2 Mar 2012 04:41:27 +0000 (20:41 -0800)]
CSPACE-4862: Needed to call post-init handlers AFTER tenant workspace folders get created.

14 years agoMerge branch 'master' of github.com:collectionspace/services
Richard Millet [Fri, 2 Mar 2012 00:39:34 +0000 (16:39 -0800)]
Merge branch 'master' of github.com:collectionspace/services

14 years agoCSPACE-4747: Ridding the source tree of stale configuration files related to JNDI...
Richard Millet [Fri, 2 Mar 2012 00:31:45 +0000 (16:31 -0800)]
CSPACE-4747: Ridding the source tree of stale configuration files related to JNDI data source issues.  Many of the stale files were artifacts of our previous JBoss deployment environment.  Also removing the Nuxeo DM database template files since the CollectionSpace services no longer run inside the Nuxeo DM.

14 years agoNOJIRA - removed excessive logging added for debug.
Patrick Schmitz [Thu, 1 Mar 2012 20:17:33 +0000 (12:17 -0800)]
NOJIRA - removed excessive logging added for debug.

14 years agoAdding a .gitignore file so that git does not delete the parent "log" directory.
Richard Millet [Thu, 1 Mar 2012 17:51:52 +0000 (09:51 -0800)]
Adding a .gitignore file so that git does not delete the parent "log" directory.

14 years agoCSPACE-4775: Changing four fields to be structured dates in JAXB schema for collectio...
Ray Lee [Wed, 29 Feb 2012 22:07:44 +0000 (14:07 -0800)]
CSPACE-4775: Changing four fields to be structured dates in JAXB schema for collectionobject

14 years agoCSPACE-4728,CSPACE-4684: Removed the former nightlyDist.sh script from the Services...
Aron Roberts [Wed, 29 Feb 2012 03:25:09 +0000 (19:25 -0800)]
CSPACE-4728,CSPACE-4684: Removed the former nightlyDist.sh script from the Services repo's scripts directory; this script can now be found under the name make-tomcat-cspace-tarball.sh in the Tools repo's scripts directory.

14 years agoCSPACE-4875 More work on resoruce to support getting info on one group, and fixing...
Patrick Schmitz [Wed, 29 Feb 2012 01:46:51 +0000 (17:46 -0800)]
CSPACE-4875 More work on resoruce to support getting info on one group, and fixing client test.

14 years agoCSPACE-4775: Changing four fields to be structured dates in CollectionObject.
Ray Lee [Tue, 28 Feb 2012 20:54:43 +0000 (12:54 -0800)]
CSPACE-4775: Changing four fields to be structured dates in CollectionObject.

14 years agoCSPACE-4875 Adding support for keyword search across a range of services. This has...
Patrick Schmitz [Tue, 28 Feb 2012 20:09:58 +0000 (12:09 -0800)]
CSPACE-4875 Adding support for keyword search across a range of services. This has the service structure in place, and a stub to list groups.

14 years agoNOJIRA: preventing display of target/ files in git status results.
Rick Jaffe [Tue, 28 Feb 2012 00:28:20 +0000 (16:28 -0800)]
NOJIRA: preventing display of target/ files in git status results.

14 years agoNOJIRA - Adding authRefs for the extension schema in lifesci tenant
Patrick Schmitz [Fri, 24 Feb 2012 18:12:34 +0000 (10:12 -0800)]
NOJIRA - Adding authRefs for the extension schema in lifesci tenant

14 years agoAdding example of using extension schema field in list results config
Patrick Schmitz [Wed, 22 Feb 2012 21:29:41 +0000 (13:29 -0800)]
Adding example of using extension schema field in list results config

14 years agoMerge branch 'master' of github.com:collectionspace/services
Richard Millet [Sat, 18 Feb 2012 00:20:15 +0000 (16:20 -0800)]
Merge branch 'master' of github.com:collectionspace/services

14 years agoAnother edit done on github.
remillet [Sat, 18 Feb 2012 00:17:19 +0000 (16:17 -0800)]
Another edit done on github.

14 years agoMerge branch 'master' of github.com:collectionspace/services
Richard Millet [Sat, 18 Feb 2012 00:13:31 +0000 (16:13 -0800)]
Merge branch 'master' of github.com:collectionspace/services

14 years agoMaking a change via githubs web edit feature.
remillet [Sat, 18 Feb 2012 00:11:45 +0000 (16:11 -0800)]
Making a change via githubs web edit feature.

14 years agoMerge branch 'detached-head'
Richard Millet [Fri, 17 Feb 2012 23:51:17 +0000 (15:51 -0800)]
Merge branch 'detached-head'

Conflicts:
README.txt

14 years agoWhere is the file getting commited to?
Richard Millet [Fri, 17 Feb 2012 23:32:44 +0000 (15:32 -0800)]
Where is the file getting commited to?

14 years agoAdding another test change. Make 8
Richard Millet [Fri, 17 Feb 2012 19:11:36 +0000 (11:11 -0800)]
Adding another test change. Make 8

14 years agoAdding another test change. Make 7
Richard Millet [Fri, 17 Feb 2012 19:11:26 +0000 (11:11 -0800)]
Adding another test change. Make 7

14 years agoAdding another test change.
Richard Millet [Fri, 17 Feb 2012 19:11:00 +0000 (11:11 -0800)]
Adding another test change.

14 years agoMerge branch 'master' of github.com:collectionspace/services
Richard Millet [Fri, 17 Feb 2012 17:47:28 +0000 (09:47 -0800)]
Merge branch 'master' of github.com:collectionspace/services

14 years agoAdding the "scripts" folder back to the services top-level src/main/resources/ directory.
Richard Millet [Fri, 17 Feb 2012 17:41:49 +0000 (09:41 -0800)]
Adding the "scripts" folder back to the services top-level src/main/resources/ directory.

14 years agoAdding an upstream commit.
remillet [Fri, 17 Feb 2012 01:40:31 +0000 (17:40 -0800)]
Adding an upstream commit.

14 years agoTesting commit from another client.
Richard Millet [Fri, 17 Feb 2012 00:58:05 +0000 (16:58 -0800)]
Testing commit from another client.

14 years agoYet another test.
Richard Millet [Fri, 17 Feb 2012 00:56:56 +0000 (16:56 -0800)]
Yet another test.

14 years agoA small tweak.
Richard Millet [Fri, 17 Feb 2012 00:21:00 +0000 (16:21 -0800)]
A small tweak.

14 years agoAll SSH keys deserve better.
Richard Millet [Thu, 16 Feb 2012 23:34:11 +0000 (15:34 -0800)]
All SSH keys deserve better.

14 years agoA message for the commit.
Richard Millet [Thu, 16 Feb 2012 23:17:34 +0000 (15:17 -0800)]
A message for the commit.

14 years agoMerge branch 'master' of github.com:collectionspace/services
Richard Millet [Thu, 16 Feb 2012 22:44:14 +0000 (14:44 -0800)]
Merge branch 'master' of github.com:collectionspace/services

Conflicts:
README.txt

14 years agoA change that might have a conflict.
Richard Millet [Thu, 16 Feb 2012 22:34:06 +0000 (14:34 -0800)]
A change that might have a conflict.