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

SLING-7752 - Deserializing and serializing a feature model file suffles the configurations #144

Open
wants to merge 10,000 commits into
base: trunk
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
10000 commits
Select commit Hold shift + click to select a range
fecba1d
Update permission handling
cziegeler Jan 26, 2018
51a5f20
[converter] Some fixes to pass the OSGi CT tests.
bosschaert Jan 26, 2018
8ded84f
FELIX-5778 : Refactor factory configuration handling. Remove unused b…
cziegeler Jan 26, 2018
3fdc405
FELIX-5457 : Logger Support. Delegate to parent logger if log is disa…
cziegeler Jan 28, 2018
39394e8
Update to latest R7 api
cziegeler Jan 31, 2018
c4ab01c
Update to latest R7 api
cziegeler Jan 31, 2018
1673d2c
FELIX-5781 : Http endpoint property must be set
cziegeler Feb 1, 2018
12041a6
Add unit test for Version conversion.
bosschaert Feb 8, 2018
6166183
Correct typo in comment
cziegeler Feb 10, 2018
c2899c4
FELIX-5787 : Wrong port 433 instread of 443 used as default port for …
cziegeler Feb 10, 2018
1cc1298
FELIX-5787 : Wrong port 433 instread of 443 used as default port for …
cziegeler Feb 10, 2018
8403de7
FELIX-5351 : Close tracker before setting configurationmanager to nul…
cziegeler Feb 15, 2018
7664ea1
FELIX-5290 : [R7] Locking Configuration Records
cziegeler Feb 16, 2018
eacfc3a
Remove unused imports
cziegeler Feb 16, 2018
94c9579
FELIX-5789: make dynamic imports optional to prevent deadlocks.
karlpauls Feb 21, 2018
584c085
Update svn:ignore
karlpauls Feb 22, 2018
f6827f5
[maven-release-plugin] prepare release org.apache.felix.webconsole.pl…
karlpauls Feb 22, 2018
57e3ea2
[maven-release-plugin] prepare for next development iteration
karlpauls Feb 22, 2018
e14bf47
Merge FELIX-5601 into the r7 resolver, update to the latest OSGi sour…
karlpauls Feb 23, 2018
60eb6cd
Branch the framework for R7 work with updated osgi classes, removed p…
karlpauls Feb 23, 2018
42d0457
Update to parent pom version 4, add animal-sniffer, exclude transitiv…
karlpauls Feb 23, 2018
da63007
FELIX-5792: Add basic support for java.* exports and imports and remo…
karlpauls Feb 23, 2018
fea3857
FELIX-5793 : Update to Jetty 9.4.x
cziegeler Feb 26, 2018
dd9eebb
FELIX-5793 : Update to Jetty 9.4.x
cziegeler Feb 27, 2018
d1994b7
Remove unused imports
cziegeler Feb 27, 2018
a6c97ef
Add missing field for serialization
cziegeler Mar 2, 2018
db22db6
FELIX-5793 : Update to Jetty 9.4.x
cziegeler Mar 5, 2018
bd389e2
Initial contribution of Bundle Archive File Installer Extension
Mar 8, 2018
7bce10c
FELIX-5782 allow resolver errors to be introspected
rotty3000 Mar 8, 2018
b085fff
Update changelog for release
karlpauls Mar 9, 2018
05c5962
Update svn:ignore
karlpauls Mar 9, 2018
b05546d
[maven-release-plugin] prepare release org.apache.felix.resolver-1.16.0
karlpauls Mar 9, 2018
48586b5
[maven-release-plugin] prepare for next development iteration
karlpauls Mar 9, 2018
eb48bbf
FELIX-5803: Auto refresh uninstalled bundle graph if possible
karlpauls Mar 12, 2018
381f49f
FELIX-5798: Implement FrameworkWiringDTO
karlpauls Mar 12, 2018
52de272
FELIX-5804: Improve framework lookup for bundle protocol urls
karlpauls Mar 13, 2018
c047d3b
FELIX-5804: Improve framework lookup for bundle protocol urls
karlpauls Mar 13, 2018
6f2bbc5
Reformat some code
karlpauls Mar 13, 2018
4751ce6
[FELIX-5805][gogo][runtime] OOM caused by endless loop when parsing "]"
gnodet Mar 14, 2018
5ec08ea
[FELIX-5806] EventAdmin webconsole plugins displays wrong value for B…
gnodet Mar 14, 2018
f820b4c
[FELIX-5807] Do not hide the cause when a problem occurs in URLHandle…
gnodet Mar 14, 2018
21e98c6
FELIX-5807: Do not hide the cause when a problem occurs in URLHandler…
karlpauls Mar 14, 2018
f6003b5
FELIX-5808: Clean-up bundlecache manifest parsing and entry reading
karlpauls Mar 14, 2018
975a806
FELIX-5796: Implement multi-release jar support.
karlpauls Mar 14, 2018
525386e
FELIX-5809: Capture context for bundle: protocol urls if possible.
karlpauls Mar 14, 2018
c571a52
FELIX-5810: add sun.awt.www.content to the default search list for co…
karlpauls Mar 16, 2018
f76aaea
FELIX-5811: Prevent bundles from providing ee capabilities.
karlpauls Mar 16, 2018
8d6f7f2
FELIX-5797: Allow extension bundles to have imports and handle them l…
karlpauls Mar 16, 2018
1f911eb
FELIX-5797: Improve the check if we need to try to resolve pending ex…
karlpauls Mar 16, 2018
3aadaec
FELIX-5799: Catch Throwable instead of Exception when calling a servi…
karlpauls Mar 17, 2018
4dbe43e
FELIX-5808: Add a test case for the different kind of bundle revision…
karlpauls Mar 20, 2018
2f7bea9
Update to latest jetty snapshot
cziegeler Mar 20, 2018
6a3190a
FELIX-5812 : External session id differs from internal session id
cziegeler Mar 20, 2018
74275ae
FELIX-5812 : External session id differs from internal session id
cziegeler Mar 20, 2018
8f4d067
FELIX-5808: Add checks for proper manifest header handling and native…
karlpauls Mar 20, 2018
23c159c
FELIX-5813 : EventAdmin async threads should be named. Apply patch fr…
cziegeler Mar 21, 2018
447c6f5
FELIX-5814 : Unstable service id should not be used for session attri…
cziegeler Mar 22, 2018
7c0d4b8
FELIX-5814 : Unstable service id should not be used for session attri…
cziegeler Mar 22, 2018
2ac9171
FELIX-5815 : Duplicate events send to session listener for http context
cziegeler Mar 22, 2018
09bc050
FELIX-5815 : Duplicate events send to session listener for http context
cziegeler Mar 22, 2018
49fb461
FELIX-5819 : Container session should not be invalidated
cziegeler Mar 29, 2018
f86428f
FELIX-5819 : Container session should not be invalidated
cziegeler Mar 29, 2018
4354733
FELIX-5716: Applied the patch attached to the jira issue.
Mar 29, 2018
597c8ad
FELIX-5818: Only resolve fragments that are required on dynamic import.
karlpauls Apr 3, 2018
743f391
FELIX-5800: Clean-up default properties handling to make it easier to…
karlpauls Apr 3, 2018
885effb
FELIX-5816: make random configurable (SecureRandom v.s. normal) for u…
karlpauls Apr 3, 2018
d983d21
Set version to 5.9.0-SNAPSHOT, make tests work with java6, and remove…
karlpauls Apr 3, 2018
e38df75
FELIX-5819 : Add test case
cziegeler Apr 4, 2018
acb3b23
FELIX-5819 : Add test case
cziegeler Apr 4, 2018
9676863
FELIX-5820 : Update parent pom
cziegeler Apr 4, 2018
72890e1
Adjust to latest parent pom and remove dependency to easymock
cziegeler Apr 4, 2018
cc6d160
Adjust to latest parent pom and remove dependency to easymock
cziegeler Apr 4, 2018
398f864
Update to latest parent pom
cziegeler Apr 4, 2018
dd810ac
[FELIX-5821][gogo][runtime] Hitting Ctrl+C may kill the console outpu…
gnodet Apr 4, 2018
c24321c
Update to latest parent pom 5-SNAPSHOT.
karlpauls Apr 4, 2018
d58d091
FELIX-5793 : Update to Jetty 9.4.x
cziegeler Apr 4, 2018
ca7a330
[FELIX-5822][gogo][jline] Improve syntax of procedural functions
gnodet Apr 4, 2018
f54360d
FELIX-5823: Remove support for old multi-file bundle cache format.
karlpauls Apr 6, 2018
df2f114
[maven-release-plugin] prepare release org.apache.felix.gogo.runtime-…
gnodet Apr 9, 2018
30683d8
[maven-release-plugin] prepare for next development iteration
gnodet Apr 9, 2018
467dff5
[maven-release-plugin] prepare release org.apache.felix.gogo.jline-1.…
gnodet Apr 9, 2018
770f3e9
[maven-release-plugin] prepare for next development iteration
gnodet Apr 9, 2018
a51c356
Fix a comment
karlpauls Apr 13, 2018
3b1e849
Add a method for getCanonicalPath and generic PrivilegedActivions to …
karlpauls Apr 13, 2018
3e970fc
FELIX-5800: calculate system package exports at runtime on jpms, opti…
karlpauls Apr 13, 2018
bfc541e
FELIX-5800: add some simple test to see that we have at least some sy…
karlpauls Apr 13, 2018
1d388e4
FELIX-5824: Use VersionRange from OSGi and remove our own.
karlpauls Apr 13, 2018
ed1d547
FELIX-5825: Use ReentrantLock inside WeakZipFileFactory/WeakZipFile a…
karlpauls Apr 13, 2018
659c640
FELIX-5826: Remove FelixBundleContext interface.
karlpauls Apr 13, 2018
8f6cdcd
FELIX-5800: Add animal sniffer annotations
karlpauls Apr 13, 2018
e220bc3
FELIX-5827: Use less synchronized in the BundleWiring and BundleClass…
karlpauls Apr 13, 2018
1efba85
Fix a parameter ordering mistake.
karlpauls Apr 13, 2018
51371a5
FELIX-5738 : EventAdmin IgnoreTopic config. property doesn't support …
cziegeler Apr 16, 2018
22c331e
FELIX-5831 : Async/sync Thread Pool Ratio is not changeable at runtim…
cziegeler Apr 17, 2018
500fd28
Change JSON classloading and fix permissions. Apply patch provided by…
cziegeler Apr 19, 2018
53443ba
Update changelog
cziegeler Apr 19, 2018
4fa272a
[maven-release-plugin] prepare release felix-parent-5
cziegeler Apr 19, 2018
1eb4721
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 19, 2018
cac1c37
[FELIX-5832] Only handle ConfigurationEvents for config objects manag…
gnodet Apr 19, 2018
1a8f0fc
[gogo] Switch version to 1.1.0
gnodet Apr 19, 2018
9b75801
[FELIX-5834][gogo][jline] Upgrade to a recent JLine version
gnodet Apr 19, 2018
a58e66f
[FELIX-5833][gogo][jline] Fix parser to support quotes and escape cha…
gnodet Apr 19, 2018
607f748
[FELIX-5837][gogo][jline] Improve styling support
gnodet Apr 19, 2018
448e312
[FELIX-5836][gogo] Upgrade to OSGi r6
gnodet Apr 19, 2018
dcc5612
[FELIX-5835][gogo] Upgrade requirement to JDK 8
gnodet Apr 19, 2018
ef757ed
[FELIX-5835][gogo] Code cleanup
gnodet Apr 19, 2018
5ef5df7
Bring OSGi Capability and Requirement implementation to utils bundle.
bosschaert Apr 19, 2018
0542244
Move OSGi Capability and Requirement to utils package.
bosschaert Apr 19, 2018
b2e4feb
Improvements to the OSGi Capability and Requirement implementations
bosschaert Apr 20, 2018
e6f2199
Use the latest shared Capabilities implementation from utils project.
bosschaert Apr 20, 2018
94a456b
FELIX-5838 Add OSGi Resource implementations to Felix Utils
bosschaert Apr 20, 2018
eeb35d4
Use latest capabilities from utils project.
bosschaert Apr 20, 2018
8cb2d55
Provide optimized resource / filter / capability / requirement / capa…
gnodet Apr 20, 2018
f49f098
[FELIX-5839] Add xml and json repositories implemenation
gnodet Apr 20, 2018
6cf6285
FELIX-5838 Add OSGi Resource implementations to Felix Utils
bosschaert Apr 20, 2018
89a7c15
Use released parent pom 5
cziegeler Apr 23, 2018
a5e16b6
Use release http.whiteboard api
cziegeler Apr 23, 2018
d450f68
Use release http.whiteboard api
cziegeler Apr 23, 2018
784a7e2
Use release http.whiteboard api
cziegeler Apr 23, 2018
adca54b
Use released OSGi R7 api
cziegeler Apr 23, 2018
59c9229
Use released R7 apis
cziegeler Apr 23, 2018
28292f7
Use released R7 apis
cziegeler Apr 23, 2018
f0af2e4
Use released R7 api
cziegeler Apr 23, 2018
c1359eb
Remove R6 implementation in favour of R7 one
cziegeler Apr 23, 2018
00cceef
Move http base R7 to master
cziegeler Apr 23, 2018
7d12c2b
Move http bridge R7 to master
cziegeler Apr 23, 2018
92ece6f
Move http jetty R7 to master
cziegeler Apr 23, 2018
b6ddfe7
Move http itest R7 to master
cziegeler Apr 23, 2018
a6d44ec
Adjust versions
cziegeler Apr 23, 2018
ea6f139
Remove obsolete http directory
cziegeler Apr 23, 2018
e99f1fc
[Felix Converter] Remove dependency on OSGi Maven repo
bosschaert Apr 23, 2018
a31854a
[Felix Converter] Prepare Javadoc for release
bosschaert Apr 23, 2018
865b001
[maven-release-plugin] prepare release org.apache.felix.converter-1.0.0
bosschaert Apr 23, 2018
cb521ba
[maven-release-plugin] prepare for next development iteration
bosschaert Apr 23, 2018
b597828
FELIX-5838 Add OSGi Resource implementations to Felix Utils
bosschaert Apr 23, 2018
0872513
FELIX-5829: delete ImmutableMap/List.
karlpauls Apr 23, 2018
f584b1a
[FELIX-5839] Make checkAndLoadCache available for override
gnodet Apr 24, 2018
37513ba
[FELIX-5838] Move capability/requirement toString to a new ResourceUt…
gnodet Apr 24, 2018
4bcb5b3
[FELIX-5838] Make the filter usage a bit more coherent
gnodet Apr 24, 2018
ead1643
Correct version
cziegeler Apr 24, 2018
3709bc2
Add missing ca version property
cziegeler Apr 25, 2018
a60cf08
Move R7 configadmin to trunk
cziegeler Apr 26, 2018
223426e
Move R7 configadmin to trunk
cziegeler Apr 26, 2018
451224d
Move R7 SCR to trunk
cziegeler Apr 26, 2018
e1b6709
Move R7 scr to trunk
cziegeler Apr 26, 2018
3020b46
Move R7 configurator to trunk
cziegeler Apr 26, 2018
8823a3f
Update changelog
cziegeler Apr 26, 2018
49f4b99
Update changelog
cziegeler Apr 26, 2018
ec90747
Correct svn location
cziegeler Apr 26, 2018
a30efa4
[maven-release-plugin] prepare release org.apache.felix.configadmin-1…
cziegeler Apr 26, 2018
f8f987f
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 26, 2018
6d951e5
Correct svn location
cziegeler Apr 26, 2018
d4e288c
Use configadmin 1.9.0
cziegeler Apr 26, 2018
b97dc51
[maven-release-plugin] prepare release org.apache.felix.scr-2.1.0
cziegeler Apr 26, 2018
342cd8a
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 26, 2018
7fae5ca
Correct svn location
cziegeler Apr 26, 2018
3d00649
Use latest converter
cziegeler Apr 26, 2018
009f52d
Prepare for release
cziegeler Apr 26, 2018
3a0b957
[maven-release-plugin] prepare release org.apache.felix.http.parent-10
cziegeler Apr 26, 2018
e81ba24
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 26, 2018
ea355bd
[maven-release-plugin] prepare release org.apache.felix.http.base-4.0.0
cziegeler Apr 26, 2018
408a576
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 26, 2018
c8a96f0
[maven-release-plugin] prepare release org.apache.felix.http.whiteboa…
cziegeler Apr 26, 2018
68bf975
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 26, 2018
cb65b93
[maven-release-plugin] prepare release org.apache.felix.http.bridge-4…
cziegeler Apr 26, 2018
bef3f97
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 26, 2018
b244c3d
[maven-release-plugin] prepare release org.apache.felix.http.jetty-4.0.0
cziegeler Apr 26, 2018
c5b90e7
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 26, 2018
7a82fda
Use released converter
cziegeler Apr 26, 2018
cf49215
[maven-release-plugin] prepare release org.apache.felix.configurator-…
cziegeler Apr 27, 2018
1eca303
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 27, 2018
fabd361
Use correct dependency for osgi promises
cziegeler Apr 27, 2018
502e622
FELIX-5841 : Update webconsole plugin to DS 1.4 (R7)
cziegeler Apr 27, 2018
d35bba8
Fix up some javadoc in preparation for the release.
bosschaert May 1, 2018
f28b76c
Use Felix Parent Pom v5
bosschaert May 2, 2018
56d3459
[maven-release-plugin] prepare release org.apache.felix.utils-1.11.0
bosschaert May 2, 2018
34a961d
[maven-release-plugin] prepare for next development iteration
bosschaert May 2, 2018
699fcec
Update trunk to the osgi-r7 resolver
karlpauls May 3, 2018
1878353
Update trunk to the osgi-r7 framework
karlpauls May 3, 2018
dba7b60
Delete empty osgi-r7 dir.
karlpauls May 3, 2018
4375b59
Update to latest parent pom version 5
karlpauls May 3, 2018
0b08a65
Update to latest parent pom version 5
karlpauls May 3, 2018
b3c9531
Update to latest parent pom version 5 and current framework snapshot …
karlpauls May 3, 2018
41814af
Set version as 5.9.0-SNAPSHOT
karlpauls May 3, 2018
28fcc0b
FELIX-5773 : Update implementation to EventAdmin 1.4 (R7)
cziegeler May 4, 2018
f4fd49d
Avoid dependency to osgi.compendium
cziegeler May 4, 2018
1f78518
[maven-release-plugin] prepare release org.apache.felix.eventadmin-1.5.0
cziegeler May 4, 2018
a8df099
[maven-release-plugin] prepare for next development iteration
cziegeler May 4, 2018
3055edb
FELIX-5779 : Update metatype to R7
cziegeler May 4, 2018
b26785e
[maven-release-plugin] prepare release org.apache.felix.metatype-1.2.0
cziegeler May 4, 2018
a6ae219
[maven-release-plugin] prepare for next development iteration
cziegeler May 4, 2018
43b256b
Update changelog.txt
bosschaert May 8, 2018
062c941
prepare systemready contrib
dulvac May 8, 2018
62e1003
FELIX-5845 : org.apache.felix.cm.impl.persistence.PersistenceManagerP…
cziegeler May 8, 2018
fec3651
FELIX-5848 [contribution] Contribute System Ready to felix
dulvac May 9, 2018
8bb154a
Add test for FELIX-5849
cziegeler May 10, 2018
9a2b07b
More info to the FrameworkStartCheck
dulvac May 10, 2018
4106c73
Update tests to junit annotations
cziegeler May 11, 2018
3e2fa37
[FELIX-5855] Support array subscript in expander
gnodet May 17, 2018
a2d37b6
[FELIX-5856] Coercion between Object[] and List
gnodet May 17, 2018
ad104da
[FELIX-5856] Fix coercion between typed array and List
gnodet May 17, 2018
56ba0ac
[FELIX-5857] Provide a context classloader on the session to help wit…
gnodet May 17, 2018
a25c2e1
[logbackend] first commit
rotty3000 May 18, 2018
d99ae9f
[maven-release-plugin] prepare release org.apache.felix.configadmin-1…
cziegeler May 23, 2018
764acc6
[maven-release-plugin] prepare for next development iteration
cziegeler May 23, 2018
bbeda1c
Merge branch 'FELIX-5860' into trunk
gnodet May 24, 2018
43874dd
Revert "[FELIX-5860] Upgrade to OSGi R7"
gnodet May 24, 2018
6c9ecce
Update to felix-parent 5
jbonofre May 24, 2018
3736869
[maven-release-plugin] prepare release org.apache.felix.connect-0.2.0
jbonofre May 24, 2018
6e5cde8
[maven-release-plugin] prepare for next development iteration
jbonofre May 24, 2018
4135f37
Cancel Felix Connect 0.2.0 release
jbonofre May 25, 2018
2dcfb78
Update NOTICE file using Felix Connect name and adding ASF copyright
jbonofre May 25, 2018
c630981
Update NOTICE
jbonofre May 25, 2018
01b05ea
[maven-release-plugin] prepare release org.apache.felix.connect-0.2.0
jbonofre May 25, 2018
b3c5be9
[maven-release-plugin] prepare for next development iteration
jbonofre May 25, 2018
db14dec
[logback] rename and add integration test suite
rotty3000 May 28, 2018
2755274
[logback] do less work during release/deploy
rotty3000 May 28, 2018
1d2716f
FELIX-5848 FrameworkStartCheck and general improvements
dulvac Jun 4, 2018
0f47585
[FELIX-5794] maven-bundle-plugin fails to parse meta-persistence
gnodet Jun 8, 2018
018aeba
Make the FileInstall BAR plugin easier to build
Jun 11, 2018
38bfba7
FELIX-5865 : SCR r7 logging support doesn't work on equinox framework
cziegeler Jun 12, 2018
0e4a0f9
[logback] update project configurations
rotty3000 Jun 12, 2018
a8fe38f
FELIX-5867 reference field of type Logger for service LoggerFactory i…
rotty3000 Jun 12, 2018
e86f3d1
FELIX-5866 : scr does not respect the log level set in LoggerAdmin
cziegeler Jun 13, 2018
111ed75
Update changelog
cziegeler Jun 13, 2018
9bd7fbe
[FELIX-5869] [goto][jline] Weird error if the script contains unicode…
gnodet Jun 14, 2018
1a176e7
[maven-release-plugin] prepare release gogo-parent-3
gnodet Jun 14, 2018
bfc2b3d
[maven-release-plugin] rollback the release of gogo-parent-3
gnodet Jun 14, 2018
8090dba
Upgrade to latest felix parent
gnodet Jun 14, 2018
caa0628
[maven-release-plugin] prepare release gogo-parent-3
gnodet Jun 14, 2018
f2ea0c3
[maven-release-plugin] prepare for next development iteration
gnodet Jun 14, 2018
433a0c1
Upgrade to latest parent
gnodet Jun 14, 2018
de41d04
Upgrade to latest felix parent, fix poms
gnodet Jun 14, 2018
f75edf1
[maven-release-plugin] prepare release gogo-parent-4
gnodet Jun 14, 2018
78bb837
[maven-release-plugin] prepare for next development iteration
gnodet Jun 14, 2018
1508cb8
Upgrade to gogo-parent 4
gnodet Jun 14, 2018
f809e9c
[maven-release-plugin] prepare release org.apache.felix.gogo.runtime-…
gnodet Jun 14, 2018
ebc1019
[maven-release-plugin] prepare for next development iteration
gnodet Jun 14, 2018
b02d06a
Upgrade to gogo-parent 4
gnodet Jun 14, 2018
135f6f6
[maven-release-plugin] prepare release org.apache.felix.gogo.shell-1.1.0
gnodet Jun 14, 2018
8c35aa1
[maven-release-plugin] prepare for next development iteration
gnodet Jun 14, 2018
ced5e62
[maven-release-plugin] prepare release org.apache.felix.gogo.jline-1.1.0
gnodet Jun 14, 2018
32169dd
[maven-release-plugin] prepare for next development iteration
gnodet Jun 14, 2018
9063278
[maven-release-plugin] prepare release maven-bundle-plugin-3.5.1
gnodet Jun 14, 2018
aa197fa
[maven-release-plugin] prepare for next development iteration
gnodet Jun 14, 2018
1454115
FELIX-5870: Don't allow relative path instructions in bundleclasspath…
karlpauls Jun 15, 2018
54d492f
FELIX-5800: fix a bug where we where using the wrong properties map.
karlpauls Jun 15, 2018
975b8ea
FELIX-5800: Fix a small bug when calculating osgi.ee on > java9.
karlpauls Jun 18, 2018
0a1e13e
FELIX-5828: Remove support for android.
karlpauls Jun 18, 2018
d5b37ec
SLING-7752 - Deserializing and serializing a feature model file suffl…
andreituicu Jun 22, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
FELIX-5782 allow resolver errors to be introspected
Signed-off-by: Raymond Augé <rotty3000@apache.org>

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1826276 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
rotty3000 committed Mar 8, 2018
commit 7bce10c1e91bff34e441f763b93472e161ad12ab
5 changes: 3 additions & 2 deletions osgi-r7/resolver/pom.xml
Original file line number Diff line number Diff line change
@@ -73,13 +73,14 @@
<configuration>
<instructions>
<_sources>true</_sources>
<_sourcepath>${build.sourceDirectory}</_sourcepath>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<_sourcepath>${project.build.sourceDirectory}</_sourcepath>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Activator>
org.apache.felix.resolver.Activator
</Bundle-Activator>
<Private-Package>org.apache.*</Private-Package>
<Export-Package>
org.apache.felix.resolver.reason,
org.osgi.service.resolver.*;provide:=true
</Export-Package>
<Import-Package>
Original file line number Diff line number Diff line change
@@ -24,11 +24,13 @@

