Skip to end of metadata
Go to start of metadata

You are viewing an old version of this content. View the current version.

Compare with Current View Version History

Β« Previous Version 35 Next Β»

[11:13:18 CDT(-0500)] <b-rock> Greetings uPortal devs: I read on the mail list that 4.0.2 is planned to be cut next week. Is the fix for multi-valued user attributes in that? I know we chatted here about it but I don't think a ticket ever got created.

[11:13:59 CDT(-0500)] <athena> any objection to taking that most popular portlets portlet out of the 3.2 default layout?

[11:15:13 CDT(-0500)] <athena> dont' think it actually works on a lot of non-hsql databases

[11:37:43 CDT(-0500)] <athena> EricDalquist: looking at UP-3195, which notes that if you have the missing channel in your layout, you cant' add new content

[11:37:49 CDT(-0500)] <athena> have a temporary fix that makes that problem go away

[11:38:02 CDT(-0500)] <athena> but do we want to just strip the channel out of the layout entirely when the layout is resaved?

[11:51:32 CDT(-0500)] <EricDalquist> sorry athena, was on a conf call with terrecotta

[11:51:37 CDT(-0500)] <athena> no worries (smile)

[11:52:01 CDT(-0500)] <EricDalquist> they are going to help us get uPortal working on the heap size based cache config when ehcache 2.5 comes out

[11:52:14 CDT(-0500)] <athena> oh wow, that sounds awesome

[11:52:27 CDT(-0500)] <EricDalquist> they also said that if we get an out of the box terrecotta config setup they would add uPortal to their validation suite for terrecottta

[11:52:33 CDT(-0500)] <athena> oh wow

[11:52:42 CDT(-0500)] <EricDalquist> b-rock: a fix was committed for that

[11:52:53 CDT(-0500)] <b-rock> thank you EricDalquist!!

[11:53:47 CDT(-0500)] <EricDalquist> b-rock: https://issues.jasig.org/browse/UP-3217

[11:54:48 CDT(-0500)] <b-rock> cool. quick question EricDalquist. Is the procedure for non-comitters to submit a patch to uPortal now the same as creating a ticket and attaching the patch, or should we try to do a pull request through github?

[11:55:33 CDT(-0500)] <b-rock> I don't have anything to submit at the moment, but I'm sure I will eventually.

[11:55:58 CDT(-0500)] <EricDalquist> either way is fine

[11:56:12 CDT(-0500)] <EricDalquist> doing a pull request through github will get your fix in the fastest though

[11:56:27 CDT(-0500)] <EricDalquist> since then someone can review the diff and merge it in the github UI

[11:56:36 CDT(-0500)] <EricDalquist> which makes it REALLY fast and easy

[11:56:43 CDT(-0500)] <b-rock> ok great. I have been trying it but haven't done a pull request yet.

[11:57:03 CDT(-0500)] <EricDalquist> I'm working on a git usage guide for committers right now

[11:57:11 CDT(-0500)] <EricDalquist> and will add another page for non-committers

[11:57:18 CDT(-0500)] <b-rock> cool. thanks.

[11:57:21 CDT(-0500)] <EricDalquist> since with github anyone can submit a pull

[11:57:27 CDT(-0500)] <EricDalquist> which is REALLY nice for us

[11:57:32 CDT(-0500)] <EricDalquist> so athena 3195

[11:57:35 CDT(-0500)] <athena> yes

[11:57:48 CDT(-0500)] <EricDalquist> I think we should strip the channel

[11:57:53 CDT(-0500)] <athena> ok, that was my thought too

[11:57:56 CDT(-0500)] <EricDalquist> that is what used to happen for expired channels

[11:57:59 CDT(-0500)] <athena> cant' think of any reason to keep it around

[11:58:04 CDT(-0500)] <athena> it's not like there's a chance it might come back

[11:58:15 CDT(-0500)] <EricDalquist> the problem is the code assumed that expired was as "deleted" as something could get

[11:58:16 CDT(-0500)] <athena> it's a bit weird since it won't get stripped until the layout is resaved

[11:58:20 CDT(-0500)] <athena> yeah

