[00:00:09 EST(-0500)] * esm (n=esm@207-53-192-222.dynamic-dsl.qis.net) has joined ##uportal
[08:19:14 EST(-0500)] * jayshao (n=jayshao@jayshao.oirt.rutgers.edu) has joined ##uportal
[08:36:18 EST(-0500)] * esm (n=esm@207-53-192-222.dynamic-dsl.qis.net) has joined ##uportal
[09:34:25 EST(-0500)] * EricDalquist (n=dalquist@bohemia.doit.wisc.edu) has joined ##uportal
[09:39:56 EST(-0500)] * esm (n=esm@asdf.dkc.jhu.edu) has joined ##uportal
[09:40:52 EST(-0500)] * awills (n=awills@mtw160-5.ippl.jhu.edu) has joined ##uportal
[09:47:41 EST(-0500)] <EricDalquist> so close to M5 ...
[09:49:10 EST(-0500)] <esm> sweet
[09:49:23 EST(-0500)] <EricDalquist> I think I'm going to move the pluto branch to the trunk this morning
[09:49:56 EST(-0500)] <EricDalquist> the only other thing I want to get done before a m5 is syncing the portlets' states & modes to the layout theme parameters
[09:50:06 EST(-0500)] <EricDalquist> but I have to refactor UserPreferencesManager first
[10:00:46 EST(-0500)] <EricDalquist> so esm I'm thinking of following what pluto just did
[10:00:53 EST(-0500)] <EricDalquist> doing a svn delete on up2/trunk
[10:01:07 EST(-0500)] <EricDalquist> then a svn move up2/branchs/working-pluto up2/trunk
[10:01:31 EST(-0500)] <EricDalquist> everything that was committed to trunk has been merged into the branch
[10:01:43 EST(-0500)] <EricDalquist> and that seems much easier than doing a giant merge back into the trunk
[10:01:53 EST(-0500)] <EricDalquist> plus the history would be cleaner
[10:07:06 EST(-0500)] <esm> yeah i mean i hate the way the pluto branches evolved
[10:07:57 EST(-0500)] <esm> history-wise i don't know if its cleaner per se. if you merge your branch back into the trunk, you'll get a big fat history entry.
[10:08:11 EST(-0500)] <esm> it depends on your def of clean i guess 
[10:08:15 EST(-0500)] <EricDalquist> yeah
[10:08:31 EST(-0500)] <EricDalquist> I think I'd prefer the move since all of the history for all of the work in the pluto branch would be right there
[10:08:41 EST(-0500)] <esm> you certainly get more resolution - instead of one commit you get discrete commits.
[10:08:43 EST(-0500)] <EricDalquist> which would be helpful for people trying to figure out what changed
[10:08:48 EST(-0500)] <EricDalquist> and why
[10:09:39 EST(-0500)] <esm> yeah
[10:18:55 EST(-0500)] <esm> shoot i'd go for it i guess. if everythign has been merged up into the branch since the branch point
[10:19:08 EST(-0500)] <EricDalquist> yup
[10:19:45 EST(-0500)] <esm> <xsl:variable name="handlerid" select="substring-after(substring(@target,10,string-length(@target)), 'handle/')" />
[10:19:56 EST(-0500)] <esm> kill
[10:20:22 EST(-0500)] <EricDalquist>
[10:20:39 EST(-0500)] <esm> when what they meant was: <xsl:variable name="handlerid" select="substring-after(@target, 'handle/')" />
[10:20:47 EST(-0500)] <esm> which is so much simpler
[10:20:54 EST(-0500)] <esm> <xsl:message> is my friend.
[10:43:59 EST(-0500)] * michelled (n=team@142.150.154.114) has joined ##uportal
[10:54:48 EST(-0500)] * anastasiac (n=chatzill@142.150.154.149) has joined ##uportal
[11:28:52 EST(-0500)] <awills> EricDalquist – I can adjust the .user docs that reference ALM, if you like, in both 2-6 and HEAD... you haven't started to work on that have you?
[11:29:05 EST(-0500)] <EricDalquist> yes I have
[11:29:10 EST(-0500)] <EricDalquist> you can do the branch if you like
[11:29:21 EST(-0500)] <EricDalquist> don't do anything in the trunk though
[11:29:22 EST(-0500)] <awills> you only did uP3, correct?
[11:29:41 EST(-0500)] <EricDalquist> I did the working-pluto branch
[11:29:41 EST(-0500)] <EricDalquist> BUT
[11:29:47 EST(-0500)] <awills> ah yes... when will i update & get your renamming?
[11:29:59 EST(-0500)] <EricDalquist> in a few hours I will be deleting up2/trunk
[11:30:06 EST(-0500)] <EricDalquist> and moving working-pluto to up2/trunk
[11:30:09 EST(-0500)] <EricDalquist> so don't do anything there
[11:30:19 EST(-0500)] <awills> sure. np.
[11:30:31 EST(-0500)] <EricDalquist> the changes are all committed in working-pluto
[11:34:00 EST(-0500)] <awills> ic. Here's a JIRA if it comes up at all...
[11:34:01 EST(-0500)] <awills> http://www.ja-sig.org/issues/browse/UP-1893
[12:30:41 EST(-0500)] * EiNZTEiN (n=einztein@205.241.143.4) has joined ##uportal
[13:23:54 EST(-0500)] <KWhat_Work> Anyone got a tomcat config file they care to share and/or know where i can get detailed information on the server.xml file for what is available ?
General
Content
Integrations