import org.apache.felix.resolver.ResolverImpl.PermutationType;
import org.apache.felix.resolver.ResolverImpl.ResolveSession;
import org.apache.felix.resolver.reason.ReasonException;
import org.apache.felix.resolver.util.*;
import org.osgi.framework.Version;
import org.osgi.framework.namespace.*;
import org.osgi.resource.*;
import org.osgi.service.resolver.HostedCapability;
import org.osgi.service.resolver.ResolutionException;
import org.osgi.service.resolver.ResolveContext;

class Candidates
@@ -1274,6 +1276,11 @@ public Collection<Requirement> getUnresolvedRequirements() {
return Collections.singleton(requirement);
}

@Override
public ResolutionException toException() {
return new ReasonException(ReasonException.Reason.DynamicImport, getMessage(), null, getUnresolvedRequirements());
}

}

static class FragmentNotSelectedError extends ResolutionError {
@@ -1288,6 +1295,16 @@ public String getMessage() {
return "Fragment was not selected for attachment: " + resource;
}

@Override
public Collection<Requirement> getUnresolvedRequirements() {
return resource.getRequirements(HostNamespace.HOST_NAMESPACE);
}

@Override
public ResolutionException toException() {
return new ReasonException(ReasonException.Reason.FragmentNotSelected, getMessage(), null, getUnresolvedRequirements());
}

}

