[Esbox-commits] r1221 - in branches/work_Petr: org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands org.maemo.esbox.product org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm org.maemo.esbox.vm.qemu/src/org/maemo/esbox/internal/vm/qemu org.maemo.esbox.vm.vmware/src/org/maemo/esbox/vm/vmware
baranov at garage.maemo.org
baranov at garage.maemo.org
Fri Feb 13 10:57:24 EET 2009
Author: baranov
Date: 2009-02-13 10:57:24 +0200 (Fri, 13 Feb 2009)
New Revision: 1221
Modified:
branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestOProfileValgrindSupport.java
branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestProcessLauncher.java
branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestRunStandalone.java
branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB1ProcessLauncher.java
branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB1SDKProvider.java
branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2ProcessLauncher.java
branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2SDKProvider.java
branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/BaseSb1Test.java
branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/BaseTest.java
branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestGdbQemuCommand.java
branches/work_Petr/org.maemo.esbox.product/ESbox.product
branches/work_Petr/org.maemo.esbox.product/plugin.properties
branches/work_Petr/org.maemo.esbox.vm.qemu/src/org/maemo/esbox/internal/vm/qemu/Activator.java
branches/work_Petr/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/vm/vmware/Activator.java
branches/work_Petr/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/Activator.java
Log:
Merge rev 1208:1220 from trunk.
Modified: branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestOProfileValgrindSupport.java
===================================================================
--- branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestOProfileValgrindSupport.java 2009-02-12 22:37:05 UTC (rev 1220)
+++ branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestOProfileValgrindSupport.java 2009-02-13 08:57:24 UTC (rev 1221)
@@ -21,6 +21,7 @@
import org.maemo.mica.common.analysis.adapters.IValgrindSupportAdapter;
import org.maemo.mica.common.core.machine.IMachine;
import org.maemo.mica.common.core.sdk.ISDKTarget;
+import org.maemo.mica.common.core.tests.TestUtils;
import org.maemo.mica.internal.api.protocol.ssh.DeviceSSHLinuxMachine;
import org.maemo.mica.protocol.ssh.SSHConfiguration;
@@ -39,7 +40,7 @@
for (ISDKTarget sdkTarget : ScratchboxSDKFacade.getInstance().getScratchboxSDKTargets()) {
IOProfileSupportAdapter oprofileSupport = (IOProfileSupportAdapter) sdkTarget.getAdapter(IOProfileSupportAdapter.class);
IValgrindSupportAdapter valgrindSupportAdapter = (IValgrindSupportAdapter) sdkTarget.getAdapter(IValgrindSupportAdapter.class);
- if (sdkTarget.getPlatform().getName().toLowerCase().matches("chinook|diablo|fremantle")) {
+ if (TestUtils.isSupportedSDKTarget(sdkTarget)) {
assertNotNull(sdkTarget.getName(), oprofileSupport);
assertNotNull(sdkTarget.getName(), valgrindSupportAdapter);
Modified: branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestProcessLauncher.java
===================================================================
--- branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestProcessLauncher.java 2009-02-12 22:37:05 UTC (rev 1220)
+++ branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestProcessLauncher.java 2009-02-13 08:57:24 UTC (rev 1221)
@@ -48,6 +48,11 @@
super.setUp();
}
+ /**
+ * Provide the SDKs whose SDK targets should be tested
+ * @return non-<code>null</code> list of ISDK
+ * @throws MicaException
+ */
protected List<ISDK> getSDKs() throws MicaException {
ArrayList<ISDK> sdks = new ArrayList<ISDK>();
for (IMachine machine : MachineRegistry.getInstance().getBuildMachines()) {
@@ -57,6 +62,16 @@
return sdks;
}
+ /**
+ * Tell whether the SDK target should be tested
+ * @param sdkTarget
+ * @return
+ */
+ protected boolean isSupportedSDKTarget(ISDKTarget sdkTarget) {
+ // we supply these by hand
+ return true;
+ }
+
protected interface IRunner {
void run(ISDKTarget target) throws Exception;
}
@@ -67,9 +82,7 @@
int count = MAX_TARGETS;
ISDKTarget[] targets = sdk.getSDKTargets();
for (ISDKTarget target : targets) {
- if (target.getName().contains("libtool")
- || target.getName().contains("REMOVE")
- || target.getName().contains("bora"))
+ if (!isSupportedSDKTarget(target))
continue;
if (!validateMachine(target.getMachine()))
continue;
@@ -79,7 +92,7 @@
runner.run(target);
}
}
- assertTrue("No SDK targets found", any);
+ assertTrue("No testable SDK targets found", any);
}
Modified: branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestRunStandalone.java
===================================================================
--- branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestRunStandalone.java 2009-02-12 22:37:05 UTC (rev 1220)
+++ branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestRunStandalone.java 2009-02-13 08:57:24 UTC (rev 1221)
@@ -18,6 +18,7 @@
import org.maemo.esbox.scratchbox.core.sdk.ScratchboxSDKFacade;
import org.maemo.mica.common.core.process.ProcessLauncherParameters;
import org.maemo.mica.common.core.sdk.ISDKTarget;
+import org.maemo.mica.common.core.tests.TestUtils;
import org.maemo.mica.common.launch.adapters.IRunStandaloneAdapter;
@@ -30,12 +31,11 @@
@Test
public void testSbox() throws Exception {
for (ISDKTarget sdkTarget : ScratchboxSDKFacade.getInstance().getScratchboxSDKTargets()) {
+ if (!TestUtils.isSupportedSDKTarget(sdkTarget))
+ continue;
IRunStandaloneAdapter support = (IRunStandaloneAdapter) sdkTarget.getAdapter(IRunStandaloneAdapter.class);
- if (sdkTarget.getPlatform().getName().toLowerCase().matches("chinook|diablo|fremantle")) {
- assertNotNull(sdkTarget.getName(), support);
- } else {
- continue;
- }
+ assertNotNull(sdkTarget.getName(), support);
+
assertEquals(true, support.getDefault());
assertNotNull(support.getLabelText());
assertNotNull(support.getTooltipText());
Modified: branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB1ProcessLauncher.java
===================================================================
--- branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB1ProcessLauncher.java 2009-02-12 22:37:05 UTC (rev 1220)
+++ branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB1ProcessLauncher.java 2009-02-13 08:57:24 UTC (rev 1221)
@@ -18,6 +18,7 @@
import org.maemo.mica.common.core.env.IEnvironmentModifierBlock;
import org.maemo.mica.common.core.process.*;
import org.maemo.mica.common.core.sdk.*;
+import org.maemo.mica.common.core.tests.TestUtils;
import java.io.ByteArrayOutputStream;
import java.util.Collections;
@@ -71,6 +72,14 @@
return sdks;
}
+ /* (non-Javadoc)
+ * @see org.maemo.esbox.scratchbox.tests.TestProcessLauncher#isSupportedSDKTarget(org.maemo.mica.common.core.sdk.ISDKTarget)
+ */
+ @Override
+ protected boolean isSupportedSDKTarget(ISDKTarget sdkTarget) {
+ return TestUtils.isSupportedSDKTarget(sdkTarget);
+ }
+
/** Make sure commands are assembled appropriately */
@Test
public void testSB1ProcessLauncherAssembly() throws Exception {
Modified: branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB1SDKProvider.java
===================================================================
--- branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB1SDKProvider.java 2009-02-12 22:37:05 UTC (rev 1220)
+++ branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB1SDKProvider.java 2009-02-13 08:57:24 UTC (rev 1221)
@@ -26,6 +26,7 @@
import org.maemo.mica.common.core.sdk.ISDKProvider;
import org.maemo.mica.common.core.sdk.ISDKTarget;
import org.maemo.mica.common.core.sdk.SDKFactory;
+import org.maemo.mica.common.core.tests.TestUtils;
import org.maemo.mica.common.core.tests.core.BaseTest;
import org.maemo.mica.maemosdk.core.MaemoSDKPlatform;
import org.maemo.mica.maemosdk.core.MaemoSDKPlatformEngine;
@@ -103,7 +104,8 @@
for (ISDKTarget target : targets) {
_testSDKTarget(target);
// only do tests on real targets
- if (!ISDKPlatform.NAME_UNKNOWN.equals(target.getPlatform().getName())) {
+ if (TestUtils.isSupportedBuildableSDKTarget(target)
+ && !ISDKPlatform.NAME_UNKNOWN.equals(target.getPlatform().getName())) {
_testSDKTargetFileConvs(target);
_testSDKTargetFileAccess(target);
_testSDKTargetPlatform(target);
Modified: branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2ProcessLauncher.java
===================================================================
--- branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2ProcessLauncher.java 2009-02-12 22:37:05 UTC (rev 1220)
+++ branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2ProcessLauncher.java 2009-02-13 08:57:24 UTC (rev 1221)
@@ -17,6 +17,7 @@
import org.maemo.mica.common.core.*;
import org.maemo.mica.common.core.process.*;
import org.maemo.mica.common.core.sdk.*;
+import org.maemo.mica.common.core.tests.TestUtils;
import java.util.Collections;
import java.util.List;
@@ -73,6 +74,15 @@
SDKFactory.getInstance().waitForRefreshComplete(null);
return sdks;
}
+
+ /* (non-Javadoc)
+ * @see org.maemo.esbox.scratchbox.tests.TestProcessLauncher#isSupportedSDKTarget(org.maemo.mica.common.core.sdk.ISDKTarget)
+ */
+ @Override
+ protected boolean isSupportedSDKTarget(ISDKTarget sdkTarget) {
+ return TestUtils.isSupportedSDKTarget(sdkTarget);
+ }
+
/** Make sure commands are assembled appropriately */
@Test
Modified: branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2SDKProvider.java
===================================================================
--- branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2SDKProvider.java 2009-02-12 22:37:05 UTC (rev 1220)
+++ branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2SDKProvider.java 2009-02-13 08:57:24 UTC (rev 1221)
@@ -18,6 +18,7 @@
import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.machine.ILocalMachine;
import org.maemo.mica.common.core.sdk.*;
+import org.maemo.mica.common.core.tests.TestUtils;
import org.maemo.mica.maemosdk.core.MaemoSDKPlatform;
import org.maemo.mica.maemosdk.core.MaemoSDKPlatformEngine;
@@ -86,7 +87,7 @@
for (ISDK sdk : sdks) {
ISDKTarget[] targets = sdk.getSDKTargets();
for (ISDKTarget target : targets) {
- if (target.getName().contains("DELETEME") || target.getName().contains("bora"))
+ if (!TestUtils.isSupportedBuildableSDKTarget(target))
continue;
_testSDKTarget(target);
_testSDKTargetPlatform(target);
@@ -163,6 +164,7 @@
assertNotNull(hostPath);
assertTrue(hostPath.toString(),
new Path("/opt/maemo/dists/etch/etc").equals(hostPath)
+ || new Path("/opt/maemo/dists/etch-2008/etc").equals(hostPath)
|| etcPath.equals(hostPath));
IPath rootstrapPath = ((IScratchboxSDKTarget) target).getRootstrapPath();
Modified: branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/BaseSb1Test.java
===================================================================
--- branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/BaseSb1Test.java 2009-02-12 22:37:05 UTC (rev 1220)
+++ branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/BaseSb1Test.java 2009-02-13 08:57:24 UTC (rev 1221)
@@ -13,6 +13,7 @@
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
import org.maemo.esbox.scratchbox.sb1.sdk.IScratchbox1SDKTarget;
import org.maemo.mica.common.core.sdk.ISDKTarget;
+import org.maemo.mica.common.core.tests.TestUtils;
public abstract class BaseSb1Test extends BaseTest {
@@ -23,6 +24,8 @@
public void setUp() throws Exception {
super.setUp();
for (ISDKTarget tmp:sb1Sdk.getSDKTargets()) {
+ if (!TestUtils.isSupportedBuildableSDKTarget(tmp))
+ continue;
if(tmp.getArchitecture().equals(IScratchboxSDKTarget.ARCHITECTURE_ARMEL))
targetARMEL=(IScratchbox1SDKTarget)tmp;
else if(tmp.getArchitecture().equals(IScratchboxSDKTarget.ARCHITECTURE_X86))
Modified: branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/BaseTest.java
===================================================================
--- branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/BaseTest.java 2009-02-12 22:37:05 UTC (rev 1220)
+++ branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/BaseTest.java 2009-02-13 08:57:24 UTC (rev 1221)
@@ -13,6 +13,7 @@
import org.junit.Before;
import org.maemo.esbox.internal.scratchbox.sb1.core.Scratchbox1SDK;
import org.maemo.esbox.internal.scratchbox.sb2.core.Scratchbox2SDK;
+import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
import org.maemo.esbox.scratchbox.core.sdk.ScratchboxSDKFacade;
import org.maemo.esbox.scratchbox.sb1.sdk.IScratchbox1SDK;
@@ -22,6 +23,7 @@
import org.maemo.mica.common.core.sdk.ISDKTarget;
import org.maemo.mica.common.core.sdk.SDKFactory;
import org.maemo.mica.common.core.sdk.commands.ICommandAbstractor;
+import org.maemo.mica.common.core.tests.TestUtils;
import junit.framework.TestCase;
@@ -45,14 +47,19 @@
public void setUp() throws Exception {
SDKFactory.getInstance().waitForRefreshComplete(null);
this.sb1Sdk = ScratchboxSDKFacade.getInstance().getScratchboxSDK(IScratchbox1SDK.class).get(0);
- this.sb1Command = ((Scratchbox1SDK) sb1Sdk).getCommandAbstractor();
- this.sb2Sdk = ScratchboxSDKFacade.getInstance().getScratchboxSDK(IScratchbox2SDK.class).get(0);
- this.sb2Command = ((Scratchbox2SDK) sb2Sdk).getCommandAbstractor();
+ this.sb1Command = ((Scratchbox1SDK) sb1Sdk).getCommandAbstractor();
+ try {
+ this.sb2Sdk = ScratchboxSDKFacade.getInstance().getScratchboxSDK(IScratchbox2SDK.class).get(0);
+ this.sb2Command = ((Scratchbox2SDK) sb2Sdk).getCommandAbstractor();
+ } catch (ScratchboxException e) {
+ // no sb2, fine
+ }
if (sb2Sdk != null) {
for (ISDKTarget target : sb2Sdk.getSDKTargets()) {
- if (target.getArchitecture().equals(IScratchboxSDKTarget.ARCHITECTURE_ARMEL) &&
- !target.getName().contains("minimal") &&
- !target.getName().contains("REMOVEME")) {
+ if (!TestUtils.isSupportedBuildableSDKTarget(target))
+ continue;
+
+ if (target.getArchitecture().equals(IScratchboxSDKTarget.ARCHITECTURE_ARMEL)) {
final ISDKTarget sdkTarget = target;
this.sb2ArmelTargetCommand = new ICommandAbstractor() {
Modified: branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestGdbQemuCommand.java
===================================================================
--- branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestGdbQemuCommand.java 2009-02-12 22:37:05 UTC (rev 1220)
+++ branches/work_Petr/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestGdbQemuCommand.java 2009-02-13 08:57:24 UTC (rev 1221)
@@ -13,6 +13,7 @@
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
import org.maemo.esbox.scratchbox.core.sdk.ScratchboxSDKFacade;
import org.maemo.mica.common.core.MicaException;
+import org.maemo.mica.common.core.tests.TestUtils;
/**
@@ -22,11 +23,13 @@
public void testQemuVersionCommand() throws MicaException {
for (IScratchboxSDKTarget sdkTarget : ScratchboxSDKFacade.getInstance().getScratchboxSDKTargets()) {
+ if (!TestUtils.isSupportedSDKTarget(sdkTarget))
+ continue;
String pattern = sdkTarget.getGdbQemuCommandPattern(
sdkTarget.getArchitecture());
assertNotNull(pattern);
if (sdkTarget.getSboxVersion() == 2) {
- assertTrue(pattern.contains("${PORT}"));
+ assertTrue(pattern, pattern.contains("${PORT}"));
}
if (sdkTarget.getArchitecture().equals(IScratchboxSDKTarget.ARCHITECTURE_ARMEL)) {
assertTrue(pattern, pattern.contains("qemu-arm"));
Modified: branches/work_Petr/org.maemo.esbox.product/ESbox.product
===================================================================
--- branches/work_Petr/org.maemo.esbox.product/ESbox.product 2009-02-12 22:37:05 UTC (rev 1220)
+++ branches/work_Petr/org.maemo.esbox.product/ESbox.product 2009-02-13 08:57:24 UTC (rev 1221)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.4"?>
-<product name="ESbox" id="org.maemo.esbox.product.esbox" application="org.eclipse.ui.ide.workbench" version="2.0.0-I20090204" useFeatures="true">
+<product name="ESbox" id="org.maemo.esbox.product.esbox" application="org.eclipse.ui.ide.workbench" version="2.0.0-I20090210" useFeatures="true">
<aboutInfo>
<image path="/org.maemo.esbox.product/icons/esbox_64.png"/>
Modified: branches/work_Petr/org.maemo.esbox.product/plugin.properties
===================================================================
--- branches/work_Petr/org.maemo.esbox.product/plugin.properties 2009-02-12 22:37:05 UTC (rev 1220)
+++ branches/work_Petr/org.maemo.esbox.product/plugin.properties 2009-02-13 08:57:24 UTC (rev 1221)
@@ -13,7 +13,7 @@
productName=ESbox
productBlurb=ESbox\n\
-version: 2.0.0-I20090204\n\
+version: 2.0.0-I20090210\n\
Eclipse build id: {0}\n\
\n\
Copyright (c)2007-2009 INdT, 2007-2009 Nokia Corporation. All rights reserved.\n\
@@ -28,7 +28,7 @@
shortcut.samples.tooltip = Samples
shortcut.whatsnew.tooltip = What's New
-productIntroTitle = Welcome to ESbox 2.0.0-I20090204
+productIntroTitle = Welcome to ESbox 2.0.0-I20090210
productIntroBrandingText = ESbox
introDescription-overview = ESbox is an Eclipse plug-in that helps programmers to develop applications for maemo platform on Scratchbox Apophis.
introDescription-tutorials = Learn how to be productive using ESbox by completing end-to-end tutorials that will guide you along the way.
Modified: branches/work_Petr/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/Activator.java
===================================================================
--- branches/work_Petr/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/Activator.java 2009-02-12 22:37:05 UTC (rev 1220)
+++ branches/work_Petr/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/Activator.java 2009-02-13 08:57:24 UTC (rev 1221)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
package org.maemo.esbox.internal.vm;
import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
Modified: branches/work_Petr/org.maemo.esbox.vm.qemu/src/org/maemo/esbox/internal/vm/qemu/Activator.java
===================================================================
--- branches/work_Petr/org.maemo.esbox.vm.qemu/src/org/maemo/esbox/internal/vm/qemu/Activator.java 2009-02-12 22:37:05 UTC (rev 1220)
+++ branches/work_Petr/org.maemo.esbox.vm.qemu/src/org/maemo/esbox/internal/vm/qemu/Activator.java 2009-02-13 08:57:24 UTC (rev 1221)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
package org.maemo.esbox.internal.vm.qemu;
import org.eclipse.core.runtime.*;
Modified: branches/work_Petr/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/vm/vmware/Activator.java
===================================================================
--- branches/work_Petr/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/vm/vmware/Activator.java 2009-02-12 22:37:05 UTC (rev 1220)
+++ branches/work_Petr/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/vm/vmware/Activator.java 2009-02-13 08:57:24 UTC (rev 1221)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
package org.maemo.esbox.vm.vmware;
import org.eclipse.core.runtime.*;
More information about the Esbox-commits
mailing list