Tycho WIP e4

.gitattributes

@@ -0,0 +1,4 @@
+* 	text=auto
+
+*.java	text	diff=java
+*.html	text	diff=html

.travis.yml

@@ -0,0 +1,3 @@
+language: java
+script:
+  mvn clean verify -DskipTests=true -f com.windowtester_parent/pom.xml

com.windowtester.eclipse.help/.gitignore

@@ -0,0 +1,2 @@
+/bin
+/target

com.windowtester.eclipse.help/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.windowtester.eclipse.help; singleton:=true
-Bundle-Version: 0.0.0
+Bundle-Version: 6.1.2.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,

com.windowtester.eclipse.help/plugin.properties

@@ -9,4 +9,4 @@
 #  Google, Inc. - initial API and implementation
 ###############################################################################
 pluginName = WindowTester Pro Help Plug-in
-providerName = ${product.provider}
+providerName = Google, Inc.

com.windowtester.eclipse.help/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.windowtester</groupId>
+    <artifactId>com.windowtester.ide-parent</artifactId>
+    <version>6.1.2-SNAPSHOT</version>
+    <relativePath>../com.windowtester.ide_parent</relativePath>
+  </parent>
+
+  <groupId>com.windowtester</groupId>
+  <artifactId>com.windowtester.eclipse.help</artifactId>
+  <version>6.1.2-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+
+</project>

com.windowtester.eclipse.ui.update.notifier/.gitignore

@@ -0,0 +1,2 @@
+/bin
+/target

com.windowtester.eclipse.ui.update.notifier/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.windowtester.eclipse.ui.update.notifier;singleton:=true
-Bundle-Version: 0.0.0
+Bundle-Version: 6.1.2.qualifier
 Bundle-Activator: com.windowtester.eclipse.ui.updater.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

com.windowtester.eclipse.ui.update.notifier/plugin.properties

@@ -10,4 +10,4 @@
 ###############################################################################
 
 pluginName = WindowTester UI Version Update Notifier
-providerName = ${product.provider}
+providerName = Google, Inc.

com.windowtester.eclipse.ui.update.notifier/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.windowtester</groupId>
+    <artifactId>com.windowtester.ide-parent</artifactId>
+    <version>6.1.2-SNAPSHOT</version>
+    <relativePath>../com.windowtester.ide_parent</relativePath>
+  </parent>
+
+  <groupId>com.windowtester</groupId>
+  <artifactId>com.windowtester.eclipse.ui.update.notifier</artifactId>
+  <version>6.1.2-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+
+</project>

com.windowtester.eclipse.ui/.gitignore

@@ -0,0 +1,3 @@
+/bin
+/target
+/ui.jar

com.windowtester.eclipse.ui/META-INF/MANIFEST.MF

@@ -2,40 +2,27 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.windowtester.eclipse.ui; singleton:=true
-Bundle-Version: 0.0.0
+Bundle-Version: 6.1.2.qualifier
 Bundle-ClassPath: ui.jar
 Bundle-Activator: com.windowtester.eclipse.ui.UiPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: com.swtdesigner,
