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.

Sign up for GitHub

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

Jump to bottom

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

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

wants to merge 10,000 commits into from

Conversation

andreituicu
Copy link

No description provided.

cziegeler and others added 30 commits January 26, 2018 07:30
@cziegeler
Update permission handling
fecba1d 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1822252 13f79535-47bb-0310-9956-ffa450edef68
@bosschaert
[converter] Some fixes to pass the OSGi CT tests.
51a5f20 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1822265 13f79535-47bb-0310-9956-ffa450edef68
@cziegeler
FELIX-5778 : Refactor factory configuration handling. Remove unused b…
8ded84f 
…ase class and add more tests

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1822320 13f79535-47bb-0310-9956-ffa450edef68
@cziegeler
FELIX-5457 : Logger Support. Delegate to parent logger if log is disa…
3fdc405 
…bled

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1822454 13f79535-47bb-0310-9956-ffa450edef68
@cziegeler
Update to latest R7 api
39394e8 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1822740 13f79535-47bb-0310-9956-ffa450edef68
@cziegeler
Update to latest R7 api
c4ab01c 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1822741 13f79535-47bb-0310-9956-ffa450edef68
@cziegeler
FELIX-5781 : Http endpoint property must be set
1673d2c 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1822848 13f79535-47bb-0310-9956-ffa450edef68
@bosschaert
Add unit test for Version conversion.
12041a6 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1823573 13f79535-47bb-0310-9956-ffa450edef68
@cziegeler
Correct typo in comment
6166183 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1823741 13f79535-47bb-0310-9956-ffa450edef68
@cziegeler
FELIX-5787 : Wrong port 433 instread of 443 used as default port for …
c2899c4 
…https

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1823742 13f79535-47bb-0310-9956-ffa450edef68
@cziegeler
FELIX-5787 : Wrong port 433 instread of 443 used as default port for …
1cc1298 
…https

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1823743 13f79535-47bb-0310-9956-ffa450edef68
@cziegeler
FELIX-5351 : Close tracker before setting configurationmanager to nul…
8403de7 
…l (avoiding NPE on shutdown)

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1824285 13f79535-47bb-0310-9956-ffa450edef68
@cziegeler
FELIX-5290 : [R7] Locking Configuration Records
7664ea1 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1824450 13f79535-47bb-0310-9956-ffa450edef68
@cziegeler
Remove unused imports
eacfc3a 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1824521 13f79535-47bb-0310-9956-ffa450edef68
@karlpauls
FELIX-5789: make dynamic imports optional to prevent deadlocks.
94c9579 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1824965 13f79535-47bb-0310-9956-ffa450edef68
@karlpauls
Update svn:ignore
584c085 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1825059 13f79535-47bb-0310-9956-ffa450edef68
@karlpauls
[maven-release-plugin] prepare release org.apache.felix.webconsole.pl…
f6827f5 
…ugins.memoryusage-1.0.8

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1825060 13f79535-47bb-0310-9956-ffa450edef68
@karlpauls
[maven-release-plugin] prepare for next development iteration
57e3ea2 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1825063 13f79535-47bb-0310-9956-ffa450edef68
@karlpauls
Merge FELIX-5601 into the r7 resolver, update to the latest OSGi sour…
e14bf47 
…ces, and set the version to 1.2.0-SNAPSHOT.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1825128 13f79535-47bb-0310-9956-ffa450edef68
@karlpauls
Branch the framework for R7 work with updated osgi classes, removed p…
60eb6cd 
…ackageinfos, version set to 6.0.0-SNAPSHOT, and adaption to the new R7 resolver api changes.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1825132 13f79535-47bb-0310-9956-ffa450edef68
@karlpauls
Update to parent pom version 4, add animal-sniffer, exclude transitiv…
42d0457 
…e dependency on org.osgi.core.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1825178 13f79535-47bb-0310-9956-ffa450edef68
@karlpauls
FELIX-5792: Add basic support for java.* exports and imports and remo…
da63007 
…ve old, unsupported jdk profiles.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1825179 13f79535-47bb-0310-9956-ffa450edef68
@cziegeler
FELIX-5793 : Update to Jetty 9.4.x
fea3857 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1825378 13f79535-47bb-0310-9956-ffa450edef68
@cziegeler
FELIX-5793 : Update to Jetty 9.4.x
dd9eebb 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1825458 13f79535-47bb-0310-9956-ffa450edef68
@cziegeler
Remove unused imports
d1994b7 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1825459 13f79535-47bb-0310-9956-ffa450edef68
@cziegeler
Add missing field for serialization
a6c97ef 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1825703 13f79535-47bb-0310-9956-ffa450edef68
@cziegeler
FELIX-5793 : Update to Jetty 9.4.x
db22db6 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1825852 13f79535-47bb-0310-9956-ffa450edef68
Initial contribution of Bundle Archive File Installer Extension
bd389e2 
IP Clearance vote result: https://www.mail-archive.com/[email protected]/msg62591.html

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1826244 13f79535-47bb-0310-9956-ffa450edef68
@rotty3000
FELIX-5782 allow resolver errors to be introspected
7bce10c 
Signed-off-by: Raymond Augé <[email protected]>

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1826276 13f79535-47bb-0310-9956-ffa450edef68
@karlpauls
Update changelog for release
b085fff 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1826382 13f79535-47bb-0310-9956-ffa450edef68
cziegeler and others added 26 commits June 13, 2018 06:11
@cziegeler
Update changelog
111ed75 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833439 13f79535-47bb-0310-9956-ffa450edef68
@gnodet
[FELIX-5869] [goto][jline] Weird error if the script contains unicode…
9bd7fbe 
… characters

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833507 13f79535-47bb-0310-9956-ffa450edef68
@gnodet
[maven-release-plugin] prepare release gogo-parent-3
1a176e7 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833513 13f79535-47bb-0310-9956-ffa450edef68
@gnodet
[maven-release-plugin] rollback the release of gogo-parent-3
bfc2b3d 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833514 13f79535-47bb-0310-9956-ffa450edef68
@gnodet
Upgrade to latest felix parent
8090dba 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833515 13f79535-47bb-0310-9956-ffa450edef68
@gnodet
[maven-release-plugin] prepare release gogo-parent-3
caa0628 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833516 13f79535-47bb-0310-9956-ffa450edef68
@gnodet
[maven-release-plugin] prepare for next development iteration
f2ea0c3 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833518 13f79535-47bb-0310-9956-ffa450edef68
@gnodet
Upgrade to latest parent
433a0c1 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833523 13f79535-47bb-0310-9956-ffa450edef68
@gnodet
Upgrade to latest felix parent, fix poms
de41d04 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833539 13f79535-47bb-0310-9956-ffa450edef68
@gnodet
[maven-release-plugin] prepare release gogo-parent-4
f75edf1 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833540 13f79535-47bb-0310-9956-ffa450edef68
@gnodet
[maven-release-plugin] prepare for next development iteration
78bb837 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833542 13f79535-47bb-0310-9956-ffa450edef68
@gnodet
Upgrade to gogo-parent 4
1508cb8 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833543 13f79535-47bb-0310-9956-ffa450edef68
@gnodet
[maven-release-plugin] prepare release org.apache.felix.gogo.runtime-…
f809e9c 
…1.1.0

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833545 13f79535-47bb-0310-9956-ffa450edef68
@gnodet
[maven-release-plugin] prepare for next development iteration
ebc1019 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833547 13f79535-47bb-0310-9956-ffa450edef68
@gnodet
Upgrade to gogo-parent 4
b02d06a 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833548 13f79535-47bb-0310-9956-ffa450edef68
@gnodet
[maven-release-plugin] prepare release org.apache.felix.gogo.shell-1.1.0
135f6f6 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833549 13f79535-47bb-0310-9956-ffa450edef68
@gnodet
[maven-release-plugin] prepare for next development iteration
8c35aa1 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833551 13f79535-47bb-0310-9956-ffa450edef68
@gnodet
[maven-release-plugin] prepare release org.apache.felix.gogo.jline-1.1.0
ced5e62 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833553 13f79535-47bb-0310-9956-ffa450edef68
@gnodet
[maven-release-plugin] prepare for next development iteration
32169dd 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833555 13f79535-47bb-0310-9956-ffa450edef68
@gnodet
[maven-release-plugin] prepare release maven-bundle-plugin-3.5.1
9063278 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833561 13f79535-47bb-0310-9956-ffa450edef68
@gnodet
[maven-release-plugin] prepare for next development iteration
aa197fa 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833563 13f79535-47bb-0310-9956-ffa450edef68
@karlpauls
FELIX-5870: Don't allow relative path instructions in bundleclasspath…
1454115 
… to prevent access outside the bundle cache.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833597 13f79535-47bb-0310-9956-ffa450edef68
@karlpauls
FELIX-5800: fix a bug where we where using the wrong properties map.
54d492f 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833625 13f79535-47bb-0310-9956-ffa450edef68
@karlpauls
FELIX-5800: Fix a small bug when calculating osgi.ee on > java9.
975b8ea 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833705 13f79535-47bb-0310-9956-ffa450edef68
@karlpauls
FELIX-5828: Remove support for android.
0a1e13e 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1833715 13f79535-47bb-0310-9956-ffa450edef68
@andreituicu
SLING-7752 - Deserializing and serializing a feature model file suffl…
d5b37ec 
…es the configurations
@andreituicu
Copy link
Author

