Commit graph

2 commits

Author SHA1 Message Date
Max Schenkelberg
25f5a9b1aa Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e

Former-commit-id: 1ed5f10230 [formerly 30c1802398] [formerly d1099addc6] [formerly 00822a4f39 [formerly d1099addc6 [formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]]
Former-commit-id: 00822a4f39
Former-commit-id: 5eaaf2b42110ba677fab87f22b62f6cd269072be [formerly c4e5092f94]
Former-commit-id: 4408af827f
2012-11-12 16:46:21 -06:00
Max Schenkelberg
f9e6347863 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: 94e64c9b0d [formerly f069f34a96] [formerly 11111d3a29cb179e3e47566262a8a2be05fd32e6 [formerly 2f90120248]] [formerly ca4177dd08 [formerly 2f90120248 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]]
Former-commit-id: ca4177dd08
Former-commit-id: 42f60026840ae4bf86371ebfd3e40ca565028c4b [formerly 747ab974e9]
Former-commit-id: 5a5bd522a1
2012-11-07 10:44:42 -06:00