Commit graph

6 commits

Author SHA1 Message Date
Dustin Johnson
f274ce63e9 Issue #1412 Add common useradmin code to PDE build for EDEX
Change-Id: I5d676ff43dbe89c2e6a2f48e373704cbf38e42bc

Former-commit-id: 6cc28be958 [formerly ede32c8d3e] [formerly f316320b06 [formerly 39d60f23ea246e17924c78562c45cc0b6491a53d]]
Former-commit-id: f316320b06
Former-commit-id: 35409872a6
2013-01-11 08:56:39 -06:00
Nate Jensen
94b9d10c81 Issue #1409 Initial implementation of hydro data access
Change-Id: I309694f9477384446658520794e19ca9493473fb

Former-commit-id: c236b4e1ad [formerly 817717fe0a] [formerly 85658e7e1d [formerly ae7ac8a8bfc51d1c7dc3493c8fc036a87772f323]]
Former-commit-id: 85658e7e1d
Former-commit-id: 3c2865bbd7
2012-12-12 11:20:42 -06:00
Dustin Johnson
2d1e886cf3 Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: efd3d3735a [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 1dbeb22893
Former-commit-id: 4222b24d09
2012-11-08 09:57:16 -06:00
Max Schenkelberg
5a5bd522a1 Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration.
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345

Former-commit-id: f069f34a96 [formerly 2f90120248] [formerly ca4177dd08 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]
Former-commit-id: ca4177dd08
Former-commit-id: 747ab974e9
2012-11-07 10:44:42 -06:00
Steve Harris
e720b8ed31 12.10.1-1 baseline
Former-commit-id: 0abf64b77c [formerly 195158c004] [formerly d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]
Former-commit-id: d708932029
Former-commit-id: 7bd9c63dc7
2012-09-04 12:07:27 -05:00
Steve Harris
7fb0b17bd5 12.9.1-5 baseline
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
2012-08-21 15:27:03 -05:00