Updated Branches: refs/heads/master cb2106aca -> f14bc879a
camel-optaplanner: production code + unit test Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9648e916 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9648e916 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9648e916 Branch: refs/heads/master Commit: 9648e916dcf3abeca42ba09bbf38b58d71eaa3b5 Parents: 78f68b3 Author: Geoffrey De Smet <gds.geoffrey.de.s...@gmail.com> Authored: Tue Nov 26 11:51:16 2013 +0100 Committer: Geoffrey De Smet <gds.geoffrey.de.s...@gmail.com> Committed: Tue Nov 26 11:51:16 2013 +0100 ---------------------------------------------------------------------- components/camel-optaplanner/pom.xml | 71 +++++++ .../optaplanner/OptaPlannerComponent.java | 41 ++++ .../optaplanner/OptaPlannerEndpoint.java | 87 ++++++++ .../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++ .../src/main/resources/META-INF/NOTICE.txt | 11 + .../org/apache/camel/component/optaplanner | 18 ++ .../component/optaplanner/OptaPlannerTest.java | 58 ++++++ .../src/test/resources/log4j.properties | 36 ++++ .../component/optaplanner/solverConfig.xml | 35 ++++ components/pom.xml | 1 + parent/pom.xml | 10 + 11 files changed, 571 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9648e916/components/camel-optaplanner/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-optaplanner/pom.xml b/components/camel-optaplanner/pom.xml new file mode 100644 index 0000000..eb36231 --- /dev/null +++ b/components/camel-optaplanner/pom.xml @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.camel</groupId> + <artifactId>components</artifactId> + <version>2.13-SNAPSHOT</version> + </parent> + + <artifactId>camel-optaplanner</artifactId> + <packaging>bundle</packaging> + <name>Camel :: OptaPlanner</name> + <description>Camel OptaPlanner support</description> + + <properties> + <camel.osgi.export.pkg>org.apache.camel.component.optaplanner.*</camel.osgi.export.pkg> + <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=optaplanner</camel.osgi.export.service> + </properties> + + <dependencies> + + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-core</artifactId> + </dependency> + <dependency> + <groupId>org.optaplanner</groupId> + <artifactId>optaplanner-core</artifactId> + </dependency> + + <!-- testing --> + <dependency> + <groupId>org.optaplanner</groupId> + <artifactId>optaplanner-examples</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-test-spring</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + +</project> http://git-wip-us.apache.org/repos/asf/camel/blob/9648e916/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 new file mode 100644 index 0000000..55f26e3 --- /dev/null +++ b/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerComponent.java @@ -0,0 +1,41 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.optaplanner; + +import java.net.URL; +import java.util.Map; + +import org.apache.camel.Endpoint; +import org.apache.camel.impl.DefaultComponent; +import org.apache.camel.util.ObjectHelper; +import org.apache.camel.util.ResourceHelper; +import org.optaplanner.core.api.solver.SolverFactory; +import org.optaplanner.core.config.solver.XmlSolverFactory; + +/** + * OptaPlanner component for Camel + */ +public class OptaPlannerComponent extends DefaultComponent { + + protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { + SolverFactory solverFactory = new XmlSolverFactory(remaining); + OptaPlannerEndpoint endpoint = new OptaPlannerEndpoint(uri, this, remaining); + endpoint.setSolverFactory(solverFactory); + return endpoint; + } + +} http://git-wip-us.apache.org/repos/asf/camel/blob/9648e916/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 new file mode 100644 index 0000000..5eefc56 --- /dev/null +++ b/components/camel-optaplanner/src/main/java/org/apache/camel/component/optaplanner/OptaPlannerEndpoint.java @@ -0,0 +1,87 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.optaplanner; + +import java.io.Reader; +import java.io.StringReader; +import java.io.StringWriter; +import java.util.Map; + +import org.apache.camel.Component; +import org.apache.camel.Exchange; +import org.apache.camel.ExchangePattern; +import org.apache.camel.Message; +import org.apache.camel.component.ResourceEndpoint; +import org.apache.camel.util.ExchangeHelper; +import org.apache.camel.util.ObjectHelper; +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 + */ +public class OptaPlannerEndpoint extends ResourceEndpoint { + + private SolverFactory solverFactory; + + public OptaPlannerEndpoint() { + } + + public OptaPlannerEndpoint(String uri, Component component, String resourceUri) { + super(uri, component, resourceUri); + } + + public SolverFactory getSolverFactory() { + return solverFactory; + } + + public void setSolverFactory(SolverFactory solverFactory) { + this.solverFactory = solverFactory; + } + + @Override + public boolean isSingleton() { + return true; + } + + @Override + public ExchangePattern getExchangePattern() { + return ExchangePattern.InOut; + } + + @Override + protected String createEndpointUri() { + return "optaplanner:" + getResourceUri(); + } + + @Override + protected void onExchange(Exchange exchange) throws Exception { + ObjectHelper.notNull(solverFactory, "solverFactory"); + Solver solver = solverFactory.buildSolver(); + + Object bodyObject = exchange.getIn().getBody(); + Solution planningProblem = ObjectHelper.cast(Solution.class, bodyObject); + + solver.setPlanningProblem(planningProblem); + solver.solve(); + Solution bestSolution = solver.getBestSolution(); + + exchange.getOut().setBody(bestSolution); + } + +} http://git-wip-us.apache.org/repos/asf/camel/blob/9648e916/components/camel-optaplanner/src/main/resources/META-INF/LICENSE.txt ---------------------------------------------------------------------- diff --git a/components/camel-optaplanner/src/main/resources/META-INF/LICENSE.txt b/components/camel-optaplanner/src/main/resources/META-INF/LICENSE.txt new file mode 100644 index 0000000..6b0b127 --- /dev/null +++ b/components/camel-optaplanner/src/main/resources/META-INF/LICENSE.txt @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + http://git-wip-us.apache.org/repos/asf/camel/blob/9648e916/components/camel-optaplanner/src/main/resources/META-INF/NOTICE.txt ---------------------------------------------------------------------- diff --git a/components/camel-optaplanner/src/main/resources/META-INF/NOTICE.txt b/components/camel-optaplanner/src/main/resources/META-INF/NOTICE.txt new file mode 100644 index 0000000..2e215bf --- /dev/null +++ b/components/camel-optaplanner/src/main/resources/META-INF/NOTICE.txt @@ -0,0 +1,11 @@ + ========================================================================= + == NOTICE file corresponding to the section 4 d of == + == the Apache License, Version 2.0, == + == in this case for the Apache Camel distribution. == + ========================================================================= + + This product includes software developed by + The Apache Software Foundation (http://www.apache.org/). + + Please read the different LICENSE files present in the licenses directory of + this distribution. http://git-wip-us.apache.org/repos/asf/camel/blob/9648e916/components/camel-optaplanner/src/main/resources/META-INF/services/org/apache/camel/component/optaplanner ---------------------------------------------------------------------- diff --git a/components/camel-optaplanner/src/main/resources/META-INF/services/org/apache/camel/component/optaplanner b/components/camel-optaplanner/src/main/resources/META-INF/services/org/apache/camel/component/optaplanner new file mode 100644 index 0000000..c96af0e --- /dev/null +++ b/components/camel-optaplanner/src/main/resources/META-INF/services/org/apache/camel/component/optaplanner @@ -0,0 +1,18 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +class=org.apache.camel.component.optaplanner.OptaPlannerComponent http://git-wip-us.apache.org/repos/asf/camel/blob/9648e916/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 new file mode 100644 index 0000000..d5a84de --- /dev/null +++ b/components/camel-optaplanner/src/test/java/org/apache/camel/component/optaplanner/OptaPlannerTest.java @@ -0,0 +1,58 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.optaplanner; + +import javax.activation.DataHandler; + +import org.apache.camel.Exchange; +import org.apache.camel.Processor; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; +import org.optaplanner.examples.cloudbalancing.domain.CloudBalance; +import org.optaplanner.examples.cloudbalancing.persistence.CloudBalancingGenerator; + +/** + * OptaPlanner unit test with Camel + */ +public class OptaPlannerTest extends CamelTestSupport { + + @Test + public void testCloudBalance_4computers_12processes() throws Exception { + CloudBalancingGenerator generator = new CloudBalancingGenerator(true); + final CloudBalance planningProblem = generator.createCloudBalance(4, 12); + assertNull(planningProblem.getScore()); + assertNull(planningProblem.getProcessList().get(0).getComputer()); + + CloudBalance bestSolution = (CloudBalance) template.requestBody("direct:in", planningProblem); + + assertEquals(4, bestSolution.getComputerList().size()); + assertEquals(12, bestSolution.getProcessList().size()); + assertNotNull(bestSolution.getScore()); + assertTrue(bestSolution.getScore().isFeasible()); + assertNotNull(bestSolution.getProcessList().get(0).getComputer()); + } + + protected RouteBuilder createRouteBuilder() { + return new RouteBuilder() { + public void configure() { + from("direct:in"). + to("optaplanner:/org/apache/camel/component/optaplanner/solverConfig.xml"); + } + }; + } +} http://git-wip-us.apache.org/repos/asf/camel/blob/9648e916/components/camel-optaplanner/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-optaplanner/src/test/resources/log4j.properties b/components/camel-optaplanner/src/test/resources/log4j.properties new file mode 100644 index 0000000..f6387c5 --- /dev/null +++ b/components/camel-optaplanner/src/test/resources/log4j.properties @@ -0,0 +1,36 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- + +# +# The logging properties used during tests.. +# +log4j.rootLogger=INFO, out + +log4j.logger.org.apache.activemq.spring=WARN +log4j.logger.org.apache.camel.component.optaplanner=DEBUG + +# CONSOLE appender not used by default +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n + +# File appender +log4j.appender.out=org.apache.log4j.FileAppender +log4j.appender.out.layout=org.apache.log4j.PatternLayout +log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n +log4j.appender.out.file=target/camel-optaplanner-test.log +log4j.appender.out.append=true http://git-wip-us.apache.org/repos/asf/camel/blob/9648e916/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 new file mode 100644 index 0000000..9362df9 --- /dev/null +++ b/components/camel-optaplanner/src/test/resources/org/apache/camel/component/optaplanner/solverConfig.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<solver> + <!--<environmentMode>FAST_ASSERT</environmentMode>--> + + <!-- Domain model configuration --> + <solutionClass>org.optaplanner.examples.cloudbalancing.domain.CloudBalance</solutionClass> + <planningEntityClass>org.optaplanner.examples.cloudbalancing.domain.CloudProcess</planningEntityClass> + + <!-- Score configuration --> + <scoreDirectorFactory> + <scoreDefinitionType>HARD_SOFT</scoreDefinitionType> + <scoreDrl>/org/optaplanner/examples/cloudbalancing/solver/cloudBalancingScoreRules.drl</scoreDrl> + </scoreDirectorFactory> + + <!-- Optimization algorithms configuration --> + <termination> + <terminationCompositionStyle>AND</terminationCompositionStyle> + <maximumSecondsSpend>10</maximumSecondsSpend> + <scoreAttained>-1hard/0soft</scoreAttained> + </termination> + <constructionHeuristic> + <constructionHeuristicType>FIRST_FIT_DECREASING</constructionHeuristicType> + <forager> + <pickEarlyType>FIRST_NON_DETERIORATING_SCORE</pickEarlyType> + </forager> + </constructionHeuristic> + <localSearch> + <acceptor> + <entityTabuSize>7</entityTabuSize> + </acceptor> + <forager> + <acceptedCountLimit>1000</acceptedCountLimit> + </forager> + </localSearch> +</solver> http://git-wip-us.apache.org/repos/asf/camel/blob/9648e916/components/pom.xml ---------------------------------------------------------------------- diff --git a/components/pom.xml b/components/pom.xml index 57cc1e4..a345076 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -136,6 +136,7 @@ <module>camel-netty4</module> <module>camel-netty-http</module> <module>camel-ognl</module> + <module>camel-optaplanner</module> <module>camel-paxlogging</module> <module>camel-printer</module> <module>camel-protobuf</module> http://git-wip-us.apache.org/repos/asf/camel/blob/9648e916/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index c38bcb1..a787f37 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -313,6 +313,7 @@ <openejb-version>4.5.2</openejb-version> <openjpa-version>2.2.2</openjpa-version> <opensaml-version>2.5.1_2</opensaml-version> + <optaplanner-version>6.0.0.Final</optaplanner-version> <oro-bundle-version>2.0.8_6</oro-bundle-version> <oscache-bundle-version>2.4_5</oscache-bundle-version> <osgi-version>4.3.1</osgi-version> @@ -2086,6 +2087,15 @@ <version>${krati-version}</version> </dependency> + <!-- optional OptaPlanner dependencies --> + <dependency> + <groupId>org.optaplanner</groupId> + <artifactId>optaplanner-bom</artifactId> + <type>pom</type> + <version>${optaplanner-version}</version> + <scope>import</scope> + </dependency> + <!-- blueprint --> <dependency> <groupId>org.apache.aries.blueprint</groupId>
