Thanks Babak for fixing the broken builds (w/ java 6). Hadrian
On 06/05/2013 04:14 PM, bvah...@apache.org wrote:
Updated Branches: refs/heads/master ddb599ea4 -> 5463fb1d2 CAMEL-6428: The camel-salesforce code base should support Java 6. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5463fb1d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5463fb1d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5463fb1d Branch: refs/heads/master Commit: 5463fb1d2d2ae067920d1132a15557f72599e2fd Parents: ddb599e Author: Babak Vahdat <bvah...@apache.org> Authored: Wed Jun 5 22:14:33 2013 +0200 Committer: Babak Vahdat <bvah...@apache.org> Committed: Wed Jun 5 22:14:33 2013 +0200 ---------------------------------------------------------------------- .../camel-salesforce-component/pom.xml | 10 +--------- .../salesforce/api/PicklistEnumConverter.java | 10 +++++----- parent/pom.xml | 5 +++++ 3 files changed, 11 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5463fb1d/components/camel-salesforce/camel-salesforce-component/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml index 03db485..5d6c831 100644 --- a/components/camel-salesforce/camel-salesforce-component/pom.xml +++ b/components/camel-salesforce/camel-salesforce-component/pom.xml @@ -43,22 +43,18 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core</artifactId> - <version>${project.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-client</artifactId> - <version>${jetty-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>${jetty-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>${jetty-version}</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> @@ -68,7 +64,6 @@ <dependency> <groupId>com.thoughtworks.xstream</groupId> <artifactId>xstream</artifactId> - <version>${xstream-version}</version> </dependency> <dependency> <groupId>org.cometd.java</groupId> @@ -90,30 +85,27 @@ <artifactId>joda-time</artifactId> <version>${jodatime2-bundle-version}</version> </dependency> + <!-- logging --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j-api-version}</version> </dependency> <!-- testing --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j-api-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test</artifactId> - <version>${project.version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/5463fb1d/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/PicklistEnumConverter.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/PicklistEnumConverter.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/PicklistEnumConverter.java index 6b5c95b..9594e3d 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/PicklistEnumConverter.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/PicklistEnumConverter.java @@ -37,7 +37,7 @@ public class PicklistEnumConverter implements Converter { try { Method getterMethod = aClass.getMethod("value"); writer.setValue((String) getterMethod.invoke(o)); - } catch (ReflectiveOperationException e) { + } catch (Exception e) { throw new IllegalArgumentException( String.format("Exception writing pick list value %s of type %s: %s", o, o.getClass().getName(), e.getMessage()), @@ -53,14 +53,14 @@ public class PicklistEnumConverter implements Converter { Method factoryMethod = requiredType.getMethod(FACTORY_METHOD, String.class); // use factory method to create object return factoryMethod.invoke(null, value); - } catch (ReflectiveOperationException e) { + } catch (SecurityException e) { throw new IllegalArgumentException( - String.format("Exception reading pick list value %s of type %s: %s", + String.format("Security Exception reading pick list value %s of type %s: %s", value, context.getRequiredType().getName(), e.getMessage()), e); - } catch (SecurityException e) { + } catch (Exception e) { throw new IllegalArgumentException( - String.format("Security Exception reading pick list value %s of type %s: %s", + String.format("Exception reading pick list value %s of type %s: %s", value, context.getRequiredType().getName(), e.getMessage()), e); } http://git-wip-us.apache.org/repos/asf/camel/blob/5463fb1d/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index d558694..956adeb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1642,6 +1642,11 @@ </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>${jetty-version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> <version>${jetty-version}</version> </dependency>
