svn commit: r1177946 - in /camel/branches/camel-2.8.x: ./ components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java

[davsclaus]

Author: davsclaus
Date: Sat Oct  1 08:37:13 2011
New Revision: 1177946

URL: http://svn.apache.org/viewvc?rev=1177946&view=rev
Log:
Merged revisions 1177945 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/PrinterConfiguration.java
    
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:37:13 2011
@@ -1 +1 @@
-/camel/trunk:1177126,1177309,1177394
+/camel/trunk:1177126,1177309,1177394,1177945

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/PrinterConfiguration.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java?rev=1177946&r1=1177945&r2=1177946&view=diff
==============================================================================
--- 
camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java
 (original)
+++ 
camel/branches/camel-2.8.x/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java
 Sat Oct  1 08:37:13 2011
@@ -23,9 +23,8 @@ import javax.print.DocFlavor;
 import javax.print.attribute.standard.MediaSizeName;
 import javax.print.attribute.standard.Sides;
 
+import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.URISupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class PrinterConfiguration {
     private URI uri;
@@ -59,7 +58,12 @@ public class PrinterConfiguration {
         setUri(uri);
         setHostname(uri.getHost());
         setPort(uri.getPort());
-        setPrintername(uri.getPath());
+
+        // use path as printer name, but without any leading slashes
+        String path = uri.getPath();
+        path = ObjectHelper.removeStartingCharacters(path, '/');
+        path = ObjectHelper.removeStartingCharacters(path, '\\');
+        setPrintername(path);
         
         Map printSettings = URISupport.parseParameters(uri);
         setFlavor((String)printSettings.get("flavor"));

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=1177946&r1=1177945&r2=1177946&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:37:13 2011
@@ -83,7 +83,7 @@ public class PrinterProducer extends Def
         PrintService printService;
         
         if ((config.getHostname().equalsIgnoreCase("localhost")) 
-            && (config.getPrintername().equalsIgnoreCase("/default"))) {
+            && (config.getPrintername().equalsIgnoreCase("default"))) {
             printService = PrintServiceLookup.lookupDefaultPrintService();     
       
         } else {
             PrintService[] services = 
PrintServiceLookup.lookupPrintServices(null, null);