static class MissingRequirementError extends ResolutionError {
@@ -1318,6 +1335,12 @@ public Collection<Requirement> getUnresolvedRequirements() {
return Collections.singleton(requirement);
}

@Override
public ResolutionException toException() {
return new ReasonException(
ReasonException.Reason.MissingRequirement, getMessage(), cause != null ? cause.toException() : null, getUnresolvedRequirements());
}

}

}
Original file line number Diff line number Diff line change
@@ -38,9 +38,7 @@ public Collection<Requirement> getUnresolvedRequirements() {
return Collections.emptyList();
}

public ResolutionException toException() {
return new ResolutionException(getMessage(), null, getUnresolvedRequirements());
}
public abstract ResolutionException toException();

@Override
public String toString() {
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;

import org.apache.felix.resolver.reason.ReasonException;
import org.apache.felix.resolver.util.ArrayMap;
import org.apache.felix.resolver.util.CandidateSelector;
import org.apache.felix.resolver.util.OpenHashMap;
@@ -2437,6 +2438,11 @@ private Capability getSatisfyingCapability(Requirement req)

return cap;
}

@Override
public ResolutionException toException() {
return new ReasonException(ReasonException.Reason.UseConstraint, getMessage(), null, getUnresolvedRequirements());
}
}

private static class EnhancedExecutor
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
/*
* 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.resolver.reason;

import java.util.Collection;

import org.osgi.resource.Requirement;
import org.osgi.service.resolver.ResolutionException;

/**
* An exception that holds the reason for a resolution failure.
*
* @see {@link ResolutionException}
*/
public class ReasonException extends ResolutionException {

/**
* The reasons for resolution failure.
*/
public static enum Reason {
/**
* Represents an unresolved package referenced by {@code Dynamic-ImportPackage}.
* <p>
* {@link ReasonException#getUnresolvedRequirements()} will return a
* collection containing the single {@code osgi.wiring.package;resolution:=dynamic}
* requirement which failed to resolve.
* <p>
* This reason has no a transitive cause.
*/
DynamicImport,

/**
* Represents the scenario where a fragment matches a host but is not
* selected because another fragment with the same {@code Bundle-SymbolicName}
* already matched, usually a fragment of a higher version.
* <p>
* {@link ReasonException#getUnresolvedRequirements()} will return
* a collection containing the single {@code osgi.wiring.host} requirement of
* the fragment.
* <p>
* This reason has no a transitive cause.
*/
FragmentNotSelected,

/**
* Represents the scenario where a requirement could not be resolved.
* <p>
* {@link ReasonException#getUnresolvedRequirements()} will return
* a collection containing a single requirement that didn't resolve.
* <p>
* This reason may have a transitive cause.
*/
MissingRequirement,

/**
* Represents a failure in the <em>use constraints</em> of a bundle.
* <p>
* {@link ReasonException#getUnresolvedRequirements()} will return
* a collection containing a single requirement to blame for the use constraint
* violation.
* <p>
* This reason has no a transitive cause.
*/
UseConstraint
}

private static final long serialVersionUID = -5276675175114379539L;

public ReasonException(Reason reason, String message, Throwable cause, Collection<Requirement> unresolvedRequirements) {
super(message, cause, unresolvedRequirements);
this.reason = reason;
}

public Reason getReason() {
return reason;
}

private final Reason reason;

}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
version 1.0.0
5 changes: 3 additions & 2 deletions resolver/pom.xml
Original file line number Diff line number Diff line change
@@ -68,13 +68,14 @@
<configuration>
<instructions>
<_sources>true</_sources>
<_sourcepath>${build.sourceDirectory}</_sourcepath>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<_sourcepath>${project.build.sourceDirectory}</_sourcepath>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Activator>
org.apache.felix.resolver.Activator
</Bundle-Activator>
<Private-Package>org.apache.*</Private-Package>
<Export-Package>
org.apache.felix.resolver.reason,
org.osgi.service.resolver.*;provide:=true
</Export-Package>
<Import-Package>
23 changes: 23 additions & 0 deletions resolver/src/main/java/org/apache/felix/resolver/Candidates.java
Original file line number Diff line number Diff line change
@@ -24,11 +24,13 @@