- com.windowtester.eclipse.ui,
- com.windowtester.eclipse.ui.actions,
- com.windowtester.eclipse.ui.assertions,
- com.windowtester.eclipse.ui.convert,
- com.windowtester.eclipse.ui.convert.rule,
- com.windowtester.eclipse.ui.dialogs,
- com.windowtester.eclipse.ui.inspector,
- com.windowtester.eclipse.ui.inspector.notifications,
- com.windowtester.eclipse.ui.jdt,
- com.windowtester.eclipse.ui.jdt.analysis.util,
- com.windowtester.eclipse.ui.launcher,
- com.windowtester.eclipse.ui.launcher.bundle,
- com.windowtester.eclipse.ui.pde.launcher,
- com.windowtester.eclipse.ui.preferences,
- com.windowtester.eclipse.ui.session,
- com.windowtester.eclipse.ui.target,
- com.windowtester.eclipse.ui.viewers,
- com.windowtester.eclipse.ui.views,
- com.windowtester.eclipse.ui.wizard,
- com.windowtester.recorder.ui,
- com.windowtester.recorder.ui.events,
- com.windowtester.recorder.ui.remote,
- com.windowtester.recorder.ui.remote.standalone,
- com.windowtester.ui.core.model,
- com.windowtester.ui.internal.core.recorder,
- com.windowtester.ui.internal.corel.model,
- com.windowtester.ui.session,
- com.windowtester.ui.util
+Export-Package: com.swtdesigner,com.windowtester.eclipse.ui,com.window
+ tester.eclipse.ui.actions,com.windowtester.eclipse.ui.assertions,com.
+ windowtester.eclipse.ui.convert,com.windowtester.eclipse.ui.convert.r
+ ule,com.windowtester.eclipse.ui.dialogs,com.windowtester.eclipse.ui.i
+ nspector,com.windowtester.eclipse.ui.inspector.notifications,com.wind
+ owtester.eclipse.ui.jdt,com.windowtester.eclipse.ui.jdt.analysis.util
+ ,com.windowtester.eclipse.ui.launcher,com.windowtester.eclipse.ui.lau
+ ncher.bundle,com.windowtester.eclipse.ui.pde.launcher,com.windowteste
+ r.eclipse.ui.preferences,com.windowtester.eclipse.ui.session,com.wind
+ owtester.eclipse.ui.target,com.windowtester.eclipse.ui.viewers,com.wi
+ ndowtester.eclipse.ui.views,com.windowtester.eclipse.ui.wizard,com.wi
+ ndowtester.recorder.ui,com.windowtester.recorder.ui.events,com.window
+ tester.recorder.ui.remote,com.windowtester.recorder.ui.remote.standal
+ one,com.windowtester.ui.core.model,com.windowtester.ui.internal.core.
+ recorder,com.windowtester.ui.internal.corel.model,com.windowtester.ui
+ .session,com.windowtester.ui.util
 Require-Bundle: org.eclipse.ui.forms,
  org.eclipse.ui.ide,
  org.eclipse.debug.ui,

com.windowtester.eclipse.ui/plugin.properties

@@ -11,7 +11,7 @@
 
 
 pluginName = WindowTester UI Contributions
-providerName = ${product.provider}
+providerName = Google, Inc.
 
 ################################################################################
 #

com.windowtester.eclipse.ui/pom.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.windowtester</groupId>
+    <artifactId>com.windowtester.ide-parent</artifactId>
+    <version>6.1.2-SNAPSHOT</version>
+    <relativePath>../com.windowtester.ide_parent</relativePath>
+  </parent>
+
+  <groupId>com.windowtester</groupId>
+  <artifactId>com.windowtester.eclipse.ui</artifactId>
+  <version>6.1.2-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+
+</project>

com.windowtester.eclipse.ui/src/com/windowtester/eclipse/ui/launcher/ProgramArgumentBuilder.java