[11:58:31 CDT(-0500)] <EricDalquist> and so there were a bunch of places that null checks were needed

[11:59:40 CDT(-0500)] <athena> yeah

[11:59:51 CDT(-0500)] <athena> easy enough to do

[12:02:01 CDT(-0500)] <EricDalquist> yup

[12:08:10 CDT(-0500)] <EricDalquist> I'm going through the git workflow right now on a small set of changes

[12:08:18 CDT(-0500)] <EricDalquist> so I should have it all verified later this afternoon

[12:09:57 CDT(-0500)] <athena> awesome

[12:10:11 CDT(-0500)] <athena> i have some changes to commit this morning on the 3.2 branch as well

[12:36:09 CDT(-0500)] <athena> EricDalquist: just made two commits to the 3.2 branch

[12:36:13 CDT(-0500)] <athena> seems like they tooik

[12:36:31 CDT(-0500)] <athena> instructions were mostly good, though the forking instructions over on the git site give you a URL that doesn't work for pushing

[12:39:09 CDT(-0500)] <EricDalquist> ok good to know

[12:39:23 CDT(-0500)] <EricDalquist> I'll make a note that committers need to use the read/write url when setting up the upstream reamote

[12:39:32 CDT(-0500)] <athena> sounds good

[12:39:36 CDT(-0500)] <athena> other than that it seems fine

[12:39:39 CDT(-0500)] <EricDalquist> great

[12:39:40 CDT(-0500)] <athena> worked well for a branch too

[12:40:04 CDT(-0500)] <EricDalquist> (smile) and it looks like you were able to push to both your fork and uPortal

[12:40:08 CDT(-0500)] <athena> yeah

[12:40:12 CDT(-0500)] <athena> seems to have worked (smile)

[12:40:14 CDT(-0500)] <EricDalquist> great

[12:40:18 CDT(-0500)] <athena> yeah

[12:40:23 CDT(-0500)] <athena> feel like i can be productive again

[12:40:24 CDT(-0500)] <athena> so that's good

[12:40:24 CDT(-0500)] <EricDalquist> I believe you could also just push to your fork and then do a pull request

[12:40:25 CDT(-0500)] <athena> (smile)

[12:40:29 CDT(-0500)] <EricDalquist> if you ever want code review

[12:40:29 CDT(-0500)] <athena> yeah

[12:40:36 CDT(-0500)] <EricDalquist> but I'll make sure to document all of that

[12:40:38 CDT(-0500)] <athena> shoudl be a good workflow

[12:40:47 CDT(-0500)] <EricDalquist> (smile)

[12:41:00 CDT(-0500)] <EricDalquist> I'm looking forward to having people like b-rock be able to do pull requests

[12:41:05 CDT(-0500)] <athena> totally

[12:41:07 CDT(-0500)] <EricDalquist> will make applying patches even easier

[12:41:09 CDT(-0500)] <athena> shoudl be a really good thing for us

[12:41:13 CDT(-0500)] <athena> yeah

[13:06:11 CDT(-0500)] <b-rock> Hi again uPortal devs. I'm working on getting the toro gateway sso portlet working in the up4 build. can you tell me if there is an equivalent of UserInstanceManager.getUserInstance(req); in up4? right now I'm getting a noclassdef because the file moved and not sure if this is supported

[13:07:44 CDT(-0500)] <athena> my strong recommendation would be that that portlet be rewriten using modern technology

[13:08:01 CDT(-0500)] <athena> it's very, very outdated, and i wouldn't be shocked if it starts becoming hard to work with

[13:08:06 CDT(-0500)] <b-rock> yeah I agree. It would also be nice to pull it out of the toro project

[13:08:14 CDT(-0500)] <athena> yeah

[13:08:20 CDT(-0500)] <athena> we could rewrite it with a lot less code

[13:08:22 CDT(-0500)] <EricDalquist> b-rock: see the IUserInstanceManager interface

[13:08:22 CDT(-0500)] <b-rock> well it almost works right now.

[13:08:32 CDT(-0500)] <athena> it'd be much simpler

[13:08:34 CDT(-0500)] <EricDalquist> and inject it via spring

