Build engineering for variability (11)

Change-Id: Iec635c34831ffbfea4ae9699d93adeba2c41e86d


Change-Id: Iec635c34831ffbfea4ae9699d93adeba2c41e86d


Change-Id: Iec635c34831ffbfea4ae9699d93adeba2c41e86d


Change-Id: Iec635c34831ffbfea4ae9699d93adeba2c41e86d


Change-Id: Iec635c34831ffbfea4ae9699d93adeba2c41e86d


Change-Id: Iec635c34831ffbfea4ae9699d93adeba2c41e86d


Change-Id: Iec635c34831ffbfea4ae9699d93adeba2c41e86d


Change-Id: Iec635c34831ffbfea4ae9699d93adeba2c41e86d


Change-Id: Iec635c34831ffbfea4ae9699d93adeba2c41e86d


Change-Id: Iec635c34831ffbfea4ae9699d93adeba2c41e86d


Change-Id: Iec635c34831ffbfea4ae9699d93adeba2c41e86d
diff --git a/plugins/variability/org.eclipse.emf.henshin.variability.configuration/src/configuration/impl/ConfigurationFactoryImpl.java b/plugins/variability/org.eclipse.emf.henshin.variability.configuration/src/configuration/impl/ConfigurationFactoryImpl.java
index f16f748..2db30d4 100644
--- a/plugins/variability/org.eclipse.emf.henshin.variability.configuration/src/configuration/impl/ConfigurationFactoryImpl.java
+++ b/plugins/variability/org.eclipse.emf.henshin.variability.configuration/src/configuration/impl/ConfigurationFactoryImpl.java
@@ -2,7 +2,12 @@
  */
 package configuration.impl;
 
-import configuration.*;
+import configuration.Configuration;
+import configuration.ConfigurationFactory;
+import configuration.ConfigurationPackage;
+import configuration.Feature;
+import configuration.Favorite;
+import configuration.FeatureBinding;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
diff --git a/plugins/variability/org.eclipse.emf.henshin.variability/.classpath b/plugins/variability/org.eclipse.emf.henshin.variability/.classpath
index c8f5ef5..1ad4e02 100644
--- a/plugins/variability/org.eclipse.emf.henshin.variability/.classpath
+++ b/plugins/variability/org.eclipse.emf.henshin.variability/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<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 kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="lib/aima-core-3.0.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/plugins/variability/org.eclipse.emf.henshin.variability/META-INF/MANIFEST.MF b/plugins/variability/org.eclipse.emf.henshin.variability/META-INF/MANIFEST.MF
index cb7d822..fdcf8e5 100644
--- a/plugins/variability/org.eclipse.emf.henshin.variability/META-INF/MANIFEST.MF
+++ b/plugins/variability/org.eclipse.emf.henshin.variability/META-INF/MANIFEST.MF
@@ -3,6 +3,14 @@
 Bundle-Name: Henshin Variability Core
 Bundle-SymbolicName: org.eclipse.emf.henshin.variability;singleton:=true
 Bundle-Version: 1.5.0.qualifier
+Bundle-ClassPath: .,
+ lib/aima-core-3.0.0.jar
+Bundle-Vendor: %providerName
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.emf.henshin.variability,
+ org.eclipse.emf.henshin.variability.matcher,
+ org.eclipse.emf.henshin.variability.util,
+ org.eclipse.emf.henshin.variability.wrapper
 Require-Bundle: org.eclipse.emf.henshin.trace,
  org.eclipse.emf.henshin.interpreter,
  org.eclipse.ocl.ecore,
@@ -10,10 +18,4 @@
  org.eclipse.core.runtime,
  org.eclipse.emf.transaction,
  org.sat4j.core
-Bundle-ClassPath: lib/aima-core-3.0.0.jar
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.emf.henshin.variability,
- org.eclipse.emf.henshin.variability.matcher,
- org.eclipse.emf.henshin.variability.util,
- org.eclipse.emf.henshin.variability.wrapper
 Automatic-Module-Name: org.eclipse.emf.henshin.variability
diff --git a/plugins/variability/org.eclipse.emf.henshin.variability/build.properties b/plugins/variability/org.eclipse.emf.henshin.variability/build.properties
index 104047e..0c788b1 100644
--- a/plugins/variability/org.eclipse.emf.henshin.variability/build.properties
+++ b/plugins/variability/org.eclipse.emf.henshin.variability/build.properties
@@ -6,10 +6,12 @@
 # http://www.eclipse.org/legal/epl-v10.html
 # </copyright>
 
-bin.includes = .,\
-               META-INF/,\
-               lib/,\
-               lib/aima-core-3.0.0.jar
 source.. = src/
 output.. = bin/
-custom = true
+bin.includes =  .,\
+               plugin.properties,\
+               META-INF/,\
+               plugin.xml,\
+               lib/,\
+               lib/aima-core-3.0.0.jar
+