Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D708E11790 for ; Tue, 5 Aug 2014 14:51:05 +0000 (UTC) Received: (qmail 80262 invoked by uid 500); 5 Aug 2014 14:51:05 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 80193 invoked by uid 500); 5 Aug 2014 14:51:05 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 80184 invoked by uid 99); 5 Aug 2014 14:51:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Aug 2014 14:51:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4D8E19BF9D7; Tue, 5 Aug 2014 14:51:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Date: Tue, 05 Aug 2014 14:51:05 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: camel-optaplanner: Upgrade OptaPlanner from 6.0.1.Final to 6.1.0.CR2 Repository: camel Updated Branches: refs/heads/master 100133625 -> 683548000 camel-optaplanner: Upgrade OptaPlanner from 6.0.1.Final to 6.1.0.CR2 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/05092311 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/05092311 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/05092311 Branch: refs/heads/master Commit: 05092311ed8501eff263d2e536425b341462a06c Parents: 5ec6adf Author: Geoffrey De Smet Authored: Tue Jul 15 16:39:08 2014 +0200 Committer: Geoffrey De Smet Committed: Tue Jul 15 16:39:08 2014 +0200 ---------------------------------------------------------------------- .../camel/component/optaplanner/OptaPlannerComponent.java | 3 +-- .../camel/component/optaplanner/OptaPlannerEndpoint.java | 5 ++--- ...ptaPlannerComponentConfigurationAndDocumentationTest.java | 2 +- .../apache/camel/component/optaplanner/OptaPlannerTest.java | 3 ++- .../org/apache/camel/component/optaplanner/solverConfig.xml | 8 ++++---- parent/pom.xml | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/05092311/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerComponent.java b/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerComponent.java index f19fe5f..cb59460 100644 --- a/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerComponent.java +++ b/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerComponent.java @@ -21,7 +21,6 @@ import java.util.Map; import org.apache.camel.Endpoint; import org.apache.camel.impl.UriEndpointComponent; import org.optaplanner.core.api.solver.SolverFactory; -import org.optaplanner.core.config.solver.XmlSolverFactory; /** * OptaPlanner component for Camel @@ -33,7 +32,7 @@ public class OptaPlannerComponent extends UriEndpointComponent { } protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { - SolverFactory solverFactory = new XmlSolverFactory(remaining); + SolverFactory solverFactory = SolverFactory.createFromXmlResource(remaining); OptaPlannerEndpoint endpoint = new OptaPlannerEndpoint(uri, this, remaining); endpoint.setSolverFactory(solverFactory); http://git-wip-us.apache.org/repos/asf/camel/blob/05092311/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerEndpoint.java b/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerEndpoint.java index c120fd0..9cc96aa 100644 --- a/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerEndpoint.java +++ b/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerEndpoint.java @@ -22,9 +22,9 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.component.ResourceEndpoint; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.util.ObjectHelper; +import org.optaplanner.core.api.domain.solution.Solution; import org.optaplanner.core.api.solver.Solver; import org.optaplanner.core.api.solver.SolverFactory; -import org.optaplanner.core.impl.solution.Solution; /** * OptaPlanner endpoint for Camel @@ -66,8 +66,7 @@ public class OptaPlannerEndpoint extends ResourceEndpoint { Solution planningProblem = exchange.getIn().getMandatoryBody(Solution.class); - solver.setPlanningProblem(planningProblem); - solver.solve(); + solver.solve(planningProblem); Solution bestSolution = solver.getBestSolution(); exchange.getOut().setBody(bestSolution); http://git-wip-us.apache.org/repos/asf/camel/blob/05092311/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerComponentConfigurationAndDocumentationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerComponentConfigurationAndDocumentationTest.java b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerComponentConfigurationAndDocumentationTest.java index 19269d6..fd3ab3c 100644 --- a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerComponentConfigurationAndDocumentationTest.java +++ b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerComponentConfigurationAndDocumentationTest.java @@ -33,7 +33,7 @@ public class OptaPlannerComponentConfigurationAndDocumentationTest extends Camel @Test public void testComponentConfiguration() throws Exception { OptaPlannerComponent component = context.getComponent("optaplanner", OptaPlannerComponent.class); - EndpointConfiguration configuration = component.createConfiguration("optaplanner:/org/apache/camel/component/optaplanner/solverConfig.xml?" + EndpointConfiguration configuration = component.createConfiguration("optaplanner:org/apache/camel/component/optaplanner/solverConfig.xml?" + "synchronous=false&contentCache=true"); assertEquals("true", configuration.getParameter("contentCache")); http://git-wip-us.apache.org/repos/asf/camel/blob/05092311/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerTest.java b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerTest.java index 1d541be..5a7fd15 100644 --- a/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerTest.java +++ b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerTest.java @@ -47,8 +47,9 @@ public class OptaPlannerTest extends CamelTestSupport { return new RouteBuilder() { public void configure() { from("direct:in"). - to("optaplanner:/org/apache/camel/component/optaplanner/solverConfig.xml"); + to("optaplanner:org/apache/camel/component/optaplanner/solverConfig.xml"); } }; } + } http://git-wip-us.apache.org/repos/asf/camel/blob/05092311/components/camel-optaplanner/src/test/resources/org/apache/camel/component/optaplanner/solverConfig.xml ---------------------------------------------------------------------- diff --git a/components/camel-optaplanner/src/test/resources/org/apache/camel/component/optaplanner/solverConfig.xml b/components/camel-optaplanner/src/test/resources/org/apache/camel/component/optaplanner/solverConfig.xml index eb07fc0..6ecf1a6 100644 --- a/components/camel-optaplanner/src/test/resources/org/apache/camel/component/optaplanner/solverConfig.xml +++ b/components/camel-optaplanner/src/test/resources/org/apache/camel/component/optaplanner/solverConfig.xml @@ -20,19 +20,19 @@ org.optaplanner.examples.cloudbalancing.domain.CloudBalance - org.optaplanner.examples.cloudbalancing.domain.CloudProcess + org.optaplanner.examples.cloudbalancing.domain.CloudProcess HARD_SOFT - /org/optaplanner/examples/cloudbalancing/solver/cloudBalancingScoreRules.drl + org/optaplanner/examples/cloudbalancing/solver/cloudBalancingScoreRules.drl AND - 10 - -1hard/0soft + 10 + true FIRST_FIT_DECREASING http://git-wip-us.apache.org/repos/asf/camel/blob/05092311/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 874dc0e..04049a5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -322,7 +322,7 @@ 2.3.0 2.5.1_2 2.5.0.Final - 6.0.1.Final + 6.1.0.CR2 2.0.8_6 2.4_5 4.3.1