[13:09:09 CDT(-0500)] <EricDalquist> private IUserInstanceManager userInstanceManager;

[13:09:09 CDT(-0500)] <EricDalquist> @Autowired

[13:09:09 CDT(-0500)]

<EricDalquist> public void setUserInstanceManager(IUserInstanceManager userInstanceManager)

Unknown macro: {...}

[13:09:11 CDT(-0500)] <b-rock> ok hmm. so I'll need to wire it via spring in the toro project.

[13:09:20 CDT(-0500)] <EricDalquist> yup

[13:09:29 CDT(-0500)] <EricDalquist> A LOT of things are no only available as spring injected beans

[13:09:39 CDT(-0500)] <EricDalquist> the eventual goal is that everything is a spring injected bean (tongue)

[13:09:41 CDT(-0500)] <athena> EricDalquist: maybe another thing to put in the Git documentation would be how to work with a branch

[13:09:51 CDT(-0500)] <athena> like a remote maintainence branch, i mean

[13:09:51 CDT(-0500)] <EricDalquist> like a patches branch?

[13:09:53 CDT(-0500)] <athena> yeah

[13:10:00 CDT(-0500)] <EricDalquist> oh

[13:10:03 CDT(-0500)] <EricDalquist> wait ...

[13:10:03 CDT(-0500)] <b-rock> ok I'll see how far I can get with this. Thanks for your help.

[13:10:09 CDT(-0500)] <EricDalquist> so like 3.2-patches athena?

[13:10:10 CDT(-0500)] <athena> this might also be a good page to link to: http://git.or.cz/course/svn.html

[13:10:12 CDT(-0500)] <athena> yeah

[13:10:12 CDT(-0500)] <EricDalquist> or something ekse?

[13:10:33 CDT(-0500)] <athena> so do git checkout β€”track -b rel-3-2-patches origin/rel-3-2-patches

[13:10:52 CDT(-0500)] <athena> and then have some notes that if you're on the branch you really want to use rel-3-2-patches instead of master at those relevant spots

[13:10:53 CDT(-0500)] <EricDalquist> ok will do, it should just be a matter of replacing "master" with "rel-3-2-patches"

[13:10:56 CDT(-0500)] <athena> yep (smile)

[13:11:17 CDT(-0500)] <athena> confirmed that that all works fine, once you do the checkout β€”track bit

[13:11:29 CDT(-0500)] <EricDalquist> ah right

[13:11:39 CDT(-0500)] <EricDalquist> that's a good one, need to setup the local branch

[13:11:45 CDT(-0500)] <athena> yeah

[13:19:16 CDT(-0500)] <athena> huh.

[13:19:39 CDT(-0500)] <athena> what version of ant did we require for 3.1?

[13:19:49 CDT(-0500)] <EricDalquist> I can't remember

[13:20:01 CDT(-0500)] <athena> ah, the uportal manual! it has all the answers

[13:20:06 CDT(-0500)] <athena> having some problems building 3.1

[13:20:08 CDT(-0500)] <athena> [artifact:install] An error has occurred while processing the Maven artifact tasks.

[13:20:08 CDT(-0500)] <athena> [artifact:install] Diagnosis:

[13:20:08 CDT(-0500)] <athena> [artifact:install]

[13:20:08 CDT(-0500)] <athena> [artifact:install] Error installing artifact 'org.jasig.portal:uportal-parent:pom': Error installing artifact's metadata: Error installing metadata: Error updating group repository metadata

[13:20:08 CDT(-0500)] <athena> [artifact:install] expected START_TAG or END_TAG not TEXT (position: TEXT seen ...<classifier>site</... @13:27)

[13:20:12 CDT(-0500)] <athena> not sure what the issue is

[13:20:20 CDT(-0500)] <athena> mvn install worked ok

[13:20:26 CDT(-0500)] <athena> ant task produces that error

[15:01:40 CDT(-0500)] <athena> EricDalquist: not sure what i'm doing wrong, but i don't think my fork is getting updated

[15:02:14 CDT(-0500)] <EricDalquist> you see commits on jasig/uportal that are not on athena/uportal?

