Justin: the code won't compile without the addition of getType(). When I made the change to the broker interfaces that Fraser's code uses, I would have checked in a near identical change, except the code did not compile anyway (due to the missing file).
-- Rob On 19 July 2013 17:20, Justin Ross <[email protected]> wrote: > Hi, Fraser. The diff for QPID-5005 is indeed trivial, but due to my > naivete I want to check: should this be necessary? Should the > original behavior of getType be restored? Again, I have no expertise > here. I just feel better asking. > > Adding the missing files is fine for 0.24. I need a jira (perhaps the > one used for the original work?) so I can mark approval somewhere. > Indeed, in general for this kind of "forgot to add" commit, I think > it's nice to bundle it with the jira it was originally intended for. > It makes tracking down a coherent set of changes easier. > > Justin > > > On Fri, Jul 19, 2013 at 9:35 AM, Fraser Adams > <[email protected]> wrote: > > Thanks guys, I had indeed forgotten to add Session.java to source control > > *shame* :-[ > > > > I've just done an svn add for Session.java and commited, *hopefully* you > can > > see it on trunk now? does ant all in /tools/src/java on trunk build for > you > > cleanly now with Session.java added and the getType() fix I commited > > earlier? > > > > If so ..... Justin can I request inclusion of the getType() fix I > mentioned > > earlier plus adding Session.java to the 0.24 branch. > > > > Sorry 'bout that. > > > > Frase > > > > > > > > On 19/07/13 14:14, Robbie Gemmell wrote: > >> > >> ...and I meant to say that the file is not there on trunk, as can be > seen > >> here: > >> > >> > >> > http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/src/qpid-broker-plugins-management-qmf2/java/org/apache/qpid/server/qmf2/agentdata/ > >> > >> > >> On 19 July 2013 14:11, Robbie Gemmell <[email protected]> wrote: > >> > >>> svn status is what you are after > >>> > >>> See http://svnbook.red-bean.com/ for the definitive guide. > >>> > >>> Robbie > >>> > >>> > >>> On 19 July 2013 14:02, Fraser Adams <[email protected]> > >>> wrote: > >>> > >>>> Hi Rob, > >>>> Just to check - are you saying that you can't see the file > Session.java > >>>> in: > >>>> > >>>> /tools/src/java/src/qpid-**broker-plugins-management-** > >>>> qmf2/java/org/apache/qpid/**server/qmf2/agentdata > >>>> > >>>> on trunk? > >>>> > >>>> Could you check and let me know? What's the betting that I've done the > >>>> classic svn faux pas of adding a file and neglecting to do an svn add > on > >>>> it!!??? > >>>> > >>>> I'm a bit rubbish as subversion I don't suppose you know of a command > >>>> that'll let me know whether a given file in a directory (Session.java > in > >>>> this case) is actually added to source control? > >>>> > >>>> Cheers, > >>>> Frase > >>>> > >>>> > >>>> > >>>> > >>>> > >>>> On 19/07/13 13:39, Rob Godfrey wrote: > >>>> > >>>>> Hi Frase, > >>>>> > >>>>> sorry - I meant to mail you about this at the time... When I made the > >>>>> plugin change I prepared the patch for you QMF Plugin, but I couldn't > >>>>> get > >>>>> it to compile after applying - I was seeing the same errors (on > trunk) > >>>>> that > >>>>> you are seeing on 0.24. Have you tried checking out a completely > clean > >>>>> version of trunk - it may be something messed up in your local > checkout > >>>>> which is causing it to work for you there. > >>>>> > >>>>> -- Rob > >>>>> > >>>>> > >>>>> On 19 July 2013 14:35, Fraser Adams <[email protected] > **> > >>>>> wrote: > >>>>> > >>>>> Hey again Justin, > >>>>>> > >>>>>> With respect to the other two errors I noticed on 0.24 but not on > >>>>>> trunk > >>>>>> I've just looked and noticed that the Session.java file in > >>>>>> tools/src/java/src/qpid-****broker-plugins-management-** > >>>>>> qmf2/java/org/apache/qpid/****server/qmf2/agentdata is present in > >>>>>> trunk but > >>>>>> not in 0.24. I'm slightly worried by that given that I'm pretty > >>>>>> certain > >>>>>> I > >>>>>> added that file quite a while ago and checking the file properties > is > >>>>>> says > >>>>>> "Sat 20 Apr 2013 18:35:47 BST" for the modified time, so I'm a bit > >>>>>> concerned about the state of some stuff that got pulled into the > 0.24 > >>>>>> branch. > >>>>>> > >>>>>> Am I losing my marbles? > >>>>>> > >>>>>> Frase > >>>>>> > >>>>>> > >>>>>> > >>>>>> On 19/07/13 13:14, Fraser Adams wrote: > >>>>>> > >>>>>> Hi Justin, > >>>>>>> > >>>>>>> I just noticed today that the Java Broker Plugin API has changed to > >>>>>>> need > >>>>>>> overridden getType() method in instances of PluginFactory. > >>>>>>> > >>>>>>> I raised QPID-5005 and fixed this on trunk with: > >>>>>>> > >>>>>>> — qpid/tools/src/java/src/qpid-****broker-plugins-management-** > >>>>>>> qmf2/java/org/apache/qpid/****server/qmf2/**** > >>>>>>> QmfManagementFactory.java > >>>>>>> (revision 1504825) > >>>>>>> +++ qpid/tools/src/java/src/qpid-****broker-plugins-management-** > >>>>>>> qmf2/java/org/apache/qpid/****server/qmf2/**** > >>>>>>> QmfManagementFactory.java > >>>>>>> (working copy) > >>>>>>> @@ -76,4 +76,10 @@ > >>>>>>> return null; > >>>>>>> } > >>>>>>> } > >>>>>>> + > >>>>>>> + @Override > >>>>>>> + public String getType() > >>>>>>> + > >>>>>>> > >>>>>>> { + return "QMF2 Management"; + } > >>>>>>> > >>>>>>> } > >>>>>>> > >>>>>>> > >>>>>>> I've just checked the 0.24 release branch and that barfs with > >>>>>>> > >>>>>>> "QmfManagementFactory is not abstract and does not override > abstract > >>>>>>> method getType() in org.apache.qpid.server.plugin.****Pluggable > >>>>>>> > >>>>>>> " > >>>>>>> > >>>>>>> > >>>>>>> Actually on 0.24 I seem to be getting a couple of other errors :-( > >>>>>>> > >>>>>>> "ins-management-qmf2/java/org/****apache/qpid/server/qmf2/**** > >>>>>>> QmfManagementAgent.java:172: > >>>>>>> cannot find symbol > >>>>>>> [javac] symbol : class Session > >>>>>>> [javac] location: package org.apache.qpid.server.qmf2.****agentdata > >>>>>>> [javac] > _agent.registerObjectClass(****org.apache.qpid.server.qmf2.** > >>>>>>> agentdata.Session.getSchema())****; > >>>>>>> [javac] ^ > >>>>>>> [javac] > >>>>>>> /home/fadams/qpid/qpid-0.24/****qpid/tools/src/java/src/qpid-* > >>>>>>> *** > >>>>>>> broker-plugins-management-****qmf2/java/org/apache/qpid/**** > >>>>>>> server/qmf2/****QmfManagementAgent.java:374: > >>>>>>> cannot find symbol > >>>>>>> [javac] symbol : class Session > >>>>>>> [javac] location: package org.apache.qpid.server.qmf2.****agentdata > >>>>>>> [javac] data = new org.apache.qpid.server.qmf2.** > >>>>>>> agentdata.Session((Session)****child, ref.getObjectId()); > >>>>>>> [javac] > >>>>>>> > >>>>>>> " > >>>>>>> > >>>>>>> Which I don't seem to be getting on trunk - there might be some > >>>>>>> differences to some of the stuff Robbie and Rob have been working > on > >>>>>>> between trunk and 0.24. > >>>>>>> > >>>>>>> > >>>>>>> Frase > >>>>>>> > >>>>>>> > >>>>>>> > >>>>>>> > >>>>>>> > >>>>>>> > >>>>>>> ------------------------------****----------------------------** > >>>>>> > >>>>>> --**--------- > >>>>>> To unsubscribe, e-mail: [email protected].****org< > >>>>>> dev-unsubscribe@qpid.**apache.org <[email protected] > >> > >>>>>> For additional commands, e-mail: [email protected] > >>>>>> > >>>>>> > >>>>>> > >>>> > >>>> > >>>> > ------------------------------**------------------------------**--------- > >>>> To unsubscribe, e-mail: > >>>> [email protected].**org<[email protected]> > >>>> > >>>> For additional commands, e-mail: [email protected] > >>>> > >>>> > > > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: [email protected] > > > > For additional commands, e-mail: [email protected] > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > >
