Attachment 83885 Details for Bug 208616 – patch for deployment on remote machine

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

patch for deployment on remote machine

208616_patch_V2.txt (text/plain), 3.43 KB, created by Bozier jerome

on 2007-11-27 12:22:24 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Bozier jerome

Created: 2007-11-27 12:22:24 EST

Size: 3.43 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.test.tools.junit.plugin
>Index: src/org/eclipse/tptp/test/tools/junit/plugin/internal/harness/WorkbenchExecutionConstants.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.tools.junit.plugin/src/org/eclipse/tptp/test/tools/junit/plugin/internal/harness/WorkbenchExecutionConstants.java,v
>retrieving revision 1.2
>diff -u -r1.2 WorkbenchExecutionConstants.java
>--- src/org/eclipse/tptp/test/tools/junit/plugin/internal/harness/WorkbenchExecutionConstants.java	4 May 2007 16:24:11 -0000	1.2
>+++ src/org/eclipse/tptp/test/tools/junit/plugin/internal/harness/WorkbenchExecutionConstants.java	27 Nov 2007 17:13:18 -0000
>@@ -19,7 +19,7 @@
> 	public final static String ECLIPSE_TEST_LAUNCHER_AGENT_TYPE = "eclipseTestLauncher"; //$NON-NLS-1$
> 	
> 	public final static String LAUNCH_TEST_COMMAND = "launchTest"; //$NON-NLS-1$
>-	public final static String COMMAND_DELIMITER = "ø"; //$NON-NLS-1$
>+	public final static String COMMAND_DELIMITER = "|"; //$NON-NLS-1$
> 	public static final String SHUTDOWN_PLATFORM = "shutdownPlatfom"; //$NON-NLS-1$
> 	public final static String AGENT_NAME_PREFIX = "Executor$location:"; //$NON-NLS-1$
> 	
>Index: src/org/eclipse/tptp/test/tools/junit/plugin/internal/harness/WorkbenchExecutionDeploymentAdapter.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.tools.junit.plugin/src/org/eclipse/tptp/test/tools/junit/plugin/internal/harness/WorkbenchExecutionDeploymentAdapter.java,v
>retrieving revision 1.6
>diff -u -r1.6 WorkbenchExecutionDeploymentAdapter.java
>--- src/org/eclipse/tptp/test/tools/junit/plugin/internal/harness/WorkbenchExecutionDeploymentAdapter.java	24 Aug 2007 15:01:14 -0000	1.6
>+++ src/org/eclipse/tptp/test/tools/junit/plugin/internal/harness/WorkbenchExecutionDeploymentAdapter.java	27 Nov 2007 17:13:19 -0000
>@@ -192,7 +192,8 @@
> 	 * on the remote workbench as enabled platform plugins.
> 	 */
> 	protected void collectPluginFiles(boolean isStandalone, IProject project, HashMap deployableFiles, String deployRootDir, Set deployedBundleDirs, Collection externalPlugins) {
>-		deployedBundleDirs.add(new Path(deployRootDir).append(project.getName()).toString());
>+		// JB : bugzilla 208616
>+		deployedBundleDirs.add(getDeployFilePath(project.getLocation().toString(), deployRootDir, isStandalone));
> 		addForeignFile(isStandalone, project, getManifestFile(project), JarFile.MANIFEST_NAME, deployableFiles, deployRootDir);
> 		addForeignFile(isStandalone, project, getPluginFile(project), PLUGIN_XML_NAME, deployableFiles, deployRootDir);
> 		
>@@ -414,6 +415,8 @@
> 		File file = new File(area, "org.eclipse.update/platform.xml"); //$NON-NLS-1$
> 		if (file.exists()) {
> 			try {
>+				// JB : bugzilla 208616
>+				searchAndReplace(file, localTargetPlatform.toString().replaceAll("\\\\", "/"), remoteEclipseDir.toString().replaceAll("\\\\", "/"));
> 				searchAndReplace(file, localTargetPlatform.toString(), remoteEclipseDir.toString());
> 			} catch (IOException e) {
> 				throw new CoreException(new Status(IStatus.ERROR, CorePlugin.PLUGIN_ID, 1, "Unexpected exception", e)); //$NON-NLS-1$
>@@ -421,7 +424,6 @@
> 		}
> 	}
> 	
>-	
> 	protected static void searchAndReplace(File file, String pattern, String replacement) throws IOException {
> 		FileInputStream fis = new FileInputStream(file);
>         FileChannel fc = fis.getChannel();

Actions: View

Attachments on bug 208616: 83281 | 83609 | 83621 | 83622 | 83635 | 83639 | 83885