Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix to avoid incompatibility if compile with jdk9 #114

Open
wants to merge 10,000 commits into
base: trunk
Choose a base branch
from
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
0e1df13
plugin documentation is now at https://svn.apache.org/repos/infra/web…
stefanseifert Mar 9, 2017
d28a58c
fix bnd URL, remove "2" from maven version
stefanseifert Mar 9, 2017
1b49e55
fix pom parent path, use placeholder for scm-publish path
stefanseifert Mar 9, 2017
6d2460c
Felix Converter - support Date <-> Long conversions
bosschaert Mar 10, 2017
f72947c
FELIX-5587: @Ignoring a broken test
Mar 13, 2017
e3e489b
FELIX-5583: Made package org.apache.felix.utils.json private
Mar 13, 2017
0b8b352
FELIX-5588: Schematizer service now implements ServiceFactory<Schemat…
Mar 13, 2017
264084c
FELIX-5354 : Implement Declarative Service Updates for R7 (RFC 222). …
cziegeler Mar 15, 2017
6504eba
FELIX-5590 : Add support for single value annotations and new key map…
cziegeler Mar 16, 2017
2dca464
FELIX-5590 : Add support for single value annotations and new key map…
cziegeler Mar 16, 2017
31594b3
FELIX-5590 : Add support for single value annotations and new key map…
cziegeler Mar 16, 2017
847614d
FELIX-5557 : Updates to section 112.8.2.2 Coercing Component Property…
cziegeler Mar 16, 2017
b93df89
FELIX-5557 : Updates to section 112.8.2.2 Coercing Component Property…
cziegeler Mar 16, 2017
991b969
FELIX-5572 : Reference target filter fails when using field strategy …
cziegeler Mar 16, 2017
d05c805
FELIX-5543 : Component property types must implement java.lang.annota…
cziegeler Mar 17, 2017
90c87d4
Felix Converter - update to support latest Rule API.
bosschaert Mar 20, 2017
11901ce
Felix Converter: support for prefixes with DTOs
bosschaert Mar 20, 2017
0f32444
Felix Converter - Support prefixes for annotations and interfaces
bosschaert Mar 20, 2017
884eba9
Support conversions from SingleElementAnnotations.
bosschaert Mar 20, 2017
7ed81d4
[FELIX-5594][gogo][jline] Improve color support for ls/grep and synta…
gnodet Mar 21, 2017
cd78ce0
[FELIX-5594][gogo][jline] Make sure the highlighter supports custom a…
gnodet Mar 22, 2017
531d1b6
FELIX-5593 Specify ARM processor Endianness
bosschaert Mar 22, 2017
2ed934c
Felix Converter - small fix to unit test
bosschaert Mar 22, 2017
8d2f13c
Felix Serializer - Fix compilation issues with tests.
bosschaert Mar 22, 2017
3c0e0a0
Felix Converter - specify the package merge policy for the API package.
bosschaert Mar 22, 2017
42ff9c0
Felix Schematizer - Fix compilation errors.
bosschaert Mar 22, 2017
e1c4baf
[FELIX-5596] Allow to configure the colors for the gogo grep command
gnodet Mar 22, 2017
0acafc8
[FELIX-5598][gogo][jline] Support the JLine ttop function if available
gnodet Mar 22, 2017
a8b7644
Felix Converter - Support converting to SingleElementAnnotations
bosschaert Mar 23, 2017
a6836a5
Felix Converter - add keysIgnoreCase() which is a new method in the API
bosschaert Mar 23, 2017
e9426b0
Felix Converter - support case-insensitive keys.
bosschaert Mar 23, 2017
1feee38
Felix Converter - support case insensistive DTO conversions
bosschaert Mar 23, 2017
89c6533
Make the empty ImmutableMap a singleton to improve memory usage (This…
karlpauls Mar 26, 2017
90b6fa5
Update to latest released bundlerepository version 2.0.8
karlpauls Mar 27, 2017
232d578
FELIX-5601 - issues resolving with substitutable exports
tjwatson Mar 28, 2017
3576945
Make osgi api optional
karlpauls Mar 28, 2017
1b45d61
FELIX-5602 : Use Java 6 as base java version
cziegeler Mar 28, 2017
cd2e785
[FELIX-5599] Allow reusing a closure from a parent session
gnodet Mar 28, 2017
809fea6
[FELIX-5600] System streams are not correctly set when running a new …
gnodet Mar 28, 2017
78cb0cd
[gogo][jline] Print a slighly nicer message when an exception is caug…
gnodet Mar 28, 2017
631440b
FELIX-5601 - issues resolving with substitutable exports
tjwatson Mar 28, 2017
2ecff40
FELIX-5568 : SCR contains compact3 profile code
cziegeler Mar 31, 2017
ac4a795
FELIX-5567 : EventAdmin contains compact3 profile code
cziegeler Mar 31, 2017
2d53500
Felix Converter - fix compilation errors
bosschaert Apr 3, 2017
d36e62b
Fix converter implementation
gnodet Apr 3, 2017
b36a328
Re-enable the error handlers
gnodet Apr 3, 2017
b984469
Normalize require capabilites the same way we normalize provide capab…
karlpauls Apr 4, 2017
12e2ed0
Fix compilation errors in converter now that handleError() has been r…
bosschaert Apr 7, 2017
d8471e7
Additional annotation conversion test.
bosschaert Apr 7, 2017
d8a20ce
Fix possible NPE
gnodet Apr 7, 2017
093f49c
[FELIX-5608] New TypedProperties object to support typed properties file
gnodet Apr 7, 2017
baf474d
[FELIX-5609] Full support for both untyped and typed configurations
gnodet Apr 7, 2017
9ffc174
[FELIX-5610] Files should be deleted if a configuration is deleted
gnodet Apr 7, 2017
6784c25
Add missing license header.
bosschaert Apr 7, 2017
6f34c68
Update Felix Converter to follow new OSGi API
bosschaert Apr 7, 2017
14fe9fe
[FELIX-5609] Do not require the OSGi package when using TypedProperties
gnodet Apr 10, 2017
5d27e47
Fix broken test.
bosschaert Apr 10, 2017
8c01569
Fix issue with MapDelegate as exposed in the YamlSerializerTest.
bosschaert Apr 10, 2017
ba757a5
Remove commented out line of code that is not needed any more.
bosschaert Apr 10, 2017
269b84b
Felix Schematizer - fix compilation.
bosschaert Apr 10, 2017
b916741
Fixes to the Felix Converter
bosschaert Apr 10, 2017
fb6ddd8
Fix for FELIX-5616
Apr 17, 2017
b2e5af3
Updated Schematizer (Some API updates, major implementation change)
Apr 17, 2017
8c29dc6
Update configurator to only listen for starting/active bundles. Proce…
cziegeler Apr 17, 2017
263c75e
Additonal test.
bosschaert Apr 18, 2017
b823cb5
FELIX-5614 Make isDTOType(Class<?> cls) publicly available
bosschaert Apr 18, 2017
017848b
FELIX-5611 BundleRepository must deal properly R5 index file with res…
bosschaert Apr 19, 2017
2ac76d2
FELIX-5614 Move DTOUtil to org.apache.felix.converter and export.
bosschaert Apr 19, 2017
95723b4
FELIX-5615 - Global lock in BaseMethod.NotResolved::resolve method ca…
tjwatson Apr 19, 2017
a7a2c96
FELIX-5568 : SCR contains compact3 profile code
cziegeler Apr 19, 2017
1900e94
FELIX-5572 : Reference target filter fails when using field strategy …
cziegeler Apr 19, 2017
111c432
Update changelog
cziegeler Apr 19, 2017
e61dfe8
FELIX-5617 Remove "null" from console messages
bosschaert Apr 20, 2017
f6c4257
FELIX-5066 BundleRepository should provide osgi.service and osgi.impl…
bosschaert Apr 20, 2017
810a8a1
FELIX-5615 - Global lock in BaseMethod.NotResolved::resolve method ca…
tjwatson Apr 20, 2017
8739b03
[maven-release-plugin] prepare release org.apache.felix.bundlereposit…
bosschaert Apr 21, 2017
c42976b
[maven-release-plugin] prepare for next development iteration
bosschaert Apr 21, 2017
c25a693
FELIX-5613 : SCR bundle fails to start without Config Admin
cziegeler Apr 23, 2017
619b1dc
FELIX-5613 : SCR bundle fails to start without Config Admin. This clo…
cziegeler Apr 23, 2017
23d27b6
FELIX-5620 : Bundle start/stop buttons are missing
cziegeler Apr 24, 2017
7707f42
Use javax.json (instead of osgi serializer) and update bundle tracking
cziegeler Apr 24, 2017
2ddcad2
Start implementing correct configuration admin handling (WiP)
cziegeler Apr 24, 2017
dc40a6b
Implementing correct configuration admin handling (WiP)
cziegeler Apr 24, 2017
928d34f
Implementing correct configuration admin handling (WiP)
cziegeler Apr 24, 2017
56f6c55
Implementing correct configuration admin handling (first version)
cziegeler Apr 24, 2017
a2f6c70
FELIX-5560 : Add change count property to runtime service
cziegeler Apr 24, 2017
fc5dd26
FELIX-5296 : Implement Http Whiteboard Service Updates (RFC 223)
cziegeler Apr 24, 2017
e79a9a1
FELIX-5296 : Implement Http Whiteboard Service Updates (RFC 223)
cziegeler Apr 24, 2017
67ef43a
FELIX-5296 : Implement Http Whiteboard Service Updates (RFC 223)
cziegeler Apr 24, 2017
fe53aa4
FELIX-5296 : Implement Http Whiteboard Service Updates (RFC 223)
cziegeler Apr 25, 2017
942a971
FELIX-5296 : Implement Http Whiteboard Service Updates (RFC 223)
cziegeler Apr 25, 2017
2095db2
[maven-release-plugin] prepare release org.apache.felix.scr-2.0.10
cziegeler Apr 25, 2017
12dd3f1
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 25, 2017
6713b5c
FELIX-5623: Improve performance of ComponentImpl.getName method (than…
Apr 26, 2017
dd0c27b
FELIX-5619: MultiProperyFilterIndex memory consumption
Apr 26, 2017
75e8f38
[FELIX-5624] HttpLite complete bundle has wrong ranges for package im…
gnodet Apr 27, 2017
7ac0604
Update json configuration format
cziegeler Apr 27, 2017
0f96a57
FELIX-5296 : Implement Http Whiteboard Service Updates (RFC 223)
cziegeler Apr 27, 2017
8710f21
Make the empty ImmutableList a singelton to reduce memory usage simil…
karlpauls Apr 27, 2017
6df9420
Change the fallback for windows native code to win32 (FELIX-5574). Th…
karlpauls Apr 27, 2017
e7cd757
Update Felix Converter implementation to suit a slight API change.
bosschaert Apr 27, 2017
d11bd68
Felix Converter - remove hard dependency on DTO class.
bosschaert Apr 27, 2017
eb09a46
Felix Converter - move DTOUtil to separate package
bosschaert Apr 27, 2017
096fb52
Felix Converter - update to the changed generics in the OSGi API
bosschaert Apr 27, 2017
681def2
[gogo][jline] Let jline use defaults for better detection
gnodet Apr 27, 2017
2a91fff
Add missing osgi.ee
karlpauls Apr 27, 2017
b60f2c6
Improve native OS version sanitation (FELIX-4696).
karlpauls Apr 27, 2017
f7af832
Normalize os.version in framework properties (FELIX-4695).
karlpauls Apr 27, 2017
f8187db
FELIX-5627 : Class loading issues while finding fields causes an NPE
cziegeler Apr 28, 2017
a4755e7
FELIX-5626 Exclude EasyMock from the runtime classpath
bosschaert Apr 28, 2017
9914c62
FELIX-5628 : Global lock in FieldHandler.NotResolved::resolve method …
tjwatson May 1, 2017
5a4035b
FELIX-5613 : SCR bundle fails to start without Config Admin
tjwatson May 1, 2017
76130ad
FELIX-5628 : Global lock in FieldHandler.NotResolved::resolve method …
tjwatson May 1, 2017
103a178
[FELIX-5629][gogo][jline] When a job is in the foreground, the shell …
gnodet May 2, 2017
e41bb24
[FELIX-5631][gogo][runtime] The parser indicates wrong repair string …
gnodet May 2, 2017
45ba2be
FELIX-5632 : Implement equals and hashCode for HttpSessionWrapper
cziegeler May 2, 2017
bf6734c
Adjust test case to R7
cziegeler May 2, 2017
47b32dc
FELIX-5630: Added test case for this issue.
May 2, 2017
5fdd99e
FELIX-5630: NullObject is created for a required dependency if the co…
May 2, 2017
bf40391
[gogo][jline] Support new less options if available
gnodet May 3, 2017
b76e2e2
[gogo][jline] Guard against infinite loops in the highlighter
gnodet May 3, 2017
c403491
[FELIX-5633][gogo][runtime] The file name generation should take ~ in…
gnodet May 4, 2017
f9e739e
[FELIX-5634][gogo][runtime] The file name generation may loop into su…
gnodet May 4, 2017
bdf1345
[maven-release-plugin] prepare release org.apache.felix.httplite.reac…
gnodet May 5, 2017
1aa5919
[maven-release-plugin] prepare for next development iteration
gnodet May 5, 2017
9800cd3
[maven-release-plugin] prepare release org.apache.felix.gogo.runtime-…
gnodet May 5, 2017
f070bcd
[maven-release-plugin] prepare for next development iteration
gnodet May 5, 2017
818a900
[maven-release-plugin] prepare release org.apache.felix.gogo.jline-1.0.6
gnodet May 5, 2017
8c83641
[maven-release-plugin] prepare for next development iteration
gnodet May 5, 2017
a3289dd
[maven-release-plugin] prepare release org.apache.felix.utils-1.10.0
gnodet May 5, 2017
990a16f
[maven-release-plugin] prepare for next development iteration
gnodet May 5, 2017
e5de6bb
[fileinstall] Upgrade to utils 1.10.0
gnodet May 5, 2017
0d9a825
[maven-release-plugin] prepare release org.apache.felix.fileinstall-3…
gnodet May 5, 2017
e918a06
[maven-release-plugin] prepare for next development iteration
gnodet May 5, 2017
80bb6f3
[maven-release-plugin] prepare release org.apache.felix.webconsole-4.3.2
karlpauls May 5, 2017
8ca1a09
[maven-release-plugin] prepare for next development iteration
karlpauls May 5, 2017
0cccd7e
[maven-release-plugin] prepare release org.apache.felix.webconsole.pl…
karlpauls May 5, 2017
781e6a2
[maven-release-plugin] prepare for next development iteration
karlpauls May 5, 2017
5f3b0eb
[FELIX-5637][gogo][runtime] Error throwns by commands are swallowed a…
gnodet May 10, 2017
6dabe0b
FELIX-5638: remove the status from the s field in the bundles.json re…
karlpauls May 10, 2017
bda9348
Update changelog for release.
karlpauls May 10, 2017
c114ac5
[maven-release-plugin] prepare release org.apache.felix.webconsole-4.3.4
karlpauls May 10, 2017
0e12f4f
[maven-release-plugin] prepare for next development iteration
karlpauls May 10, 2017
ee84757
FELIX-5636: Added test case for this issue.
May 11, 2017
0811a50
FELIX-5636: oops, the m_e class attribute must be static
May 11, 2017
cfb4f0d
FELIX-5636: ComponentImpl.getServiceProperties() must always calculat…
May 11, 2017
a1edf9b
FELIX-5619: Decreased the test size iteration to 500
May 11, 2017
4344210
Felix converter - fix issue with converting from package protected an…
bosschaert May 11, 2017
30d0ebe
Update changelog for release.
karlpauls May 21, 2017
e5a280c
[maven-release-plugin] prepare release org.apache.felix.resolver-1.14.0
karlpauls May 21, 2017
aa937b7
[maven-release-plugin] prepare for next development iteration
karlpauls May 21, 2017
7f96d64
[maven-release-plugin] rollback the release of org.apache.felix.resol…
karlpauls May 21, 2017
a0ae86f
[maven-release-plugin] prepare release org.apache.felix.resolver-1.14.0
karlpauls May 21, 2017
9140c29
[maven-release-plugin] prepare for next development iteration
karlpauls May 21, 2017
2ef05eb
Update changelog for release.
karlpauls May 21, 2017
2ff48e1
[maven-release-plugin] prepare release org.apache.felix.framework-5.6.4
karlpauls May 21, 2017
e043120
[maven-release-plugin] prepare for next development iteration
karlpauls May 21, 2017
2cba20d
Update dependencies and changelog for release
karlpauls May 21, 2017
4434c39
Update to felix parent pom 3
karlpauls May 21, 2017
7d2d508
[maven-release-plugin] prepare release org.apache.felix.main-5.6.4
karlpauls May 21, 2017
564d1e1
[maven-release-plugin] prepare for next development iteration
karlpauls May 21, 2017
1ad8bf8
Update dependencies and changelog for release
karlpauls May 21, 2017
5b984a5
[maven-release-plugin] prepare release org.apache.felix.main.distribu…
karlpauls May 21, 2017
91c6299
[maven-release-plugin] prepare for next development iteration
karlpauls May 21, 2017
adb13bf
Add correct EE and system package versions for java9 (FELIX-5646). Th…
karlpauls May 23, 2017
9cb9a5d
Add support for top-level lists to the JSON Parser.
bosschaert May 25, 2017
17efeb3
FELIX-5619: MultiProperyFilterIndex memory consumption
May 29, 2017
b12f7d6
Fix an error in the java9 package list. This closes #111.
karlpauls May 29, 2017
4a0abfd
FELIX-5619: MultiProperyFilterIndex memory consumption
May 29, 2017
c422717
FELIX-5619: MultiProperyFilterIndex memory consumption
May 29, 2017
786f012
Refactor utility methods
cziegeler May 29, 2017
c4f8b1d
Refactor utility methods
cziegeler May 29, 2017
ba8e882
Refactor utility methods
cziegeler May 29, 2017
3f0cf2f
Refactor for better reusability
cziegeler May 29, 2017
05614d3
Refactor code for easier reuse
cziegeler May 30, 2017
4f76894
Refactor for better reuse
cziegeler May 31, 2017
5bde2cf
FELIX-5644 Repository#getURI() is no longer unique in case of XML-bas…
bosschaert May 31, 2017
6899227
Fix type conversion
cziegeler Jun 1, 2017
2235d45
Correctly embedd johnzon
cziegeler Jun 6, 2017
ae49ce5
Set TCCL for johnzon
cziegeler Jun 6, 2017
bc2b944
Adjust to use latest converter
cziegeler Jun 6, 2017
3072f5e
[FELIX-5649] Refreshing a fragment causes the framework to be restarted
gnodet Jun 7, 2017
b412931
FELIX-5650: Support latest version of Gogo.
Jun 11, 2017
3e1cf13
INFRA-13644 switch site publish url to sling site staging area
stefanseifert Jun 12, 2017
960062f
Felix Converter - additional unit test.
bosschaert Jun 13, 2017
c415628
FELIX-5416 - Endless loop throwing InterruptedException when shutting…
tjwatson Jun 20, 2017
1eabf77
Felix Converter - add support for conversions of Map Entries.
bosschaert Jun 21, 2017
8cff51b
Felix Converter - additional conversions between characters and numbers
bosschaert Jun 21, 2017
e904cc6
Felix Converter - better handling of null values
bosschaert Jun 21, 2017
8ef3135
[maven-release-plugin] prepare release org.apache.felix.scr-2.0.12
karlpauls Jun 21, 2017
a64e19c
[maven-release-plugin] prepare for next development iteration
karlpauls Jun 21, 2017
36c931b
FELIX-5653: Simplify DM-Lambda samples
Jun 21, 2017
71b4c0d
FELIX-5619: Added license header
Jun 21, 2017
532affa
FELIX-5650: Support latest version of Gogo.
Jun 21, 2017
34f73dd
Updated release notes
Jun 21, 2017
5450395
Each sub project has now its own changelog (before the changelog was …
Jun 22, 2017
4f21517
use ./gradlew instead of gradle command.
Jun 22, 2017
4e476f7
Removed compilation warnings.
Jun 22, 2017
4561a4e
released dm using ./gradlew release command ...
Jun 22, 2017
494d9d3
Released dm using ./gradlew release command ...
Jun 22, 2017
3fe62e7
Incremented dmRelease to r10.
Jun 22, 2017
e471419
Reverted these jars to previous (same) binary versions (they did not …
Jun 23, 2017
74ce93a
FELIX-5652: Force the resolver threads to be daemons so that they don…
karlpauls Jun 23, 2017
8c8acff
[FELIX-5655] Possible NPE in Expression.isNumber when passing an empt…
gnodet Jun 26, 2017
a7a6307
[FELIX-5656] [gogo][runtime] The Expander does not correctly support …
gnodet Jun 26, 2017
a2e6cb5
FELIX-5658: Include poms in dm artifacts.
Jun 27, 2017
17d3a87
FELIX-5658: Include poms in dm artifacts
Jun 27, 2017
0270b4e
FELIX-5658: Include poms in dm artifacts
Jun 27, 2017
1f1dd74
FELIX-5657: DM released sources can't be rebuilt.
Jun 27, 2017
6efe9f5
FELIX-5499 (Removed json licenses)
Jun 27, 2017
724eb55
Updated changelogs
Jun 27, 2017
733e389
Released dm artifacts with "gradlew release" command.
Jun 27, 2017
0b7ee78
Update to latest configurator spec: remove environment handling, chan…
cziegeler Jun 28, 2017
f414162
Update security checks, add permissions
cziegeler Jun 28, 2017
b96186f
FELIX-5662: Return 443 as the default port for a request in case we d…
karlpauls Jul 4, 2017
6b58cbd
FELIX-5662: Return 443 as the default port for a request in case we d…
karlpauls Jul 5, 2017
4e8a9b1
[maven-release-plugin] prepare release org.apache.felix.http.sslfilte…
karlpauls Jul 5, 2017
3a54f77
[maven-release-plugin] prepare for next development iteration
karlpauls Jul 5, 2017
de9701a
Create R7 copy for http
cziegeler Jul 10, 2017
d63eb2b
Remove unnecessary modules
cziegeler Jul 10, 2017
d9c5caa
Remove R7 features
cziegeler Jul 10, 2017
042ecde
FELIX-5664 : Update Jetty to 9.3.20.v20170531 or 9.4.6.v20170531 to f…
cziegeler Jul 11, 2017
c34515c
[maven-release-plugin] prepare release org.apache.felix.http.jetty-3.4.4
cziegeler Jul 11, 2017
437b76b
[maven-release-plugin] prepare for next development iteration
cziegeler Jul 11, 2017
e6cb0ad
Felix Converter - update the implementation for the new API.
bosschaert Jul 11, 2017
25450f8
Adjust to latest converter api
cziegeler Jul 11, 2017
db1620e
Felix converter - support special conversions between character array…
bosschaert Jul 11, 2017
685a2b1
Felix Converter - better handling of rules with generics
bosschaert Jul 11, 2017
efb8275
Felix Converter - slight improvement on ConverterImpl.
bosschaert Jul 11, 2017
278e7bf
Update to latest OSGi R7 API. Commit e77f468
cziegeler Jul 16, 2017
8a62690
R7: Implement finishSecurity
cziegeler Jul 16, 2017
dc83d36
Remove api copy, sync Jetty changes
cziegeler Jul 16, 2017
77ffdd2
Remove intermediate 'configurations' node
cziegeler Jul 19, 2017
940568b
Improve retry mechanism
cziegeler Jul 21, 2017
e5390fc
Make thread a daemon thread and set name
cziegeler Jul 21, 2017
9396472
Fix a typo
karlpauls Jul 25, 2017
b8a6fc9
Update svn ignore
karlpauls Jul 25, 2017
0a3de23
Update changelog for release.
karlpauls Jul 25, 2017
3f2047a
[maven-release-plugin] prepare release org.apache.felix.framework-5.6.6
karlpauls Jul 25, 2017
56ca114
[maven-release-plugin] prepare for next development iteration
karlpauls Jul 25, 2017
6c0cb54
Update changelog for release.
karlpauls Jul 25, 2017
393a4f4
[maven-release-plugin] prepare release org.apache.felix.main-5.6.6
karlpauls Jul 25, 2017
c735e1f
[maven-release-plugin] prepare for next development iteration
karlpauls Jul 25, 2017
619cc6d
Update dependencies for release
karlpauls Jul 25, 2017
9a9d439
Update changelog for release.
karlpauls Jul 25, 2017
afc28a5
[maven-release-plugin] prepare release org.apache.felix.main.distribu…
karlpauls Jul 25, 2017
7f800bd
[maven-release-plugin] prepare for next development iteration
karlpauls Jul 25, 2017
b421896
FELIX-5668: Fix a possible NPE trying to get the symbolicname of the …
karlpauls Jul 31, 2017
2ef06ec
Compatibility with covariant return type on JDK 9's ByteBuffer
nroduit Jul 31, 2017
9c64b14
Merge remote-tracking branch 'origin/trunk' into trunk
nroduit Jul 31, 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