Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10000 commits
Select commit Hold shift + click to select a range
a441714
Use latest release
cziegeler May 12, 2016
6b7a2da
[maven-release-plugin] prepare release maven-scr-plugin-1.22.0
cziegeler May 12, 2016
2db7064
[maven-release-plugin] prepare for next development iteration
cziegeler May 12, 2016
5d37fff
Back to snapshot
cziegeler May 12, 2016
0274b94
Felix Converter Service: support for conversions to-from Java Beans.
bosschaert May 12, 2016
5581413
Avoid compilation problems with Java 5
cziegeler May 12, 2016
940e5e4
Avoid compilation problems with Java 5
cziegeler May 12, 2016
aeb6cf2
Group attributes into own json object to avoid name collision
cziegeler May 12, 2016
fe9d1d8
extra service event listener logging
djencks May 12, 2016
dc0abd4
FELIX-5256 Object conversion should pass through unrecognized objects…
djencks May 12, 2016
9751f09
Undo accidentally pushed rev 1743541
djencks May 12, 2016
96fd2b6
FELIX-5257 Improve formatting of command list output
djencks May 14, 2016
43775d1
FELIX-5249 : Enabling SSL for org.apache.felix.http fails to properly…
cziegeler May 17, 2016
5707854
Code formatting
cziegeler May 17, 2016
d04cb86
FELIX-5258 : Add a new MOJO which verifies the bundle integrity. Appl…
cziegeler May 18, 2016
d555872
FELIX-5258 : Add a new MOJO which verifies the bundle integrity. Appl…
cziegeler May 19, 2016
1ba632e
FELIX-5253 : Update to bndlib 3.2.0
cziegeler May 19, 2016
6016205
FELIX-5223 : [IE11][Edge]: Fields in OSGI Configuration Manager are n…
cziegeler May 19, 2016
28c40ab
[FELIX-5243] Introduce a ComponentActivator interface and move Target…
gnodet May 20, 2016
e8b5a3a
[FELIX-5243] Break dependency to ComponentRegistry
gnodet May 20, 2016
431799c
[FELIX-5243] Remove metadata package dependency on parser package
gnodet May 20, 2016
7794a25
[FELIX-5243] Remove Activator static log methods
gnodet May 20, 2016
82d9667
[FELIX-5243] Refactor to isolate manager, helper and metadata packages
gnodet May 20, 2016
e520aa5
[FELIX-5243] Refactor all component methods related code into a separ…
gnodet May 20, 2016
0ba7655
SLING-5259 : SslFilterRequest always returns -1 when X-Forwarded-Port…
cziegeler May 20, 2016
633df0d
FELIX-4417 More informative circular reference tracking
djencks May 21, 2016
d3e8f14
FELIX-5186 Fix more alarmist logging on async service changes
djencks May 21, 2016
3f64b7a
Added FELIX-5108.
May 22, 2016
81c0e5c
Use latest released versions for scr generator and scr annotations.
May 22, 2016
3847e4b
[maven-release-plugin] prepare release org.apache.felix.scr.bnd-1.5.0
May 22, 2016
5e0d442
[maven-release-plugin] prepare for next development iteration
May 22, 2016
2de4afb
Added test which ensures that a service provider is removed from the …
May 26, 2016
1a13897
removed this temporary test. Will make another one later.
May 26, 2016
fc7fdd2
In unregisterService(), really unregister the service is also in the …
May 26, 2016
df1b75a
Set compiler level to 1.6, mark dependencies as scope provided, and t…
karlpauls May 27, 2016
d5bb92f
use JavaSE 1.8
May 28, 2016
fa5de10
FELIX-5268: Added test case which reproduces the issue for FELIX-5268.
May 28, 2016
46e9237
FELIX-5268: added test for this issue.
May 28, 2016
a739d9d
FELIX-4795 : Servlet API 3.x not supported
cziegeler May 31, 2016
a929af3
FELIX-4941 : Web console doesn't work with fileinstall
cziegeler May 31, 2016
19a6b3d
Update changelog
cziegeler May 31, 2016
40da421
[maven-release-plugin] prepare release org.apache.felix.webconsole-4.…
cziegeler May 31, 2016
271f67d
[maven-release-plugin] prepare for next development iteration
cziegeler May 31, 2016
1ca306b
FELIX-5254: Improve structure of permutations to use unmodifiable cap…
tjwatson May 31, 2016
b9f8ffb
[FELIX-5243] Add a ConfigurableComponentHolder#getComponentMethods() …
gnodet Jun 1, 2016
59243ac
[FELIX-5272] Upgrade to jline 3.0.0.M1
gnodet Jun 1, 2016
01a5c5a
[FELIX-5243] Remove anonymous inner class, add a unit test to ensure …
gnodet Jun 1, 2016
7d4bfb1
[FELIX-5243] Make ComponentContextImpl#setImplementationAccessible pu…
gnodet Jun 1, 2016
190ceca
FELIX-5273: Wrong log when a callback is not found from component ins…
Jun 1, 2016
c524c44
[FELIX-5271] Change system bundle location to System Bundle
karlpauls Jun 2, 2016
18e1830
FELIX-5264 Introduce a single State enum and use an atomic to track i…
djencks Jun 2, 2016
d0d3148
FELIX-4417 Improve logging of circular references. Fix some problems…
djencks Jun 2, 2016
1763707
FELIX-5276 track service event before changing service properties
djencks Jun 8, 2016
978a710
FELIX-5270 Don't set bundle location on configurations
djencks Jun 11, 2016
35423a8
Felix Converter - start of a serialization test
bosschaert Jun 13, 2016
0d1c33f
FELIX-4840 : Asynchronous IO fails in webconsole plugin
cziegeler Jun 13, 2016
ccaab96
[FELIX-5261] FileInstall: allow comments in *.config files
gnodet Jun 13, 2016
a556049
FELIX-5224 : Expose Jetty session coniguration options in Felix confi…
cziegeler Jun 13, 2016
0d732d5
Felix Converter - Additional JSON serialization tests.
bosschaert Jun 13, 2016
83b512c
Felix Converter - some refactoring
bosschaert Jun 13, 2016
58257a9
FELIX-5248 test for complaint
djencks Jun 13, 2016
1a0fc78
Felix Converter Service - Initial YAML codec
bosschaert Jun 14, 2016
d8b11f6
Felix Converter Service - rename some tests
bosschaert Jun 14, 2016
a02528b
Felix Converter Service - delete some renamed classes.
bosschaert Jun 14, 2016
d9c0af6
Felix Converter Service - Add a little more meat to the YAML encoding.
bosschaert Jun 14, 2016
25c72b9
Felix Converter Service - Additional testing for YAML codec
bosschaert Jun 14, 2016
d63b9c7
FELIX-5281 : Improve LoadBalancerCustomizerFactoryTracker
cziegeler Jun 15, 2016
3cc56fd
Add .svnignore
cziegeler Jun 17, 2016
7ea8078
[maven-release-plugin] prepare release org.apache.felix.http.sslfilte…
cziegeler Jun 19, 2016
86b3611
[maven-release-plugin] prepare for next development iteration
cziegeler Jun 19, 2016
71bfbed
add missing license header
cziegeler Jun 23, 2016
9a4abe5
Support handling of defaultValue()
bosschaert Jun 23, 2016
eb512a8
Revert rev 1749869
cziegeler Jun 23, 2016
2a5ecf8
FELIX-5248 missing license header
djencks Jun 23, 2016
ea55660
FELIX-5270 log when bundle locations are inconsistent
djencks Jun 23, 2016
e6a411f
Felix converter service - additional Character conversions
bosschaert Jun 26, 2016
2385224
Better support for Character array conversions.
bosschaert Jun 29, 2016
9afe354
Felix Converter Service: Fix bug in collection handling.
bosschaert Jun 29, 2016
b31c92e
Felix Converter Service - added some support for exceptions and defau…
bosschaert Jun 29, 2016
179daf0
Felix Converter Service: implement some special cases as adapters and…
bosschaert Jun 29, 2016
9b48cfb
FELIX-5256 Also push through null of unknown type
djencks Jun 30, 2016
7102a41
Felix Converter Service - bring updated service API in.
bosschaert Jul 1, 2016
ba46714
Felix Converter Service - add service loader support
bosschaert Jul 1, 2016
8509019
Felix Converter Service - add static factory.
bosschaert Jul 1, 2016
73fcb63
Felix Converter Service - make ConverterFactory static as it should be.
bosschaert Jul 1, 2016
f5322a4
FELIX-5300 : ServiceComponentRuntime should not throw IllegalStateExc…
cziegeler Jul 4, 2016
28a4a8d
FELIX-5300 : ServiceComponentRuntime should not throw IllegalStateExc…
cziegeler Jul 4, 2016
a86dc42
[maven-release-plugin] prepare release org.apache.felix.scr-2.0.4
cziegeler Jul 5, 2016
2ea4e00
[maven-release-plugin] prepare for next development iteration
cziegeler Jul 5, 2016
ddba7b8
FELIX-5088 : CaseSensitiveDictionary should implement equals()
cziegeler Jul 5, 2016
8ae351b
Update changelog
cziegeler Jul 5, 2016
ad11a98
[maven-release-plugin] prepare release org.apache.felix.scr-2.0.4
cziegeler Jul 5, 2016
ee4b71f
[maven-release-plugin] prepare for next development iteration
cziegeler Jul 5, 2016
03e6752
FELIX-5301 : ConfigurationPlugin support is not spec compliant
cziegeler Jul 5, 2016
47573ff
Felix Converter Service - add the start of a simple JSON parser
bosschaert Jul 5, 2016
3a69b9b
Felix Converter Service - use the Json Parser with the decoder.
bosschaert Jul 5, 2016
1685ecf
Felix Converter Service - work on the JSON codec
bosschaert Jul 5, 2016
e8d8cbf
Felix Converter Service - start of Yaml decoder.
bosschaert Jul 5, 2016
0991aeb
Felix Converter Service - additional methods implemented for codecs.
bosschaert Jul 5, 2016
752d15e
[maven-release-plugin] prepare release org.apache.felix.scr.ext.anno-…
cziegeler Jul 6, 2016
b532ea4
[maven-release-plugin] prepare for next development iteration
cziegeler Jul 6, 2016
2f42abf
[maven-release-plugin] prepare release org.apache.felix.configadmin-1…
cziegeler Jul 6, 2016
1941f43
[maven-release-plugin] prepare for next development iteration
cziegeler Jul 6, 2016
e9c1f9d
[maven-release-plugin] prepare release org.apache.felix.scr.compat-1.0.4
cziegeler Jul 6, 2016
66f7f30
[maven-release-plugin] prepare for next development iteration
cziegeler Jul 6, 2016
0b1b02e
Update changelog
cziegeler Jul 6, 2016
89b442b
Felix Converter Service - fix a bug with improper recursion.
bosschaert Jul 7, 2016
e940e68
FELIX-5302 : NPE using Http Whiteboard
cziegeler Jul 8, 2016
fa0dfbd
FELIX-5304 : SERVICE_PID property should not be created
cziegeler Jul 11, 2016
461a402
FELIX-5304 : SERVICE_PID property should not be created
cziegeler Jul 11, 2016
7633391
[maven-release-plugin] prepare release org.apache.felix.scr.annotatio…
cziegeler Jul 11, 2016
9793f6d
[maven-release-plugin] prepare for next development iteration
cziegeler Jul 11, 2016
9715808
FELIX-5304 : SERVICE_PID property should not be created
cziegeler Jul 12, 2016
c580c9b
FELIX-5287 : [SSLFilter] use Integer.parseInt instead of Integer.valu…
cziegeler Jul 12, 2016
8c88f66
FELIX-5116 : Dump SCR component definitions broken. Apply additional …
cziegeler Jul 14, 2016
f4a2914
Update notice and dependencies
cziegeler Jul 15, 2016
e8f7cd1
[maven-release-plugin] prepare release maven-bundle-plugin-3.2.0
cziegeler Jul 15, 2016
213081c
[maven-release-plugin] prepare for next development iteration
cziegeler Jul 15, 2016
d5ce081
Use java 7 as bnd requires java 7 as well
cziegeler Jul 15, 2016
9dc9495
FELIX-5307 : Update jetty to 9.3.9.v20160517
cziegeler Jul 18, 2016
3e0440a
[maven-release-plugin] prepare release org.apache.felix.http.base-3.0.10
cziegeler Jul 18, 2016
7a16263
[maven-release-plugin] prepare for next development iteration
cziegeler Jul 18, 2016
46cb7b3
Update to released base 3.0.10
cziegeler Jul 18, 2016
32a0bbf
[maven-release-plugin] prepare release org.apache.felix.http.bridge-3…
cziegeler Jul 18, 2016
5003d26
[maven-release-plugin] prepare for next development iteration
cziegeler Jul 18, 2016
821c64d
Switch http.base to 3.0.11-SNAPSHOT after release
cziegeler Jul 18, 2016
e494cc8
Update to released base 3.0.10
cziegeler Jul 18, 2016
bd97e86
[maven-release-plugin] prepare release org.apache.felix.http.jetty-3.2.2
cziegeler Jul 18, 2016
1ba0a52
[maven-release-plugin] prepare for next development iteration
cziegeler Jul 18, 2016
2348c41
Switch http.base to 3.0.11-SNAPSHOT after release
cziegeler Jul 18, 2016
62f3e16
Use latest snapshot for testing
cziegeler Jul 18, 2016
9693945
[FELIX-5272] Fix builtin fg/bg job control commands
gnodet Jul 28, 2016
68396b1
Export the org.osgi.service.converter.util package.
bosschaert Jul 29, 2016
1753ae6
[FELIX-5085] Add missing easymock test dependency
gnodet Jul 29, 2016
f82fedc
FELIX-5315 (at least partial) fix, getting the correct ConfigAdmin fo…
djencks Aug 2, 2016
83dd371
FELIX-4923 : SslFilterResponse doesn 't take in account ssl-forward.h…
cziegeler Aug 2, 2016
20e2dcd
[maven-release-plugin] prepare release org.apache.felix.http.sslfilte…
cziegeler Aug 2, 2016
7ae4169
[maven-release-plugin] prepare for next development iteration
cziegeler Aug 2, 2016
325346c
FELIX-5317 : Use http whiteboard for filter registration
cziegeler Aug 2, 2016
239046f
FELIX-5316 Make sure PackageAdmin tracker can be opened, plus a lot o…
djencks Aug 2, 2016
371ae69
FELIX-5318 preliminary reformat
djencks Aug 3, 2016
170cf7a
FELIX-5318 Use lock rather than countdown latch to protect bundle sta…
djencks Aug 3, 2016
dba865e
Update changelog for 2.0.6
cziegeler Aug 3, 2016
0c3bad2
[maven-release-plugin] prepare release org.apache.felix.scr-2.0.6
cziegeler Aug 3, 2016
68edb81
[maven-release-plugin] prepare for next development iteration
cziegeler Aug 3, 2016
48b70d4
Felix Converter Service - support for annotations.
bosschaert Aug 4, 2016
adfb3cd
Add special cases for long and double
cziegeler Aug 4, 2016
bb49a6a
FELIX-5319 : HttpServiceRuntime provides incorrect info for service t…
cziegeler Aug 5, 2016
2c9ee05
FELIX-5319 : HttpServiceRuntime provides incorrect info for service t…
cziegeler Aug 5, 2016
65c73ad
[maven-release-plugin] prepare release org.apache.felix.http.sslfilte…
cziegeler Aug 8, 2016
3e2baf0
[maven-release-plugin] prepare for next development iteration
cziegeler Aug 8, 2016
0f1397d
FELIX-5321 : Include service.ranking of servlet context helpers in we…
cziegeler Aug 8, 2016
e43ca9a
FELIX-5321 : Include service.ranking of servlet context helpers in we…
cziegeler Aug 8, 2016
5c3eb4b
Slightly improve web console output
cziegeler Aug 9, 2016
441f032
[maven-release-plugin] prepare release org.apache.felix.http.base-3.0.12
cziegeler Aug 9, 2016
810d22b
[maven-release-plugin] prepare for next development iteration
cziegeler Aug 9, 2016
f47701c
Use http.base 3.0.12
cziegeler Aug 9, 2016
3b2df2e
[maven-release-plugin] prepare release org.apache.felix.http.jetty-3.2.4
cziegeler Aug 9, 2016
c02791d
[maven-release-plugin] prepare for next development iteration
cziegeler Aug 9, 2016
658d79d
Switch to http.base 3.0.13-SNAPSHOT
cziegeler Aug 9, 2016
de6d955
Use http.base 3.0.12
cziegeler Aug 9, 2016
f2ef022
[maven-release-plugin] prepare release org.apache.felix.http.bridge-3…
cziegeler Aug 9, 2016
0ee48da
[maven-release-plugin] prepare for next development iteration
cziegeler Aug 9, 2016
0d5e21e
Switch to http.base 3.0.13-SNAPSHOT
cziegeler Aug 9, 2016
b9e7985
FELIX-5305: Added testcase, based on the sample code provided by Jan …
Aug 10, 2016
afbd248
FELIX-5305: Fixed a bug where map field is cleared instead of being u…
Aug 10, 2016
d162929
FELIX-5323 : Event admin should export version 1.3.1 of org.osgi.serv…
cziegeler Aug 11, 2016
79e90d1
Update readme
cziegeler Aug 11, 2016
b3e4584
[maven-release-plugin] prepare release org.apache.felix.eventadmin-1.4.8
cziegeler Aug 11, 2016
49a6b3c
[maven-release-plugin] prepare for next development iteration
cziegeler Aug 11, 2016
0588b91
Felix Converter: initial support for DTOs
bosschaert Aug 11, 2016
dd348f2
FELIX-5325 Support embedded DTOs
bosschaert Aug 17, 2016
9eccf0e
Felix converter service. Add missing test class belonging to previous…
bosschaert Aug 17, 2016
e2c8c0f
Felix Converter Service: Support converting DTOs to JSON and back
bosschaert Aug 18, 2016
ebd3823
Register JSON and YAML codecs as services.
bosschaert Aug 19, 2016
5776e41
FELIX-5330 Double fields in Map if superclass shares a field name
bosschaert Aug 22, 2016
43e0107
FELIX-4881 : DOAP needs to provide <asfext:id> value for implements/S…
cziegeler Aug 22, 2016
5316725
Felix converter: more flexible adapters.
bosschaert Aug 22, 2016
ecc53d7
Update API source formatting
bosschaert Aug 23, 2016
9d8b5c9
FELIX-5309 : SslFilter: sendRedirect does not support deliberate prot…
cziegeler Aug 23, 2016
a367de1
[maven-release-plugin] prepare release org.apache.felix.http.sslfilte…
cziegeler Aug 25, 2016
d007a42
[maven-release-plugin] prepare for next development iteration
cziegeler Aug 25, 2016
13b805c
Felix Converter Service - move converter into a submodule
bosschaert Aug 25, 2016
b755f94
Felix Converter Service - Add codec module.
bosschaert Aug 25, 2016
e0d530e
Felix Convert - separated out codecs.
bosschaert Aug 25, 2016
0007df4
Felix Converter Service - Separate out codecs.
bosschaert Aug 25, 2016
694c124
Remove hardcoded dependency to ConverterImpl
bosschaert Aug 29, 2016
9d64f71
Apply the path for FELIX-5285.
cescoffier Aug 31, 2016
3114fb8
Felix Converter Service - fix NPE and add additional test
bosschaert Sep 6, 2016
0d48b81
FELIX-5339: Enhance the diagnostics API to retrieve missing custom de…
Sep 6, 2016
fadafb3
Rename getAdapter() to newAdapter()
bosschaert Sep 6, 2016
e24e64b
Felix Converter Service - Add Convert Result data class.
bosschaert Sep 6, 2016
7bda9fe
Felix Converter Service: fix some Javadoc
bosschaert Sep 7, 2016
f57e037
FELIX-5337: Do not include default objectClass in ServiceDependency f…
Sep 7, 2016
d541067
FELIX-5337: added test case for this issue.
Sep 7, 2016
f65dac3
Felix Converter Service - fix deep copy issues.
bosschaert Sep 7, 2016
fe28533
Felix Converter - simplify the Adapter API
bosschaert Sep 8, 2016
00d68a1
FELIX-5238: ConfigurationDependency should provide the setRequired() …
Sep 8, 2016
6a5ce2f
FELIX-5238: ConfigurationDependency should provide the setRequired() …
Sep 8, 2016
2d0040a
FELIX-5238: Added test case for optional configuration dependency ann…
Sep 8, 2016
982a77e
Felix Converter - Refactoring of the API
bosschaert Sep 8, 2016
be23bca
Felix Converter - remove META-INF/services resource
bosschaert Sep 8, 2016
be713ea
Felix Converter - rename codec to serializer
bosschaert Sep 8, 2016
22a76b5
Felix Converter - rename codec to serializer
bosschaert Sep 8, 2016
775c3a7
Felix Converter - rename codec to serializer
bosschaert Sep 8, 2016
446e2e2
Felix Converter - rename codec to serializer
bosschaert Sep 8, 2016
49b42fb
FELIX-5238: ConfigurationDependency should provide the setRequired() …
Sep 8, 2016
ec54be5
Felix Converter - Move to newer version of Maven Bundle plugin
bosschaert Sep 8, 2016
0d5e376
Deprecate annotations
cziegeler Sep 9, 2016
8787685
Felix Converter - Rename FunctionThrowsException to Function.
bosschaert Sep 10, 2016
2701685
FELIX-5344 : HTTP_WHITEBOARD_TARGET doesn't work reliably
cziegeler Sep 13, 2016
bd07a31
FELIX-5344 : HTTP_WHITEBOARD_TARGET doesn't work reliably
cziegeler Sep 13, 2016
b8ba199
Update snapshot dependency to latest Jetty
cziegeler Sep 13, 2016
1efe76f
FELIX-5344 : HTTP_WHITEBOARD_TARGET doesn't work reliably
cziegeler Sep 13, 2016
4f94903
Fix whiteboard manager usage
cziegeler Sep 15, 2016
1b976fc
FELIX-5345 : Incorrect encoding in metatype props file
cziegeler Sep 15, 2016
4fc8f08
FELIX-5345 : Incorrect encoding in metatype props file
cziegeler Sep 15, 2016
bcf1a78
FELIX-5350 - Deprecate SCR Annotations
cziegeler Sep 16, 2016
16f4153
FELIX-5328 : NoClassDefFound not wrapped in the ClassScanner
cziegeler Sep 16, 2016
ad0ddd1
Update changelog
cziegeler Sep 16, 2016
00aaeb0
Update changelog
cziegeler Sep 16, 2016
795bdc7
Update changelog
cziegeler Sep 16, 2016
8d68cb7
FELIX-5288 - Implement RFC 227 (R7 Update)
cziegeler Sep 16, 2016
6c99a87
FELIX-5288 - Implement RFC 227 (R7 Update)
cziegeler Sep 16, 2016
a736259
Move Configurator to trunk
cziegeler Sep 16, 2016
e469970
FELIX-5294 : Implement Configurator (RFC 218)
cziegeler Sep 16, 2016
896a40a
FELIX-5349 : add ManagedServiceFactory to HTTP service
cziegeler Sep 16, 2016
1d86a51
FELIX-5349 : add ManagedServiceFactory to HTTP service
cziegeler Sep 16, 2016
730a94f
FELIX-5349 : add ManagedServiceFactory to HTTP service
cziegeler Sep 16, 2016
add6baa
FELIX-5341 Exception thrown when field in Map missing from DTO
bosschaert Sep 16, 2016
e747b4b
[FELIX-5272] Upgrade to jline 3.0.0.M2
gnodet Sep 17, 2016
30ba902
FELIX-5349 : add ManagedServiceFactory to HTTP service. Apply 2nd pat…
cziegeler Sep 18, 2016
d982117
FELIX-5337: wait for 2 seconds before counting number of services bec…
Sep 18, 2016
d22c65a
FELIX-4384: committed improvement for the support of annotation inher…
Sep 18, 2016
cb257af
FELIX-5349 : add ManagedServiceFactory to HTTP service. Cleaning up c…
cziegeler Sep 19, 2016
bb703ad
[FELIX-5354] Implement Declarative Service Updates for R7 (RFC 222)
cziegeler Sep 19, 2016
65e286c
Fix debug logging
cziegeler Sep 19, 2016
0ab7fdd
FELIX-5349 : add ManagedServiceFactory to HTTP service. Cleaning up code
cziegeler Sep 20, 2016
27306c3
FELIX-5349 : add ManagedServiceFactory to HTTP service. Cleaning up code
cziegeler Sep 20, 2016
bc6a8fb
Felix Converter - move with(converter) from Serializer to (De)Seriali…
bosschaert Sep 21, 2016
9a572c4
Felix Converter - add a withContext() API to the (De)Serializing inte…
bosschaert Sep 21, 2016
5689de6
Update changelog for release.
karlpauls Sep 22, 2016
4043d52
[maven-release-plugin] prepare release org.apache.felix.resolver-1.10.0
karlpauls Sep 22, 2016
4f25b79
[maven-release-plugin] prepare for next development iteration
karlpauls Sep 22, 2016
84b6d09
Update changelog for release
karlpauls Sep 22, 2016
e3f90a1
Update dependencies for release
karlpauls Sep 22, 2016
1c4606b
Update changelog for release
karlpauls Sep 22, 2016
a8c78eb
[maven-release-plugin] prepare release org.apache.felix.framework-5.6.0
karlpauls Sep 22, 2016
9a83c07
[maven-release-plugin] prepare for next development iteration
karlpauls Sep 22, 2016
1fffbd7
Felix Prefs should declare a provided service capability
yrashk Sep 26, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
16 changes: 16 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.checkstyle
.classpath
.pmd
.project
.ruleset
.settings/
target/
*.iml
*.iws
*.ipr
velocity.log
maven-eclipse.xml
.externalToolBuilders
.idea/
*~
dependency-reduced-pom.xml
6 changes: 0 additions & 6 deletions build_run.sh

