Permalink
Browse files

Created a new choco-solver plugin version

  • Loading branch information...
RobertHilbrich committed Jun 30, 2017
1 parent 335700e commit 4278ce4f23906ac8e67146d07442c315d2aacbbf
Showing with 506 additions and 298 deletions.
  1. +0 −15 .gitmodules
  2. +28 −5 ch.hilbri.assist.features.gui/feature.xml
  3. +7 −9 ch.hilbri.assist.features.libraries/feature.xml
  4. +14 −23 ch.hilbri.assist.features.mapping/feature.xml
  5. +0 −12 ch.hilbri.assist.gui/META-INF/MANIFEST.MF
  6. +7 −0 ch.hilbri.assist.libraries.choco-solver/.classpath
  7. +1 −7 {ch.hilbri.assist.libraries.choco → ch.hilbri.assist.libraries.choco-solver}/.project
  8. 0 ...aries.choco → ch.hilbri.assist.libraries.choco-solver}/.settings/org.eclipse.core.resources.prefs
  9. +7 −0 ch.hilbri.assist.libraries.choco-solver/.settings/org.eclipse.jdt.core.prefs
  10. 0 ...t.libraries.choco → ch.hilbri.assist.libraries.choco-solver}/.settings/org.eclipse.m2e.core.prefs
  11. +8 −57 {ch.hilbri.assist.libraries.choco → ch.hilbri.assist.libraries.choco-solver}/META-INF/MANIFEST.MF
  12. +2 −0 ch.hilbri.assist.libraries.choco-solver/build.properties
  13. BIN ch.hilbri.assist.libraries.choco-solver/choco-solver-4.0.4-with-dependencies.jar
  14. +13 −0 ch.hilbri.assist.libraries.choco-solver/pom.xml
  15. +0 −14 ch.hilbri.assist.libraries.choco/.classpath
  16. +0 −106 ch.hilbri.assist.libraries.choco/.settings/org.eclipse.jdt.core.prefs
  17. +0 −6 ch.hilbri.assist.libraries.choco/.settings/org.eclipse.xtend.core.Xtend.prefs
  18. +0 −1 ch.hilbri.assist.libraries.choco/automaton
  19. +0 −3 ch.hilbri.assist.libraries.choco/build.properties
  20. +0 −1 ch.hilbri.assist.libraries.choco/choco-sat
  21. +0 −1 ch.hilbri.assist.libraries.choco/choco-solver
  22. +0 −1 ch.hilbri.assist.libraries.choco/cpprof-java
  23. +0 −1 ch.hilbri.assist.libraries.choco/cutoffseq
  24. +0 −13 ch.hilbri.assist.libraries.choco/pom.xml
  25. BIN ch.hilbri.assist.libraries.choco/protobuf-java-3.2.0.jar
  26. BIN ch.hilbri.assist.libraries.choco/trove4j-3.0.3.jar
  27. +410 −0 ch.hilbri.assist.mapping.dsl.ui/plugin.xml_gen
  28. +0 −1 ch.hilbri.assist.mapping.tests/META-INF/MANIFEST.MF
  29. +2 −2 ch.hilbri.assist.mapping/.classpath
  30. +4 −19 ch.hilbri.assist.mapping/META-INF/MANIFEST.MF
  31. +3 −1 ch.hilbri.assist.releng/pom.xml