import org.apache.felix.resolver.ResolverImpl.PermutationType;
import org.apache.felix.resolver.ResolverImpl.ResolveSession;
import org.apache.felix.resolver.reason.ReasonException;
import org.apache.felix.resolver.util.*;
import org.osgi.framework.Version;
import org.osgi.framework.namespace.*;
import org.osgi.resource.*;
import org.osgi.service.resolver.HostedCapability;
import org.osgi.service.resolver.ResolutionException;
import org.osgi.service.resolver.ResolveContext;

class Candidates
@@ -1276,6 +1278,11 @@ public Collection<Requirement> getUnresolvedRequirements() {
return Collections.singleton(requirement);
}

@Override
public ResolutionException toException() {
return new ReasonException(ReasonException.Reason.DynamicImport, getMessage(), null, getUnresolvedRequirements());
}

}

static class FragmentNotSelectedError extends ResolutionError {
@@ -1290,6 +1297,16 @@ public String getMessage() {
return "Fragment was not selected for attachment: " + resource;
}

@Override
public Collection<Requirement> getUnresolvedRequirements() {
return resource.getRequirements(HostNamespace.HOST_NAMESPACE);
}

@Override
public ResolutionException toException() {
return new ReasonException(ReasonException.Reason.FragmentNotSelected, getMessage(), null, getUnresolvedRequirements());
}

}