This file was deleted.

101 changes: 101 additions & 0 deletions bundlerepository.osgi-ct/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
<version>2.1</version>
<relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Apache Felix Bundle Repository - OSGi CT integration</name>
<description>
Bundle repository service OSGi CT integration. To run a Repository implementation in the
OSGi CT, a small integration layer needs to be provided by the implementation that knows
how to prime the repository with the provided repository xml file.
</description>
<artifactId>org.apache.felix.bundlerepository.osgi-ct</artifactId>
<version>2.0.3-SNAPSHOT</version>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/bundlerepository.osgi-ct</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/bundlerepository.osgi-ct</developerConnection>
<url>http://svn.apache.org/repos/asf/felix/trunk/bundlerepository.osgi-ct</url>
</scm>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>5.0.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>5.0.0</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<target>1.5</target>
<source>1.5</source>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.4</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Export-Package></Export-Package>
<Private-Package>org.apache.felix.bundlerepository.osgict</Private-Package>
<Bundle-Activator>org.apache.felix.bundlerepository.osgict.Activator</Bundle-Activator>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludeSubProjects>false</excludeSubProjects>
<useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
<useMavenDefaultExcludes>true</useMavenDefaultExcludes>
<excludes>
<param>doc/*</param>
<param>maven-eclipse.xml</param>
<param>.checkstyle</param>
<param>.externalToolBuilders/*</param>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.felix.bundlerepository.osgict;

import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Dictionary;
import java.util.Hashtable;

import org.apache.felix.bundlerepository.RepositoryAdmin;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Filter;
import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTracker;

/**
* This Activator implements the required glue between an OSGi Repository implementation and the
* OSGi CT. It is needed to prime the repository with the data needed by the CT and works as
* follows:
* <ul>
* <li>The CT registers a String service with as property {@code repository-xml}. This service is
* literally the repository XML needed by the test, and must be fed to the repository implementation.
* <li>When that's done this glue code registers another service with as property
* {@code repository-populated} to signal to the CT that the priming is done.
* </ul>
*/
public class Activator implements BundleActivator
{
private BundleContext bundleContext;
private ServiceTracker<String, String> repoXMLTracker;
private ServiceTracker<RepositoryAdmin, RepositoryAdmin> repoTracker;

public void start(BundleContext context) throws Exception
{
bundleContext = context;
Filter f = context.createFilter("(&(objectClass=java.lang.String)(repository-xml=*))");
repoXMLTracker = new ServiceTracker<String, String>(context, f, null) {
@Override
public String addingService(ServiceReference<String> reference)
{
try
{
String xml = super.addingService(reference);
handleRepositoryXML(reference, xml);
return xml;
}
catch (Exception e)
{
throw new RuntimeException(e);
}
}
};
repoXMLTracker.open();
}

public void stop(BundleContext context) throws Exception
{
repoXMLTracker.close();
if (repoTracker != null)
repoTracker.close();
}

private void handleRepositoryXML(ServiceReference<String> reference, String xml) throws Exception
{
File tempXMLFile = bundleContext.getDataFile("repo-" + reference.getProperty("repository-xml") + ".xml");
writeXMLToFile(tempXMLFile, xml);

repoTracker = new ServiceTracker<RepositoryAdmin, RepositoryAdmin>(bundleContext, RepositoryAdmin.class, null);
repoTracker.open();
RepositoryAdmin repo = repoTracker.waitForService(30000);
repo.addRepository(tempXMLFile.toURI().toURL());
tempXMLFile.delete();

Dictionary<String, Object> props = new Hashtable<String, Object>();
props.put("repository-populated", reference.getProperty("repository-xml"));
bundleContext.registerService(String.class, "", props);
}

private void writeXMLToFile(File tempXMLFile, String xml) throws IOException
{
FileOutputStream fos = new FileOutputStream(tempXMLFile);
try
{
fos.write(xml.getBytes());
}
finally
{
fos.close();
}
}
}
32 changes: 32 additions & 0 deletions bundlerepository/DEPENDENCIES
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
Apache Felix OSGi Bundle Repository
Copyright 2014 The Apache Software Foundation

