You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/10/01 10:47:08 UTC
svn commit: r1177949 - in /camel/branches/camel-2.8.x: ./
components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
Author: davsclaus
Date: Sat Oct 1 08:47:08 2011
New Revision: 1177949
URL: http://svn.apache.org/viewvc?rev=1177949&view=rev
Log:
Merged revisions 1177948 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 1 08:47:08 2011
@@ -1 +1 @@
-/camel/trunk:1177126,1177309,1177394,1177945
+/camel/trunk:1177126,1177309,1177394,1177945,1177948
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java?rev=1177949&r1=1177948&r2=1177949&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java (original)
+++ camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java Sat Oct 1 08:47:08 2011
@@ -87,7 +87,15 @@ public class PrinterProducer extends Def
printService = PrintServiceLookup.lookupDefaultPrintService();
} else {
PrintService[] services = PrintServiceLookup.lookupPrintServices(null, null);
- setPrinter("\\\\" + config.getHostname() + "\\" + config.getPrintername());
+ String name;
+ if (config.getHostname().equalsIgnoreCase("localhost")) {
+ // no hostname for localhost printers
+ name = config.getPrintername();
+ } else {
+ name = "\\\\" + config.getHostname() + "\\" + config.getPrintername();
+ }
+ log.debug("Using printer name: {}", name);
+ setPrinter(name);
int position = findPrinter(services, printer);
if (position < 0) {
throw new PrintException("No printer found with name: " + printer + ". Please verify that the host and printer are registered and reachable from this machine.");
Re: svn commit: r1177949 - in /camel/branches/camel-2.8.x: ./ components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
Posted by Daniel Kulp <dk...@apache.org>.
On Wednesday, October 05, 2011 5:35:57 PM Claus Ibsen wrote:
> On Mon, Oct 3, 2011 at 7:47 PM, Daniel Kulp <dk...@apache.org> wrote:
> > Claus,
> >
> > Can you *please* make some more attempts to get a newer version of
> > svnmerge.py working or use git cherry-pick or something that will
> > retain the log? Not having the log entries on the branch makes is
> > much harder to see what has and hasn't been merged onto the branch.
> > For example, if you click on:
> >
> > https://issues.apache.org/jira/browse/CAMEL-4478
> >
> > it says
> > Fix Version/s: 2.7.4, 2.8.2, 2.9.0
>
> I am using the svnmerge.py file I got from you.
Are you using the DoMerges script as well?
svnmerge.py should have generated a file of:
svnmerge-commit-message.txt
If not using the DoMerges thing, then you can do:
svn commit -F svnmerge-commit-message.txt
to do the commit and the "enhanced" log message would be used. DoMerges does
that automatically but if you manually run the script, that's probably the
easiest way to do the commit. :-)
> Today I backported to 2.8 and I used the same commit message as on
> trunk. So it ought to be visible in JIRA
> https://issues.apache.org/jira/browse/CAMEL-4509
Yep. Perfect. Just like to make sure the data is synced up.
Thanks!
Dan
> > But the subversion tab doesn't have any entries for the branches.
> > We'll really have no idea when the fix was merged back, the svn
> > revision, etc....
> >
> > Thanks!
> > Dan
> >
> > On Saturday, October 01, 2011 8:47:08 AM davsclaus@apache.org wrote:
> >> Author: davsclaus
> >> Date: Sat Oct 1 08:47:08 2011
> >> New Revision: 1177949
> >>
> >> URL: http://svn.apache.org/viewvc?rev=1177949&view=rev
> >> Log:
> >> Merged revisions 1177948 via svnmerge from
> >> https://svn.apache.org/repos/asf/camel/trunk
> >>
> >>
> >> Modified:
> >> camel/branches/camel-2.8.x/ (props changed)
> >>
> >> camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/
> >> apach e/camel/component/printer/PrinterProducer.java
> >>
> >> Propchange: camel/branches/camel-2.8.x/
> >> ----------------------------------------------------------------------
> >> ------ -- --- svn:mergeinfo (original)
> >> +++ svn:mergeinfo Sat Oct 1 08:47:08 2011
> >> @@ -1 +1 @@
> >> -/camel/trunk:1177126,1177309,1177394,1177945
> >> +/camel/trunk:1177126,1177309,1177394,1177945,1177948
> >>
> >> Propchange: camel/branches/camel-2.8.x/
> >> ----------------------------------------------------------------------
> >> ------ -- Binary property 'svnmerge-integrated' - no diff available.
> >>
> >> Modified:
> >> camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/
> >> apach e/camel/component/printer/PrinterProducer.java URL:
> >> http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/cam
> >> el-pr
> >> inter/src/main/java/org/apache/camel/component/printer/PrinterProduce
> >> r.java? rev=1177949&r1=1177948&r2=1177949&view=diff
> >> ======================================================================
> >> ===== === ---
> >> camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/
> >> apach e/camel/component/printer/PrinterProducer.java (original) +++
> >> camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/
> >> apach e/camel/component/printer/PrinterProducer.java Sat Oct 1
> >> 08:47:08 2011 @@ -87,7 +87,15 @@ public class PrinterProducer extends
> >> Def
> >> printService =
> >> PrintServiceLookup.lookupDefaultPrintService(); } else {
> >> PrintService[] services =
> >> PrintServiceLookup.lookupPrintServices(null, null); -
> >> setPrinter("\\\\" + config.getHostname() + "\\" +
> >> config.getPrintername()); + String name;
> >> + if (config.getHostname().equalsIgnoreCase("localhost")) {
> >> + // no hostname for localhost printers
> >> + name = config.getPrintername();
> >> + } else {
> >> + name = "\\\\" + config.getHostname() + "\\" +
> >> config.getPrintername(); + }
> >> + log.debug("Using printer name: {}", name);
> >> + setPrinter(name);
> >> int position = findPrinter(services, printer);
> >> if (position < 0) {
> >> throw new PrintException("No printer found with name:
> >> " + printer + ". Please verify that the host and printer are
> >> registered and reachable from this machine.");
> >
> > --
> > Daniel Kulp
> > dkulp@apache.org
> > http://dankulp.com/blog
> > Talend - http://www.talend.com
--
Daniel Kulp
dkulp@apache.org
http://dankulp.com/blog
Talend - http://www.talend.com
Re: svn commit: r1177949 - in /camel/branches/camel-2.8.x: ./ components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
Posted by Claus Ibsen <cl...@gmail.com>.
On Mon, Oct 3, 2011 at 7:47 PM, Daniel Kulp <dk...@apache.org> wrote:
>
> Claus,
>
> Can you *please* make some more attempts to get a newer version of svnmerge.py
> working or use git cherry-pick or something that will retain the log? Not
> having the log entries on the branch makes is much harder to see what has and
> hasn't been merged onto the branch. For example, if you click on:
>
> https://issues.apache.org/jira/browse/CAMEL-4478
>
> it says
> Fix Version/s: 2.7.4, 2.8.2, 2.9.0
>
I am using the svnmerge.py file I got from you.
Today I backported to 2.8 and I used the same commit message as on
trunk. So it ought to be visible in JIRA
https://issues.apache.org/jira/browse/CAMEL-4509
> But the subversion tab doesn't have any entries for the branches. We'll
> really have no idea when the fix was merged back, the svn revision, etc....
>
> Thanks!
> Dan
>
>
>
> On Saturday, October 01, 2011 8:47:08 AM davsclaus@apache.org wrote:
>> Author: davsclaus
>> Date: Sat Oct 1 08:47:08 2011
>> New Revision: 1177949
>>
>> URL: http://svn.apache.org/viewvc?rev=1177949&view=rev
>> Log:
>> Merged revisions 1177948 via svnmerge from
>> https://svn.apache.org/repos/asf/camel/trunk
>>
>>
>> Modified:
>> camel/branches/camel-2.8.x/ (props changed)
>>
>> camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/apach
>> e/camel/component/printer/PrinterProducer.java
>>
>> Propchange: camel/branches/camel-2.8.x/
>> ----------------------------------------------------------------------------
>> -- --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Sat Oct 1 08:47:08 2011
>> @@ -1 +1 @@
>> -/camel/trunk:1177126,1177309,1177394,1177945
>> +/camel/trunk:1177126,1177309,1177394,1177945,1177948
>>
>> Propchange: camel/branches/camel-2.8.x/
>> ----------------------------------------------------------------------------
>> -- Binary property 'svnmerge-integrated' - no diff available.
>>
>> Modified:
>> camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/apach
>> e/camel/component/printer/PrinterProducer.java URL:
>> http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-pr
>> inter/src/main/java/org/apache/camel/component/printer/PrinterProducer.java?
>> rev=1177949&r1=1177948&r2=1177949&view=diff
>> ===========================================================================
>> === ---
>> camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/apach
>> e/camel/component/printer/PrinterProducer.java (original) +++
>> camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/apach
>> e/camel/component/printer/PrinterProducer.java Sat Oct 1 08:47:08 2011 @@
>> -87,7 +87,15 @@ public class PrinterProducer extends Def
>> printService = PrintServiceLookup.lookupDefaultPrintService();
>> } else {
>> PrintService[] services =
>> PrintServiceLookup.lookupPrintServices(null, null); -
>> setPrinter("\\\\" + config.getHostname() + "\\" + config.getPrintername());
>> + String name;
>> + if (config.getHostname().equalsIgnoreCase("localhost")) {
>> + // no hostname for localhost printers
>> + name = config.getPrintername();
>> + } else {
>> + name = "\\\\" + config.getHostname() + "\\" +
>> config.getPrintername(); + }
>> + log.debug("Using printer name: {}", name);
>> + setPrinter(name);
>> int position = findPrinter(services, printer);
>> if (position < 0) {
>> throw new PrintException("No printer found with name: " +
>> printer + ". Please verify that the host and printer are registered and
>> reachable from this machine.");
> --
> Daniel Kulp
> dkulp@apache.org
> http://dankulp.com/blog
> Talend - http://www.talend.com
>
--
Claus Ibsen
-----------------
FuseSource
Email: cibsen@fusesource.com
Web: http://fusesource.com
Twitter: davsclaus, fusenews
Blog: http://davsclaus.blogspot.com/
Author of Camel in Action: http://www.manning.com/ibsen/
Re: svn commit: r1177949 - in /camel/branches/camel-2.8.x: ./ components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
Posted by Daniel Kulp <dk...@apache.org>.
Claus,
Can you *please* make some more attempts to get a newer version of svnmerge.py
working or use git cherry-pick or something that will retain the log? Not
having the log entries on the branch makes is much harder to see what has and
hasn't been merged onto the branch. For example, if you click on:
https://issues.apache.org/jira/browse/CAMEL-4478
it says
Fix Version/s: 2.7.4, 2.8.2, 2.9.0
But the subversion tab doesn't have any entries for the branches. We'll
really have no idea when the fix was merged back, the svn revision, etc....
Thanks!
Dan
On Saturday, October 01, 2011 8:47:08 AM davsclaus@apache.org wrote:
> Author: davsclaus
> Date: Sat Oct 1 08:47:08 2011
> New Revision: 1177949
>
> URL: http://svn.apache.org/viewvc?rev=1177949&view=rev
> Log:
> Merged revisions 1177948 via svnmerge from
> https://svn.apache.org/repos/asf/camel/trunk
>
>
> Modified:
> camel/branches/camel-2.8.x/ (props changed)
>
> camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/apach
> e/camel/component/printer/PrinterProducer.java
>
> Propchange: camel/branches/camel-2.8.x/
> ----------------------------------------------------------------------------
> -- --- svn:mergeinfo (original)
> +++ svn:mergeinfo Sat Oct 1 08:47:08 2011
> @@ -1 +1 @@
> -/camel/trunk:1177126,1177309,1177394,1177945
> +/camel/trunk:1177126,1177309,1177394,1177945,1177948
>
> Propchange: camel/branches/camel-2.8.x/
> ----------------------------------------------------------------------------
> -- Binary property 'svnmerge-integrated' - no diff available.
>
> Modified:
> camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/apach
> e/camel/component/printer/PrinterProducer.java URL:
> http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-pr
> inter/src/main/java/org/apache/camel/component/printer/PrinterProducer.java?
> rev=1177949&r1=1177948&r2=1177949&view=diff
> ===========================================================================
> === ---
> camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/apach
> e/camel/component/printer/PrinterProducer.java (original) +++
> camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/apach
> e/camel/component/printer/PrinterProducer.java Sat Oct 1 08:47:08 2011 @@
> -87,7 +87,15 @@ public class PrinterProducer extends Def
> printService = PrintServiceLookup.lookupDefaultPrintService();
> } else {
> PrintService[] services =
> PrintServiceLookup.lookupPrintServices(null, null); -
> setPrinter("\\\\" + config.getHostname() + "\\" + config.getPrintername());
> + String name;
> + if (config.getHostname().equalsIgnoreCase("localhost")) {
> + // no hostname for localhost printers
> + name = config.getPrintername();
> + } else {
> + name = "\\\\" + config.getHostname() + "\\" +
> config.getPrintername(); + }
> + log.debug("Using printer name: {}", name);
> + setPrinter(name);
> int position = findPrinter(services, printer);
> if (position < 0) {
> throw new PrintException("No printer found with name: " +
> printer + ". Please verify that the host and printer are registered and
> reachable from this machine.");
--
Daniel Kulp
dkulp@apache.org
http://dankulp.com/blog
Talend - http://www.talend.com