You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2015/07/30 16:33:20 UTC
[1/3] camel git commit: fix checkstyle issues
Repository: camel
Updated Branches:
refs/heads/master c285fbf88 -> d9ba90f43
fix checkstyle issues
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cb4b4c44
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cb4b4c44
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cb4b4c44
Branch: refs/heads/master
Commit: cb4b4c443d373a5b5628eb78aff25a1c1b9c32c2
Parents: c285fbf
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Jul 29 09:47:14 2015 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Jul 30 10:19:10 2015 -0400
----------------------------------------------------------------------
.../org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java | 2 +-
.../org/apache/camel/management/mbean/ManagedCamelContext.java | 3 ++-
.../apache/camel/processor/loadbalancer/WeightedLoadBalancer.java | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cb4b4c44/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java
index 7b01c89..d866fea 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultRuntimeEndpointRegistry.java
@@ -296,7 +296,7 @@ public class DefaultRuntimeEndpointRegistry extends EventNotifierSupport impleme
}
}
- private static class EndpointRuntimeStatistics implements Statistic {
+ private static final class EndpointRuntimeStatistics implements Statistic {
private final String uri;
private final String routeId;
http://git-wip-us.apache.org/repos/asf/camel/blob/cb4b4c44/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
index a1c1be7..cd3ed4a 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
@@ -37,6 +37,8 @@ import javax.management.openmbean.CompositeType;
import javax.management.openmbean.TabularData;
import javax.management.openmbean.TabularDataSupport;
+import org.w3c.dom.Document;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.ComponentConfiguration;
@@ -61,7 +63,6 @@ import org.apache.camel.spi.ManagementStrategy;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.JsonSchemaHelper;
import org.apache.camel.util.ObjectHelper;
-import org.w3c.dom.Document;
/**
* @version
http://git-wip-us.apache.org/repos/asf/camel/blob/cb4b4c44/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java b/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java
index 4626100..04866bc 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/WeightedLoadBalancer.java
@@ -20,10 +20,11 @@ import java.util.ArrayList;
import java.util.List;
public abstract class WeightedLoadBalancer extends QueueLoadBalancer {
+ transient int lastIndex;
+
private List<Integer> distributionRatioList = new ArrayList<Integer>();
private List<DistributionRatio> runtimeRatios = new ArrayList<DistributionRatio>();
- transient int lastIndex;
public WeightedLoadBalancer(List<Integer> distributionRatios) {
deepCloneDistributionRatios(distributionRatios);
[3/3] camel git commit: Remove references to the jexcelapi lib
Posted by dk...@apache.org.
Remove references to the jexcelapi lib
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d9ba90f4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d9ba90f4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d9ba90f4
Branch: refs/heads/master
Commit: d9ba90f432ab1b7c817df65457d4a4042ef862f7
Parents: 5b14a3e
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Jul 30 10:28:07 2015 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Jul 30 10:28:07 2015 -0400
----------------------------------------------------------------------
parent/pom.xml | 2 --
platforms/karaf/features/src/main/resources/bundles.properties | 1 -
platforms/karaf/features/src/main/resources/features.xml | 5 +++--
3 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d9ba90f4/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 43038c8..ffd8717 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -272,8 +272,6 @@
<jetty-plugin-version>8.1.16.v20140903</jetty-plugin-version>
<jetty-runner-groupId>org.mortbay.jetty</jetty-runner-groupId>
<jettison-version>1.3.7</jettison-version>
- <jexcelapi-bundle-version>2.4.2_4</jexcelapi-bundle-version>
- <jexcelapi-version>2.4.2</jexcelapi-version>
<jgit-version>4.0.1.201506240215-r</jgit-version>
<jgroups-version>3.6.4.Final</jgroups-version>
<jibx-version>1.2.6</jibx-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/d9ba90f4/platforms/karaf/features/src/main/resources/bundles.properties
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/bundles.properties b/platforms/karaf/features/src/main/resources/bundles.properties
index 84cd284..8c7e448 100644
--- a/platforms/karaf/features/src/main/resources/bundles.properties
+++ b/platforms/karaf/features/src/main/resources/bundles.properties
@@ -49,7 +49,6 @@ org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/${irclib-bund
org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.jcr-api/${jcr-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}/jar
-org.apache.servicemix.bundles/org.apache.servicemix.bundles.jexcelapi/${jexcelapi-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.jettison/${jettison-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.cometd-java-server/${cometd-java-server-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version}/jar
http://git-wip-us.apache.org/repos/asf/camel/blob/d9ba90f4/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index b3f69b1..9d74e49 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -406,8 +406,9 @@
<feature name='camel-flatpack' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jexcelapi/${jexcelapi-bundle-version}</bundle>
- <bundle dependency='true'>mvn:net.sf.flatpack/flatpack/${flatpack-version}</bundle>
+ <!-- when flatpack 3.4.3 is released, we can use this as the jexcelapi deps will be optional. Tell then, use the latest smx bundle -->
+ <!--bundle dependency='true'>mvn:net.sf.flatpack/flatpack/${flatpack-version}</bundle-->
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.flatpack/3.2.0_2</bundle>
<bundle>mvn:org.apache.camel/camel-flatpack/${project.version}</bundle>
</feature>
<feature name='camel-fop' version='${project.version}' resolver='(obr)' start-level='50'>
[2/3] camel git commit: Don't pull in jxl lib
Posted by dk...@apache.org.
Don't pull in jxl lib
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5b14a3eb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5b14a3eb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5b14a3eb
Branch: refs/heads/master
Commit: 5b14a3ebf56db6a70929c7b2eb468b1eba29eb30
Parents: cb4b4c4
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Jul 30 10:24:14 2015 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Jul 30 10:24:14 2015 -0400
----------------------------------------------------------------------
components/camel-flatpack/pom.xml | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5b14a3eb/components/camel-flatpack/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-flatpack/pom.xml b/components/camel-flatpack/pom.xml
index e7ef6a6..1925e1a 100644
--- a/components/camel-flatpack/pom.xml
+++ b/components/camel-flatpack/pom.xml
@@ -52,14 +52,9 @@
<version>${flatpack-version}</version>
</dependency>
<dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>${jdom-version}</version>
- </dependency>
- <dependency>
- <groupId>jexcelapi</groupId>
- <artifactId>jxl</artifactId>
- <version>${jexcelapi-version}</version>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>${jdom-version}</version>
</dependency>
<!-- logging -->