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

Avoid package conflicts #116

Merged
merged 4 commits into from
Jan 17, 2017

Conversation

aledsage
Copy link
Member

This is required for vcloud-director port-forwarding to work in OSGi. The package brooklyn.networking.vclouddirector was previously exported by two different bundles, so those depending on it would only get it from one (and thus would not get access to some classes).

On examining the other modules, it was apparent that the same problem exists for brooklyn.networking.subnet, so fixed that as well.

The first commit is a bit unrelated: it avoids the use of anonymous inner classes in persisted state.


I'll create a related PR in brooklyn-server shortly for the package renames (modifying deserializingClassRenames.properties).

Create private-static-class as alternative (but keep anonymous inner
class in case it is referenced in persisted state).
This was deprecated in 0.7.0; 
instead use brooklyn.networking.common.subnet

It duplicates a package name in brooklyn-networking-portforwarding,
which causes problems in OSGi
Package name was used by two modules (very bad in OSGi) so renaming
to brooklyn.networking.vclouddirector.nat in the bundle
brooklyn-networking-vcloud-director
@aledsage
Copy link
Member Author

See apache/brooklyn-server#522

@ivanayov
Copy link
Contributor

Looks good

@aledsage
Copy link
Member Author

Thanks @iyovcheva - merging.

@aledsage aledsage merged commit e15060f into brooklyncentral:master Jan 17, 2017
@aledsage aledsage deleted the avoid-package-conflicts branch January 17, 2017 22:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants