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
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
6069588
Update dependencies after release
karlpauls Sep 22, 2016
8b3d577
Update changelog for release.
karlpauls Sep 22, 2016
5fb497b
Update dependencies for release
karlpauls Sep 22, 2016
260d8ef
[maven-release-plugin] prepare release org.apache.felix.main-5.6.0
karlpauls Sep 22, 2016
70769ad
[maven-release-plugin] prepare for next development iteration
karlpauls Sep 22, 2016
a9510f7
Update dependencies after release
karlpauls Sep 22, 2016
e1f7004
Update copyright year
karlpauls Sep 22, 2016
e78f955
Update changelogs for release
karlpauls Sep 22, 2016
562f8e0
Update dependencies for release
karlpauls Sep 22, 2016
1afd895
[maven-release-plugin] prepare release org.apache.felix.main.distribu…
karlpauls Sep 22, 2016
3d5c174
[maven-release-plugin] prepare for next development iteration
karlpauls Sep 22, 2016
1fe20bc
Update dependencies after release
karlpauls Sep 22, 2016
7d6d6d5
Update the security provider to work with the latest felix framework.
karlpauls Sep 22, 2016
3c21dc5
Update dependencies for release
karlpauls Sep 22, 2016
468a7d7
[maven-release-plugin] prepare release org.apache.felix.resolver-1.10.0
karlpauls Sep 22, 2016
2d031b5
[maven-release-plugin] prepare for next development iteration
karlpauls Sep 22, 2016
2e59dd2
Get USE_CACHEDURLS_PROPS in doPriv block to make it work with security.
karlpauls Sep 22, 2016
beb6e83
[maven-release-plugin] prepare release org.apache.felix.framework-5.6.0
karlpauls Sep 22, 2016
882f9a7
[maven-release-plugin] prepare for next development iteration
karlpauls Sep 22, 2016
e8f52d6
[maven-release-plugin] prepare release org.apache.felix.main-5.6.0
karlpauls Sep 22, 2016
8639e4d
[maven-release-plugin] prepare for next development iteration
karlpauls Sep 22, 2016
dec5992
[maven-release-plugin] prepare release org.apache.felix.main.distribu…
karlpauls Sep 22, 2016
723d986
[maven-release-plugin] prepare for next development iteration
karlpauls Sep 22, 2016
1a1be9c
Update changelog for release
karlpauls Sep 22, 2016
2bc8fbb
Don't fail on javadoc errors
karlpauls Sep 22, 2016
231a4cd
Prepare for release
karlpauls Sep 22, 2016
9a298c7
[maven-release-plugin] prepare release org.apache.felix.framework.sec…
karlpauls Sep 22, 2016
67aca7d
[maven-release-plugin] prepare for next development iteration
karlpauls Sep 22, 2016
8983ae1
Attach sources
karlpauls Sep 22, 2016
4dfe2b6
[maven-release-plugin] prepare release org.apache.felix.framework.sec…
karlpauls Sep 22, 2016
d6642ea
[maven-release-plugin] prepare for next development iteration
karlpauls Sep 22, 2016
a4a1d55
Update to felix parent 3
karlpauls Sep 22, 2016
2f11260
[maven-release-plugin] prepare release org.apache.felix.framework.sec…
karlpauls Sep 22, 2016
ce28544
[maven-release-plugin] prepare for next development iteration
karlpauls Sep 22, 2016
efb917b
Update dependencies after release
karlpauls Sep 22, 2016
1e321d4
Felix Converter Service - migrate adapter to builder pattern
bosschaert Sep 22, 2016
733f0cf
Felix Converter - reformatted the converter API package
bosschaert Sep 22, 2016
473b60b
Felix Converter: additional tests.
bosschaert Sep 23, 2016
aa4317a
FELIX-5274: remove callback fails after manually removing dynamic dep…
Sep 24, 2016
63f5cca
Use less locking in URL handlers in order to speed up urls under conc…
karlpauls Sep 25, 2016
9cce8db
FELIX-5274: Uncommitted the patch, which seems to break amdatu-remote…
Sep 26, 2016
e6beccf
Rename osgi.codec.mimetype property to mimetype
bosschaert Sep 26, 2016
0ad82ec
FELIX-5332 Schematizer
bosschaert Sep 26, 2016
6e78e08
Felix Converter - tidy up pom
bosschaert Sep 26, 2016
5696cb5
FELIX-5358 Cannot deserialize empty Map
bosschaert Sep 26, 2016
2ae4687
Rename AdapterTest to ConverterBuilderTest
bosschaert Sep 27, 2016
1e57772
Felix Converter - move Calendar and Date conversions in
bosschaert Sep 27, 2016
9e6b14b
Felix Converter - additional unit test
bosschaert Sep 27, 2016
43dfbf8
Felix Converter - additional YAML serializer unit test
bosschaert Sep 27, 2016
70e7c16
FELIX-5274: avoid the state maching to be reentrant.
Sep 27, 2016
b6ba2fa
Felix Converter - fix an issue with converting to a generics based type
bosschaert Sep 27, 2016
f970120
Felix Converter - additional YAML serializer testing.
bosschaert Sep 27, 2016
fd4ecbe
Felix Converter - additional YAML support
bosschaert Sep 27, 2016
da7a201
[gogo-jline] Make sure not() function actually returns a value
gnodet Sep 27, 2016
055494d
[gogo-jline] Fix uri resolution from shell init script
gnodet Sep 27, 2016
bfe14fc
FELIX-5366 : Additional Unit Tests for ConfigurationHandler. Apply pa…
cziegeler Sep 30, 2016
fe54b86
FELIX-5367 : Update Jetty to 9.3.12.v20160915
cziegeler Sep 30, 2016
147a6e2
[maven-release-plugin] prepare release org.apache.felix.http.base-3.0.14
cziegeler Sep 30, 2016
4ec37d0
[maven-release-plugin] prepare for next development iteration
cziegeler Sep 30, 2016
efbf8cc
Use released base 3.0.14
cziegeler Sep 30, 2016
d296f13
[maven-release-plugin] prepare release org.apache.felix.http.bridge-3…
cziegeler Sep 30, 2016
5aa92a1
[maven-release-plugin] prepare for next development iteration
cziegeler Sep 30, 2016
c2fc775
Switch back to base 3.0.15-SNAPSHOT
cziegeler Sep 30, 2016
2f574ef
Use released base 3.0.14
cziegeler Sep 30, 2016
9a5d112
[maven-release-plugin] prepare release org.apache.felix.http.jetty-3.3.0
cziegeler Sep 30, 2016
fc1e85f
[maven-release-plugin] prepare for next development iteration
cziegeler Sep 30, 2016
1c14fd7
Switch back to base 3.0.15-SNAPSHOT
cziegeler Sep 30, 2016
66f6f44
Use latest jetty snapshot 3.3.1-SNAPSHOT
cziegeler Sep 30, 2016
a741f4a
[gogo-runtime] Downgrade the requirement to java 7 for wider adoption
gnodet Oct 3, 2016
5309ffa
Correct NOTICE, DEPENDENCIES, and LICENSE
cziegeler Oct 5, 2016
308f3a1
[FELIX-5247] Reduce number of threads created by Resolver during a st…
gnodet Oct 5, 2016
c0467e6
Use correct copyright year and add missing NOTICE file
cziegeler Oct 5, 2016
20fe39d
[maven-release-plugin] prepare release org.apache.felix.http.base-3.0.16
cziegeler Oct 5, 2016
0744de9
[maven-release-plugin] prepare for next development iteration
cziegeler Oct 5, 2016
34f6b47
Switch to base 3.0.16 for release
cziegeler Oct 5, 2016
fd55616
[maven-release-plugin] prepare release org.apache.felix.http.bridge-3…
cziegeler Oct 5, 2016
3f20728
[maven-release-plugin] prepare for next development iteration
cziegeler Oct 5, 2016
6c44498
[maven-release-plugin] prepare release org.apache.felix.http.jetty-3.4.0
cziegeler Oct 5, 2016
999c922
[maven-release-plugin] prepare for next development iteration
cziegeler Oct 5, 2016
d53e9af
Use latest snapshots after release
cziegeler Oct 5, 2016
cc61d17
FELIX-5369 : Metatype Service Inventory Printer json export fails on …
cziegeler Oct 6, 2016
1d3be06
[gogo-jline] Adapt to gogo-runtime changes for JDK7 compat
gnodet Oct 7, 2016
849e7f7
[gogo-runtime] Add a noglob option to disable filename generation
gnodet Oct 7, 2016
20ca38a
[FELIX-5370] Error parsing clauses with values containing ':='
gnodet Oct 7, 2016
18399a8
[FELIX-5372] BundleWiring#getClassLoader should return null for fragm…
gnodet Oct 7, 2016
becefa2
[maven-release-plugin] prepare release org.apache.felix.utils-1.8.4
gnodet Oct 7, 2016
5ed0636
[maven-release-plugin] prepare for next development iteration
gnodet Oct 7, 2016
57b836c
[fileinstall] Upgrade to latest utils snapshot
gnodet Oct 7, 2016
4f4c7c3
[maven-release-plugin] prepare release org.apache.felix.fileinstall-3…
gnodet Oct 7, 2016
edd6913
[maven-release-plugin] prepare for next development iteration
gnodet Oct 7, 2016
22539e4
FELIX-5364 : Felix Prefs does not declare a capability it provides. A…
cziegeler Oct 9, 2016
6034fb8
Update to latest parent, use latest maven bundle plugin, clean up con…
cziegeler Oct 9, 2016
acee155
FELIX-5371 : ComponentDescriptorIO.java relies on XML tags order
cziegeler Oct 9, 2016
d2c635f
Felix Converter - rename org.osgi.service.converter to org.osgi.conve…
bosschaert Oct 10, 2016
0dbfe92
Update pom, use newer dependencies, use generics, add a simple test case
cziegeler Oct 10, 2016
c25cb3e
Felix Converter - initial implementation of supporting the as() method.
bosschaert Oct 10, 2016
fe56afc
Felix Converter - update ProviderType/ConsumerType annotations
bosschaert Oct 10, 2016
f3eee65
Felix Converter - some renaming on the Function interface.
bosschaert Oct 10, 2016
e94dabd
Felix Converter - Refactor some Javadoc.
bosschaert Oct 10, 2016
c8d86b2
No jira: reduce log level for SCR noting the absence of MetaType to i…
bimargulies Oct 10, 2016
f49416e
Felix converter - fix typo
bosschaert Oct 10, 2016
a26575e
FELIX-5377 : Getting childnode names should not perform sync
cziegeler Oct 10, 2016
6a4a399
FELIX-2984 : org.osgi.service.log should not be mandatory
cziegeler Oct 10, 2016
719277f
Felix Converter - Support as() in customized converters.
bosschaert Oct 11, 2016
8f6e017
@Ignore two tests that expect objects to be treated as a DTO which ar…
bosschaert Oct 11, 2016
18a70b9
Update to latest converter changes
cziegeler Oct 11, 2016
8151f36
FELIX-5356 - fix for Component Factory and CM factory Configurations …
tjwatson Oct 11, 2016
ea7631c
FELIX-5360 - remove loading of gogo Descriptor class
tjwatson Oct 11, 2016
fae7357
[gogo] Upgrade packages and bundles versions to 1.0.0
gnodet Oct 11, 2016
f4a7f5a
[maven-release-plugin] prepare release gogo-reactor-1.0.0
gnodet Oct 11, 2016
19a5be8
[maven-release-plugin] prepare for next development iteration
gnodet Oct 11, 2016
08384f6
[gogo] Upgrade parent to felix 4 parent
gnodet Oct 11, 2016
08a6b74
[maven-release-plugin] prepare release 1.0.0
gnodet Oct 11, 2016
9211282
[maven-release-plugin] prepare for next development iteration
gnodet Oct 11, 2016
f75273f
[maven-release-plugin] prepare release org.apache.felix.prefs-1.1.0
cziegeler Oct 12, 2016
420e36a
Correct pom after failed release
cziegeler Oct 12, 2016
f9a161e
[maven-release-plugin] prepare release org.apache.felix.prefs-1.1.0
cziegeler Oct 12, 2016
300cab4
[maven-release-plugin] prepare for next development iteration
cziegeler Oct 12, 2016
6923106
FELIX-5379 : Http Service is not unregistered / restarted if Jetty is…
cziegeler Oct 12, 2016
f60f7aa
FELIX-5379 : Http Service is not unregistered / restarted if Jetty is…
cziegeler Oct 12, 2016
92d73af
FELIX-5373 : Improve failure message when enabling metatype and using…
cziegeler Oct 12, 2016
4e30e2d
FELIX-5373 : Improve failure message when enabling metatype and using…
cziegeler Oct 12, 2016
76309e8
FELIX-5373 : Improve failure message when enabling metatype and using…
cziegeler Oct 12, 2016
edf75b0
FELIX-5373 : Improve failure message when enabling metatype and using…
cziegeler Oct 12, 2016
faec2e7
Prepare SCR Tooling release
cziegeler Oct 13, 2016
13495bd
[maven-release-plugin] prepare release org.apache.felix.scr.annotatio…
cziegeler Oct 13, 2016
3f9b796
[maven-release-plugin] prepare for next development iteration
cziegeler Oct 13, 2016
f66ec18
[maven-release-plugin] prepare release org.apache.felix.scr.generator…
cziegeler Oct 13, 2016
7fa0a5c
[maven-release-plugin] prepare for next development iteration
cziegeler Oct 13, 2016
54ec416
[maven-release-plugin] prepare release maven-scr-plugin-1.23.0
cziegeler Oct 13, 2016
2f1c682
[maven-release-plugin] prepare for next development iteration
cziegeler Oct 13, 2016
22ba322
[maven-release-plugin] prepare release org.apache.felix.scr.ant-1.16.0
cziegeler Oct 13, 2016
f6e2b8c
[maven-release-plugin] prepare for next development iteration
cziegeler Oct 13, 2016
dfd3c25
[maven-release-plugin] prepare release org.apache.felix.scr.bnd-1.6.0
cziegeler Oct 13, 2016
1c27438
[maven-release-plugin] prepare for next development iteration
cziegeler Oct 13, 2016
1f4a46e
Switch back to snapshot references after release
cziegeler Oct 13, 2016
57e4f9f
Felix Converter - rename org.osgi.converter to org.osgi.util.converter
bosschaert Oct 18, 2016
042b04f
Felix Converter - Support specifying a target view class.
bosschaert Oct 18, 2016
3b1ce6b
Felix Converter - some refactoring
bosschaert Oct 18, 2016
96f2e8b
Felix Converter - additional refactoring
bosschaert Oct 18, 2016
034fa7b
Small Javadoc edit.
bosschaert Oct 18, 2016
444c67a
[FELIX-5380] Reduce quite useless log verbosity, keep log entries cau…
gnodet Oct 18, 2016
1e8e623
[FELIX-5385] ConfigAdmin uses wrong security when calling ManagedServ…
gnodet Oct 20, 2016
e153a58
[FELIX-5384] EventDispatcher#createWhitelistFromHooks fails under sec…
gnodet Oct 20, 2016
d3633e6
FELIX-5368 : ConfigurationManager ignores NotCachablePersistenceManag…
cziegeler Oct 21, 2016
f289ff3
Create branch for configadmin 1.8.x
cziegeler Oct 21, 2016
5be847c
Create branch for 1.8.x release
cziegeler Oct 21, 2016
927f246
Start 1.9.0 branch for R7
cziegeler Oct 21, 2016
c6e3695
Update changelog
cziegeler Oct 21, 2016
046480b
Port changes from main branch to 1.8.x branch
cziegeler Oct 21, 2016
119d923
[FELIX-5384] EventDispatcher#createWhitelistFromHooks fails under sec…
karlpauls Oct 21, 2016
1102065
Cleanup StatefulResolver a bit
karlpauls Oct 21, 2016
015bbda
Don't shutdown resolver executor for now as it happens in the wrong p…
karlpauls Oct 21, 2016
ad9bd05
Update changelog for release
karlpauls Oct 21, 2016
1cbf247
Update to latest obr version 2.0.8
karlpauls Oct 21, 2016
5bc3e00
Update changelog for release
karlpauls Oct 21, 2016
2890724
Update changelog for release
karlpauls Oct 21, 2016
29ffdb7
Downgrad dependencies for release
karlpauls Oct 21, 2016
113623d
[maven-release-plugin] prepare release org.apache.felix.framework-5.6.1
karlpauls Oct 21, 2016
712611a
[maven-release-plugin] prepare for next development iteration
karlpauls Oct 21, 2016
f97f009
Upgrade dependencies after release
karlpauls Oct 21, 2016
502b1d0
Update to framework 5.6.1
karlpauls Oct 21, 2016
0b946a6
[maven-release-plugin] prepare release org.apache.felix.main-5.6.1
karlpauls Oct 21, 2016
8da24f1
[maven-release-plugin] prepare for next development iteration
karlpauls Oct 21, 2016
addecda
Upgrade dependencies after release
karlpauls Oct 21, 2016
68ce852
Update to framework 5.6.1
karlpauls Oct 21, 2016
0da07ba
[maven-release-plugin] prepare release org.apache.felix.main.distribu…
karlpauls Oct 21, 2016
28e82da
[maven-release-plugin] prepare for next development iteration
karlpauls Oct 21, 2016
2d9a034
Upgrade dependencies after release
karlpauls Oct 21, 2016
3982306
Sync with master branch
cziegeler Oct 22, 2016
f1c3da0
[maven-release-plugin] prepare release org.apache.felix.configadmin-1…
cziegeler Oct 22, 2016
9a1b62e
[maven-release-plugin] prepare for next development iteration
cziegeler Oct 22, 2016
fe959e5
Update to use latest Felix framework for pax testing
cziegeler Oct 25, 2016
1b4c6e3
Update to use latest Felix framework for pax testing
cziegeler Oct 25, 2016
1e21032
FELIX-5387 : NPE for requests missing 'felix-webconsole-locale' cookie
cziegeler Oct 25, 2016
bbaae28
Refactor util class and make private
bosschaert Oct 27, 2016
fbe5893
Felix Converter - add copy() method to the API
bosschaert Oct 27, 2016
4415705
Felix Converter - take Function from org.osgi.util.function (latest v…
bosschaert Oct 27, 2016
cca7001
Felix Converter - additional information for converter rules
bosschaert Oct 28, 2016
363836a
[FELIX-5389] NullPointerException in Candidates#prepare() method
tjwatson Nov 2, 2016
71133b5
[FELIX-5390] general clean up of code
tjwatson Nov 2, 2016
a7255a7
Update changelog for release
karlpauls Nov 3, 2016
714afa2
[maven-release-plugin] prepare release org.apache.felix.resolver-1.10.1
karlpauls Nov 3, 2016
dcd72da
[maven-release-plugin] prepare for next development iteration
karlpauls Nov 3, 2016
3070c4e
FELIX-5399: Added test cases for 5399 issue.
Nov 6, 2016
fcb3833
FELIX-5399: Make sure default map or list values specified in configu…
Nov 6, 2016
28522b1
FELIX-5400: added test case for 5400 issue.
Nov 6, 2016
e82cca2
FELIX-5400: Can't override default configuration type list value usin…
Nov 6, 2016
cd816d9
FELIX-5401: Added test for 5401 issue.
Nov 6, 2016
b4b2e1b
FELIX-5401: Can't override default configuration type map value using…
Nov 6, 2016
1087e9f
FELIX-5355: added test case for support of dots in configuration prox…
Nov 6, 2016
f1ecd4d
FELIX-5355: Allow to use properties having dots with configuration pr…
Nov 6, 2016
9807dcd
FELIX-5395 Use gogo 1.0.0 with JLine support as default in the Felix …
bosschaert Nov 8, 2016
1af1d13
FELIX-5402: Factory configuration adapter ignores factory method.
Nov 8, 2016
915fbb4
FELIX-5403: Improve the Javadoc for org.apache.felix.dm.ComponentStat…
Nov 9, 2016
de0ba58
FELIX-5403: enhanced javadoc.
Nov 9, 2016
53d1622
FELIX-5403: Added STARTING/STARTED/STOPPING/STOPPED events in Compone…
Nov 10, 2016
e55913e
FELIX-5405: Do not have org.apache.felix.dm.Logger invoke toString() …
Nov 10, 2016
0187320
FELIX-5403: Removed the STARTED event in ComponentState because it is…
Nov 10, 2016
402cc7d
FELIX-5407: DM annotation plugin generates temp log files even if log…
Nov 10, 2016
5f5aacc
FELIX-5406: DM lambda fluent service properties don't support dots.
Nov 10, 2016
0dbb924
FELIX-5409: Parallel DM should not stop components asynchronously.
Nov 10, 2016
3777797
FELIX-5337: Reverted the patch to the previous version because it bre…
Nov 11, 2016
989adb1
FELIX-5337: Filter-based dependencies working differently for annotat…
Nov 12, 2016
19f71c2
FELIX-5337: Added test which dump all services with a filter.
Nov 12, 2016
1cd05a5
FELIX-5406: DM lambda fluent service properties don't support dots.
Nov 13, 2016
c40bca5
Felix Converter - report path when calling convert function.
bosschaert Nov 13, 2016
a862ba8
FELIX-5411: Added test case for this issue.
Nov 13, 2016
689529a
FELIX-5411: When you stop a component, the service references are not…
Nov 13, 2016
daf075a
FELIX-5411: Ensure we don't unget the service reference twice.
Nov 13, 2016
ad1083f
Felix Converter - fix failing tests
bosschaert Nov 14, 2016
ef4ca6f
Felix Converter - Add Converting Type Settings interface.
bosschaert Nov 15, 2016
d31e2a6
Felix Converter - convert targetAsType() to target() APIs
bosschaert Nov 15, 2016
103ddc0
Felix Converter - reformat some interfaces.
bosschaert Nov 15, 2016
a11dc6d
Felix Converter - Fix Java Bean handling.
bosschaert Nov 15, 2016
beb9f33
FELIX-5391 AbstractMethodError in bundlerepository due to wrong impor…
bosschaert Nov 16, 2016
98a968b
FELIX-5418: update to work with gogo 1.0.0.
bimargulies Nov 17, 2016
7623a2c
Felix Converter - Additional Unit Test
bosschaert Nov 18, 2016
3812f7e
FELIX-5422: more date formats in lite.
bimargulies Nov 21, 2016
3e7ea45
FELIX-5422: handle another exception while retrying date formats.
bimargulies Nov 22, 2016
3af2d07
Prepare to release httplite by making it into a conventional
bimargulies Nov 22, 2016
e7bcbc3
FELIX-5424 - Maven plugin - Add metadata for exported services
paoloantinori Nov 23, 2016
bdc3af2
FELIX-5424 - Maven plugin - Add metadata for exported services
paoloantinori Nov 23, 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