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
a743323
Add special error logging
cziegeler Sep 6, 2017
1569517
Check state of bundles on startup
cziegeler Sep 6, 2017
9d5b7e5
Fix sorting in some cases
gnodet Sep 6, 2017
d372b87
[FELIX-5642] Add unit test
gnodet Sep 6, 2017
22134f8
[FELIX-5306] Add unit test demonstrating reading floats from configur…
gnodet Sep 6, 2017
87a9e4d
Add some tests for TypedProperties
gnodet Sep 7, 2017
7a95a40
[FELIX-5688] TypedProperties#put method is not idempotent
gnodet Sep 7, 2017
3390ccf
[FELIX-5689] FileInstall always expand configuration files
gnodet Sep 7, 2017
1a202cd
[FELIX-5684] Set multi-location for created configurations
gnodet Sep 8, 2017
50799fb
[FELIX-5539] Directory Watcher leaks ZipInflater
gnodet Sep 8, 2017
df5d752
[FELIX-5448] Exceptions from bundle.start() should be logged, not swa…
gnodet Sep 8, 2017
1d902f3
[FELIX-4416] Ability to specify an encoding for config files
gnodet Sep 8, 2017
e009577
FELIX-5506 : OSGi's @Component parameter configurationPid is handled …
cziegeler Sep 8, 2017
7cad2cf
FELIX-5506 : OSGi's @Component parameter configurationPid is handled …
cziegeler Sep 8, 2017
24c7aee
[maven-release-plugin] prepare release org.apache.felix.scr.ds-annota…
cziegeler Sep 8, 2017
55ae9ec
[maven-release-plugin] prepare for next development iteration
cziegeler Sep 8, 2017
49fe4e3
[FELIX-5145] FileInstall writes .config files back with backslashes e…
gnodet Sep 8, 2017
58b4dbf
[FELIX-5306] User friendly syntax for floats and doubles in FileInstall
gnodet Sep 8, 2017
cda9260
[FELIX-4743] Have to escape '=' characters in quoted values in *.conf…
gnodet Sep 8, 2017
1c50681
[FELIX-4416] Also use the encoding when writing configurations
gnodet Sep 8, 2017
3451c3e
[maven-release-plugin] prepare release org.apache.felix.utils-1.10.2
gnodet Sep 8, 2017
9126f1f
[maven-release-plugin] prepare for next development iteration
gnodet Sep 8, 2017
a393263
Upgrade FileInstall to Utils 1.10.2 for release
gnodet Sep 8, 2017
424db79
[maven-release-plugin] prepare release org.apache.felix.fileinstall-3…
gnodet Sep 8, 2017
20242eb
[maven-release-plugin] prepare for next development iteration
gnodet Sep 8, 2017
7923c69
[maven-release-plugin] prepare release org.apache.felix.gogo.runtime-…
gnodet Sep 8, 2017
2b20f67
[maven-release-plugin] rollback the release of org.apache.felix.gogo.…
gnodet Sep 8, 2017
4ad4f0d
Add scm info
gnodet Sep 8, 2017
7a84d3b
[maven-release-plugin] prepare release org.apache.felix.gogo.runtime-…
gnodet Sep 8, 2017
e196967
[maven-release-plugin] prepare for next development iteration
gnodet Sep 8, 2017
6eccde7
[maven-release-plugin] prepare release org.apache.felix.gogo.jline-1.0.8
gnodet Sep 8, 2017
8ba614e
[maven-release-plugin] prepare for next development iteration
gnodet Sep 8, 2017
757eec8
[Converter] WriterFactory needs to be provided as a ServiceFactory
Sep 9, 2017
a5a3572
[FELIX-5691] Fix whitespace handling in TypedProperties
gnodet Sep 14, 2017
57ee181
[FELIX-5692] TypedProperties is missing a method to add a raw value
gnodet Sep 14, 2017
e8399b4
Switch to utils snapshot
gnodet Sep 14, 2017
557d61d
[http whiteboard] Add new error constants for file permission errors
cziegeler Sep 19, 2017
397ac58
[http whiteboard] Update error codes
cziegeler Sep 20, 2017
7ea68dd
Start implementing file permission checks
cziegeler Sep 20, 2017
bb88d48
Use correct access control context
cziegeler Sep 20, 2017
d183402
FELIX-5693 : Improve persistent manager handling
cziegeler Sep 20, 2017
33df29f
FELIX-5693 : Improve persistent manager handling
cziegeler Sep 20, 2017
fa0e6c7
FELIX-5693 : Improve persistent manager handling
cziegeler Sep 21, 2017
f8089b0
FELIX-5693 : Improve persistent manager handling
cziegeler Sep 21, 2017
4af52a6
FELIX-5693 : Improve persistent manager handling
cziegeler Sep 21, 2017
0968871
FELIX-5695 : Use Java 7 as base version
cziegeler Sep 22, 2017
ca01414
Add missing changelog for 2.0.12
cziegeler Sep 22, 2017
06c19e0
FELIX-5696 : Separate metatype provider from managed service
cziegeler Sep 22, 2017
bd7d99c
Update changelog
cziegeler Sep 22, 2017
4b62fe8
FELIX-5696 : Separate metatype provider from managed service
cziegeler Sep 22, 2017
c7631c2
FELIX-5697 : DS WebConsole Plugin should neither require Configuratio…
cziegeler Sep 22, 2017
32be6eb
Clean up code - no functional changes
cziegeler Sep 22, 2017
7289cde
FELIX-5701 : metatype.properties file must not be in OSGI-INF/metatype
cziegeler Sep 25, 2017
e2c69d4
FELIX-5700 : Metatype generation wrongly puts properties files into m…
cziegeler Sep 26, 2017
5bad719
FELIX-5700 : Metatype generation wrongly puts properties files into m…
cziegeler Sep 26, 2017
ea441a0
FELIX-5700 : Metatype generation wrongly puts properties files into m…
cziegeler Sep 26, 2017
40e0b39
[maven-release-plugin] prepare release org.apache.felix.scr.generator…
cziegeler Sep 26, 2017
4adb183
[maven-release-plugin] prepare for next development iteration
cziegeler Sep 26, 2017
1bcf1da
Use latest releases
cziegeler Sep 26, 2017
a37a032
[maven-release-plugin] prepare release org.apache.felix.scr.ant-1.18.0
cziegeler Sep 26, 2017
491c9ce
[maven-release-plugin] prepare for next development iteration
cziegeler Sep 26, 2017
b5bef42
Switch back to SNAPSHOTS
cziegeler Sep 26, 2017
be58038
Use latest releases
cziegeler Sep 26, 2017
a795470
[maven-release-plugin] prepare release org.apache.felix.scr.bnd-1.8.0
cziegeler Sep 26, 2017
1ddb46b
[maven-release-plugin] prepare for next development iteration
cziegeler Sep 26, 2017
e1a5580
Switch back to SNAPSHOTS
cziegeler Sep 26, 2017
6c2a4ea
Use latest releases
cziegeler Sep 26, 2017
1efaf45
[maven-release-plugin] prepare release maven-scr-plugin-1.25.0
cziegeler Sep 26, 2017
20c95f6
[maven-release-plugin] prepare for next development iteration
cziegeler Sep 26, 2017
bdbe00b
Use latest releases
cziegeler Sep 26, 2017
967504a
FELIX-5702 : All files in OSG-INF/metatype must be considered
cziegeler Sep 26, 2017
f65f845
FELIX-5702 : Plugin should work without configuration admin
cziegeler Sep 26, 2017
2ee570c
[maven-release-plugin] prepare release org.apache.felix.webconsole.pl…
cziegeler Sep 26, 2017
056a4fc
[maven-release-plugin] prepare for next development iteration
cziegeler Sep 26, 2017
e279d1a
[maven-release-plugin] prepare release org.apache.felix.webconsole.pl…
cziegeler Sep 26, 2017
d8ccab4
[maven-release-plugin] prepare for next development iteration
cziegeler Sep 26, 2017
6d6daee
Add some missing R6 methods.
karlpauls Sep 27, 2017
5a429bc
Compile converter for Java 7 while leaving the unit tests at Java 8
bosschaert Sep 27, 2017
e55929b
Switch to Java 7 as the base
cziegeler Sep 28, 2017
b6841e6
FELIX-5702 : All files in OSG-INF/metatype must be considered
cziegeler Sep 28, 2017
5b4b22f
[maven-release-plugin] prepare release org.apache.felix.metatype-1.1.6
cziegeler Sep 28, 2017
8bc31aa
[maven-release-plugin] prepare for next development iteration
cziegeler Sep 28, 2017
9fb531e
Move osgicheck plugin to trunk
cziegeler Oct 2, 2017
9178dc6
Add check plugin to reactor
cziegeler Oct 2, 2017
e18b4e4
Back to latest snapshot version
cziegeler Oct 2, 2017
90a32a1
[FELIX-5635][gogo][jline] The "cd" command should not attempt to comp…
gnodet Oct 2, 2017
9671a24
Update javadoc
cziegeler Oct 2, 2017
6b00a90
Fix permission checking
cziegeler Oct 2, 2017
ed54295
[FELIX-5704] SCR can't be wired to recent gogo-runtime versions
gnodet Oct 2, 2017
4c1696f
Use english locale to convert method names
gnodet Oct 3, 2017
1e1d7d6
[FELIX-5706] Unable to access DTO fields using reflection
gnodet Oct 3, 2017
65180be
[FELIX-5705] Provide completion for SCR commands
gnodet Oct 3, 2017
ff0cd15
FELIX-5707: don't require osname and processor parameters for native …
karlpauls Oct 6, 2017
51a61b3
FELIX-5709: Only return hosts in the HOST_NAMESPACE from PackageAdmin…
karlpauls Oct 6, 2017
c84626c
[CONVERTER] Added orderMap method to WriterFactory in Serializer and …
Oct 12, 2017
c51ed9a
[FELIX-5714] ArrayIndexOutOfBoundsException running history | grep
gnodet Oct 16, 2017
81cd1d7
[FELIX-5715] Central point to allow customization of security related…
gnodet Oct 16, 2017
dcddfa5
FELIX-5683: getServiceProperties returns null instead of empty dictio…
Oct 17, 2017
951c9af
[FELIX-4906] Changes in symlinked bundles not detected with NIO2 Watc…
gnodet Oct 18, 2017
44c8af9
[FELIX-5651] Disable log history in Gogo console
gnodet Oct 18, 2017
66df263
[maven-release-plugin] prepare release org.apache.felix.gogo.runtime-…
gnodet Oct 18, 2017
68196b3
[maven-release-plugin] prepare for next development iteration
gnodet Oct 18, 2017
6cbee34
[maven-release-plugin] prepare release org.apache.felix.gogo.jline-1.…
gnodet Oct 18, 2017
f01d98b
[maven-release-plugin] prepare for next development iteration
gnodet Oct 18, 2017
eee6eb4
FELIX-5720: Use PlatformClassLoader as default instead of boot classl…
karlpauls Oct 18, 2017
cb4b81c
FELIX-5719: add property substitution to eval of user defined system.…
karlpauls Oct 18, 2017
d30bb96
FELIX-5718: Autodetect java9 modules available.
karlpauls Oct 18, 2017
5092305
FELIX-5717: Add correct definitions of packages export from java9 sta…
karlpauls Oct 18, 2017
23fe084
FELIX-5721: Make javafx packages available by default on java9 if the…
karlpauls Oct 18, 2017
b13be7e
[FELIX-5686] NPE in ConfigInstaller on ConfigDelete
gnodet Oct 19, 2017
ef68447
[FELIX-4740] Bundles don't start if no BundleEvent fired after reachi…
gnodet Oct 19, 2017
149e44a
[FELIX-4661] FileInstall: Property "felix.fileinstall.filter" ignored…
gnodet Oct 19, 2017
2cb1968
[maven-release-plugin] prepare release org.apache.felix.utils-1.10.4
gnodet Oct 19, 2017
1f9605d
[maven-release-plugin] prepare for next development iteration
gnodet Oct 19, 2017
038e7c8
[maven-release-plugin] prepare release org.apache.felix.fileinstall-3…
gnodet Oct 19, 2017
b252496
[maven-release-plugin] prepare for next development iteration
gnodet Oct 19, 2017
b615452
FELIX-5719: Require felix.systempackages.substitution=true to enable …
karlpauls Oct 19, 2017
44f8ca7
Update to latest OSGi R7 API. OSGi commit id 8781e36834e238cac5831709…
cziegeler Oct 21, 2017
bdaf291
FELIX-5455 : [R7] Constructor Injection
cziegeler Oct 21, 2017
fbb94c3
FELIX-5455 : [R7] Constructor Injection. Update API/DTOs
cziegeler Oct 23, 2017
b63a456
[FELIX-5125] Possible NPE
gnodet Oct 23, 2017
062a695
FELIX-5725: Cache lookup of jdk.internal.reflection classes to preven…
karlpauls Oct 23, 2017
117d3db
Update to snapshot
gnodet Oct 23, 2017
1f98f29
[FELIX-5723] ConfigInstaller is not deleting files in the etc directory
gnodet Oct 23, 2017
7e91040
[FELIX-5726] Thread create by gogo should be named
gnodet Oct 23, 2017
cea2c79
Update changelog
gnodet Oct 23, 2017
541f35e
[maven-release-plugin] prepare release org.apache.felix.utils-1.10.4
gnodet Oct 23, 2017
3eb57f2
[maven-release-plugin] prepare for next development iteration
gnodet Oct 23, 2017
c77f2e9
[maven-release-plugin] prepare release org.apache.felix.fileinstall-3…
gnodet Oct 23, 2017
7159c1a
[maven-release-plugin] prepare for next development iteration
gnodet Oct 23, 2017
7ba899d
FELIX-5727: Refactor extension bundle support to allow for custom cla…
karlpauls Oct 23, 2017
6ebb62a
FELIX-1974: provide a way to extend the framework to support boot cla…
karlpauls Oct 24, 2017
13a467e
FELIX-5455 : [R7] Constructor Injection. Change constructor init
cziegeler Oct 25, 2017
e9c00c9
FELIX-5455 : [R7] Constructor Injection. Add basic constructor test
cziegeler Oct 25, 2017
0ca319b
Small refactoring on the Converter
bosschaert Oct 26, 2017
493bb1d
Move some special converter cases to rules.
bosschaert Oct 26, 2017
94e464e
Felix Converter: add comments and make some internal classes package …
bosschaert Oct 26, 2017
5148863
Rename AdapterImpl to CustomConverterImpl
bosschaert Oct 26, 2017
9a7b3b4
FELIX-5457 : [R7] Logger Support
cziegeler Oct 27, 2017
91f43ff
FELIX-5457 : [R7] Logger Support. Clean up logging
cziegeler Oct 27, 2017
e7c6010
FELIX-5457 : [R7] Logger Support. Clean up logging
cziegeler Oct 27, 2017
9f6f7a2
FELIX-5457 : [R7] Logger Support. Clean up logging
cziegeler Oct 27, 2017
3140cb5
FELIX-5457 : [R7] Logger Support. Clean up logging
cziegeler Oct 27, 2017
0d427f4
[FELIX-5734] The plugin generates wrong service requirements when usi…
gnodet Oct 27, 2017
01443fe
FELIX-5455 : [R7] Constructor Injection. Supporting references
cziegeler Oct 30, 2017
f5fa6af
FELIX-5457 : [R7] Logger Support. Pass in bundle as well
cziegeler Oct 30, 2017
2eecc14
FELIX-5457 : Logger Support
cziegeler Nov 2, 2017
39e328e
FELIX-5455 : [R7] Constructor Injection
cziegeler Nov 2, 2017
9770da8
Update changelog
cziegeler Nov 2, 2017
367495a
FELIX-5736 : forward custom properties in a configuration to HttpRunt…
cziegeler Nov 2, 2017
9f3a098
FELIX-5736 : forward custom properties in a configuration to HttpRunt…
cziegeler Nov 2, 2017
1b234cd
FELIX-5740 : Update to jetty 9.3.22.v20171030
cziegeler Nov 2, 2017
fbdac7e
[maven-release-plugin] prepare release org.apache.felix.http.jetty-3.4.6
cziegeler Nov 2, 2017
01fee57
[maven-release-plugin] prepare for next development iteration
cziegeler Nov 2, 2017
4443a8e
Update to latest jetty snapshot
cziegeler Nov 2, 2017
041bb5b
FELIX-5740 : Update to jetty 9.3.22.v20171030
cziegeler Nov 2, 2017
14654f2
FELIX-5742: Add a felix.detect.jpms property that maps to jpms and us…
karlpauls Nov 7, 2017
b8086f1
Update jetty version
cziegeler Nov 8, 2017
5644991
FELIX-5455 : [R7] Constructor Injection
cziegeler Nov 8, 2017
3291042
FELIX-5730 : Different separators in localization attribute
cziegeler Nov 8, 2017
0f5f5bb
FELIX-5729 : NoSuchFieldError when @Reference referenceInterface type…
cziegeler Nov 8, 2017
696eaa4
FELIX-5464 : java.lang.NullPointerException at org.apache.felix.scrpl…
cziegeler Nov 8, 2017
92d647c
FELIX-5739 : Strange behaviour with Lazy-ActivationPolicy and autostart
cziegeler Nov 9, 2017
3bb0015
FELIX-5739 : Strange behaviour with Lazy-ActivationPolicy and autostart
cziegeler Nov 9, 2017
66bf4c7
Update changelog
karlpauls Nov 10, 2017
fdb7994
Update changelog
karlpauls Nov 10, 2017
23ccb31
Update to latest gogo and jline
karlpauls Nov 10, 2017
28d6f14
Update to latest gogo and jline and update changelog
karlpauls Nov 10, 2017
abeb41b
Use resolver 1.14.0
karlpauls Nov 10, 2017
485419f
[maven-release-plugin] prepare release org.apache.felix.framework-5.6.10
karlpauls Nov 10, 2017
ae9df05
[maven-release-plugin] prepare for next development iteration
karlpauls Nov 10, 2017
90b6a8c
[maven-release-plugin] prepare release org.apache.felix.main-5.6.10
karlpauls Nov 10, 2017
a558604
[maven-release-plugin] prepare for next development iteration
karlpauls Nov 10, 2017
517be32
Update dependency for release
karlpauls Nov 10, 2017
0332c6c
[maven-release-plugin] prepare release org.apache.felix.main.distribu…
karlpauls Nov 10, 2017
3c2764c
[maven-release-plugin] prepare for next development iteration
karlpauls Nov 10, 2017
b37ef81
Support null default values for Converter
bosschaert Nov 14, 2017
6ab0166
Update to converter test
bosschaert Nov 14, 2017
0c1c9cf
Fix default handling in Converter
bosschaert Nov 14, 2017
2c152df
Fix Converter default handling for collections
bosschaert Nov 14, 2017
cf69b1c
Update to latest converter and add handling of special cases incl tes…
cziegeler Nov 14, 2017
29ffbe5
Implement HTTP request logging. This closes #127
Nov 14, 2017
552d840
Fix missing import
Nov 14, 2017
1c6b006
FELIX-5744 Felix HTTP Jetty does not support request logging
Nov 14, 2017
ec3aeac
Update to latest OSGi API. Rev 05584aa
cziegeler Nov 15, 2017
478bc08
FELIX-5745 : Empty collections should be allowed as property value
cziegeler Nov 15, 2017
90402e6
FELIX-5745 : Empty collections should be allowed as property value
cziegeler Nov 15, 2017
083d232
Update logging, make log service optional
cziegeler Nov 15, 2017
bdda9f1
Updates to latest OSGi API
cziegeler Nov 15, 2017
9dbb9fe
Updates to latest OSGi API
cziegeler Nov 15, 2017
97aad30
Fix conversion of empty array to untyped collection
cziegeler Nov 15, 2017
960a68a
Remove todo statements
cziegeler Nov 15, 2017
b093dee
Move OSGi Converter Implementation to OSGi package to make it usable …
bosschaert Nov 16, 2017
6fa474b
Use latest converter
cziegeler Nov 16, 2017
1a469ae
Remove some empty directories
bosschaert Nov 16, 2017
34d86d1
Fix live map conversion
bosschaert Nov 16, 2017
21e5b86
Fix an issue with the converter Map Delegate.
bosschaert Nov 16, 2017
c74b5c3
Support additional collection interfaces in the converter.
bosschaert Nov 16, 2017
dad4f57
Converter fixes to get the OSGi CT to pass
bosschaert Nov 17, 2017
02699f3
Updates to the Converter to handle name mangling better.
bosschaert Nov 17, 2017
8bc2592
Converter fixes needed to pass the OSGi Converter CT.
bosschaert Nov 17, 2017
c2088c1
Additional fixes to the converter
bosschaert Nov 17, 2017
d56eeca
Bring OSGi converter API to avoid circular dependency
bosschaert Nov 17, 2017
db8e78e
Fix to Felix Converter to pass CT
bosschaert Nov 17, 2017
1cd82a2
FELIX-5296 : Implement Http Whiteboard Service Updates (RFC 223)
cziegeler Nov 20, 2017
9ce111a
FELIX-5747 : Implement proprietary whiteboard based on R7 whiteboard
cziegeler Nov 21, 2017
634fca9
FELIX-5747 : Implement proprietary whiteboard based on R7 whiteboard
cziegeler Nov 21, 2017
f26edd7
FELIX-5748 : Remove ExtHttpManager support
cziegeler Nov 21, 2017
7d12fcd
FELIX-5747 : Implement proprietary whiteboard based on R7 whiteboard
cziegeler Nov 21, 2017
2571942
FELIX-5748 : Remove ExtHttpManager support
cziegeler Nov 21, 2017
f23d2f5
FELIX-5746 : Make optional dependencies runtime optional
cziegeler Nov 21, 2017
739d96b
FELIX-5746 : Make optional dependencies runtime optional
cziegeler Nov 21, 2017
27185d0
FELIX-5746 : Make optional dependencies runtime optional
cziegeler Nov 21, 2017
f757e8c
FELIX-5746 : Make optional dependencies runtime optional
cziegeler Nov 21, 2017
5c231cb
FELIX-5746 : Make optional dependencies runtime optional
cziegeler Nov 21, 2017
49757a9
Use latest R7 API snapshots directly
cziegeler Nov 22, 2017
56ad597
FELIX-5457 : Logger Support
cziegeler Nov 24, 2017
a186bf5
FELIX-5753 : Wrong require capability for http whiteboard
cziegeler Nov 28, 2017
05f1e3a
[maven-release-plugin] prepare release org.apache.felix.http.sslfilte…
cziegeler Nov 28, 2017
08a1504
[maven-release-plugin] prepare for next development iteration
cziegeler Nov 28, 2017
f725ad2
[Converter] Implementation of live collections and unit tests for these.
bosschaert Nov 29, 2017
534a1e5
[Converter] Fix some of the generics.
bosschaert Nov 29, 2017
0fb8f15
Fix synchronization issue
cziegeler Nov 30, 2017
42bfa64
Fixed a sync problem related to the change count
cziegeler Nov 30, 2017
3836d20
[converter] update the source to follow OSGi formatting guidelines
bosschaert Dec 1, 2017
dc803b5
[Converter] Improved name mangling implementation committed on behalf…
bosschaert Dec 1, 2017
2be208a
Update change count handling
cziegeler Dec 1, 2017
5b558aa
Update change count handling
cziegeler Dec 1, 2017
2c99b70
Update change count handling
cziegeler Dec 1, 2017
bd0b3f3
[converter] fix compilation error on java 7
bosschaert Dec 1, 2017
e76ac33
Update to latest converter
cziegeler Dec 4, 2017
f335654
FELIX-5755 : Servlet API should be optional
cziegeler Dec 5, 2017
8e67e56
FELIX-5755 : Servlet API should be optional
cziegeler Dec 5, 2017
6be2cb2
[maven-release-plugin] prepare release org.apache.felix.inventory-1.0.6
karlpauls Dec 5, 2017
6b948d4
[maven-release-plugin] prepare for next development iteration
karlpauls Dec 5, 2017
ac1ce0c
[converter] update to the latest OSGi API.
bosschaert Dec 7, 2017
ab24474
[maven-release-plugin] prepare release org.apache.felix.http.jetty-3.4.8
karlpauls Dec 7, 2017
a21f695
[maven-release-plugin] prepare for next development iteration
karlpauls Dec 7, 2017
a84e25b
FELIX-5754: remove an unnessary continutation from the system package…
karlpauls Dec 7, 2017
fc81481
FELIX-5759: map protocol instead of URLHandler to URL for builtin han…
karlpauls Dec 7, 2017
6bfce26
FELIX-5712 set correct website url for bundle plugin documentation
stefanseifert Dec 8, 2017
cf5672e
FELIX-5760 Update to latest bnd 3.5.0
Dec 11, 2017
3791bca
FELIX-5592 Maven bundle plugin does not support Java 9 Multi-Release …
Dec 11, 2017
24236d7
FELIX-5592 Fix missing = in fixupmessages directive
Dec 12, 2017
ec86c46
FELIX-5592 Ensure user can override fixups:
Dec 12, 2017
69f1bad
FELIX-5760 Update to bnd version 3.4
Dec 12, 2017
f42b50d
Update changelog
karlpauls Dec 13, 2017
92203f8
[maven-release-plugin] prepare release org.apache.felix.scr-2.0.14
karlpauls Dec 13, 2017
78bbf74
[maven-release-plugin] prepare for next development iteration
karlpauls Dec 13, 2017
4166789
Update PrimitiveComponentType.java
yangqiju Dec 14, 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