[15:02:22 CDT(-0500)] <athena> yeah

[15:02:51 CDT(-0500)] <EricDalquist> which ones?

[15:03:22 CDT(-0500)] <athena> pretty much everything since oct 18 when i forked it

[15:03:34 CDT(-0500)] <athena> except the two changes i just committed, since i pushed those to my fork first

[15:03:59 CDT(-0500)] <EricDalquist> did you do the "keeping your fork up to date" section on: https://wiki.jasig.org/display/UPC/Git+Tips+and+Tricks

[15:04:07 CDT(-0500)] <EricDalquist> for the branch in question?

[15:04:08 CDT(-0500)] <athena> yeah

[15:04:22 CDT(-0500)] <athena> those log statements never show anything, either

[15:05:16 CDT(-0500)] <athena> oh ack.

[15:05:17 CDT(-0500)] <athena> sigh

[15:05:42 CDT(-0500)] <EricDalquist> ?

[15:05:53 CDT(-0500)] <athena> looks like i accidentally added my own branch as the upstream that last time

[15:06:01 CDT(-0500)] <athena> that would definitely make it look like they always matched, huH?

[15:06:11 CDT(-0500)] <EricDalquist> ah yeah

[15:06:14 CDT(-0500)] <athena> heh.

[15:09:27 CDT(-0500)] <athena> aaaack

[15:09:33 CDT(-0500)] <EricDalquist> uh oh

[15:09:36 CDT(-0500)] <athena> yeah.

[15:09:56 CDT(-0500)] <athena> think i screwed up

[15:10:00 CDT(-0500)] <EricDalquist> things all screwy?

[15:10:37 CDT(-0500)] <athena> umm, think i committed something i shouldn't have to the jasig side :/

[15:11:08 CDT(-0500)] <EricDalquist> https://github.com/Jasig/uPortal/commit/c145935bde1d1e607947d784eb3604c9379cc26e

[15:11:09 CDT(-0500)] <EricDalquist> that?

[15:11:21 CDT(-0500)] <athena> yeah

[15:11:29 CDT(-0500)] <athena> clearly that doesn't look good at all

[15:11:47 CDT(-0500)] <EricDalquist> ok, just a minute

[15:11:51 CDT(-0500)] <athena> sorry :/

[15:11:55 CDT(-0500)] <EricDalquist> no problem (smile)

[15:12:33 CDT(-0500)] <EricDalquist> what does "git remote -v" show you?

[15:12:48 CDT(-0500)] <athena> origin git@github.com:/bourey/uPortal.git (fetch)

[15:12:48 CDT(-0500)] <athena> origin git@github.com:/bourey/uPortal.git (push)

[15:12:48 CDT(-0500)] <athena> upstream git@github.com:Jasig/uPortal.git (fetch)

[15:12:48 CDT(-0500)] <athena> upstream git@github.com:Jasig/uPortal.git (push)

[15:12:56 CDT(-0500)] <EricDalquist> ok

[15:12:57 CDT(-0500)] <EricDalquist> try:

[15:13:08 CDT(-0500)] <EricDalquist> git push -f upstream HEAD^:master

[15:13:31 CDT(-0500)] <EricDalquist> that should un-push the last commit from upstream (jasig/uportal)

[15:13:44 CDT(-0500)] <athena> excelletn

[15:13:59 CDT(-0500)] <athena> looks like that did do it

[15:14:07 CDT(-0500)] <EricDalquist> great (smile)

[15:14:14 CDT(-0500)] <athena> thanks so much - sorry about that

[15:14:20 CDT(-0500)] <athena> really not sure what happened there

[15:14:21 CDT(-0500)] <EricDalquist> no problem

[15:14:31 CDT(-0500)] <EricDalquist> do you have a lot of local work in progress?

[15:14:33 CDT(-0500)] <athena> no

[15:14:35 CDT(-0500)] <athena> nothing

[15:14:36 CDT(-0500)] <EricDalquist> if not you can always refork and reclone

[15:14:45 CDT(-0500)] <EricDalquist> just to make sure you're in the state you think you are

[15:14:48 CDT(-0500)] <athena> yeah

  • No labels