Author: davsclaus
Date: Thu Jun 23 14:42:45 2011
New Revision: 1138905
URL: http://svn.apache.org/viewvc?rev=1138905&view=rev
Log:
CAMEL-4130: Added option guiAvailable to jt400. Thanks to Joao for the patch.
Modified:
camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmEndpoint.java
camel/trunk/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueEndpointTest.java
camel/trunk/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmEndpointTest.java
Modified:
camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java?rev=1138905&r1=1138904&r2=1138905&view=diff
==============================================================================
---
camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
(original)
+++
camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
Thu Jun 23 14:42:45 2011
@@ -27,6 +27,8 @@ import org.apache.camel.CamelException;
import org.apache.camel.PollingConsumer;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultPollingEndpoint;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* AS/400 Data queue endpoint
@@ -47,6 +49,8 @@ public class Jt400DataQueueEndpoint exte
*/
binary;
}
+
+ private static final transient Logger LOG =
LoggerFactory.getLogger(Jt400DataQueueEndpoint.class);
private final AS400 system;
private final String objectPath;
@@ -66,6 +70,12 @@ public class Jt400DataQueueEndpoint exte
} catch (URISyntaxException e) {
throw new CamelException("Unable to parse URI for " + endpointUri,
e);
}
+
+ try {
+ system.setGuiAvailable(false);
+ } catch (PropertyVetoException e) {
+ LOG.warn("Failed do disable AS/400 prompting in the environment
running Camel.", e);
+ }
}
public void setCcsid(int ccsid) throws PropertyVetoException {
@@ -80,6 +90,10 @@ public class Jt400DataQueueEndpoint exte
return format;
}
+ public void setGuiAvailable(boolean guiAvailable) throws
PropertyVetoException {
+ this.system.setGuiAvailable(guiAvailable);
+ }
+
@Override
public PollingConsumer createPollingConsumer() throws Exception {
return new Jt400DataQueueConsumer(this);
Modified:
camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmEndpoint.java?rev=1138905&r1=1138904&r2=1138905&view=diff
==============================================================================
---
camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmEndpoint.java
(original)
+++
camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmEndpoint.java
Thu Jun 23 14:42:45 2011
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.jt400;
+import java.beans.PropertyVetoException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Arrays;
@@ -30,8 +31,11 @@ import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultEndpoint;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class Jt400PgmEndpoint extends DefaultEndpoint {
+ private static final transient Logger LOG =
LoggerFactory.getLogger(Jt400PgmEndpoint.class);
private String programToExecute;
@@ -53,6 +57,12 @@ public class Jt400PgmEndpoint extends De
} catch (URISyntaxException e) {
throw new CamelException("Unable to parse URI for " + endpointUri,
e);
}
+
+ try {
+ iSeries.setGuiAvailable(false);
+ } catch (PropertyVetoException e) {
+ LOG.warn("Failed do disable AS/400 prompting in the environment
running Camel.", e);
+ }
}
public Jt400PgmEndpoint(String endpointUri, String programToExecute,
Map<String, Object> parameters,
@@ -120,4 +130,12 @@ public class Jt400PgmEndpoint extends De
}
}
+ public void setGuiAvailable(boolean guiAvailable) throws
PropertyVetoException {
+ this.iSeries.setGuiAvailable(guiAvailable);
+ }
+
+ public boolean isGuiAvailable() {
+ return iSeries != null && iSeries.isGuiAvailable();
+ }
+
}
Modified:
camel/trunk/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueEndpointTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueEndpointTest.java?rev=1138905&r1=1138904&r2=1138905&view=diff
==============================================================================
---
camel/trunk/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueEndpointTest.java
(original)
+++
camel/trunk/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueEndpointTest.java
Thu Jun 23 14:42:45 2011
@@ -32,7 +32,7 @@ public class Jt400DataQueueEndpointTest
@Before
public void setUp() throws Exception {
super.setUp();
- endpoint =
(Jt400DataQueueEndpoint)resolveMandatoryEndpoint("jt400://user:password@host/qsys.lib/library.lib/queue.dtaq?ccsid=500&format=binary");
+ endpoint =
(Jt400DataQueueEndpoint)resolveMandatoryEndpoint("jt400://user:password@host/qsys.lib/library.lib/queue.dtaq?ccsid=500&format=binary&guiAvailable=true");
}
/**
@@ -44,5 +44,6 @@ public class Jt400DataQueueEndpointTest
assertEquals("host", endpoint.getSystem().getSystemName());
assertEquals(500, endpoint.getSystem().getCcsid());
assertEquals(Format.binary, endpoint.getFormat());
+ assertTrue(endpoint.getSystem().isGuiAvailable());
}
}
Modified:
camel/trunk/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmEndpointTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmEndpointTest.java?rev=1138905&r1=1138904&r2=1138905&view=diff
==============================================================================
---
camel/trunk/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmEndpointTest.java
(original)
+++
camel/trunk/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmEndpointTest.java
Thu Jun 23 14:42:45 2011
@@ -37,7 +37,7 @@ public class Jt400PgmEndpointTest extend
public void setUp() throws Exception {
super.setUp();
endpoint = (Jt400PgmEndpoint)resolveMandatoryEndpoint("jt400://" +
USER + ":" + PASSWORD
- + "@" + HOST +
PGM + "?outputFieldsIdx=1,2&fieldsLength=10,512,255");
+ + "@" + HOST +
PGM + "?guiAvailable=true&outputFieldsIdx=1,2&fieldsLength=10,512,255");
}
/**
@@ -48,6 +48,7 @@ public class Jt400PgmEndpointTest extend
assertEquals(USER, endpoint.getiSeries().getUserId());
assertEquals(HOST, endpoint.getiSeries().getSystemName());
assertEquals(PGM, endpoint.getProgramToExecute());
+ assertTrue(endpoint.getiSeries().isGuiAvailable());
assertEquals(10, endpoint.getOutputFieldLength(0));
assertEquals(512, endpoint.getOutputFieldLength(1));
assertEquals(255, endpoint.getOutputFieldLength(2));