static class MissingRequirementError extends ResolutionError {
@@ -1320,6 +1337,12 @@ public Collection<Requirement> getUnresolvedRequirements() {
return Collections.singleton(requirement);
}

@Override
public ResolutionException toException() {
return new ReasonException(
ReasonException.Reason.MissingRequirement, getMessage(), cause != null ? cause.toException() : null, getUnresolvedRequirements());
}

}

}
Original file line number Diff line number Diff line change
@@ -38,9 +38,7 @@ public Collection<Requirement> getUnresolvedRequirements() {
return Collections.emptyList();
}

public ResolutionException toException() {
return new ResolutionException(getMessage(), null, getUnresolvedRequirements());
}
public abstract ResolutionException toException();

@Override
public String toString() {
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;

import org.apache.felix.resolver.reason.ReasonException;
import org.apache.felix.resolver.util.ArrayMap;
import org.apache.felix.resolver.util.CandidateSelector;
import org.apache.felix.resolver.util.OpenHashMap;
@@ -2464,6 +2465,11 @@ private Capability getSatisfyingCapability(Requirement req)

return cap;
}

@Override
public ResolutionException toException() {
return new ReasonException(ReasonException.Reason.UseConstraint, getMessage(), null, getUnresolvedRequirements());
}
}

private static class EnhancedExecutor
Loading