[08:29:15 EDT(-0400)] * athena7 (n=athena7@c-24-2-189-230.hsd1.ct.comcast.net) has joined ##uportal
[08:51:54 EDT(-0400)] * anastasiac (n=team@142.150.154.105) has joined ##uportal
[09:35:23 EDT(-0400)] * jessm (n=Jess@142.150.154.101) has joined ##uportal
[10:13:08 EDT(-0400)] * colinclark (n=colin@142.150.154.101) has joined ##uportal
[10:14:15 EDT(-0400)] <athena7> welcome, jess!
[10:14:30 EDT(-0400)] <athena7> i think fluid is outnumbering uportal here today 
[10:14:36 EDT(-0400)] <jessm> thanks so much – very excited to be here
[10:15:11 EDT(-0400)] <athena7> so are you officially started?
[10:15:41 EDT(-0400)] <jessm> yep, in fact, I'm in Toronto all this week working with the uofT Fluid folks
[10:16:12 EDT(-0400)] <athena7> awesome
[10:16:17 EDT(-0400)] <athena7> you're based out of boston, right?
[10:16:46 EDT(-0400)] <jessm> yes, well, not quite yet, i'll be in boston in july
[10:16:51 EDT(-0400)] * EricDalquist (n=dalquist@bohemia.doit.wisc.edu) has joined ##uportal
[10:16:53 EDT(-0400)] <jessm> right now i'm in chapel hill, nc
[10:17:02 EDT(-0400)] <athena7> ah nice
[10:17:08 EDT(-0400)] <jessm> athena7: you nearby to boston?
[10:17:13 EDT(-0400)] <athena7> july sounds like a good month to move northward
[10:17:20 EDT(-0400)] <athena7> sort of - i'm in new haven, ct
[10:17:21 EDT(-0400)] <athena7> morning eric
[10:18:34 EDT(-0400)] <EricDalquist> morning
[10:20:20 EDT(-0400)] <athena7> the home office definitely needs a new monitor, i've gotten spoiled
[10:20:35 EDT(-0400)] <EricDalquist> lol
[10:20:54 EDT(-0400)] <athena7> that and i can't figure out how to adjust the chair height, not sure if it's broken
[10:20:56 EDT(-0400)] <athena7> but oh wel
[10:22:45 EDT(-0400)] <EricDalquist> so do you actually have an 'office' area at home?
[10:23:26 EDT(-0400)] <athena7> sort of
[10:23:55 EDT(-0400)] <athena7> the main part of my apartment is a long rectangle - i've kind of separated off a living room area at one end
[10:24:01 EDT(-0400)] <athena7> and then there's my desk near the door
[10:24:18 EDT(-0400)] <athena7> but we're moving in july, at which point i'm hoping to fit my desk into the second bedroom
[10:24:32 EDT(-0400)] <EricDalquist> that will be nice
[10:24:36 EDT(-0400)] <athena7> definitely
[10:24:41 EDT(-0400)] <athena7> it'll be nice to have the extra space
[10:25:02 EDT(-0400)] <athena7> and i'll be able to close the door and talk on the phone and whatever and kris can have the living room to herself to relax
[10:33:11 EDT(-0400)] <athena7> so it looks like the ldap problem i've been having really is related to up3 specifically
[10:33:24 EDT(-0400)] * michelled (n=team@142.150.154.197) has joined ##uportal
[10:33:28 EDT(-0400)] <EricDalquist> yeah I saw your email, could you send a full ldapContext.xml example?
[10:33:53 EDT(-0400)] <athena7> sure
[10:34:00 EDT(-0400)] <athena7> want me to send it to the list?
[10:34:18 EDT(-0400)] <athena7> er, actually, i think i sent you one of those on fri
[10:35:38 EDT(-0400)] <EricDalquist> there was a note with some new properties listed
[10:35:47 EDT(-0400)] <EricDalquist> but it wasn't really clear how to actually configure those in ldapContext.xml
[10:36:54 EDT(-0400)] <athena7> i think i'd sent an email just to you, last week, let me resend it to the list
[10:37:03 EDT(-0400)] <athena7> finding it now
[10:37:24 EDT(-0400)] <athena7> here we go
[10:38:45 EDT(-0400)] <EricDalquist> ah ok, I may have missed it
[10:39:08 EDT(-0400)] <athena7> nah it was when we were talking about stuff the other day
[10:39:09 EDT(-0400)] <athena7> no worries
[10:39:20 EDT(-0400)] <athena7> ok i was not clear with that email over the weekend at all, wow
[10:39:31 EDT(-0400)] <athena7> the "properties" were properties as seen in tomcat's debugger
[10:39:36 EDT(-0400)] <athena7> looking at the actual objects
[10:39:40 EDT(-0400)] <athena7> not ones in spring files
[10:40:33 EDT(-0400)] <EricDalquist> ah
[10:40:43 EDT(-0400)] <EricDalquist> yeah I was kind of confused
[10:41:36 EDT(-0400)] <athena7> yeah no kidding!
[10:41:38 EDT(-0400)] <athena7> sorry about that
[10:41:45 EDT(-0400)] <athena7> i must have been totally fried or something
[10:42:20 EDT(-0400)] <EricDalquist>
[10:42:25 EDT(-0400)] <EricDalquist> thanks for the reply email
[10:42:33 EDT(-0400)] <athena7> yeah
[10:42:43 EDT(-0400)] <EricDalquist> so what ended up being the problem? Just getting the base & url correct?
[10:42:48 EDT(-0400)] <athena7> no i haven't fixed it
[10:42:56 EDT(-0400)] <athena7> it's still broken
[10:43:04 EDT(-0400)] <athena7> but i did finally set up a up2 install
[10:43:05 EDT(-0400)] <EricDalquist> oh 
[10:43:08 EDT(-0400)] <athena7> and it works without problem there
[10:43:18 EDT(-0400)] <EricDalquist> weird
[10:43:30 EDT(-0400)] <EricDalquist> can you send me the ldap.xml from that?
[10:43:30 EDT(-0400)] <athena7> so i started looking at what the differences in the connections between up2 and up3 were in the debugger
[10:43:41 EDT(-0400)] <athena7> and came up with the list that made it into my useless email
[10:43:41 EDT(-0400)] <athena7> yes
[10:44:00 EDT(-0400)] <athena7> the really weird thing though is that that ldapContext.xml works perfectly for the person directory connection
[10:45:01 EDT(-0400)] <EricDalquist> I think the problem may be in the ldap security context
[10:45:10 EDT(-0400)] <EricDalquist> I'm wondering if it is appending the baseDN again
[10:45:48 EDT(-0400)] <athena7> i think it is
[10:45:56 EDT(-0400)] <athena7> that was one of the differences I found
[10:46:13 EDT(-0400)] <athena7> the url for up2 is ldapserver:port
[10:46:20 EDT(-0400)] <athena7> and for up3 it's ldapserver:port/baseDN
[10:46:30 EDT(-0400)] <EricDalquist> that was one of the differences with the Spring ldapcontext code versus the uPortal ldapserver code
[10:46:37 EDT(-0400)] <EricDalquist> the uPortal code exposes the baseDn to client code
[10:47:12 EDT(-0400)] <athena7> ah
[10:47:36 EDT(-0400)] <athena7> that might explain why the person dir works and the security context doesn't then?
[10:47:40 EDT(-0400)] <EricDalquist> yup
[10:47:57 EDT(-0400)] <athena7> hm, ok
[10:48:01 EDT(-0400)] <EricDalquist> persondir uses Spring-LDAP so it expects the BaseDN to 'just be there'
[10:48:03 EDT(-0400)] <athena7> any suggestions for fixing it?
[10:48:05 EDT(-0400)] <athena7> right
[10:48:12 EDT(-0400)] <EricDalquist> the uPortal LDAP AuthN code may try to do more work than it needs to
[10:48:19 EDT(-0400)] <EricDalquist> look in the LDAP security context
[10:48:25 EDT(-0400)] <EricDalquist> see if you can find where it uses the BaseDN
[10:48:30 EDT(-0400)] <EricDalquist> and just remove it for now
[10:48:38 EDT(-0400)] <EricDalquist> that would be try 1
[10:48:49 EDT(-0400)] <EricDalquist> try 2 would be do the modifications to just use SpringLDAP in that code
[10:48:54 EDT(-0400)] <EricDalquist> which shouldn't be too much work
[10:49:30 EDT(-0400)] <athena7> sounds reasonable
[10:59:52 EDT(-0400)] * EiNZTEiN (n=einztein@205.241.143.4) has joined ##uportal
[11:03:34 EDT(-0400)] <athena7> ok, i'm not really sure what to think here
[11:03:48 EDT(-0400)] <athena7> i tried setting the search name from the base dn to an empty string
[11:04:09 EDT(-0400)] <athena7> and it breaks in a similar way, although ti seems to get further
[11:04:09 EDT(-0400)] <athena7> LDAP Errorjavax.naming.NameNotFoundException: [LDAP: error cod
[11:04:10 EDT(-0400)] <athena7> e 32 - 0000208D: NameErr: DSID-031001BD, problem 2001 (NO_OBJECT), data 0, best match of:
[11:04:10 EDT(-0400)] <athena7> 'CN=Users,DC=unicon,DC=net'
[11:04:10 EDT(-0400)] <athena7> ^@]; remaining name 'CN=Jennifer Bourey, cn=Users, dc=unicon, dc=net' with user: jbourey
[11:04:25 EDT(-0400)] <athena7> so it seems to somewhat find me?
[11:06:59 EDT(-0400)] <EricDalquist> hrm
[11:08:20 EDT(-0400)] <athena7> i don't imagine than an empty string is really a valid search name
[11:09:13 EDT(-0400)] <EricDalquist> probably not
[11:09:21 EDT(-0400)] <EricDalquist> I'm going to go look at the spring-ldap authn docs
[11:09:27 EDT(-0400)] <athena7> ah
[11:09:39 EDT(-0400)] <athena7> i'd sort of tried to make a spring version at one point
[11:09:51 EDT(-0400)] <athena7> but i'm really not familiar with either ldap or the spring-ldap stuff
[11:17:27 EDT(-0400)] <EricDalquist> yeah either am I
[11:17:33 EDT(-0400)] <EricDalquist> The examples they have are all for Acegi
[11:17:41 EDT(-0400)] <EricDalquist> so I'm trying to figure out what Acegi does
[11:18:18 EDT(-0400)] <athena7> ah
[11:19:03 EDT(-0400)] <EricDalquist> you could just volunteer to replace the security code with spring-security and that would solve the problem 
[11:19:54 EDT(-0400)] <athena7> yeah . . .
[11:19:55 EDT(-0400)] <athena7> haha
[11:20:02 EDT(-0400)] <athena7> except i don't know spring security either
[11:20:19 EDT(-0400)] <EricDalquist>
[11:20:37 EDT(-0400)] <athena7> i may not have as much time for a while, we'll see
[11:21:23 EDT(-0400)] <EricDalquist> so ... reading through spring-security gives an example of how they do it
[11:21:30 EDT(-0400)] <athena7> yeah
[11:21:35 EDT(-0400)] <EricDalquist> but I don't think I have the understanding to explain it
[11:21:50 EDT(-0400)] <athena7> yeah
[11:22:17 EDT(-0400)] <athena7> i worry a little, because for this project, not having ldap working for local login is only an annoyance at the moment
[11:22:37 EDT(-0400)] <athena7> but if it crops up for people who rely on it for production use that'll be annoying
[11:22:42 EDT(-0400)] <EricDalquist> yup
[11:22:50 EDT(-0400)] <EricDalquist> yeah we need to get this resolved
[11:24:30 EDT(-0400)] <EricDalquist> http://static.springframework.org/spring-security/site/reference/html/ldap.html
[11:24:49 EDT(-0400)] <EricDalquist> 18.4.5 has the spring bean config they use ...
[11:25:08 EDT(-0400)] <EricDalquist> the more I look at this the more I think SimpleLdapSecurityContext is going to need some work
[11:25:09 EDT(-0400)] <EricDalquist> 
[11:25:25 EDT(-0400)] <athena7> yeah
[11:25:42 EDT(-0400)] <EricDalquist> and if that is the case I'm really wanting to just replace it with spring-security
[11:25:48 EDT(-0400)] <athena7> i'm not very confident at the moment that we'll be able to resolve it without just making the security context springified in some way
[11:25:54 EDT(-0400)] <EricDalquist> yeah
[11:26:00 EDT(-0400)] <athena7> well we'd talked about using spring security in general, right?
[11:26:01 EDT(-0400)] <EricDalquist> I'm not sure either
[11:26:04 EDT(-0400)] <EricDalquist> oh yes
[11:26:09 EDT(-0400)] <EricDalquist> it was on the plan for 3.0
[11:26:15 EDT(-0400)] <EricDalquist> but didn't happen because of time
[11:26:27 EDT(-0400)] <EricDalquist> we have a portal steering committee meeting today so I'll bring this up there
[11:26:34 EDT(-0400)] <EricDalquist> as much as it is a 'big' change
[11:26:38 EDT(-0400)] <athena7> sounds like a good idea
[11:26:39 EDT(-0400)] <EricDalquist> this may have to happen for 3.0.1
[11:26:40 EDT(-0400)] <athena7> yeah
[11:26:50 EDT(-0400)] <athena7> i think we need to resolve it in some way pretty soon
[11:27:02 EDT(-0400)] <athena7> even if we need to shoehorn a temporary fix in, then do the spring security stuff later
[11:27:07 EDT(-0400)] <EricDalquist> because at this point re-writing SimpleLdapSecurityContext seems like a lot of work when that could be put into porting
[11:27:52 EDT(-0400)] <athena7> yeah, very true
[11:28:00 EDT(-0400)] <athena7> if we can do it in a short amount of time, then even better
[11:28:03 EDT(-0400)] <EricDalquist> so it looks like it is a DN issue
[11:28:15 EDT(-0400)] <EricDalquist> the problem is the way I put in spring-ldap
[11:28:24 EDT(-0400)] <EricDalquist> doesn't allow you specify a different basedn for the user
[11:28:30 EDT(-0400)] <EricDalquist> I don't think ...
[11:28:43 EDT(-0400)] <athena7> that kinda sounds right
[11:29:51 EDT(-0400)] <EricDalquist> so
[11:29:59 EDT(-0400)] <EricDalquist> could I ask you to try a few more things?
[11:30:10 EDT(-0400)] <athena7> sure
[11:30:20 EDT(-0400)] <EricDalquist> could you modify ContextSourceLdapServerImpl so that you can set your own baseDn there too?
[11:30:33 EDT(-0400)] <EricDalquist> then the base for the LdapContextSource is one thing
[11:30:39 EDT(-0400)] <athena7> sure
[11:31:26 EDT(-0400)] <EricDalquist> and revert the change to the SimpleLdapSecurityContext
[11:31:50 EDT(-0400)] <athena7> o
[11:31:50 EDT(-0400)] <athena7> k
[11:32:01 EDT(-0400)] <EricDalquist> thanks
[11:32:16 EDT(-0400)] <athena7> so where should i get it to use the other baseDN?
[11:32:55 EDT(-0400)] <EricDalquist> so can you pastebin your working up2 config?
[11:33:39 EDT(-0400)] <athena7> http://uportal.pastebin.com/m2c1c9ad3
[11:34:40 EDT(-0400)] <EricDalquist> hrm
[11:35:50 EDT(-0400)] <EricDalquist> so try just not specifying a base in the LdapContextSource
[11:36:06 EDT(-0400)] <athena7> ok
[11:36:08 EDT(-0400)] <EricDalquist> and specify the baseDN from your ldap.xml
[11:36:16 EDT(-0400)] <EricDalquist> as the baseDn property on ContextSourceLdapServerImpl
[11:36:26 EDT(-0400)] <EricDalquist> just wildly guessing here
[11:36:38 EDT(-0400)] <athena7> yeah that's what i've been doing too
[11:36:43 EDT(-0400)] <athena7> that might help though, i'll see
[11:37:01 EDT(-0400)] <athena7> if it does work i could always configure different ldap contexts for security and person dir stuff
[11:37:57 EDT(-0400)] <EricDalquist> yup
[11:38:03 EDT(-0400)] <EricDalquist> which may be recommended anyways
[11:38:13 EDT(-0400)] <EricDalquist> since you can pool the context used for persondirectory
[11:38:33 EDT(-0400)] <athena7> makes sense
[11:38:47 EDT(-0400)] <EricDalquist> though in theory you could also have the LDAP authn call return attributes too
[11:38:56 EDT(-0400)] <EricDalquist> though that would really be much easier with spring-security
[11:43:21 EDT(-0400)] <athena7> yeah, i definitely like the idea of using spring security
[11:44:06 EDT(-0400)] <athena7> no dice
[11:45:46 EDT(-0400)] <athena7> oh wait, i forgot to turn the search path back
[11:48:35 EDT(-0400)] * holdorph (n=holdorph@wsip-98-174-242-39.ph.ph.cox.net) has joined ##uportal
[11:50:02 EDT(-0400)] <athena7> hey eric i think that might work
[11:50:09 EDT(-0400)] <athena7> now i'm getting an invalid password error
[11:50:16 EDT(-0400)] <EricDalquist> yay
[11:50:18 EDT(-0400)] <athena7> which is major progress
[11:50:27 EDT(-0400)] <athena7> ok
[11:50:30 EDT(-0400)] <athena7> so
[11:50:37 EDT(-0400)] <EricDalquist> well keep me posted, hopefully just allowing the two DNs will be a temporary fix
[11:50:57 EDT(-0400)] <athena7> one thing we could do would be to have separate ldap contexts
[11:51:11 EDT(-0400)] <athena7> then add something to the ldap server bean to put the DN there instead
[11:51:29 EDT(-0400)] <athena7> then have the code look there, rather than on the connection object
[11:51:58 EDT(-0400)] <EricDalquist> yup
[11:52:24 EDT(-0400)] <athena7> i'll make the code changes and test it out and send an email to the list
[11:52:33 EDT(-0400)] <EricDalquist> sounds grea
[11:52:34 EDT(-0400)] <EricDalquist> great*
[11:52:47 EDT(-0400)] <athena7> i'm glad, this has been driving me insane
[11:53:51 EDT(-0400)] <EricDalquist> I bet
[11:54:24 EDT(-0400)] <athena7> assuming i can get this working, at least it would give us some time to implement spring security not in emergency fix mode
[11:54:31 EDT(-0400)] <athena7> which sounds like a much better way to do things
[11:55:25 EDT(-0400)] <EricDalquist> yes
[11:55:35 EDT(-0400)] <EricDalquist> I'd much rather it be a well thought-out feature of 3.1 or 3.2
[11:55:46 EDT(-0400)] <athena7> yeah
[11:55:52 EDT(-0400)] <athena7> i mean i agree that spring security is the right way to go
[11:56:02 EDT(-0400)] <athena7> but it's always been to be able to plan out changes like that
[12:07:06 EDT(-0400)] <athena7> SUCCESS!
[12:07:18 EDT(-0400)] <athena7> and the person dir worked too, which is even better@
[12:07:29 EDT(-0400)] <EricDalquist> yay!
[12:07:46 EDT(-0400)] <EricDalquist> can you take care of patching in svn?
[12:08:03 EDT(-0400)] <athena7> for this bug?
[12:08:09 EDT(-0400)] <EricDalquist> yeah
[12:08:12 EDT(-0400)] <athena7> yes
[12:08:14 EDT(-0400)] <EricDalquist> thanks
[12:08:23 EDT(-0400)] <athena7> do you want me to email the list first?
[12:08:35 EDT(-0400)] <EricDalquist> perhaps an email to a linked jira issue?
[12:08:38 EDT(-0400)] <athena7> i guess probably no one's currently relying on this behavior for anything, since it doesn't seem to work
[12:08:44 EDT(-0400)] <athena7> certainly
[12:09:06 EDT(-0400)] <athena7> i just wasn't sure if anyone would have objections to the planned fix, but i can't think of a good reason why it'd be an issue
[12:09:08 EDT(-0400)] <athena7> yeah me too
[12:09:24 EDT(-0400)] <athena7> really irritating, but at least i wasn't trying to make it work during a production upgrade
[12:09:26 EDT(-0400)] <EricDalquist> yeah, I doubt this works for anyone right now
[12:09:28 EDT(-0400)] <EricDalquist> yup
[12:22:50 EDT(-0400)] <holdorph> so whats the trick to get nexus to actually cache an artifact? I'm pretty sure I got it set up right, my entire maven build only contains 'downloading...' messages to my nexus mirror, but if I login to nexus, I only have 3 artifacts.
[12:23:27 EDT(-0400)] <EricDalquist> not sure ... it 'just works' for me
[12:23:34 EDT(-0400)] <EricDalquist> I setup the proxy repositories
[12:23:40 EDT(-0400)] <EricDalquist> add the mirrors to settings.xml
[12:23:50 EDT(-0400)] <EricDalquist> oh you should probably remove your local repo first
[12:24:02 EDT(-0400)] <EricDalquist> since if you have stuff there maven won't bother going out to check for things
[12:24:02 EDT(-0400)] <holdorph> ahhhh.... ok.
[12:24:19 EDT(-0400)] <EricDalquist> did you find the wiki page on this I added?
[12:24:35 EDT(-0400)] <holdorph> i followed your wiki page for some stuff.
[12:24:42 EDT(-0400)] <holdorph> i might not have read every detail
[12:24:51 EDT(-0400)] <EricDalquist> that wasn't in there
[12:25:02 EDT(-0400)] <EricDalquist> just curious
[12:25:07 EDT(-0400)] <holdorph> I definitely used your nexus config and settings.xml as starting points for getting it set up for sakai {color}
[12:25:26 EDT(-0400)] <EricDalquist> other than the lack of security (we're just going to do IP based in apache) it's a pretty nice little app
[12:25:27 EDT(-0400)] <holdorph> I don't remember reading it in there.
[12:29:53 EDT(-0400)] <holdorph> anyway, if that's the real cause (not sure I want to test that theory right now), then using nexus only saves me about 30 seconds on a 6minute sakai build.
[12:29:57 EDT(-0400)] <holdorph> fwiw
[12:30:33 EDT(-0400)] <EricDalquist> are you doing a local nexus instance on your machine?
[12:30:59 EDT(-0400)] <holdorph> yeah, just experimenting to see if it was worth putting up for all of Unicon on a different machine.
[12:31:03 EDT(-0400)] <athena7> do we have an open ticket for the hidden groups stuff?
[12:31:13 EDT(-0400)] <EricDalquist> yeah, there isn't any point for just a single user building
[12:31:21 EDT(-0400)] <EricDalquist> the advantage would be in new builds using it
[12:31:30 EDT(-0400)] <EricDalquist> and insulating you from remote repositories
[12:31:49 EDT(-0400)] <EricDalquist> having a proxy @ unicon could be quite nice to reduce bandwidth usage
[12:32:11 EDT(-0400)] <EricDalquist> on test would be, first do a Sakai build with nexus as your mirror with both your machine and nexus having no local cache
[12:32:17 EDT(-0400)] <EricDalquist> then remove your local cache
[12:32:22 EDT(-0400)] <EricDalquist> then re-run the build
[12:32:50 EDT(-0400)] <EricDalquist> doing that for uP3 here resulted in a 6 minute 'clean' build
[12:33:02 EDT(-0400)] <EricDalquist> and a 20 second build with my machine clean but nexus having everything cached
[12:33:09 EDT(-0400)] <holdorph> right. And, if that gives me a benefit it's interesting, but not as valuable as I'd had hoped
[12:33:40 EDT(-0400)] <holdorph> we don't do a lot of repository-clean builds around here.
[12:34:06 EDT(-0400)] <EricDalquist> yeah, most people don't
[12:34:16 EDT(-0400)] <holdorph> still it's interesting, and I might push it out, just not as big a priority
[12:34:25 EDT(-0400)] <EricDalquist> are real motivation is to ensure our builds are not dependent on remote servers
[12:34:33 EDT(-0400)] <holdorph> sakai clean-repository builds are usually around 30-60 minutes
[12:34:34 EDT(-0400)] <EricDalquist> s/are/our/
[12:34:46 EDT(-0400)] <EricDalquist> wow
[12:58:36 EDT(-0400)] <EricDalquist> I hate having to try and ask tomcat questions ....
[13:12:14 EDT(-0400)] * holdorph (n=holdorph@wsip-98-174-242-39.ph.ph.cox.net) has joined ##uportal
[13:52:29 EDT(-0400)] * jessm (n=Jess@142.150.154.101) has joined ##uportal
[14:03:27 EDT(-0400)] * jessm (n=Jess@142.150.154.101) has joined ##uportal
[14:15:11 EDT(-0400)] <athena7> hey eric
[14:15:22 EDT(-0400)] <athena7> should i try doing this whole svnmerge thing for the ldap changes?
[15:31:14 EDT(-0400)] * MarkRogers (n=MarkRoge@addhcp129.cc.umanitoba.ca) has joined ##uportal
[15:58:18 EDT(-0400)] * anastasiac (n=team@142.150.154.105) has joined ##uportal
[16:09:03 EDT(-0400)] * deuce (n=deuce@uni1.unicon.net) has joined ##uportal
[16:19:38 EDT(-0400)] <EricDalquist> athena7: sorry for the delay in response had a long meeting
[16:19:39 EDT(-0400)] <EricDalquist> yes
[16:19:42 EDT(-0400)] <EricDalquist> feel free
[16:19:47 EDT(-0400)] <athena7> oh no worries!
[16:20:01 EDT(-0400)] <EricDalquist> want a quick run-through of using it?
[16:20:13 EDT(-0400)] <athena7> well, from what i gathered from the docs
[16:20:19 EDT(-0400)] <athena7> i check out the maintenance branch
[16:20:30 EDT(-0400)] <athena7> run svnmerge merge -rrevision
[16:20:45 EDT(-0400)] <athena7> and then check it back in using the autogenerated message file as the commit message?
[16:20:48 EDT(-0400)] <EricDalquist> yup
[16:20:49 EDT(-0400)] <athena7> does that sound mostly right?
[16:20:59 EDT(-0400)] <EricDalquist> and the commit hooks are setup to allow those messages through unmodified
[16:21:09 EDT(-0400)] <athena7> oh neat
[16:21:12 EDT(-0400)] <athena7> great
[16:21:14 EDT(-0400)] <EricDalquist> also if you want to see what is available to merge: "svnmerge avail --log"
[16:21:20 EDT(-0400)] <athena7> i wanted to check and make sure that all made sense
[16:21:21 EDT(-0400)] <athena7> yeah
[16:21:44 EDT(-0400)] <athena7> oh i had a question - did the merginguserinfo bug fix get merged back into the maintenance branch?
[16:21:48 EDT(-0400)] <athena7> if not, it probably should
[16:22:26 EDT(-0400)] <EricDalquist> yeah
[16:22:32 EDT(-0400)] <EricDalquist> I only see 2 pending changes in the patches branch
[16:23:11 EDT(-0400)] <EricDalquist> if you're feeling really helpful you can do the same thing on the gaps branch (or I can since I already have it checked out)
[16:23:13 EDT(-0400)] <athena7> yeah that's what i thought i was seeing
[16:23:34 EDT(-0400)] <athena7> i don't have that checked out yet but i'll check it out tonight for future happiness
[16:24:11 EDT(-0400)] <EricDalquist> thanks!
[16:25:08 EDT(-0400)] <athena7>
[16:25:36 EDT(-0400)] <athena7> this tool is pretty awesome
[16:25:42 EDT(-0400)] <EricDalquist> yeah
[16:25:52 EDT(-0400)] <EricDalquist> it makes tracking merges between branches SO much easier
[16:25:59 EDT(-0400)] <athena7> yeah i'm sure!
[16:26:05 EDT(-0400)] <EricDalquist> and you can mark revs as merged without actually merging them
[16:26:14 EDT(-0400)] <EricDalquist> which is helpful for things that may not merge directly
[16:26:25 EDT(-0400)] <athena7> should i merge in the other outstanding change as well? i think that's the hidden group one
[16:26:29 EDT(-0400)] <EricDalquist> yup
[16:26:32 EDT(-0400)] <athena7> ok
[16:26:42 EDT(-0400)] <athena7> eventually we should probably actually create that group and put the appropriate channels in it
[16:26:46 EDT(-0400)] <EricDalquist> I try to keep them separate (which takes longer )
[16:26:56 EDT(-0400)] <EricDalquist> or at least just group commits by jira when merging
[16:26:57 EDT(-0400)] <athena7> ah
[16:27:11 EDT(-0400)] <EricDalquist> that way they're some-what atomic
[16:27:17 EDT(-0400)] <athena7> right
[16:28:08 EDT(-0400)] <athena7> so now that this is merged, should i change the relevant jiras to both be resolved with a fix version of 3.0.1?
[16:28:25 EDT(-0400)] <EricDalquist> yup
[16:29:37 EDT(-0400)] <athena7> great
[16:30:08 EDT(-0400)] <EricDalquist> thanks for doing the merges!
[16:31:10 EDT(-0400)] <athena7> no problem!
[16:31:22 EDT(-0400)] <athena7> glad i finally took the approximately 60 seconds needed to figure out how to do it
[16:31:23 EDT(-0400)] <athena7> lol
[16:31:36 EDT(-0400)] <athena7> so do you actually want these things to have fix versions of both 3.0.1 an d3.1?
[16:31:41 EDT(-0400)] <athena7> or is 3.0.1 enough?
[16:39:50 EDT(-0400)] * anastasiac (n=team@142.150.154.105) has joined ##uportal
[16:44:51 EDT(-0400)] * holdorph (n=holdorph@wsip-98-174-242-39.ph.ph.cox.net) has joined ##uportal
General
Content
Integrations