Related to apache/sling-org-apache-sling-feature#2 .

andreituicu
andreituicu commented Jun 22, 2018
View reviewed changes
configurator/src/main/java/org/apache/felix/configurator/impl/json/JSONUtil.java
@@ -201,7 +194,7 @@ public static ConfigurationFile readJSON(
int ranking = 0;
ConfigPolicy policy = ConfigPolicy.DEFAULT;

final Dictionary<String, Object> properties = new Hashtable<>();
final Dictionary<String, Object> properties = new OrderedDictionary<>();
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bosschaert @rombert I think that in this case we might have to maintain full backwards compatibility.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, here we need to keep everything backward compatible. The configurator 1.0.0 has already been released.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thinking a little more about this, I think we should try to implement SLING-7752 without needing any changes in the Felix Configurator. The configurator is an implementation of the OSGi Configurator Spec ( https://osgi.org/specification/osgi.cmpn/7.0.0/service.configurator.html ) which doesn't say anything about ordering. While AFAIK the Felix Configurator is currently the only implementation of this spec, in theory another implementation could be made that doesn't have such ordering and this could break SLING-7752 again if it was used with the Sling Feature model.

@bosschaert bosschaert mentioned this pull request Jun 24, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bosschaert bosschaert bosschaert left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@andreituicu @bosschaert @HerrRomich @cziegeler @karlpauls @rotty3000 @gnodet @dulvac @jbonofre