This software was developed at the Apache Software Foundation
(http://www.apache.org) and may have dependencies on other
Apache software licensed under Apache License 2.0.

I. Included Third-Party Software

This product includes software from http://kxml.sourceforge.net.
Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
Licensed under BSD License.

This product includes software developed at
The OSGi Alliance (http://www.osgi.org/).
Copyright (c) OSGi Alliance (2000, 2012).
Licensed under the Apache License 2.0.

II. Used Third-Party Software

This product uses software developed at
The OSGi Alliance (http://www.osgi.org/).
Copyright (c) OSGi Alliance (2000, 2012).
Licensed under the Apache License 2.0.

This product uses software developed at
The Codehaus (http://www.codehaus.org)
Licensed under the Apache License 2.0.

III. License Summary
- Apache License 2.0
- BSD License
File renamed without changes.
19 changes: 19 additions & 0 deletions bundlerepository/LICENSE.kxml2
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
16 changes: 16 additions & 0 deletions bundlerepository/NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Apache Felix OSGi Bundle Repository
Copyright 2014 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.

This product includes software from http://kxml.sourceforge.net.
Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
Licensed under BSD License.

This product includes software developed at
The OSGi Alliance (http://www.osgi.org/).
Copyright (c) OSGi Alliance (2000, 2012).
Licensed under the Apache License 2.0.

Loading