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

Update OSGi classloader #741

Merged
merged 646 commits into from May 17, 2013

Conversation

Projects
None yet
@ajuckel
Copy link
Contributor

ajuckel commented May 16, 2013

I've added an OSGi integration test. Currently it needs to be run after ant jar-jruby-complete and you need to use either the felix2 or felix4 profile. I'm open to suggestions for how to better integrate the test case.

After adding the test case, I added a different method to find the classloader for a bundle. I added this as a set of new classes, mostly because I wanted to ensure any users of the existing classes wouldn't be affected.

I verified that the new method does fallback correctly in the felix2 profile (which doesn't export the new org.osgi.framework.wiring package.

enebo and others added some commits Apr 23, 2013

Merge pull request #650 from josedonizetti/io_readlines
File/IO readlines supporting new params limit, and open mode (thanks jose!)
Merge pull request #615 from tychobrailleur/exist_fix
Restore $! when catching exception.  In most cases jnr-posix on an error will throw and not get caught like this.   This is a special case and without significant changes jnr-posix this looks like the best fix to me.
Fix recent OpenSSL failures by updating CA certs used to verify.
It seems that www.amazon.com changed the CA cert it uses for its
ssl connection, and that caused us to start failing tests. After
some investigation, I figured out which cert we needed and what
the filename needed to be in the ca_path test. I have added a
README.txt to the ca_path and comments to all the related certs.
I also removed a cert file that appeared to be duplicate and added
a more explicitly incorrect cert for the test that is supposed to
fail verification.
Catch all exceptions when running ant subtask, to avoid bubbling.
This should fix #653. We may catch too much here, but it seems
the intent of the rescue block was to capture most exceptions. It
also would have caught the ant ExitStatusException as a
NativeException before, but that stopped working after we stopped
wrapping Java exceptions. The fix should catch it properly now.
Wayne Meissner

enebo and others added some commits May 10, 2013

Merge pull request #726 from jruby/io_binwrite_dont_truncate_with_offset
IO.binwrite doesn't truncate the file if an offset is given
Merge branch 'feature/add-osgi-test'
Conflicts:
	.classpath
	nbproject/project.xml

@jrubyci jrubyci merged commit e74c159 into jruby:master May 17, 2013

1 check failed

default The Travis CI build failed
Details
@headius

This comment has been minimized.

Copy link
Member

headius commented May 17, 2013

Wow, I don't know what happened there, but it's merged.

@enebo

This comment has been minimized.

Copy link
Member

enebo commented May 17, 2013

EPIC!!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.