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
0af9df4
FELIX-5001 : scr:list Gogo command should display component descripti…
cziegeler Sep 9, 2015
9b2266c
FELIX-5001 : scr:list Gogo command should display component configura…
cziegeler Sep 9, 2015
36a4d6e
Add some extra diagnostic information to log message for ServiceExcep…
bosschaert Sep 10, 2015
5976a40
FELIX-5029 : Update to bnd 3.0.0
cziegeler Sep 10, 2015
6625014
FELIX-5027 : SSL Filter URL Decoding Issues
cziegeler Sep 11, 2015
6cc663f
Fixed FELIX-5018 : [webconsole] "create factory configuration" link f…
Sep 11, 2015
9477b3e
Fixed FELIX-5031 : NPE in Web Console configuration plugin when metat…
Sep 11, 2015
11334ee
FELIX-4984 fix some circular reference problems
djencks Sep 11, 2015
5d66373
FELIX-5001 clean up scr:info command output
djencks Sep 11, 2015
fe2ad5c
[maven-release-plugin] prepare release org.apache.felix.http.sslfilte…
cziegeler Sep 14, 2015
c337f20
[maven-release-plugin] prepare for next development iteration
cziegeler Sep 14, 2015
9eb4e1c
update changelog, prepare for release
Sep 14, 2015
6c9923d
FELIX-5034 : Reduce and correct locking related to the hook registry
cziegeler Sep 15, 2015
960d6c4
FELIX-5034 : Reduce and correct locking related to the hook registry
cziegeler Sep 15, 2015
f5b2b35
FELIX-5028 : ServiceFactory for components might return null
cziegeler Sep 15, 2015
f6ed5e8
[maven-release-plugin] prepare release org.apache.felix.webconsole.pl…
cziegeler Sep 16, 2015
ec6bfc1
[maven-release-plugin] prepare for next development iteration
cziegeler Sep 16, 2015
06921b3
Use released scr version
cziegeler Sep 16, 2015
fba746a
[maven-release-plugin] prepare release org.apache.felix.scr.compat-1.0.2
cziegeler Sep 16, 2015
e27ce61
[maven-release-plugin] prepare for next development iteration
cziegeler Sep 16, 2015
fabf985
[maven-release-plugin] prepare release org.apache.felix.scr-2.0.2
cziegeler Sep 16, 2015
bf25213
[maven-release-plugin] prepare for next development iteration
cziegeler Sep 16, 2015
c24d12e
Update release plugin
cziegeler Sep 16, 2015
9db44ba
[maven-release-plugin] prepare release org.apache.felix.scr.compat-1.0.2
cziegeler Sep 16, 2015
0b69bb6
[maven-release-plugin] prepare for next development iteration
cziegeler Sep 16, 2015
49f9234
Update release plugin
cziegeler Sep 16, 2015
b14d89c
Update release plugin
cziegeler Sep 16, 2015
5c8fd68
[maven-release-plugin] prepare release org.apache.felix.scr-2.0.2
cziegeler Sep 16, 2015
c37ffd8
[maven-release-plugin] prepare for next development iteration
cziegeler Sep 16, 2015
db8d695
[maven-release-plugin] prepare release org.apache.felix.webconsole.pl…
cziegeler Sep 16, 2015
b06349e
[maven-release-plugin] prepare for next development iteration
cziegeler Sep 16, 2015
0d0723d
Implemented FELIX-5019 : [webconsole] "referer" parameter for configu…
Sep 16, 2015
c88808f
[maven-release-plugin] prepare release org.apache.felix.webconsole.pl…
Sep 17, 2015
def38f4
[maven-release-plugin] prepare for next development iteration
Sep 17, 2015
4678177
prepare for release
Sep 17, 2015
e2c52f3
[maven-release-plugin] prepare release org.apache.felix.webconsole.pl…
Sep 17, 2015
784faa7
[maven-release-plugin] prepare for next development iteration
Sep 17, 2015
00946a4
FELIX-5040 getBundle by location for global extender
djencks Sep 17, 2015
f210805
changelog for FELIX-5040
djencks Sep 17, 2015
72192af
prepare for release
Sep 18, 2015
4780f81
Fixed FELIX-5041 : Cannot build web console with JDK 1.8 due to javad…
Sep 18, 2015
24f5985
[maven-release-plugin] prepare release org.apache.felix.webconsole-4.…
Sep 18, 2015
f6e4c15
[maven-release-plugin] prepare for next development iteration
Sep 18, 2015
a740f8f
FELIX-5042 : Get system bundle by location, not number for global bun…
cziegeler Sep 18, 2015
137aecd
FELIX-5039 : Component getServices method does not return null anymor…
cziegeler Sep 18, 2015
c7e2ef8
FELIX-5043 Potential of waiting forever in ServiceRegistry.getService()
bosschaert Sep 18, 2015
b42e71a
FELIX-5043 Unit test for the changes committed earlier for this issue.
bosschaert Sep 18, 2015
e79a18e
FELIX-5030: check pom file exists before adding it to bundle
Sep 18, 2015
863fbe2
Added test case for the FELIX-5045 issue.
Sep 18, 2015
1eb4a45
FELIX-5045: Committed a fix that avoid invoking optional dependency c…
Sep 18, 2015
e22ac56
Updated changelog with FELIX-5045.
Sep 18, 2015
af33161
FELIX-5046: Gradle wrapper is not included in DM source release.
Sep 18, 2015
77ef931
FELIX-5047 : Disable bnd ScrPlugin by default
cziegeler Sep 19, 2015
dd8f3e5
FELIX-5034 : Reduce and correct locking related to the hook registry
cziegeler Sep 19, 2015
edf227a
Fixed a bug: we must wait for the configuration to be effectively rem…
Sep 19, 2015
d117e83
FELIX-5044 make sure property changes during service registration eve…
djencks Sep 21, 2015
a901400
Fix potential NPE in baseline check
cziegeler Sep 21, 2015
c431eac
[maven-release-plugin] prepare release org.apache.felix.bundlereposit…
bosschaert Sep 22, 2015
d42e6ed
[maven-release-plugin] prepare for next development iteration
bosschaert Sep 22, 2015
40567ce
[maven-release-plugin] prepare release maven-bundle-plugin-3.0.0
bosschaert Sep 22, 2015
76d680d
[maven-release-plugin] rollback the release of maven-bundle-plugin-3.0.0
bosschaert Sep 22, 2015
7f9b8e8
Fix SCM section in the maven-bundle-plugin pom.xml
bosschaert Sep 22, 2015
726a4f3
[maven-release-plugin] prepare release maven-bundle-plugin-3.0.0
bosschaert Sep 22, 2015
5607d58
[maven-release-plugin] prepare for next development iteration
bosschaert Sep 22, 2015
2200379
FElIX-5051 - Memory leak in async delivery
cziegeler Sep 24, 2015
7750922
Added more ignore patterns
srs Sep 24, 2015
68bc29e
FELIX-5054: Added testcase for 5054 issue.
Sep 24, 2015
1088d6d
FELIX-5054: clean-up instance bound dependencies when the component i…
Sep 24, 2015
0b60ee6
fixed typo.
Sep 24, 2015
e730b43
Fixed build problems. JettyServiceTest needed longer timeout.
srs Sep 24, 2015
cff099b
Fixed build problems. Cometd sample package referes to unknown version.
srs Sep 24, 2015
be8d039
FELIX-5052: Removed annoying System.out in RequestDispatcherImpl.
srs Sep 24, 2015
09d1ff4
FELIX-5055: Upgrade DM to BndTools 3.0.0
Sep 24, 2015
06622f5
Updated changelog.
Sep 24, 2015
bc9b27a
Update changelog for OBR 2.0.6
bosschaert Sep 25, 2015
c6d253b
Update changelog for maven bundle plugin 3.0.0
bosschaert Sep 25, 2015
dd67bc6
FELIX-5044 add missing test file
djencks Sep 25, 2015
e8cf145
Use latest felix framework. Use org.apache.felix.http.jetty with vers…
Sep 25, 2015
d163fed
Fixed type.
Sep 25, 2015
1cf91d1
Fixed typo
Sep 25, 2015
ac5ec40
Fixed typo.
Sep 25, 2015
ee515ac
FELIX-5015 NPE in ResolverImpl
bosschaert Sep 28, 2015
c6e7402
FELIX-5015 Unit tests (for NPE in ResolverImpl)
bosschaert Sep 28, 2015
019ce6e
FELIX-5057 : Race condition between getService and stopping the http …
cziegeler Sep 28, 2015
c1c7857
FELIX-5053: IllegalArgumentException when forwarding request.
srs Oct 1, 2015
8d53f28
Prepare for release.
bosschaert Oct 1, 2015
301bc9d
[maven-release-plugin] prepare release org.apache.felix.gogo.shell-0.…
bosschaert Oct 1, 2015
d6cf118
[maven-release-plugin] prepare for next development iteration
bosschaert Oct 1, 2015
254a7b6
Prepare for release.
bosschaert Oct 1, 2015
bafcd82
[maven-release-plugin] prepare release org.apache.felix.gogo.command-…
bosschaert Oct 1, 2015
756b801
[maven-release-plugin] prepare for next development iteration
bosschaert Oct 1, 2015
20ae1dd
Fixed some problems with split packages.
srs Oct 1, 2015
187e903
FELIX-5059 : Embedd http api bundle in jetty bundle
cziegeler Oct 2, 2015
25b77a2
FELIX-5059 : Embedd http api bundle in jetty bundle
cziegeler Oct 2, 2015
39ab16f
FELIX-5060 : Unnecessary import of org.osgi.service.component
cziegeler Oct 2, 2015
4398161
[maven-release-plugin] prepare release org.apache.felix.webconsole-4.…
cziegeler Oct 2, 2015
068a901
[maven-release-plugin] prepare for next development iteration
cziegeler Oct 2, 2015
b2ea432
FELIX-5060 : Unnecessary import of org.osgi.service.component
cziegeler Oct 2, 2015
f9ddbfa
Apply patch to avoid resolve failures for optional fragments (FELIX-5…
Oct 5, 2015
8096bd8
FELIX-5064 Framework should provide service capabilities for register…
bosschaert Oct 6, 2015
597f154
Use latest http base
cziegeler Oct 8, 2015
19539b2
FELIX-5053 : IllegalArgumentException when forwarding request
cziegeler Oct 9, 2015
aedcb08
[maven-release-plugin] prepare release org.apache.felix.http.base-3.0.2
cziegeler Oct 9, 2015
3f5573e
[maven-release-plugin] prepare for next development iteration
cziegeler Oct 9, 2015
5eb8fc8
Use released http.base
cziegeler Oct 9, 2015
1fe6a25
[maven-release-plugin] prepare release org.apache.felix.http.jetty-3.1.2
cziegeler Oct 9, 2015
dde3644
[maven-release-plugin] prepare for next development iteration
cziegeler Oct 9, 2015
6bd32e8
Switch back to snapshot
cziegeler Oct 9, 2015
80b2b6c
Update to latest http jetty snapshot version
cziegeler Oct 9, 2015
30e80ae
Use release http.base
cziegeler Oct 9, 2015
aceab7c
[maven-release-plugin] prepare release org.apache.felix.http.bridge-3…
cziegeler Oct 9, 2015
52b0ec6
[maven-release-plugin] prepare for next development iteration
cziegeler Oct 9, 2015
12512da
Switch to latest http.base snapshot
cziegeler Oct 9, 2015
1a38754
FELIX-4417 Commit updated circular reference test from Victor Antonov…
djencks Oct 10, 2015
9e01613
FELIX-5075 Framework hooks not re-sorted on service ranking update
bosschaert Oct 12, 2015
0a0bb3e
FELIX-5075 Framework hooks not re-sorted on service ranking update
bosschaert Oct 12, 2015
1f2635e
Update changelog for release
karlpauls Oct 13, 2015
12a68be
[maven-release-plugin] prepare release org.apache.felix.resolver-1.8.0
karlpauls Oct 13, 2015
32fdad3
[maven-release-plugin] prepare for next development iteration
karlpauls Oct 13, 2015
a70141e
Update changelog and dependencies for release
karlpauls Oct 13, 2015
909e9a8
[maven-release-plugin] prepare release org.apache.felix.framework-5.4.0
karlpauls Oct 13, 2015
0e313ac
[maven-release-plugin] prepare for next development iteration
karlpauls Oct 13, 2015
9ce70ca
Update changelog and dependencies for release
karlpauls Oct 13, 2015
f742261
[maven-release-plugin] prepare release org.apache.felix.main-5.4.0
karlpauls Oct 13, 2015
4b35fe5
[maven-release-plugin] prepare for next development iteration
karlpauls Oct 13, 2015
f9ad643
Update changelog and dependencies for release
karlpauls Oct 13, 2015
76ab69c
[maven-release-plugin] prepare release org.apache.felix.main.distribu…
karlpauls Oct 13, 2015
0dd0930
[maven-release-plugin] prepare for next development iteration
karlpauls Oct 13, 2015
fac349d
Upgrade dependencies after release
karlpauls Oct 13, 2015
00c4653
Downgrade dependencies for release
karlpauls Oct 13, 2015
0f8d3a6
[maven-release-plugin] prepare release org.apache.felix.resolver-1.8.0
karlpauls Oct 13, 2015
cfc2dba
[maven-release-plugin] prepare for next development iteration
karlpauls Oct 13, 2015
8132118
[maven-release-plugin] prepare release org.apache.felix.framework-5.4.0
karlpauls Oct 13, 2015
6aaeca2
[maven-release-plugin] prepare for next development iteration
karlpauls Oct 13, 2015
fcba71f
[maven-release-plugin] prepare release org.apache.felix.main-5.4.0
karlpauls Oct 13, 2015
17108aa
[maven-release-plugin] prepare for next development iteration
karlpauls Oct 13, 2015
43bea1c
[maven-release-plugin] prepare release org.apache.felix.main.distribu…
karlpauls Oct 13, 2015
d0bedbc
[maven-release-plugin] prepare for next development iteration
karlpauls Oct 13, 2015
36e1671
Upgrade dependencies after release
karlpauls Oct 13, 2015
38700ee
Downgrade dependencies for rerelase
karlpauls Oct 13, 2015
9cfbafd
[maven-release-plugin] prepare release org.apache.felix.resolver-1.8.0
karlpauls Oct 13, 2015
3a53873
[maven-release-plugin] prepare for next development iteration
karlpauls Oct 13, 2015
bff6b1f
[maven-release-plugin] prepare release org.apache.felix.framework-5.4.0
karlpauls Oct 13, 2015
fee78d9
[maven-release-plugin] prepare for next development iteration
karlpauls Oct 13, 2015
78bcaba
[maven-release-plugin] prepare release org.apache.felix.main-5.4.0
karlpauls Oct 13, 2015
d0a8da1
[maven-release-plugin] prepare for next development iteration
karlpauls Oct 13, 2015
a49340e
[maven-release-plugin] prepare release org.apache.felix.main.distribu…
karlpauls Oct 13, 2015
8f8299b
[maven-release-plugin] prepare for next development iteration
karlpauls Oct 13, 2015
c03cbeb
Upgrade dependencies after release
karlpauls Oct 13, 2015
fe50406
FELIX-5072 : Support optional property "pattern" in @SlingFilter anno…
cziegeler Oct 15, 2015
0c9a5b0
FELIX-5080 Implementation Class in gogo output
djencks Oct 16, 2015
b9174de
FELIX-5032 fix index out of bounds exception and concealed test failure
djencks Oct 20, 2015
64d6b8b
FELIX-5073: dependency-reduced-pom support; remove embedded items fro…
bimargulies Oct 24, 2015
eca2b9c
FELIX-5073: integration test.
bimargulies Oct 24, 2015
0619b68
FELIX-5073: fill in integration test.
bimargulies Oct 24, 2015
f9f66ed
Closes #37.
bimargulies Oct 24, 2015
ad751c9
FELIX-4970: add scm to the gogo pom.
bimargulies Oct 24, 2015
039a39b
FELIX-5070: integration test that proves that there's no problem here.
bimargulies Oct 24, 2015
9028f10
no jira: set up for site publication.
bimargulies Oct 24, 2015
256e7a8
no jira: more entries in .gitignore.
bimargulies Oct 24, 2015
d050bd3
[FELIX-5074] Applied the patch proposed by Konrad (thanks). Everythin…
Oct 25, 2015
dc1032f
FELIX-5062 : maven-bundle-plugin includes tests dependencies in packa…
cziegeler Oct 27, 2015
0f941a3
FELIX-5062 : maven-bundle-plugin includes tests dependencies in packa…
cziegeler Oct 27, 2015
027cda5
FELIX-5062 : maven-bundle-plugin includes tests dependencies in packa…
cziegeler Oct 27, 2015
e321536
FELIX-5086 : Coordinator.begin can return null
cziegeler Nov 4, 2015
9c32c22
FELIX-5065 : Coordinator should provide osgi.service capability
cziegeler Nov 4, 2015
629bbec
Remove obsolete build files
cziegeler Nov 4, 2015
e26afbf
Move current development version to 0.1.0-SNAPSHOT
bosschaert Nov 6, 2015
8ff9a6a
Switch URL for auto-publication of bundle plugin doc to work with ext…
bimargulies Nov 8, 2015
45927db
Edited the wrong place.
bimargulies Nov 8, 2015
eb59a6e
[maven-release-plugin] prepare release org.apache.felix.coordinator-1…
bosschaert Nov 9, 2015
d38ca9d
[maven-release-plugin] prepare for next development iteration
bosschaert Nov 9, 2015
5d475a5
Add SCM details to pom
bosschaert Nov 9, 2015
e7bd591
Set ingore properties
bosschaert Nov 9, 2015
c617f92
[maven-release-plugin] prepare release org.apache.felix.webconsole.pl…
bosschaert Nov 9, 2015
f4b2551
[maven-release-plugin] prepare for next development iteration
bosschaert Nov 9, 2015
fcd69a9
Some ignorance.
bimargulies Nov 9, 2015
751ca48
[maven-release-plugin] prepare release maven-bundle-plugin-3.0.1
bimargulies Nov 9, 2015
63f08e5
[maven-release-plugin] prepare for next development iteration
bimargulies Nov 9, 2015
43ca21b
FELIX-5104: Call a conf dependency callback Instance with an instanti…
Nov 16, 2015
7f45ee0
Added FELIX-5104
Nov 16, 2015
91b1702
FELIX-5107: NullPointerException in org.apache.felix.eventadmin.impl.…
bosschaert Nov 18, 2015
4559af3
FELIX-5099 JSESSIONID Cookie in HTTPS Session Without 'Secure' and ‘H…
bosschaert Nov 19, 2015
05a04cf
FELIX-5109 : Wrong path matching for http whiteboard service
cziegeler Nov 19, 2015
5a01734
cziegeler Nov 19, 2015
1189d25
FELIX-5110 : HTTP resources content type are not set when using white…
cziegeler Nov 20, 2015
2f2d9e8
Added missing license header. Cleaned imports.
Nov 20, 2015
bd5c018
Incremented dm release to r6.
Nov 20, 2015
a00b620
Fixed typo.
Nov 20, 2015
3a01602
Replaced old r5 jars by new r6 jars.
Nov 20, 2015
030a431
Revert to previous r5 artifacts.
Nov 20, 2015
58018a1
[FELIX-5113] - Remove useless wrong test in ConfigurationDependencyImpl.
Nov 22, 2015
04ac0ed
Added a missing test that is verifying that a ConfigurationDependency…
Nov 22, 2015
a291216
[FELIX-5055] - Upgrade DM to BndTools 3.0.0
Nov 22, 2015
a7ea9e1
[FELIX-4921] Don't activate baselining by default, because unmodified…
Nov 22, 2015
239c9da
refresh repo indexes.
Nov 22, 2015
1038ad7
refresh repo indexes.
Nov 22, 2015
95a550f
Fixed wait time for step 4.
Nov 22, 2015
b2a6811
added author.
Nov 22, 2015
c723eb3
FELIX-5114: Schedule configuration update in Component executor synch…
Nov 22, 2015
41e1471
Added FELIX-5114
Nov 22, 2015
ccb2355
Preparing release r6.
Nov 22, 2015
9f9a132
Minor fixes and updates:
Nov 24, 2015
03a98a9
FELIX-518 - support localization and signature files:
Nov 24, 2015
8b301c5
FELIX-5117 : Call to SSOHttpSessionListener#sessionDestroyed is done …
cziegeler Nov 25, 2015
e7f163e
FELIX-5093 : HttpServletRequest.getRequestURI is broken for escaped c…
cziegeler Nov 26, 2015
f38dc10
[maven-release-plugin] prepare release org.apache.felix.http.base-3.0.4
cziegeler Nov 26, 2015
f4e63c3
[maven-release-plugin] prepare for next development iteration
cziegeler Nov 26, 2015
328f5f1
Use http.base 3.0.4
cziegeler Nov 26, 2015
518554e
[maven-release-plugin] prepare release org.apache.felix.http.jetty-3.1.4
cziegeler Nov 26, 2015
574f371
[maven-release-plugin] prepare for next development iteration
cziegeler Nov 26, 2015
ca559b2
Switch to http.base 3.0.5-SNAPSHOT
cziegeler Nov 26, 2015
54747d3
Use http.base 3.0.4
cziegeler Nov 26, 2015
cadacdc
[maven-release-plugin] prepare release org.apache.felix.http.bridge-3…
cziegeler Nov 26, 2015
e3bd508
[maven-release-plugin] prepare for next development iteration
cziegeler Nov 26, 2015
247adde
Switch to http.base 3.0.5-SNAPSHOT
cziegeler Nov 26, 2015
f96cadb
FELIX-4827 - Improve logging on LoginModule registration
chetanmeh Nov 30, 2015
ea632c1
FELIX-5083 - Set webconsole.configurationFactory.nameHint for JAAS co…
chetanmeh Nov 30, 2015
2bdfd5a
FELIX-5119 - Jaas module build fails with JDK 8
chetanmeh Nov 30, 2015
febed48
FELIX-5121 - Script console build failing on latest trunk
chetanmeh Nov 30, 2015
2e1c6a2
FELIX-5120 - ScriptEngineManager not able to parse service file with …
chetanmeh Nov 30, 2015
835ef73
FELIX-5120 - ScriptEngineManager not able to parse service file with …
chetanmeh Nov 30, 2015
2b89656
FELIX-5120 - ScriptEngineManager not able to parse service file with …
chetanmeh Nov 30, 2015
b3b58bc
FELIX-5122 - Script console output cannot be copied
chetanmeh Nov 30, 2015
283b811
FELIX-5123 - Script Console UI improvements
chetanmeh Nov 30, 2015
1784540
Prepare for 1.0.2 release
chetanmeh Nov 30, 2015
2474b78
[maven-release-plugin] prepare release org.apache.felix.webconsole.pl…
chetanmeh Nov 30, 2015
223e808
[maven-release-plugin] prepare for next development iteration
chetanmeh Nov 30, 2015
1cba106
Prepare for 0.0.4 release
chetanmeh Nov 30, 2015
ea145c7
Updated the parent pom to 3
chetanmeh Nov 30, 2015
d9a3871
FELIX-5119 - Jaas module build fails with JDK 8
chetanmeh Nov 30, 2015
15bb7d5
[maven-release-plugin] prepare release org.apache.felix.jaas-0.0.4
chetanmeh Nov 30, 2015
65c7a53
[maven-release-plugin] prepare for next development iteration
chetanmeh Nov 30, 2015
2fef2c1
no jira: add remark about $ escaping for instructions.
bimargulies Dec 1, 2015
30b2c58
Add additional test for deprecated http whiteboard filter
cziegeler Dec 1, 2015
e822723
Improved the makeStaging task in order to get latest available versio…
Dec 1, 2015
b9cc242
removed unecessary comment.
Dec 1, 2015
3d024b7
FELIX-5079 Register configuration listener per config admin found
djencks Dec 3, 2015
f6c2e7f
FELIX-5129 make lack of component configurations more visible
djencks Dec 3, 2015
89aafba
Remove unused code
cziegeler Dec 7, 2015
fe9a014
FELIX-5112 ClassCastException when deploying an OBR Resource already …
bosschaert Dec 8, 2015
76e5ebe
FELIX-5112 ClassCastException when deploying an OBR Resource already …
bosschaert Dec 8, 2015
ea1e80c
FELIX-5112 ClassCastException when deploying an OBR Resource already …
bosschaert Dec 8, 2015
3274cd8
FELIX-5112 ClassCastException when deploying an OBR Resource already …
bosschaert Dec 8, 2015
1ea7c81
FELIX-5112 ClassCastException when deploying an OBR Resource already …
bosschaert Dec 8, 2015
8b510d2
FELIX-5112 ClassCastException when deploying an OBR Resource already …
bosschaert Dec 8, 2015
105897e
FELIX-5084 Add a mock based test for BundleTracker
bosschaert Dec 9, 2015
c8fe441
FELIX-5085 Add a mock based test for ServiceTracker
bosschaert Dec 9, 2015
3b53b4e
FELIX-5079 fix NPE introduced in 1717854
djencks Dec 10, 2015
1ed6bc1
FELIX-5136 Improve startup performance and memory consumption of Dire…
CodingFabian Dec 13, 2015
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