@@ -37,13 +37,13 @@ public String[] getProgramArguments(ILaunchConfiguration configuration,
 		HashSet notFound=new HashSet();
 		try{
 
-		/* $if eclipse.version >= 3.6 $
+		/* $if eclipse.version >= 3.6 $ */
 
 		return new ProgramArgumentBuilder36(notFound).getProgramArguments(configuration, requiredPluginsIds);
 
-		$elseif eclipse.version == 3.5 $ */
+		/* $elseif eclipse.version == 3.5 $ */
 
-		return new ProgramArgumentBuilder35(notFound).getProgramArguments(configuration, requiredPluginsIds);
+//		return new ProgramArgumentBuilder35(notFound).getProgramArguments(configuration, requiredPluginsIds);
 
 		/* $elseif eclipse.version == 3.4 $
 

com.windowtester.eclipse.ui/src/com/windowtester/eclipse/ui/launcher/ProgramArgumentBuilder35.java

@@ -27,7 +27,7 @@
 import org.eclipse.pde.core.plugin.IPluginBase;
 import org.eclipse.pde.core.plugin.IPluginModelBase;
 
-/* $if eclipse.version == 3.5 $ */
+/* $if eclipse.version == 3.5 $
 import org.eclipse.pde.core.plugin.ModelEntry;
 import org.eclipse.pde.core.plugin.PluginRegistry;
 import org.eclipse.pde.core.plugin.TargetPlatform;
@@ -42,7 +42,7 @@
 import org.eclipse.pde.internal.ui.launcher.LauncherUtils;
 import org.eclipse.pde.internal.ui.launcher.LaunchArgumentsHelper;
 import org.eclipse.pde.internal.ui.launcher.LaunchConfigurationHelper;
-/* $endif$ */
+$endif$ */
 
 import org.eclipse.pde.internal.ui.PDEPlugin;
 import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
@@ -75,7 +75,7 @@ private IPath getProductPath() {
 	 * @see org.eclipse.pde.ui.launcher.AbstractPDELaunchConfiguration#getConfigDir(org.eclipse.debug.core.ILaunchConfiguration)
 	 */
 	protected File getConfigDir(ILaunchConfiguration config) {
-		/* $if eclipse.version == 3.5 $ */
+		/* $if eclipse.version == 3.5 $ 
 		if (fConfigDir == null) {
 			try {
 				if (config.getAttribute(IPDELauncherConstants.USEFEATURES, false) && config.getAttribute(IPDELauncherConstants.CONFIG_USE_DEFAULT_AREA, true)) {
@@ -91,12 +91,12 @@ protected File getConfigDir(ILaunchConfiguration config) {
 				fConfigDir = LaunchConfigurationHelper.getConfigurationArea(config);
 			}
 		}
-		/* $endif$ */
+		$endif$ */
 		return fConfigDir;
 	}
 
 	public String[] getProgramArguments2(ILaunchConfiguration configuration) throws CoreException {
-		/* $if eclipse.version == 3.5 $ */
+		/* $if eclipse.version == 3.5 $
 		ArrayList programArgs = new ArrayList();
 
 		// add tracing, if turned on	
@@ -137,13 +137,13 @@ public String[] getProgramArguments2(ILaunchConfiguration configuration) throws
 		}
 
 		return (String[]) programArgs.toArray(new String[programArgs.size()]);
-		/* $else$
+		$else$ */
 		return (String[])PreprocessorInvariant.violated();		
-		$endif$ */
+		/*$endif$ */
 	}
 
 	private void ensureProductFilesExist(IPath productArea) {
-		/* $if eclipse.version == 3.5 $ */
+		/* $if eclipse.version == 3.5 $
 		File productDir = productArea.toFile();
 		File marker = new File(productDir, ".eclipseproduct"); //$NON-NLS-1$
 		IPath eclipsePath = new Path(TargetPlatform.getLocation());
@@ -160,7 +160,7 @@ private void ensureProductFilesExist(IPath productArea) {
 	}
 
 	private void validateFeatures() throws CoreException {
-		/* $if eclipse.version == 3.5 $ */
+		/* $if eclipse.version == 3.5 $
 		IPath installPath = PDEPlugin.getWorkspace().getRoot().getLocation();
 		String lastSegment = installPath.lastSegment();
 		boolean badStructure = lastSegment == null;
@@ -174,9 +174,9 @@ private void validateFeatures() throws CoreException {
 		}
 		// Ensure important files are present
 		ensureProductFilesExist(getProductPath());
-		/* $else$
+		$else$ */
 		PreprocessorInvariant.violated();		
-		$endif$ */
+		/* $endif$ */
 	}
 
 	private void updatePluginMap(Map pluginMap, String[] requiredPluginsIds) {
@@ -243,7 +243,7 @@ private void addToMap(Map map, IPluginModelBase model) {
 	}
 
 	private void addToMap(Map pluginMap, String id) {
-		/* $if eclipse.version == 3.5 $ */
+		/* $if eclipse.version == 3.5 $
 		ModelEntry entry = PluginRegistry.findEntry(id);
 		if (entry != null) {
 			IPluginModelBase models[] = entry.getExternalModels();
@@ -262,9 +262,9 @@ private void addToMap(Map pluginMap, String id) {
 		else{
 			locations.add(id);
 		}		
-		/* $else$
+		$else$ */
 		PreprocessorInvariant.violated();		
-		$endif$ */
+		/* $endif$ */
 
 	}
 
@@ -274,7 +274,7 @@ private void addToMap(Map pluginMap, String id) {
 	 */
 	public String[] getProgramArguments(ILaunchConfiguration configuration,String[] reqs) throws CoreException {
 
-		/* $if eclipse.version == 3.5 $ */
+		/* $if eclipse.version == 3.5 $
 		fModels = getBundleMap(configuration);
 
 
@@ -378,35 +378,35 @@ public String[] getProgramArguments(ILaunchConfiguration configuration,String[]
 		}
 		return (String[]) programArgs.toArray(new String[programArgs.size()]);
 
-		/* $else$
+		$else$ */
 		return (String[])PreprocessorInvariant.violated();		
-		$endif$ */
+		/* $endif$ */
 	}
 
 	private Properties getProperties(ILaunchConfiguration configuration,
 			String productID) throws CoreException {
-		/* $if eclipse.version == 3.5 $ */
+		/* $if eclipse.version == 3.5 $
 		return LaunchConfigurationHelper.createConfigIniFile(configuration, productID, fAllBundles, fModels, getConfigDir(configuration));
-		/* $else$
+		$else$ */
 		return (Properties)PreprocessorInvariant.violated();		
-		$endif$ */
+		/* $endif$ */
 	}
 
 	private Map getBundleMap(ILaunchConfiguration configuration) throws CoreException {
-		/* $if eclipse.version == 3.5 $ */
+		/* $if eclipse.version == 3.5 $
 		return BundleLauncherHelper.getMergedBundleMap(configuration, false);
-		/* $else$
+		$else$ */
 		return (Map)PreprocessorInvariant.violated();		
-		$endif$ */
+		/* $endif$ */
 	}
 
 	private String computeShowsplashArgument() {
-		/* $if eclipse.version == 3.5 $ */
+		/* $if eclipse.version == 3.5 $
 		IPath eclipseHome = new Path(TargetPlatform.getLocation());
 		IPath fullPath = eclipseHome.append("eclipse"); //$NON-NLS-1$
 		return fullPath.toOSString() + " -showsplash 600"; //$NON-NLS-1$
-		/* $else$
+		$else$ */
 		return (String)PreprocessorInvariant.violated();		
-		$endif$ */
+		/* $endif$ */
 	}
 }

com.windowtester.eclipse.ui/src/com/windowtester/eclipse/ui/launcher/RecorderSWTLaunchConfDelegate.java

@@ -225,10 +225,10 @@ public String[] getClasspath(ILaunchConfiguration configuration)
 
 	private String[] constructClassPath(ILaunchConfiguration configuration) throws CoreException {
 		/* $if eclipse.version < 3.6 $ */
-		return org.eclipse.pde.internal.ui.launcher.LaunchArgumentsHelper.constructClasspath(configuration);
-		/* $else$
+//		return org.eclipse.pde.internal.ui.launcher.LaunchArgumentsHelper.constructClasspath(configuration);
+		/* $else$ */
 		return org.eclipse.pde.internal.launching.launcher.LaunchArgumentsHelper.constructClasspath(configuration);
-		$endif$ */
+		/* $endif$ */
 	}
 
 	/**

com.windowtester.eclipse.ui_test/.gitignore

@@ -0,0 +1 @@
+/bin

com.windowtester.eclipse.ui_tool/.gitignore

@@ -0,0 +1 @@
+/bin

com.windowtester.example.contactmanager.rcp/.gitignore

@@ -0,0 +1,2 @@
+/bin
+/target

com.windowtester.example.contactmanager.rcp/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>ContactManagerRCP</name>
+	<name>com.windowtester.example.contactmanager.rcp</name>
 	<comment></comment>
 	<projects>
 	</projects>

com.windowtester.example.contactmanager.rcp/pom.xml

@@ -0,0 +1,17 @@
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.windowtester</groupId>
+		<artifactId>com.windowtester.example.contactmanager.rcp-parent</artifactId>
+		<version>1.0.0</version>
+		<relativePath>../com.windowtester.example.contactmanager.rcp_parent</relativePath>
+	</parent>
+
+	<groupId>com.windowtester</groupId>
+	<artifactId>com.windowtester.example.contactmanager.rcp</artifactId>
+	<version>1.0.0</version>
+	<packaging>eclipse-plugin</packaging>
+</project>