svn commit: r1177950 - in /camel/branches/camel-2.7.x: ./ camel-core/src/main/java/org/apache/camel/component/file/ camel-core/src/test/java/org/apache/camel/component/file/ components/camel-printer/src/main/java/org/apache/camel/component/printer/

[davsclaus]

Author: davsclaus
Date: Sat Oct  1 08:49:07 2011
New Revision: 1177950

URL: http://svn.apache.org/viewvc?rev=1177950&view=rev
Log:
Merged revisions 1177949 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x


Modified:
    camel/branches/camel-2.7.x/   (props changed)
    
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java
   (props changed)
    
camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java
   (props changed)
    
camel/branches/camel-2.7.x/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct  1 08:49:07 2011
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.8.x:1174571,1175323,1176329,1176787,1177397,1177946
-/camel/trunk:1146608,1146903,1147216,1174565,1175321,1176274,1176781-1176782,1177394,1177945
+/camel/branches/camel-2.8.x:1174571,1175323,1176329,1176787,1177397,1177946,1177949
+/camel/trunk:1146608,1146903,1147216,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Oct  1 08:49:07 2011
@@ -1 +1 @@
-/camel/branches/camel-2.8.x:1-1146127,1146608,1146653,1146771,1146903,1147216,1174571,1175323,1176329,1176787,1177397,1177946
+/camel/branches/camel-2.8.x:1-1146127,1146608,1146653,1146771,1146903,1147216,1174571,1175323,1176329,1176787,1177397,1177946,1177949

Propchange: 
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct  1 08:49:07 2011
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java:1174571,1175323,1176787,1177397,1177946
+/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java:1174571,1175323,1176787,1177397,1177946,1177949
 
/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java:1124595

Propchange: 
camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct  1 08:49:07 2011
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java:1174571,1175323,1176787,1177397,1177946
+/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java:1174571,1175323,1176787,1177397,1177946,1177949
 
/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java:1124595

Modified: 
camel/branches/camel-2.7.x/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java?rev=1177950&r1=1177949&r2=1177950&view=diff
==============================================================================
--- 
camel/branches/camel-2.7.x/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
 (original)
+++ 
camel/branches/camel-2.7.x/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
 Sat Oct  1 08:49:07 2011
@@ -88,7 +88,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.");