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 2014/01/16 10:36:20 UTC

[1/4] git commit: add configuration property for page orientation

Updated Branches:
  refs/heads/master ca33e606e -> 9fa0fcddc


add configuration property for page orientation


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cdf0d0f9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cdf0d0f9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cdf0d0f9

Branch: refs/heads/master
Commit: cdf0d0f914a871bf158b212007223a342291d7b9
Parents: a17f232
Author: Carsten Erker <ca...@akquinet.de>
Authored: Wed Jan 15 14:48:48 2014 +0100
Committer: Carsten Erker <ca...@akquinet.de>
Committed: Wed Jan 15 14:48:48 2014 +0100

----------------------------------------------------------------------
 .../component/printer/PrinterConfiguration.java | 45 +++++++++++++++++++-
 .../component/printer/PrinterProducer.java      |  3 +-
 .../component/printer/PrinterPrintTest.java     | 24 +++++++++++
 3 files changed, 70 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/cdf0d0f9/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java
index d17c9c0..cf0c341 100644
--- a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java
+++ b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java
@@ -21,6 +21,7 @@ import java.net.URISyntaxException;
 import java.util.Map;
 import javax.print.DocFlavor;
 import javax.print.attribute.standard.MediaSizeName;
+import javax.print.attribute.standard.OrientationRequested;
 import javax.print.attribute.standard.Sides;
 
 import org.apache.camel.util.ObjectHelper;