@@ -7,18 +7,3 @@
[submodule "ch.hilbri.assist.libraries.choco/choco-solver"]
path = ch.hilbri.assist.libraries.choco/choco-solver
url = https://github.com/chocoteam/choco-solver.git
[submodule "ch.hilbri.assist.libraries.choco/protobuf"]
path = ch.hilbri.assist.libraries.choco/protobuf
url = https://github.com/google/protobuf.git
[submodule "ch.hilbri.assist.libraries.choco/choco-sat"]
path = ch.hilbri.assist.libraries.choco/choco-sat
url = https://github.com/chocoteam/choco-sat
[submodule "ch.hilbri.assist.libraries.choco/automaton"]
path = ch.hilbri.assist.libraries.choco/automaton
url = https://github.com/dweiss/dk.brics.automaton
[submodule "ch.hilbri.assist.libraries.choco/cpprof-java"]
path = ch.hilbri.assist.libraries.choco/cpprof-java
url = https://github.com/cp-profiler/java-integration
[submodule "ch.hilbri.assist.libraries.choco/cutoffseq"]
path = ch.hilbri.assist.libraries.choco/cutoffseq
url = https://github.com/chocoteam/cutoffseq
@@ -18,12 +18,35 @@
<requires>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.swt"/>
<import plugin="org.eclipse.e4.core.di"/>
<import plugin="org.eclipse.e4.ui.workbench"/>
<import plugin="org.eclipse.e4.ui.di"/>
<import plugin="org.eclipse.e4.core.di.extensions"/>
<import plugin="org.eclipse.ui.workbench"/>
<import plugin="org.eclipse.e4.core.di"/>
<import plugin="org.eclipse.swt"/>
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.ui.views"/>
<import plugin="org.eclipse.ui.navigator"/>
<import plugin="org.eclipse.ui.navigator.resources"/>
<import plugin="org.eclipse.e4.core.di.annotations"/>
<import plugin="org.eclipse.ui.ide"/>
<import plugin="org.eclipse.e4.core.commands"/>
<import plugin="org.eclipse.e4.ui.model.workbench"/>
<import plugin="org.eclipse.ui.console"/>
<import plugin="org.eclipse.jface.text"/>
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.e4.core.contexts"/>
<import plugin="org.eclipse.e4.ui.services"/>
<import plugin="org.eclipse.jface"/>
<import plugin="org.eclipse.e4.core.services"/>
<import plugin="org.eclipse.osgi.services"/>
<import plugin="org.eclipse.jdt.core"/>
<import plugin="org.eclipse.jdt.launching"/>
<import plugin="org.eclipse.jdt.ui"/>
<import plugin="com.google.guava"/>
<import plugin="org.eclipse.xtext.xbase.lib"/>
<import plugin="org.eclipse.xtend.lib"/>
<import plugin="org.eclipse.xtend.lib.macro"/>
<import plugin="ch.hilbri.assist.libraries.logback"/>
<import plugin="javax.inject"/>
<import plugin="org.eclipse.osgi"/>
</requires>
<plugin
@@ -15,17 +15,8 @@
<import plugin="org.eclipse.swt" version="3.104.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.console" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jface" version="3.12.1" match="greaterOrEqual"/>
<import plugin="ch.hilbri.assist.libraries.logback" version="1.1.2" match="greaterOrEqual"/>
<import plugin="ch.hilbri.assist.libraries.jgrapht" version="1.0.1" match="greaterOrEqual"/>
</requires>
<plugin
id="ch.hilbri.assist.libraries.choco"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="ch.hilbri.assist.libraries.javafx"
download-size="0"
@@ -58,4 +49,11 @@
version="0.0.0"
unpack="false"/>
<plugin
id="ch.hilbri.assist.libraries.choco-solver"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>
@@ -12,61 +12,52 @@
</license>
<requires>
<import plugin="ch.hilbri.assist.libraries.javafx" version="1.8.60" match="greaterOrEqual"/>
<import plugin="ch.hilbri.assist.libraries.math" version="3.2.1" match="greaterOrEqual"/>
<import plugin="ch.hilbri.assist.libraries.jxl" version="2.6.12" match="greaterOrEqual"/>
<import plugin="ch.hilbri.assist.libraries.choco" version="3.3.1" match="greaterOrEqual"/>
<import plugin="ch.hilbri.assist.libraries.logback" version="1.1.2" match="greaterOrEqual"/>
<import plugin="javax.inject" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.ide" version="3.12.2" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.databinding" version="1.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.core.di" version="1.6.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.core.services" version="2.0.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.di" version="1.1.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.model.workbench" version="1.2.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.workbench" version="1.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.core" version="3.12.2" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.ui" version="3.12.2" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.forms" version="3.7.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.zest.core" version="1.5.300" match="greaterOrEqual"/>
<import plugin="org.eclipse.zest.layouts" version="1.1.300" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.ui" version="2.10.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.workbench" version="3.108.2" match="greaterOrEqual"/>
<import plugin="ch.hilbri.assist.gui" version="2.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.xbase.lib" version="2.8.4" match="greaterOrEqual"/>
<import plugin="ch.hilbri.assist.mapping.dsl.ui" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtend.lib"/>
<import plugin="org.eclipse.core.runtime" version="3.12.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore" version="2.11.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.xbase.lib" version="2.8.4" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore.xcore.lib"/>
<import plugin="org.eclipse.emf.edit"/>
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.emf.ecore.xmi"/>
<import plugin="org.eclipse.emf.edit.ui"/>
<import plugin="org.eclipse.ui.ide" version="3.12.2" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.core.services" version="2.0.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.e4.ui.services"/>
<import plugin="org.eclipse.osgi.services"/>
<import plugin="ch.hilbri.assist.mapping.model" version="2.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext"/>
<import plugin="org.eclipse.xtext.xbase"/>
<import plugin="org.eclipse.equinox.common" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.antlr.runtime" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.xtext.util" version="2.8.4" match="greaterOrEqual"/>
<import plugin="org.apache.log4j"/>
<import plugin="org.eclipse.xtext.ide"/>
<import plugin="org.eclipse.xtext.xbase.ide"/>
<import plugin="org.junit" version="4.7.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.junit4" version="2.10.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.xbase.junit"/>
<import plugin="org.hamcrest.core"/>
<import plugin="org.eclipse.xtext.ui.shared" version="2.10.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.ui.codetemplates.ui" version="2.10.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.editors" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui" version="3.108.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.compare" version="3.7.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.builder" version="2.10.0" match="greaterOrEqual"/>
<import plugin="ch.hilbri.assist.mapping.dsl.ui" version="1.0.0" match="greaterOrEqual"/>
<import plugin="com.google.guava"/>
<import plugin="org.eclipse.xtend.lib"/>
<import plugin="org.eclipse.xtend.lib.macro"/>
<import plugin="org.eclipse.equinox.common" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.ide"/>
<import plugin="org.eclipse.xtext.xbase.ide"/>
<import plugin="org.junit" version="4.7.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.xbase.junit"/>
<import plugin="org.eclipse.ui.editors" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
<import plugin="ch.hilbri.assist.libraries.choco-solver"/>
<import plugin="org.eclipse.e4.core.commands"/>
</requires>
<plugin
@@ -8,31 +8,19 @@ Service-Component: OSGI-INF/osgi-ISplashService-component.xml
Export-Package: ch.hilbri.assist.gui.splash, ch.hilbri.assist.gui.logging
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
org.eclipse.ui.views,
org.eclipse.ui.navigator,
org.eclipse.ui.navigator.resources,
org.eclipse.e4.core.di.annotations,
org.eclipse.e4.ui.workbench,
org.eclipse.ui.ide,
org.eclipse.e4.core.commands,
org.eclipse.e4.ui.model.workbench,
org.eclipse.ui.console,
org.eclipse.jface.text,
org.eclipse.core.resources,
org.eclipse.e4.core.contexts,
org.eclipse.e4.ui.services,
org.eclipse.e4.core.di,
org.eclipse.swt,
org.eclipse.jface,
org.eclipse.e4.core.services,
org.eclipse.osgi.services,
org.eclipse.jdt.core,
org.eclipse.jdt.launching,
org.eclipse.jdt.ui,
com.google.guava,
org.eclipse.xtext.xbase.lib,
org.eclipse.xtend.lib,
org.eclipse.xtend.lib.macro,
ch.hilbri.assist.libraries.logback
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javax.inject;version="1.0.0",
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry exported="true" kind="lib" path="choco-solver-4.0.4-with-dependencies.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -1,15 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>ch.hilbri.assist.libraries.choco</name>
<name>ch.hilbri.assist.libraries.choco-solver</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
@@ -35,6 +30,5 @@
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
</natures>
</projectDescription>
@@ -0,0 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8
@@ -1,42 +1,11 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ch.hilbri.assist.libraries.choco
Bundle-SymbolicName: ch.hilbri.assist.libraries.choco
Bundle-Name: ch.hilbri.assist.libraries.choco-solver
Bundle-SymbolicName: ch.hilbri.assist.libraries.choco-solver
Bundle-Version: 4.0.4.qualifier
Require-Bundle: ch.hilbri.assist.libraries.jgrapht,
ch.hilbri.assist.libraries.logback
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: com.github.cpprofiler,
com.google.protobuf,
com.google.protobuf.compiler,
dk.brics.automaton,
gnu.trove,
gnu.trove.decorator,
gnu.trove.function,
gnu.trove.impl,
gnu.trove.impl.hash,
gnu.trove.impl.sync,
gnu.trove.impl.unmodifiable,
gnu.trove.iterator,
gnu.trove.iterator.hash,
gnu.trove.list,
gnu.trove.list.array,
gnu.trove.list.linked,
gnu.trove.map,
gnu.trove.map.custom_hash,
gnu.trove.map.hash,
gnu.trove.procedure,
gnu.trove.procedure.array,
gnu.trove.queue,
gnu.trove.set,
gnu.trove.set.hash,
gnu.trove.stack,
gnu.trove.stack.array,
gnu.trove.strategy,
org.chocosolver.cutoffseq,
Export-Package: org.chocosolver.cutoffseq,
org.chocosolver.memory,
org.chocosolver.memory.generator,
org.chocosolver.memory.structure,
org.chocosolver.memory.trailing,
org.chocosolver.memory.trailing.trail,
@@ -73,12 +42,12 @@ Export-Package: com.github.cpprofiler,
org.chocosolver.solver.constraints.nary.globalcardinality,
org.chocosolver.solver.constraints.nary.lex,
org.chocosolver.solver.constraints.nary.min_max,
org.chocosolver.solver.constraints.nary.nogood,
org.chocosolver.solver.constraints.nary.nValue,
org.chocosolver.solver.constraints.nary.nValue.amnv.differences,
org.chocosolver.solver.constraints.nary.nValue.amnv.graph,
org.chocosolver.solver.constraints.nary.nValue.amnv.mis,
org.chocosolver.solver.constraints.nary.nValue.amnv.rules,
org.chocosolver.solver.constraints.nary.nogood,
org.chocosolver.solver.constraints.nary.sort,
org.chocosolver.solver.constraints.nary.sum,
org.chocosolver.solver.constraints.nary.tree,
@@ -93,8 +62,8 @@ Export-Package: com.github.cpprofiler,
org.chocosolver.solver.expression.continuous.arithmetic,
org.chocosolver.solver.expression.continuous.relational,
org.chocosolver.solver.expression.discrete.arithmetic,
org.chocosolver.solver.expression.discrete.logical,
org.chocosolver.solver.expression.discrete.relational,
org.chocosolver.solver.features,
org.chocosolver.solver.objective,
org.chocosolver.solver.propagation,
org.chocosolver.solver.propagation.hardcoded,
@@ -124,24 +93,6 @@ Export-Package: com.github.cpprofiler,
org.chocosolver.solver.variables.impl.scheduler,
org.chocosolver.solver.variables.view,
org.chocosolver.util,
org.chocosolver.util.criteria,
org.chocosolver.util.graphOperations.connectivity,
org.chocosolver.util.graphOperations.dominance,
org.chocosolver.util.iterators,
org.chocosolver.util.objects,
org.chocosolver.util.objects.graphs,
org.chocosolver.util.objects.queues,
org.chocosolver.util.objects.setDataStructures,
org.chocosolver.util.objects.setDataStructures.bitset,
org.chocosolver.util.objects.setDataStructures.constant,
org.chocosolver.util.objects.setDataStructures.iterable,
org.chocosolver.util.objects.setDataStructures.linkedlist,
org.chocosolver.util.objects.setDataStructures.swapList,
org.chocosolver.util.procedure,
org.chocosolver.util.sort,
org.chocosolver.util.tools,
org.kohsuke.args4j,
org.kohsuke.args4j.spi
Bundle-ClassPath: protobuf-java-3.2.0.jar,
trove4j-3.0.3.jar
org.chocosolver.util.criteria
Bundle-ClassPath: choco-solver-4.0.4-with-dependencies.jar,
.
@@ -0,0 +1,2 @@
bin.includes = META-INF/,\
choco-solver-4.0.4-with-dependencies.jar
@@ -0,0 +1,13 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>ch.hilbri.assist.libraries.choco-solver</artifactId>
<version>4.0.4-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<parent>
<groupId>assist</groupId>
<artifactId>ch.hilbri.assist.releng</artifactId>
<version>2.1.0-SNAPSHOT</version>
<relativePath>../ch.hilbri.assist.releng</relativePath>
</parent>
</project>

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 4278ce4

Please sign in to comment.