generate bundle entries for jemmy

6 files changed, 8 insertions, 8 deletions

diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/e4App.rtask b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/e4App.rtask
index fdbef2042..2799e32cb 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/e4App.rtask
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/generator-tasks/e4App.rtask
@@ -391,7 +391,7 @@ RobotTask {
 				}
 				requiredBundles = {
 					"org.junit",
-					"org.eclipse.fx.jemmy"
+					"at.bestsolution.efxclipse.jemmy"
 				}
 			}
 			build = BuildProperties {
@@ -406,7 +406,7 @@ RobotTask {
 						## Project name
 						STRING "projectName" default "${BundleProject_bundleId}.jemmy",
 						## Launch features
-						STRING "featureList" default "org.eclipse.fx.jemmy.feature,org.eclipse.fx.jemmy.junit.feature,${BundleProject_bundleId}.feature,${BundleProject_bundleId}.jemmy.feature",
+						STRING "featureList" default "at.bestsolution.efxclipse.jemmy.feature,at.bestsolution.efxclipse.jemmy.junit.feature,${BundleProject_bundleId}.feature,${BundleProject_bundleId}.jemmy.feature",
 						## Test Suite class
 						STRING "testSuite" default "${BundleProject_bundleId}.jemmy.TestSuite",
 						## Test Product Id
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/src/org/eclipse/fx/ide/pde/ui/e4/project/template/TestSuiteGenerator.xtend b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/src/org/eclipse/fx/ide/pde/ui/e4/project/template/TestSuiteGenerator.xtend
index 893bd8887..a825c04e1 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/src/org/eclipse/fx/ide/pde/ui/e4/project/template/TestSuiteGenerator.xtend
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui.e4/src/org/eclipse/fx/ide/pde/ui/e4/project/template/TestSuiteGenerator.xtend
@@ -17,7 +17,7 @@ class TestSuiteGenerator implements Generator<File> {
 import org.junit.runner.RunWith;

 import org.junit.runners.Suite;

 

-import org.eclipse.fx.jemmy.OSGiJemmyBootstrapTestCase;

+import at.bestsolution.efxclipse.jemmy.OSGiJemmyBootstrapTestCase;

 

 @RunWith(Suite.class)

 @Suite.SuiteClasses({ SampleTestCase.class })

diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui/generator-tasks/osgi-app.rtask b/bundles/tooling/org.eclipse.fx.ide.pde.ui/generator-tasks/osgi-app.rtask
index 85676f10f..3a764c094 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui/generator-tasks/osgi-app.rtask
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui/generator-tasks/osgi-app.rtask
@@ -322,7 +322,7 @@ RobotTask {
 				}

 				requiredBundles = {

 					"org.junit",

-					"org.eclipse.fx.jemmy"

+					"at.bestsolution.efxclipse.jemmy"

 				}

 			}

 			build = BuildProperties {

@@ -337,7 +337,7 @@ RobotTask {
 						## Project name

 						STRING "projectName" default "${BundleProject_bundleId}.jemmy",

 						## Launch features

-						STRING "featureList" default "org.eclipse.fx.jemmy.feature,org.eclipse.fx.jemmy.junit.feature,${BundleProject_bundleId}.feature,${BundleProject_bundleId}.jemmy.feature",

+						STRING "featureList" default "at.bestsolution.efxclipse.jemmy.feature,at.bestsolution.efxclipse.jemmy.junit.feature,${BundleProject_bundleId}.feature,${BundleProject_bundleId}.jemmy.feature",

 						## Test Suite class

 						STRING "testSuite" default "${BundleProject_bundleId}.jemmy.TestSuite",

 						## Test Product Id

diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/JemmyJUnitTestProjectTemplate.java b/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/JemmyJUnitTestProjectTemplate.java
index 0dc1b2c9e..7f79cefdd 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/JemmyJUnitTestProjectTemplate.java
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/JemmyJUnitTestProjectTemplate.java
@@ -95,7 +95,7 @@ public class JemmyJUnitTestProjectTemplate extends FXPDETemplateSection {
 

 	public IPluginReference[] getDependencies(String schemaVersion) {

 		IPluginReference[] dep = new IPluginReference[2];

-		dep[0] = new PluginReference("org.eclipse.fx.jemmy", null, 0); //$NON-NLS-1$

+		dep[0] = new PluginReference("at.bestsolution.efxclipse.jemmy", null, 0); //$NON-NLS-1$

 		dep[1] = new PluginReference("org.junit4", null, 0); //$NON-NLS-1$

 		

 		return dep;

diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/templates/JemmyLaunch.xtend b/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/templates/JemmyLaunch.xtend
index 6c038e9bd..ddcc54399 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/templates/JemmyLaunch.xtend
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/templates/JemmyLaunch.xtend
@@ -53,7 +53,7 @@ class JemmyLaunch implements Generator<DynamicFile> {
 			}

 		}

 			

-		launchDef.getTargetPlugins().add(new PluginLaunchDef("org.eclipse.fx.jemmy"));

+		launchDef.getTargetPlugins().add(new PluginLaunchDef("at.bestsolution.efxclipse.jemmy"));

 		launchDef.getTargetPlugins().add(new PluginLaunchDef("org.eclipse.jdt.junit.runtime"));

 		launchDef.getTargetPlugins().add(new PluginLaunchDef("org.eclipse.jdt.junit4.runtime"));

 		launchDef.getTargetPlugins().add(new PluginLaunchDef("org.eclipse.osgi.services"));

diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/templates/JemmyLaunchDef.java b/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/templates/JemmyLaunchDef.java
index 4d6899a9f..76333fc48 100755
--- a/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/templates/JemmyLaunchDef.java
+++ b/bundles/tooling/org.eclipse.fx.ide.pde.ui/src/org/eclipse/fx/ide/pde/ui/templates/JemmyLaunchDef.java
@@ -77,7 +77,7 @@ public class JemmyLaunchDef extends BasicLaunchDef {
 		l.add(new PluginLaunchDef("org.eclipse.fx.ui.di"));

 		l.add(new PluginLaunchDef("org.eclipse.fx.ui.dialogs"));

 		l.add(new PluginLaunchDef("org.eclipse.fx.javafx"));

-		l.add(new PluginLaunchDef("org.eclipse.fx.jemmy"));

+		l.add(new PluginLaunchDef("at.bestsolution.efxclipse.jemmy"));

 		l.add(new PluginLaunchDef("org.eclipse.fx.osgi.util"));

 		l.add(new PluginLaunchDef("org.eclipse.fx.osgi","default","false"));

 		l.add(new PluginLaunchDef("org.eclipse.fx.ui.panes"));