@@ -40,6 +41,8 @@ public class PrinterConfiguration {
     private MediaSizeName mediaSizeName;
     private String sides;
     private Sides internalSides;
+    private String orientation;
+    private OrientationRequested internalOrientation;
     private boolean sendToPrinter = true;
     private String mediaTray;
 
@@ -79,14 +82,17 @@ public class PrinterConfiguration {
         }
         setMediaSize((String)printSettings.get("mediaSize"));
         setSides((String)printSettings.get("sides"));
-        setMediaSizeName(assignMediaSize(mediaSize));       
+        setOrientation(((String)printSettings.get("orientation")));
+        setMediaSizeName(assignMediaSize(mediaSize));
         setInternalSides(assignSides(sides));
+        setInternalOrientation(assignOrientation(orientation));
         if (printSettings.containsKey("sendToPrinter")) {
             if (!(Boolean.valueOf((String) printSettings.get("sendToPrinter")))) {
                 setSendToPrinter(false);
             }
         }
 
+
         if (printSettings.containsKey("mediaTray")) {
             setMediaTray((String) printSettings.get("mediaTray"));
         }
@@ -198,6 +204,27 @@ public class PrinterConfiguration {
         return answer;
     }
     
+    public OrientationRequested assignOrientation(final String orientation) {
+        OrientationRequested answer;
+
+        if (orientation == null) {
+            // default to portrait
+            answer = OrientationRequested.PORTRAIT;
+        } else if (orientation.equalsIgnoreCase("portrait")) {
+            answer = OrientationRequested.PORTRAIT;
+        } else if (orientation.equalsIgnoreCase("landscape")) {
+            answer = OrientationRequested.LANDSCAPE;
+        } else if (orientation.equalsIgnoreCase("reverse-portrait")) {
+            answer = OrientationRequested.REVERSE_PORTRAIT;
+        } else if (orientation.equalsIgnoreCase("reverse-landscape")) {
+            answer = OrientationRequested.REVERSE_LANDSCAPE;
+        } else {
+            answer = OrientationRequested.PORTRAIT;
+        }
+
+        return answer;
+    }
+
     public URI getUri() {
         return uri;
     }
@@ -286,6 +313,22 @@ public class PrinterConfiguration {
         this.internalSides = internalSides;
     }
 
+    public OrientationRequested getInternalOrientation() {
+        return internalOrientation;
+    }
+
+    public void setInternalOrientation(OrientationRequested internalOrientation) {
+        this.internalOrientation = internalOrientation;
+    }
+
+    public String getOrientation() {
+        return orientation;
+    }
+
+    public void setOrientation( String orientation ) {
+        this.orientation = orientation;
+    }
+
     public String getMimeType() {
         return mimeType;
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/cdf0d0f9/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
index d346481..ee3239c 100644
--- a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
+++ b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
@@ -71,7 +71,8 @@ public class PrinterProducer extends DefaultProducer {
         }
         printRequestAttributeSet.add(config.getMediaSizeName());
         printRequestAttributeSet.add(config.getInternalSides());
-        
+        printRequestAttributeSet.add(config.getInternalOrientation());
+
         if (config.getMediaTray() != null) {
             MediaTray mediaTray = resolveMediaTray(config.getMediaTray());
         

http://git-wip-us.apache.org/repos/asf/camel/blob/cdf0d0f9/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
----------------------------------------------------------------------
diff --git a/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java b/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
index b20ae18..2a13670 100644
--- a/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
+++ b/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
@@ -329,6 +329,30 @@ public class PrinterPrintTest extends CamelTestSupport {
         assertEquals("middle", mediaTray.toString());
     }
     
+    @Test
+    public void printsWithLandscapeOrientation() throws Exception {
+        PrinterEndpoint endpoint = new PrinterEndpoint();
+        PrinterConfiguration configuration = new PrinterConfiguration();
+        configuration.setHostname("localhost");
+        configuration.setPort(631);
+        configuration.setPrintername("DefaultPrinter");
+        configuration.setMediaSizeName(MediaSizeName.ISO_A4);
+        configuration.setInternalSides(Sides.ONE_SIDED);
+        configuration.setMediaTray("middle");
+        configuration.setOrientation("landscape");
+
+        PrinterProducer producer = new PrinterProducer(endpoint, configuration);
+        producer.start();
+        PrinterOperations printerOperations = producer.getPrinterOperations();
+        PrintRequestAttributeSet attributeSet = printerOperations.getPrintRequestAttributeSet();
+
+        Attribute attribute = attributeSet.get(javax.print.attribute.standard.Media.class);
+        assertNotNull(attribute);
+        assertTrue(attribute instanceof MediaTray);
+        MediaTray mediaTray = (MediaTray) attribute;
+        assertEquals("middle", mediaTray.toString());
+    }
+
     protected void setupJavaPrint() {
         // "install" another default printer
         PrintService psDefault = mock(PrintService.class);


[2/4] git commit: add printer tests with page orientation

Posted by da...@apache.org.
add printer tests with page orientation


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7be880b7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7be880b7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7be880b7

Branch: refs/heads/master
Commit: 7be880b753d9028c6d2be5c08cfe33073f9cc280
Parents: cdf0d0f
Author: Carsten Erker <ca...@akquinet.de>
Authored: Thu Jan 16 10:15:45 2014 +0100
Committer: Carsten Erker <ca...@akquinet.de>
Committed: Thu Jan 16 10:15:45 2014 +0100

----------------------------------------------------------------------
 .../component/printer/PrinterPrintTest.java     | 52 +++++++++++++-------
 1 file changed, 35 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/7be880b7/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
----------------------------------------------------------------------
diff --git a/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java b/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
index 2a13670..794e917 100644
--- a/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
+++ b/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
@@ -30,6 +30,7 @@ import javax.print.attribute.PrintRequestAttributeSet;
 import javax.print.attribute.standard.Media;
 import javax.print.attribute.standard.MediaSizeName;
 import javax.print.attribute.standard.MediaTray;
+import javax.print.attribute.standard.OrientationRequested;
 import javax.print.attribute.standard.Sides;
 
 import org.apache.camel.Endpoint;
@@ -181,6 +182,23 @@ public class PrinterPrintTest extends CamelTestSupport {
         sendJPEG();
     }
 
+    @Test
+    @Ignore
+    public void testSendingJPEGToPrinterWithLandscapePageOrientation() throws Exception {
+        if (isAwtHeadless()) {
+            return;
+        }
+        context.addRoutes(new RouteBuilder() {
+            public void configure() {
+                from("direct:start").to("lpr://localhost/default?flavor=DocFlavor.INPUT_STREAM"
+                        + "&mimeType=JPEG&sendToPrinter=false&orientation=landscape");
+            }
+        });
+        context.start();
+
+        sendJPEG();
+    }
+
     /**
      * Test for resolution of bug CAMEL-3446.
      * Not specifying mediaSize nor sides attributes make it use
@@ -199,14 +217,14 @@ public class PrinterPrintTest extends CamelTestSupport {
         });
         context.start();
     }
-    
+
     @Test
     public void moreThanOneLprEndpoint() throws Exception {
 
         if (isAwtHeadless()) {
             return;
         }
-        
+
         int numberOfPrintservicesBefore = PrintServiceLookup.lookupPrintServices(null, null).length;
 
         // setup javax.print 
@@ -224,7 +242,7 @@ public class PrinterPrintTest extends CamelTestSupport {
 
         DocPrintJob job1 = mock(DocPrintJob.class);
         when(ps1.createPrintJob()).thenReturn(job1);
-        
+
         context.addRoutes(new RouteBuilder() {
 
             public void configure() {
@@ -258,7 +276,7 @@ public class PrinterPrintTest extends CamelTestSupport {
 
         verify(job1, times(1)).print(any(Doc.class), any(PrintRequestAttributeSet.class));
     }
-    
+
     @Test
     public void printerNameTest() throws Exception {
         if (isAwtHeadless()) {
@@ -272,7 +290,7 @@ public class PrinterPrintTest extends CamelTestSupport {
         assertTrue("The Remote PrintService #1 should be registered.", res1);
         DocPrintJob job1 = mock(DocPrintJob.class);
         when(ps1.createPrintJob()).thenReturn(job1);
-        
+
         context.addRoutes(new RouteBuilder() {
 
             public void configure() {
@@ -280,14 +298,14 @@ public class PrinterPrintTest extends CamelTestSupport {
             }
         });
         context.start();
-        
+
         template.sendBody("direct:start1", "Hello Printer 1");
 
         context.stop();
 
         verify(job1, times(1)).print(any(Doc.class), any(PrintRequestAttributeSet.class));
     }
-    
+
     @Test
     public void setJobName() throws Exception {
         if (isAwtHeadless()) {
@@ -311,10 +329,11 @@ public class PrinterPrintTest extends CamelTestSupport {
         PrinterEndpoint endpoint = new PrinterEndpoint();
         PrinterConfiguration configuration = new PrinterConfiguration();
         configuration.setHostname("localhost");
-        configuration.setPort(631);
-        configuration.setPrintername("DefaultPrinter");
-        configuration.setMediaSizeName(MediaSizeName.ISO_A4);
-        configuration.setInternalSides(Sides.ONE_SIDED);
+        configuration.setPort( 631 );
+        configuration.setPrintername( "DefaultPrinter" );
+        configuration.setMediaSizeName( MediaSizeName.ISO_A4 );
+        configuration.setInternalSides( Sides.ONE_SIDED );
+        configuration.setInternalOrientation( OrientationRequested.PORTRAIT );
         configuration.setMediaTray("middle");
 
         PrinterProducer producer = new PrinterProducer(endpoint, configuration);
@@ -328,7 +347,7 @@ public class PrinterPrintTest extends CamelTestSupport {
         MediaTray mediaTray = (MediaTray) attribute;
         assertEquals("middle", mediaTray.toString());
     }
-    
+
     @Test
     public void printsWithLandscapeOrientation() throws Exception {
         PrinterEndpoint endpoint = new PrinterEndpoint();
@@ -338,19 +357,18 @@ public class PrinterPrintTest extends CamelTestSupport {
         configuration.setPrintername("DefaultPrinter");
         configuration.setMediaSizeName(MediaSizeName.ISO_A4);
         configuration.setInternalSides(Sides.ONE_SIDED);
+        configuration.setInternalOrientation( OrientationRequested.REVERSE_LANDSCAPE );
         configuration.setMediaTray("middle");
-        configuration.setOrientation("landscape");
+        configuration.setSendToPrinter(false);
 
         PrinterProducer producer = new PrinterProducer(endpoint, configuration);
         producer.start();
         PrinterOperations printerOperations = producer.getPrinterOperations();
         PrintRequestAttributeSet attributeSet = printerOperations.getPrintRequestAttributeSet();
 
-        Attribute attribute = attributeSet.get(javax.print.attribute.standard.Media.class);
+        Attribute attribute = attributeSet.get(OrientationRequested.class);
         assertNotNull(attribute);
-        assertTrue(attribute instanceof MediaTray);
-        MediaTray mediaTray = (MediaTray) attribute;
-        assertEquals("middle", mediaTray.toString());
+        assertEquals("reverse-landscape", attribute.toString());
     }
 
     protected void setupJavaPrint() {


[4/4] git commit: CAMEL-7135: Fixed CS

Posted by da...@apache.org.
CAMEL-7135: Fixed CS


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9fa0fcdd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9fa0fcdd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9fa0fcdd

Branch: refs/heads/master
Commit: 9fa0fcddce24599dc4563c474e426916c8dfe7c8
Parents: 4bd712c
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jan 16 10:40:29 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jan 16 10:40:29 2014 +0100

----------------------------------------------------------------------
 .../component/printer/PrinterConfiguration.java | 37 ++++++++++----------
 .../component/printer/PrinterPrintTest.java     | 23 ++++++------
 2 files changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/9fa0fcdd/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java
index cf0c341..a8357bf 100644
--- a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java
+++ b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java
@@ -52,10 +52,10 @@ public class PrinterConfiguration {
     public PrinterConfiguration(URI uri) throws URISyntaxException {
         this.uri = uri;
     }
-    
+
     public void parseURI(URI uri) throws Exception {
         String protocol = uri.getScheme();
-        
+
         if (!protocol.equalsIgnoreCase("lpr")) {
             throw new IllegalArgumentException("Unrecognized Print protocol: " + protocol + " for uri: " + uri);
         }
@@ -69,20 +69,20 @@ public class PrinterConfiguration {
         path = ObjectHelper.removeStartingCharacters(path, '/');
         path = ObjectHelper.removeStartingCharacters(path, '\\');
         setPrintername(path);
-        
+
         Map<String, Object> printSettings = URISupport.parseParameters(uri);
-        setFlavor((String)printSettings.get("flavor"));
-        setMimeType((String)printSettings.get("mimeType"));
+        setFlavor((String) printSettings.get("flavor"));
+        setMimeType((String) printSettings.get("mimeType"));
         setDocFlavor(assignDocFlavor(flavor, mimeType));
-        
-        setPrinterPrefix((String)printSettings.get("printerPrefix"));
-        
+
+        setPrinterPrefix((String) printSettings.get("printerPrefix"));
+
         if (printSettings.containsKey("copies")) {
             setCopies(Integer.valueOf((String) printSettings.get("copies")));
         }
-        setMediaSize((String)printSettings.get("mediaSize"));
-        setSides((String)printSettings.get("sides"));
-        setOrientation(((String)printSettings.get("orientation")));
+        setMediaSize((String) printSettings.get("mediaSize"));
+        setSides((String) printSettings.get("sides"));
+        setOrientation((String) printSettings.get("orientation"));
         setMediaSizeName(assignMediaSize(mediaSize));
         setInternalSides(assignSides(sides));
         setInternalOrientation(assignOrientation(orientation));
@@ -92,7 +92,6 @@ public class PrinterConfiguration {
             }
         }
 
-
         if (printSettings.containsKey("mediaTray")) {
             setMediaTray((String) printSettings.get("mediaTray"));
         }
@@ -106,7 +105,7 @@ public class PrinterConfiguration {
         if (flavor == null) {
             flavor = "DocFlavor.BYTE_ARRAY";
         }
-        
+
         DocFlavor d = DocFlavor.BYTE_ARRAY.AUTOSENSE;
         DocFlavorAssigner docFlavorAssigner = new DocFlavorAssigner();
         if (mimeType.equalsIgnoreCase("AUTOSENSE")) {
@@ -156,10 +155,10 @@ public class PrinterConfiguration {
         } else if (mimeType.equalsIgnoreCase("RENDERABLE_IMAGE")) {
             d = docFlavorAssigner.forMimeTypeRENDERABLEIMAGE(flavor);
         }
-        
+
         return d;
     }
-    
+
     private MediaSizeName assignMediaSize(String size) {
         MediaSizeAssigner mediaSizeAssigner = new MediaSizeAssigner();
 
@@ -177,7 +176,7 @@ public class PrinterConfiguration {
         } else {
             answer = mediaSizeAssigner.selectMediaSizeNameOther(size);
         }
-        
+
         return answer;
     }
 
@@ -200,10 +199,10 @@ public class PrinterConfiguration {
         } else {
             answer = Sides.ONE_SIDED;
         }
-        
+
         return answer;
     }
-    
+
     public OrientationRequested assignOrientation(final String orientation) {
         OrientationRequested answer;
 
@@ -325,7 +324,7 @@ public class PrinterConfiguration {
         return orientation;
     }
 
-    public void setOrientation( String orientation ) {
+    public void setOrientation(String orientation) {
         this.orientation = orientation;
     }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/9fa0fcdd/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
----------------------------------------------------------------------
diff --git a/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java b/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
index 794e917..12f9de3 100644
--- a/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
+++ b/components/camel-printer/src/test/java/org/apache/camel/component/printer/PrinterPrintTest.java
@@ -76,7 +76,7 @@ public class PrinterPrintTest extends CamelTestSupport {
                 byte buffer[] = new byte[is.available()];
                 int n = is.available();
                 for (int i = 0; i < n; i++) {
-                    buffer[i] = (byte)is.read();
+                    buffer[i] = (byte) is.read();
                 }
 
                 is.close();
@@ -97,7 +97,7 @@ public class PrinterPrintTest extends CamelTestSupport {
                 byte buffer[] = new byte[is.available()];
                 int n = is.available();
                 for (int i = 0; i < n; i++) {
-                    buffer[i] = (byte)is.read();
+                    buffer[i] = (byte) is.read();
                 }
 
                 is.close();
@@ -118,7 +118,7 @@ public class PrinterPrintTest extends CamelTestSupport {
                 byte buffer[] = new byte[is.available()];
                 int n = is.available();
                 for (int i = 0; i < n; i++) {
-                    buffer[i] = (byte)is.read();
+                    buffer[i] = (byte) is.read();
                 }
 
                 is.close();
@@ -267,8 +267,8 @@ public class PrinterPrintTest extends CamelTestSupport {
         }
         assertNotNull(lp1);
         assertNotNull(lp2);
-        assertEquals("printer1", ((PrinterEndpoint)lp1).getConfig().getPrintername());
-        assertEquals("printer2", ((PrinterEndpoint)lp2).getConfig().getPrintername());
+        assertEquals("printer1", ((PrinterEndpoint) lp1).getConfig().getPrintername());
+        assertEquals("printer2", ((PrinterEndpoint) lp2).getConfig().getPrintername());
 
         template.sendBody("direct:start1", "Hello Printer 1");
 
@@ -329,11 +329,11 @@ public class PrinterPrintTest extends CamelTestSupport {
         PrinterEndpoint endpoint = new PrinterEndpoint();
         PrinterConfiguration configuration = new PrinterConfiguration();
         configuration.setHostname("localhost");
-        configuration.setPort( 631 );
-        configuration.setPrintername( "DefaultPrinter" );
-        configuration.setMediaSizeName( MediaSizeName.ISO_A4 );
-        configuration.setInternalSides( Sides.ONE_SIDED );
-        configuration.setInternalOrientation( OrientationRequested.PORTRAIT );
+        configuration.setPort(631);
+        configuration.setPrintername("DefaultPrinter");
+        configuration.setMediaSizeName(MediaSizeName.ISO_A4);
+        configuration.setInternalSides(Sides.ONE_SIDED);
+        configuration.setInternalOrientation(OrientationRequested.PORTRAIT);
         configuration.setMediaTray("middle");
 
         PrinterProducer producer = new PrinterProducer(endpoint, configuration);
@@ -357,7 +357,7 @@ public class PrinterPrintTest extends CamelTestSupport {
         configuration.setPrintername("DefaultPrinter");
         configuration.setMediaSizeName(MediaSizeName.ISO_A4);
         configuration.setInternalSides(Sides.ONE_SIDED);
-        configuration.setInternalOrientation( OrientationRequested.REVERSE_LANDSCAPE );
+        configuration.setInternalOrientation(OrientationRequested.REVERSE_LANDSCAPE);
         configuration.setMediaTray("middle");
         configuration.setSendToPrinter(false);
 
@@ -389,4 +389,5 @@ public class PrinterPrintTest extends CamelTestSupport {
         when(psDefault.getSupportedAttributeValues(Media.class, null, null)).thenReturn(trays);
         PrintServiceLookup.registerServiceProvider(psLookup);
     }
+
 }


[3/4] git commit: Merge branch 'CAMEL-7135' of https://github.com/cerker/camel

Posted by da...@apache.org.
Merge branch 'CAMEL-7135' of https://github.com/cerker/camel


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4bd712c2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4bd712c2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4bd712c2

Branch: refs/heads/master
Commit: 4bd712c26d790fbecb8816eaea618aa0b823ab7d
Parents: ca33e60 7be880b
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jan 16 10:36:23 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jan 16 10:36:23 2014 +0100

----------------------------------------------------------------------
 .../component/printer/PrinterConfiguration.java | 45 ++++++++++++-
 .../component/printer/PrinterProducer.java      |  3 +-
 .../component/printer/PrinterPrintTest.java     | 66 ++++++++++++++++----
 3 files changed, 100 insertions(+), 14 deletions(-)
----------------------------------------------------------------------