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
ede14e1
FELIX-5428: reverted previous patch, because actually the handleRemov…
Nov 25, 2016
40626f4
FELIX-5428: renamed FELI5428_CleanupDependenciesWhenComponentIsStoppe…
Nov 25, 2016
4325905
FELIX-4226: Added test cases for the issue. Notice that for FELIX5426…
Nov 25, 2016
db848bb
FELIX-5274: remove callback fails after manually removing dynamic dep…
Nov 25, 2016
957a3ea
FELIX-5226: made the test more robust.
Nov 26, 2016
2fe7c0d
FELIX-5429: Added test case for this issue.
Nov 26, 2016
bc16a54
FELIX-5429: do not invoke swap callback in case state is INSTANTIATED…
Nov 26, 2016
fd5e605
FELIX-5401: Added a missing null check in the updated callback, which…
Nov 26, 2016
b57e3a5
[FELIX-5133][fileinstall] Remove properties that are not present in u…
gnodet Nov 28, 2016
8afbac6
Felix converter - handle name mangling for DTOs
bosschaert Nov 28, 2016
055aa73
[FELIX-5433] Interrupting a job should interrupt its children
gnodet Nov 30, 2016
c4133ab
[gogo runtime] Remove unneeded synchronization
gnodet Nov 30, 2016
48c3df9
[utils] Fix requirement on JDK 6
gnodet Nov 30, 2016
506f823
[utils] Remove unused import
gnodet Nov 30, 2016
e766703
[FELIX-5434] Add an update method to Properties
gnodet Nov 30, 2016
304f09a
Felix Converter - update API with changes from OSGi
bosschaert Dec 1, 2016
53b0189
Felix Converter - add generics to Converting.to(Type)
bosschaert Dec 2, 2016
7107a18
FELIX-5432: Message when dependency is already added to a component i…
Dec 4, 2016
5698aeb
FELIX-5436: do not log 'callback not found' in case the method invoca…
Dec 4, 2016
5444734
[FELIX-5440] [gogo] Do not print results at end of pipe
gnodet Dec 6, 2016
30ddde0
[FELIX-5441] [gogo] Do not print stack traces when inspection can not…
gnodet Dec 6, 2016
a901701
[FELIX-5442] [gogo][jline] The gosh_script can not resolve the motd f…
gnodet Dec 6, 2016
3e7441f
FELIX-5400: Adding missing null check on the cnf argument in the MyCo…
Dec 9, 2016
3c9f08b
[FELIX-5392] Move obr gogo command to bundlerepository bundle
gnodet Dec 12, 2016
32128b4
[FELIX-5447] - [gogo][jline] Command results should be printed by def…
gnodet Dec 12, 2016
675c3d2
[gogo][jline] Remove unneeded white space added by the highlighter
gnodet Dec 13, 2016
b2f11a7
[FELIX-5077] Gogo shell prints out nasty error on shutdown
gnodet Dec 13, 2016
7ff21be
[maven-release-plugin] prepare release org.apache.felix.gogo.runtime-…
gnodet Dec 13, 2016
0c25ff7
[maven-release-plugin] prepare for next development iteration
gnodet Dec 13, 2016
afc14fb
Prepare gogo jline release
gnodet Dec 13, 2016
ff478e8
[maven-release-plugin] prepare release org.apache.felix.gogo.jline-1.0.2
gnodet Dec 13, 2016
4036426
[maven-release-plugin] prepare for next development iteration
gnodet Dec 13, 2016
185972a
Prepare gogo command release
gnodet Dec 13, 2016
2639c22
[maven-release-plugin] prepare release org.apache.felix.gogo.command-…
gnodet Dec 13, 2016
198d22f
[maven-release-plugin] prepare for next development iteration
gnodet Dec 13, 2016
ee1266e
Change config admin dependency to 1.9.0
cziegeler Dec 14, 2016
d2757c4
FELIX-5446 : Http Service ignores Whiteboard Servlet API Listeners
cziegeler Dec 14, 2016
c84d518
Switch from YAML to JSON for configuration format
cziegeler Dec 15, 2016
b844e1e
[FELIX-5450] Fragments with multiple hosts can cause
tjwatson Dec 15, 2016
f0e78ad
FELIX-5404 : Annotation configurations default values are not conside…
cziegeler Dec 19, 2016
848b9e2
FELIX-5288 : Implement RFC 227 (R7 Update). Update to latest API changes
cziegeler Dec 19, 2016
c665f0a
FELIX-5288 : Implement RFC 227 (R7 Update). Update to latest API changes
cziegeler Dec 19, 2016
adb413b
Update to Config Admin RFC 227
cziegeler Dec 19, 2016
57184a4
[maven-release-plugin] prepare release org.apache.felix.fileinstall-3…
gnodet Dec 19, 2016
8761531
[maven-release-plugin] prepare for next development iteration
gnodet Dec 19, 2016
7ec7da3
FELIX-5445 : Web Console: Properly display non-string property arrays…
cziegeler Dec 19, 2016
35eb308
SLING-5451 : Input/Output streams not properly closed in org.apache.f…
cziegeler Dec 19, 2016
885030d
SLING-5452 : SCR bnd plugin fails when embedding jars with optional/e…
cziegeler Dec 19, 2016
c8863f1
FELIX-5419 : SCR Bnd Plugin does not work with bnd-maven-plugin: org.…
cziegeler Dec 19, 2016
4382d15
Update changelog
cziegeler Dec 19, 2016
1079fb0
Update changelog
cziegeler Dec 19, 2016
a4159cf
Update changelog
cziegeler Dec 19, 2016
a441b1b
Update changelog
cziegeler Dec 19, 2016
c5038e7
[maven-release-plugin] prepare release org.apache.felix.scr.generator…
cziegeler Dec 20, 2016
59f70ff
[maven-release-plugin] prepare for next development iteration
cziegeler Dec 20, 2016
05c5ac5
Use scr generator 1.16.0
cziegeler Dec 20, 2016
83cf25e
[maven-release-plugin] prepare release maven-scr-plugin-1.24.0
cziegeler Dec 20, 2016
251b81e
[maven-release-plugin] prepare for next development iteration
cziegeler Dec 20, 2016
eac8409
Switch back to scr generator snapshot dependency
cziegeler Dec 20, 2016
f4472f3
Use scr generator 1.16.0
cziegeler Dec 20, 2016
bec81b5
[maven-release-plugin] prepare release org.apache.felix.scr.ant-1.17.0
cziegeler Dec 20, 2016
672b893
[maven-release-plugin] prepare for next development iteration
cziegeler Dec 20, 2016
0615bde
Switch back to scr generator snapshot dependency
cziegeler Dec 20, 2016
fc76ffd
Use scr generator 1.16.0
cziegeler Dec 20, 2016
3ad6039
[maven-release-plugin] prepare release org.apache.felix.scr.bnd-1.7.0
cziegeler Dec 20, 2016
2834416
[maven-release-plugin] prepare for next development iteration
cziegeler Dec 20, 2016
a2fbc02
Switch back to scr generator snapshot dependency
cziegeler Dec 20, 2016
83b38ce
Felix Converter Schematizer - ignored two tests that need further inv…
bosschaert Dec 20, 2016
9a60737
Add JSMin for handling comments in json
cziegeler Dec 20, 2016
0c2b784
Delete empty directories
cziegeler Dec 21, 2016
d64f71d
FELIX-5404 : Annotation configurations default values are not conside…
cziegeler Dec 21, 2016
6177476
FELIX-5446 : Http Service ignores Whiteboard Servlet API Listeners
cziegeler Dec 21, 2016
4a0bea5
FELIX-5437 : Webconsole Ranking in the Http Jetty bundle is always ze…
cziegeler Dec 21, 2016
1c553ae
FELIX-5404 : Annotation configurations default values are not conside…
cziegeler Dec 21, 2016
89bffa2
FELIX-5458 : [R7] Improved ConfigurationPlugin Support
cziegeler Dec 21, 2016
86a3a3b
FELIX-5458 : [R7] Improved ConfigurationPlugin Support
cziegeler Dec 21, 2016
acb313a
FELIX-5354 : Implement Declarative Service Updates for R7 (RFC 222). …
cziegeler Dec 21, 2016
733581d
FELIX-5459 : Use Java 6 as minimum version
cziegeler Dec 21, 2016
baab0be
FELIX-5354 : Implement Declarative Service Updates for R7 (RFC 222). …
cziegeler Dec 21, 2016
2299346
[FELIX-5462] [gogo][runtime] Unable to add a converter using reflection
gnodet Dec 22, 2016
2f3aaa3
[FELIX-5463] [gogo][jline] The Main class should add a default Functi…
gnodet Dec 22, 2016
c16a84c
[FELIX-5465] [gogo][runtime] No way to concatenate arrays
gnodet Dec 22, 2016
b96eac8
Felix Converter. Add @Deprecated to unreleased OSGi API and add manda…
bosschaert Dec 23, 2016
c3fa588
update to latest snapshot or org.apache.felix.scr.generator
stefanseifert Dec 27, 2016
163da44
FELIX-5466 org.apache.felix.scr.bnd: Adding Target Source URL may lea…
stefanseifert Dec 27, 2016
438c47c
update changelog, set dependencies to latest released versions
stefanseifert Dec 27, 2016
62b41a4
fix javadoc error
stefanseifert Dec 27, 2016
f307201
[maven-release-plugin] prepare release org.apache.felix.scr.bnd-1.7.2
stefanseifert Dec 27, 2016
783538f
[maven-release-plugin] prepare for next development iteration
stefanseifert Dec 27, 2016
f5c599e
FELIX-5467: Do not create permutation of values for a service propert…
Dec 27, 2016
83dceb4
FELIX-5435 : Service does not get loaded with updated properties that…
cziegeler Dec 28, 2016
df09eb8
FELIX-5435 : Service does not get loaded with updated properties that…
cziegeler Dec 28, 2016
e51034e
FELIX-5468 : Refactor persistence handling (WiP)
cziegeler Dec 28, 2016
140c3b4
FELIX-5468 : Refactor persistence handling (WiP)
cziegeler Dec 28, 2016
1345a33
FELIX-5468 : Refactor persistence handling (WiP)
cziegeler Dec 28, 2016
43dc0d8
FELIX-5468 : Refactor persistence handling (WiP)
cziegeler Dec 28, 2016
db27e07
Update svn:ignore property
cziegeler Dec 28, 2016
679a2f7
Update svn:ignore property
cziegeler Dec 28, 2016
5e208ed
Add missing projects to reactor pom
cziegeler Dec 28, 2016
48df842
Fix pom warnings
cziegeler Dec 28, 2016
79bc744
Update cm event bridge project
cziegeler Dec 29, 2016
4da5868
FELIX-5443 : Frequent Changes cause UpdateThread to ConcurrentModific…
cziegeler Dec 29, 2016
c061a8a
FELIX-5443 : Frequent Changes cause UpdateThread to ConcurrentModific…
cziegeler Dec 29, 2016
f953aa6
FELIX-5468 : Refactor persistence handling (WiP)
cziegeler Dec 29, 2016
9bf9d5e
FELIX-5469: Methodcache system size property is not used. this a a re…
Dec 29, 2016
c67be47
FELIX-5291 : Improving Configuration Updates
cziegeler Dec 29, 2016
e1d1a70
Embed service tracker
cziegeler Dec 29, 2016
d310968
Correct typos in javadoc
cziegeler Dec 29, 2016
9c45330
FELIX-5290 : [R7] Locking Configuration Records
cziegeler Dec 29, 2016
a127201
Embed json parsing lib
cziegeler Dec 29, 2016
c13d513
Add tests for config util
cziegeler Dec 29, 2016
5cd3671
FELIX-5471: added test case for this issue.
Dec 30, 2016
ab659c4
FELIX-5471: Make sure dependency remove event is always handled synch…
Dec 30, 2016
8557e4f
FELIX-5471: do not use the threadpool (if one is configured) for depe…
Dec 30, 2016
0ecdf11
FELIX-5471: Fixed typo. No need to wait for execution of stop task in…
Dec 30, 2016
cb818c9
FELIX-5471: Fixed comments.
Dec 30, 2016
e6b9d88
FELIX-5471: Removed the timeout guard blocking code in ComponentImpl.…
Jan 2, 2017
ce8ee2c
FELIX-5471: fixed wrong test method names.
Jan 2, 2017
4f349e7
[maven-release-plugin] prepare release org.apache.felix.http.base-3.0.18
cziegeler Jan 3, 2017
fa9de86
[maven-release-plugin] prepare for next development iteration
cziegeler Jan 3, 2017
aa258e6
Use http.base 3.0.18
cziegeler Jan 3, 2017
55e184b
[maven-release-plugin] prepare release org.apache.felix.http.bridge-3…
cziegeler Jan 3, 2017
64f3d31
[maven-release-plugin] prepare for next development iteration
cziegeler Jan 3, 2017
ed35707
Switch to http.base 3.0.19-SNAPSHOT
cziegeler Jan 3, 2017
da0e3f6
FELIX-5472 : Update to jetty 9.3.15.v20161220
cziegeler Jan 3, 2017
924dce6
[maven-release-plugin] prepare release org.apache.felix.http.jetty-3.4.2
cziegeler Jan 3, 2017
eb6e2e1
[maven-release-plugin] prepare for next development iteration
cziegeler Jan 3, 2017
e92ad21
Switch to latest http.jetty snapshot
cziegeler Jan 3, 2017
c747c25
Switch to http.base 3.0.19-SNAPSHOT
cziegeler Jan 3, 2017
17bf64b
Fix scm info
cziegeler Jan 3, 2017
b42a24b
FELIX-5296 : Implement Http Whiteboard Service Updates (RFC 223). App…
cziegeler Jan 3, 2017
4b847d5
Sync api
cziegeler Jan 3, 2017
1b29b9d
Add target to svn:ignore
cziegeler Jan 3, 2017
dea3514
Add target to svn:ignore
cziegeler Jan 3, 2017
976b52d
Felix Serializer - add support for doubles to JSON parser
bosschaert Jan 3, 2017
6cb90aa
FELIX-5296 : Implement Http Whiteboard Service Updates (RFC 223)
cziegeler Jan 4, 2017
8329525
[FELIX-5474] Do not call no-arg Bundle.getHeaders() method
tjwatson Jan 4, 2017
83ef5fb
FELIX-5471: added javadoc for the schedule method in ComponentImpl cl…
Jan 4, 2017
4f5b2df
Create branch for SCR 2.0.x
cziegeler Jan 5, 2017
b3d54bd
Update scr version to 2.1.0-SNAPSHOT
cziegeler Jan 5, 2017
a6da8e8
Revert R7 changes
cziegeler Jan 5, 2017
ae1253f
Revert R7 changes
cziegeler Jan 5, 2017
4e6cfcb
Update changelog
cziegeler Jan 5, 2017
1bc6639
Update changelog
cziegeler Jan 5, 2017
2d2430a
Update changelog
cziegeler Jan 5, 2017
5fd7e85
FELIX-5454 : [R7] Service properties for ComponentFactory
cziegeler Jan 5, 2017
615ef58
FELIX-5456 : [R7] Field injection of component activation objects
cziegeler Jan 6, 2017
753d0a2
prepare for next resolver maintenance release 1.10.2
tjwatson Jan 6, 2017
ff4daad
prepare for next development iteration for OSGi R7 resolver
tjwatson Jan 6, 2017
2a80d51
FELIX-5354 : Implement Declarative Service Updates for R7 (RFC 222)
cziegeler Jan 6, 2017
60728c8
FELIX-5454 : [R7] Service properties for ComponentFactory
cziegeler Jan 6, 2017
2f0c7fd
Use serializer service
cziegeler Jan 6, 2017
9da3443
Move R7 work to osgi-r7 directory
cziegeler Jan 6, 2017
af06e1a
Move R7 work to osgi-r7 directory
cziegeler Jan 6, 2017
2c95925
Move R7 work to osgi-r7 directory
cziegeler Jan 6, 2017
65a9a55
Move R7 work to osgi-r7 directory
cziegeler Jan 6, 2017
d3b9db5
Move R7 work to osgi-r7 directory
cziegeler Jan 6, 2017
badca1c
Move R7 work to osgi-r7 directory
cziegeler Jan 6, 2017
e35c666
FELIX-5482 - Contribute Resolver 1.1 implementation for OSGi R7
tjwatson Jan 6, 2017
81208e7
FELIX-5456 : [R7] Field injection of component activation objects
cziegeler Jan 9, 2017
61829b6
FELIX-5455 : [R7] Constructor Injection
cziegeler Jan 9, 2017
1dd99cb
FELIX-5455 : [R7] Constructor Injection
cziegeler Jan 9, 2017
1db0645
FELIX-5484 Webconsole configuration factory name hint array rendering…
stefanseifert Jan 9, 2017
660835c
FELIX-5354 : Implement Declarative Service Updates for R7 (RFC 222)
cziegeler Jan 10, 2017
71ba690
Use some more generics - no code change
cziegeler Jan 10, 2017
22cedd5
FELIX-5354 : Implement Declarative Service Updates for R7 (RFC 222)
cziegeler Jan 10, 2017
77d63fb
prepare release
stefanseifert Jan 10, 2017
ec1972e
[maven-release-plugin] prepare release org.apache.felix.webconsole-4.…
stefanseifert Jan 10, 2017
fe35a97
[maven-release-plugin] prepare for next development iteration
stefanseifert Jan 10, 2017
5b2ea2c
[FELIX-5486] [gogo][runtime] Avoid unnecessary conversions from strin…
gnodet Jan 11, 2017
d1e3a41
Update to latest spec version
cziegeler Jan 11, 2017
a288eef
Update change log
cziegeler Jan 12, 2017
85e7e2e
Update change log
cziegeler Jan 12, 2017
049dece
FELIX-5487 : Utils code requires Java 6 - should be Java 5
cziegeler Jan 12, 2017
c45f211
Fix javadoc errors with Java 8
cziegeler Jan 12, 2017
f1751d2
[maven-release-plugin] prepare release org.apache.felix.utils-1.8.6
cziegeler Jan 12, 2017
8f0f87e
[maven-release-plugin] prepare for next development iteration
cziegeler Jan 12, 2017
aa71361
Use utils 1.8.6
cziegeler Jan 12, 2017
9147a03
[maven-release-plugin] prepare release org.apache.felix.scr-2.0.8
cziegeler Jan 12, 2017
461e73e
Correct scm tag
cziegeler Jan 12, 2017
1346062
Correct scm info
cziegeler Jan 12, 2017
09183c5
Update scm info, update changelog
cziegeler Jan 12, 2017
d77de93
[maven-release-plugin] prepare release org.apache.felix.scr-2.0.8
cziegeler Jan 12, 2017
cb17d97
[maven-release-plugin] prepare for next development iteration
cziegeler Jan 12, 2017
7d404e2
Switch to 1.8.7-SNAPSHOT for utils during vote
cziegeler Jan 12, 2017
3d6f99c
Remove dependency to org.json
cziegeler Jan 13, 2017
039225c
FELIX-5488 : DS Plugin should use PID from ComponentDescriptionDTO
cziegeler Jan 13, 2017
c6d33d4
FELIX-5489 : Remove dependency to org.json
cziegeler Jan 13, 2017
dd97cb6
Update changelog
cziegeler Jan 13, 2017
be3af18
[maven-release-plugin] prepare release org.apache.felix.webconsole.pl…
cziegeler Jan 13, 2017
53999e3
[maven-release-plugin] prepare for next development iteration
cziegeler Jan 13, 2017
565649e
Update to latest config admin api
cziegeler Jan 13, 2017
e58efae
Add test case for field activation
cziegeler Jan 13, 2017
a86d000
Update field activation test
cziegeler Jan 13, 2017
98ac9dd
Clean up test code (replace deprecated usage, remove unused)
cziegeler Jan 13, 2017
8413563
Update to latest config admin changes
cziegeler Jan 16, 2017
970f854
[FELIX-5485] ServiceReference#getUsingBundles() returns usages with 0…
gnodet Jan 16, 2017
a6e129b
FELIX-5490 Update mime type in Schematizer
bosschaert Jan 16, 2017
0b5a205
FELIX-5493 : Component descriptions requiring a policy are not displa…
cziegeler Jan 16, 2017
f247da7
Update changelog
cziegeler Jan 16, 2017
96a66a0
Update field activation test
cziegeler Jan 17, 2017
10ea1f1
Use released utils 1.8.6
cziegeler Jan 17, 2017
9e5a793
FELIX-5496 : Use bundle id and component name as key for urls
cziegeler Jan 17, 2017
a638afd
[FELIX-5463] [gogo][jline] Fix possible NPE in converter
gnodet Jan 18, 2017
b888e5f
[FELIX-5498] [gogo][jline] The shell should display exception thrown …
gnodet Jan 18, 2017
57c1a5f
FELIX-5492 Schematizer POM requires updates
bosschaert Jan 18, 2017
e50e720
Remove dependency to json.org
cziegeler Jan 18, 2017
d9cf93f
[maven-release-plugin] prepare release org.apache.felix.webconsole.pl…
cziegeler Jan 18, 2017
c38738f
[maven-release-plugin] prepare for next development iteration
cziegeler Jan 18, 2017
9d99e2e
FELIX-5503 : Add simple json writer
cziegeler Jan 20, 2017
f2f2acc
FELIX-5491 Serializer should allow empty key/values pairs when parsing
bosschaert Jan 20, 2017
601e6e3
FELIX-5502 - Startup logs from ConfigSpiOsgi may get dropped due to r…
chetanmeh Jan 20, 2017
ba2ada6
FELIX-5505 - ConfigSpiOSGi may miss out on registering some LoginModu…
chetanmeh Jan 20, 2017
06da5e3
FELIX-5505 - ConfigSpiOSGi may miss out on registering some LoginModu…
chetanmeh Jan 20, 2017
2d6f701
Felix converter - update to the latest API with sourceAsDTO() and tar…
bosschaert Jan 20, 2017
bc325ae
FELIX-5503 : Add simple json writer
cziegeler Jan 21, 2017
94b4ca9
Updated Converter API from OSGi
bosschaert Jan 23, 2017
955ebf4
Felix Converter - support for the Converter.equals() method
bosschaert Jan 23, 2017
7db0cbb
FELIX-5475 Implement sourceAsDTO() and targetAsDTO()
bosschaert Jan 23, 2017
5869188
FELIX-5184 Regression: Native JNA bundle cannot be installed on Windo…
bosschaert Jan 24, 2017
93d4938
[maven-release-plugin] prepare release org.apache.felix.jaas-1.0.0
cziegeler Jan 24, 2017
82da19b
[maven-release-plugin] prepare for next development iteration
cziegeler Jan 24, 2017
cfd455e
FELIX-5504 : Switch from org.json to new simple json writer
cziegeler Jan 24, 2017
adc6276
FELIX-5509 - Remove method keyVal from WebConsoleUtil
cziegeler Jan 24, 2017
7c9fa9a
FELIX-5509 - Remove method keyVal from WebConsoleUtil
cziegeler Jan 24, 2017
c70ebeb
FELIX-5473 : [RFC 222] 5.3 Implement multipart handling
cziegeler Jan 26, 2017
49edf19
Update http whiteboard API [RFC 223] to latest draft. Git commit id 7…
cziegeler Jan 30, 2017
f07fe5e
[maven-release-plugin] prepare release org.apache.felix.configadmin-1…
cziegeler Jan 30, 2017
c358977
[maven-release-plugin] prepare for next development iteration
cziegeler Jan 30, 2017
9aaef81
compile with org.osgi.util.function 1.0
bosschaert Jan 30, 2017
f62a3f1
FELIX-5513 : Remove code for pre java 5
cziegeler Jan 31, 2017
2380cb2
Add constants for XML elements
cziegeler Feb 1, 2017
ce64a6c
Rename method
Feb 1, 2017
cec4353
FELIX-5503 : Add simple json writer
cziegeler Feb 1, 2017
88075f2
FELIX-5351 : 5.7 Coordinations
cziegeler Feb 1, 2017
f137cdd
FELIX-5460 : Update DTOs
cziegeler Feb 1, 2017
702e1e2
FELIX--5457 : Logger Support. Refactor bind methods to use ValueUtils
cziegeler Feb 1, 2017
5f9201c
FELIX--5457 : Logger Support. Remove additional SimpleLogger argument…
cziegeler Feb 2, 2017
2b28f44
FELIX--5457 : Logger Support. Support bind/unbind methods
cziegeler Feb 2, 2017
0ee26b8
FELIX--5457 : Logger Support. Support bind/unbind methods
cziegeler Feb 2, 2017
25e8ba3
FELIX--5457 : Logger Support. Use Mockito instead of EasyMock
cziegeler Feb 2, 2017
bc220d9
Test improvement: make sure there is no more threadpool activities be…
Feb 3, 2017
b74689d
[FELIX-5514] Issues with substituted exports with require bundle
tjwatson Feb 3, 2017
4775a14
FELIX_5471: fixed a bug in the tesst (the threadpool must be quiescen…
Feb 3, 2017
6e544e3
Create a directory per pid and url encode pid for creating the file
cziegeler Feb 5, 2017
180772e
Felix Converter - support dynamic maps that reflect changes in the ba…
bosschaert Feb 6, 2017
0abf055
Updated Converter API from OSGi
bosschaert Feb 6, 2017
50ec114
Felix Converter - remove equals() functionality.
bosschaert Feb 6, 2017
af437d1
(this is a big commit, sorry, I could not take time to commit separat…
Feb 6, 2017
669f0cb
[FELIX-5525] Allow to switch to java util logging using a framework p…
cschneider Feb 7, 2017
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