well thats really interesting to hear. Though i heard JGit/EGit for Eclipse is a pretty good combo. I wonder why you had so many manual merges as git is usually quite good at doing that automatically. I don't know anything about tortoise-git but i suggest you lean the basic git command lines so your process (and possible workflow issues) are more explicit. You can be happy you get less manual merges in git than in subversion, much less. So, the question is if you really hit hard conflicting merges or it was just a not so clever command use from tortoise-git.
On Thu, Sep 30, 2010 at 6:01 PM, Achim Nierbeck <[email protected]> wrote: > Hi, for me the merge of the branch was not as easy as expected, somehow > tortoise-git showed me conflicts on almost every file and even worse on > almost every file it showed me the full file as in conflict :( > No much fun there, but probably a better client would help. BTW, the eclipse > client doesn't help much either on this, but helped a lot on comparing the > merged stuff with the original > > 2010/9/30 Toni Menzel <[email protected]> >> >> Yes, also take a note on some discussions from here: >> >> http://github.com/ops4j/org.ops4j.pax.web/commit/327e4fd3917ecdf0e7ecdfb13e8e7176979c22c9#commitcomment-159100 >> >> I would agree on keeping those comment tight and brief, so the main >> discussion go to the list. >> >> >> On Thu, Sep 30, 2010 at 5:17 PM, Niclas Hedhman <[email protected]> >> wrote: >> > Yes, now the interesting workflow bits are starting... I'm curious. >> > >> > Cheers >> > Niclas >> > >> > On Thu, Sep 30, 2010 at 10:49 PM, Guillaume Nodet <[email protected]> >> > wrote: >> >> Achim has merged the work i've done on jetty7 into the websecureContext >> >> branch. >> >> I propose we merge that back into master and continue the work there. >> >> Thoughts? >> >> >> >> On Sun, Sep 26, 2010 at 21:07, Guillaume Nodet <[email protected]> >> >> wrote: >> >>> >> >>> It would be interesting to merge with my work on jetty7 then, because >> >>> all >> >>> jetty7 jars are native osgi bundles. >> >>> That would make things easier .... >> >>> >> >>> On Sun, Sep 26, 2010 at 21:05, Achim Nierbeck >> >>> <[email protected]> >> >>> wrote: >> >>>> >> >>>> You are right about this, it was just the use case I was looking for >> >>>> when >> >>>> I added the issue in the first place. >> >>>> I did some research about JAAS inside Jetty already, as far as I >> >>>> understood, you need the jetty-plus jar also >> >>>> to get JAAS-UserRealms (btw. UserRealm is the realm interface of >> >>>> Jetty) >> >>>> going within Jetty. I did take a look >> >>>> at it, but the one I found wasn't "OSGi-fied" yet. >> >>>> >> >>>> I'll try to have a look at using JAAS, but the fact that it's running >> >>>> on >> >>>> top of Karaf should have no effect on JAAS at all. >> >>>> >> >>>> On Sat, Sep 25, 2010 at 23:07, Achim Nierbeck >> >>>> <[email protected]> >> >>>> wrote: >> >>>>> >> >>>>> Hi all, >> >>>>> >> >>>>> I would say I'm at a good point right now. >> >>>>> So feel free for a review. >> >>>>> >> >>>>> What I didn't achieve yet, is a way of connecting a JAAS Realm from >> >>>>> the >> >>>>> Karaf Server. >> >>>>> >> >>>>> greetings, Achim >> >>>>> >> >>>>>> [ >> >>>>>> >> >>>>>> http://issues.ops4j.org/browse/PAXWEB-210?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13547#action_13547 >> >>>>>> ] >> >>>>>> >> >>>>>> Achim Nierbeck commented on PAXWEB-210: >> >>>>>> --------------------------------------- >> >>>>>> >> >>>>>> Sofar so good, >> >>>>>> because of adding the improvement of PAXWEB-193 >> >>>>>> I'm able to configure and use a jetty managed "UserRealm" >> >>>>>> >> >>>>>> >> >>>>>> >> >>>>>> >> >>>>>>> >> >>>>>>> Security Constraints for WebApplications >> >>>>>>> ---------------------------------------- >> >>>>>>> >> >>>>>>> Key: PAXWEB-210 >> >>>>>>> URL: http://issues.ops4j.org/browse/PAXWEB-210 >> >>>>>>> Project: Pax Web >> >>>>>>> Issue Type: Improvement >> >>>>>>> Components: War Extender, Web Container, Whiteboard >> >>>>>>> Extender >> >>>>>>> Affects Versions: 0.7.1, 0.7.2 >> >>>>>>> Reporter: Achim Nierbeck >> >>>>>>> Assignee: Achim Nierbeck >> >>>>>>> >> >>>>>>> Currently it is not possible to configure a security-constraint >> >>>>>>> for >> >>>>>>> any kind of web application served by pax-web. >> >>>>>>> Therefore no Authentication is possible with pax-web :( >> >>>>>>> If I'm running pax-web with the Apache Karaf server there is even >> >>>>>>> an >> >>>>>>> JAAS realm I would like to connect to. >> >>>>>>> >> >>>>>> >> >>>>>> >> >>>>> >> >>>>> >> >>>>> _______________________________________________ >> >>>>> general mailing list >> >>>>> [email protected] >> >>>>> http://lists.ops4j.org/mailman/listinfo/general >> >>>> >> >>>> >> >>>> >> >>>> -- >> >>>> Cheers, >> >>>> Guillaume Nodet >> >>>> ------------------------ >> >>>> Blog: http://gnodet.blogspot.com/ >> >>>> ------------------------ >> >>>> Open Source SOA >> >>>> http://fusesource.com >> >>>> >> >>>> >> >>>> >> >>> >> >>> >> >>> >> >>> -- >> >>> Cheers, >> >>> Guillaume Nodet >> >>> ------------------------ >> >>> Blog: http://gnodet.blogspot.com/ >> >>> ------------------------ >> >>> Open Source SOA >> >>> http://fusesource.com >> >>> >> >>> >> >> >> >> >> >> >> >> -- >> >> Cheers, >> >> Guillaume Nodet >> >> ------------------------ >> >> Blog: http://gnodet.blogspot.com/ >> >> ------------------------ >> >> Open Source SOA >> >> http://fusesource.com >> >> >> >> >> >> >> >> _______________________________________________ >> >> general mailing list >> >> [email protected] >> >> http://lists.ops4j.org/mailman/listinfo/general >> >> >> >> >> > >> > >> > >> > -- >> > Niclas Hedhman, Software Developer >> > http://www.qi4j.org - New Energy for Java >> > >> > I live here; http://tinyurl.com/2qq9er >> > I work here; http://tinyurl.com/2ymelc >> > I relax here; http://tinyurl.com/2cgsug >> > >> > _______________________________________________ >> > general mailing list >> > [email protected] >> > http://lists.ops4j.org/mailman/listinfo/general >> > >> >> >> >> -- >> Toni Menzel || http://okidokiteam.com >> >> _______________________________________________ >> general mailing list >> [email protected] >> http://lists.ops4j.org/mailman/listinfo/general > > -- Toni Menzel || http://okidokiteam.com _______________________________________________ general mailing list [email protected] http://lists.ops4j.org/mailman/listinfo/general
