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

Islandora Deux in Karaf #83

Merged
merged 14 commits into from
Nov 23, 2015
Merged

Islandora Deux in Karaf #83

merged 14 commits into from
Nov 23, 2015

Conversation

whikloj
Copy link
Member

@whikloj whikloj commented Oct 16, 2015

This branch builds on @acoburn's work to have a common features.xml file for the islandora camel services and load them in a Karaf container.
It mvn build install's them, loads them at start up in the karaf 4.0.1 container.
It also implements @ruebot's PRs #80 and #82.

@whikloj
Copy link
Member Author

whikloj commented Oct 22, 2015

Has anyone had a chance to try this out? @acoburn @ruebot @DiegoPino @daniel-dgi

If it's no good I'd rather trash it then continue to let it hang.

@ruebot
Copy link
Member

ruebot commented Oct 22, 2015

I will test it today since I am now free of giving presentations at camp!

@ruebot
Copy link
Member

ruebot commented Oct 22, 2015

types vagrant up

@ruebot
Copy link
Member

ruebot commented Oct 22, 2015

@whikloj ok, testing results:

  • I can create a collection object, and it syncs to fcrepo
  • I can create a basic image object, and it syncs to fcrepo
  • The derivative service does not work with basic image
  • The basic image object does not have any children -- OBJ datastream

Any output from karaf or catalina you want me to drop in here?

@whikloj
Copy link
Member Author

whikloj commented Oct 22, 2015

Nope that matches with mine, basic-image images aren't working because the camel route doesn't see the file attachment and therefore doesn't process it. I'm working on that.

@ruebot
Copy link
Member

ruebot commented Oct 22, 2015

Ah, cool.

@daniel-dgi
Copy link
Contributor

@whikloj There's other options for you on this. The most obvious one is having micro services accept a single, standardized serialization format instead of multipart/form-data messages. I've never been a fan of multipart/form-data, but couldn't come up with a better approach at the time. Maybe it's best we talked out our options?

I keep coming back to bags. Zipped bags oughta do the trick to assemble both metadata and files in a format that's acceptable. Though that may cause logistical problems if you're zipping a 2GB file on the Drupal server.

Paging the other committers: @ruebot @acoburn @DiegoPino

And some other folks, too :) @dmoses @ppound @rosiel @qadan

Feel free to invite friends to this discussion :D

@whikloj
Copy link
Member Author

whikloj commented Nov 3, 2015

@daniel-dgi I'm more concerned why this doesn't work though. It worked then I switched the version of camel and now it doesn't so I'm just wondering if it is something I did.

But I take your point that we may want to look at how we are pushing out of Drupal.

Is this of any use then? I like it because it has Karaf 4.0.1, but if your developing of something else we should probably be on the same page.

@DiegoPino
Copy link
Contributor

@whikloj, i'm blaming jetty9. I like the idea of doing it without multipart, but still we should be able to use multipart so i'm for fixing first multipart, then evaluating a different route. Since i'm doing a lot of recoding i will try to debug the message headers to see what is going on. Is that a good idea?

@daniel-dgi
Copy link
Contributor

it's definitely jetty.

@DiegoPino I'm glad you're willing to go there, because I'm not thrilled at the prospect. I was planning on a wait and see approach under the assumption the problem is upstream. But if you're feeling pro-active enough, go for it!

@whikloj Not really writing anything just yet, but working through api changes to accomodate this without multipart. Also looking into how best to share code between web services through the use of OSGi registered services. Means things might get a little more java-beanish, but should be good in the long-term.

@ruebot
Copy link
Member

ruebot commented Nov 3, 2015

Check this out: @Islandora-CLAW/7-x-2-x-committers -- we can tag each other now 😄

Also doesn't load on Karaf boot, load after it's up.
@whikloj
Copy link
Member Author

whikloj commented Nov 20, 2015

BooYah! This worked for me, but I think I probably need a @ruebot to try it out.

@ruebot
Copy link
Member

ruebot commented Nov 20, 2015

@whikloj oh snap. This harmonizes #111?

@@ -184,7 +185,28 @@ function islandora_basic_image_node_postupdate($node) {
);
}

httprl_request("http://127.0.0.1:8888/islandora/rest/basic-image/?uuid={$node->uuid}",
httprl_request("http://127.0.0.1:8888/cxf/islandora/image/{$node->uuid}",
$options);
Copy link
Member

Choose a reason for hiding this comment

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

Port should be 8181

Copy link
Member Author

Choose a reason for hiding this comment

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

Oops 😞

Move islandora-components to their own script.
Update to ensure we use the correct version of fcrepo and blaze graph
Add @ruebot's work from daniel-dgi/islandora#1
@whikloj
Copy link
Member Author

whikloj commented Nov 20, 2015

@Islandora-CLAW/7-x-2-x-committers for review por favor

@DiegoPino
Copy link
Contributor

@whikloj , will fire a vagrant machine and test. But looks pretty good for me.

@ruebot
Copy link
Member

ruebot commented Nov 20, 2015

@whikloj pulling down, and building.

@ruebot
Copy link
Member

ruebot commented Nov 20, 2015

@whikloj I am happy to report that it works.

screenshot from 2015-11-20 14 31 23
screenshot from 2015-11-20 14 31 11

@whikloj
Copy link
Member Author

whikloj commented Nov 20, 2015

W000000000t!!!

@DiegoPino
Copy link
Contributor

No pretty pictures to show but it works fine here!

@ruebot
Copy link
Member

ruebot commented Nov 20, 2015

My proposal for how to proceed:

  1. merge this since it goes into the dev branch.
  2. merge Use CXF to expose web services #111 into 7.x-2.x (waiting on @nigelgbanks)
  3. merge 7.x-2.x-dev into 7.x-2.x
  4. start working from 7.x-2.x again... or create a new dev branch

@Islandora-CLAW/7-x-2-x-committers - thoughts?

@acoburn
Copy link
Contributor

acoburn commented Nov 20, 2015

👍 on @ruebot's proposal. Step 3 will probably require some significant work on the dev branch, but I can work on that. IMO, we'll end up no dev branch.

@DiegoPino
Copy link
Contributor

👍 on that, but we keep 2.x-dev right (smile) or it's already in the past? (i like it, even when merging will be always a pain) ? Also Means @acoburn will have to pull/write all pretty tests again (poor @acoburn)

@ruebot
Copy link
Member

ruebot commented Nov 20, 2015

@DiegoPino #65 is still open, and will need to be rebased/merged at some point soon. We should get rid of the dev branch as soon as possible because it really complicates things IMO.

@acoburn
Copy link
Contributor

acoburn commented Nov 21, 2015

@DiegoPino it's really not a problem to recreate the tests.

@ruebot
Copy link
Member

ruebot commented Nov 23, 2015

@daniel-dgi are you cool with my proposal? If so, I'll go ahead and merge this one. Then we'll need somebody to merge #111, and then we begin the big job merging dev with master 😱

@daniel-dgi
Copy link
Contributor

Go for it.

On Nov 23, 2015, at 2:21 PM, Nick Ruest [email protected] wrote:

@daniel-dgi are you cool with my proposal? If so, I'll go ahead and merge this one. Then we'll need somebody to merge #111, and then we begin the big job merging dev with master


Reply to this email directly or view it on GitHub.

ruebot added a commit that referenced this pull request Nov 23, 2015
@ruebot ruebot merged commit 6995e3b into Islandora:7.x-2.x-dev Nov 23, 2015
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.

5 participants