Squashed commit of the following:v20130128-050843

304132 - [shared] upgrading shared base causes loss of user installer
plug-ins

commit 8461eae803454c36f6a18013c44e37c20810d141
Merge: 23bc40c c847dee
Author: Pascal Rapicault <pascal@rapicault.net>
Date:   Sun Jan 27 22:11:45 2013 -0500

    Merge branch 'master' into prapicau/sharedInstall-part1

commit 23bc40c4f85b01f37fb0ac23992524a7c8ccd892
Author: Pascal Rapicault (Ericsson) <pascal.rapicault@ericsson.com>
Date:   Sun Jan 27 21:38:07 2013 -0500

    Use constant and fix copyright header

commit bc11d565b32b5b5c8bb5c93e5ea666b1d06b43ff
Author: Pascal Rapicault (Ericsson) <pascal.rapicault@ericsson.com>
Date:   Sun Jan 27 21:33:32 2013 -0500

    Annotate new profile with a base profile timestamp

commit ba4e7abda6e44ad47aead2fade320f9be08b27d5
Author: Pascal Rapicault (Ericsson) <pascal.rapicault@ericsson.com>
Date:   Sun Jan 27 21:32:20 2013 -0500

    Add constants

commit 54c8d356527d1321e25bd837e674b758aa61e248
Author: Krzysztof Daniel <kdaniel@redhat.com>
Date:   Thu Jan 24 13:23:15 2013 +0100

    SimpleConfiguratorImpl refactoring and tests.

commit 6177c466083fb7676ebfe5790bc0951043b3b727
Author: Pascal Rapicault (Ericsson) <pascal.rapicault@ericsson.com>
Date:   Thu Jan 24 11:59:45 2013 -0500

    detection of change in the reconciler

commit f04f46d6d283a6235367872b5eaa7e3e483509ed
Merge: 5243d49 c32f111
Author: Pascal Rapicault <pascal@rapicault.net>
Date:   Thu Jan 24 11:43:01 2013 -0500

    Merge branch 'master' into prapicau/sharedInstall-part1

commit 5243d497142b0f2631bcda8b5fed67d7ce0ddbd5
Author: Pascal Rapicault <pascal@rapicault.net>
Date:   Wed Jan 23 15:26:41 2013 -0500

    always use shared install when the ignoreUserConfig property is set

commit 12eccdad23420e7ba91f99221c852f7e32eb11de
Merge: c68f394 1e9fc23
Author: Pascal Rapicault <pascal@rapicault.net>
Date:   Wed Jan 23 10:29:56 2013 -0500

    Merge branch 'master' into prapicau/sharedInstall-part1

commit c68f394a39c4215ed7ac960495a3c59eb3cf3eee
Author: Pascal Rapicault <pascal@rapicault.net>
Date:   Tue Jan 22 22:24:04 2013 -0500

    Bug 398853 - [UI] installed IU shows as update

commit aa6d632dea7ff54e9ba7c3c7f9f2ecd30afe5906
Author: Pascal Rapicault <pascal@rapicault.net>
Date:   Tue Jan 22 13:50:05 2013 -0500

    Differentiate initial profile creation from reset.

commit 4fb3429ed3fd673d5daf7ca1ce9bf1184a0afcb3
Author: Pascal Rapicault <pascal@rapicault.net>
Date:   Tue Jan 22 13:49:23 2013 -0500

    Only show migration dialog once

commit a34eac29e330a41991d003e2dcd2d8b264d77145
Author: Krzysztof Daniel <kdaniel@redhat.com>
Date:   Mon Jan 21 12:40:36 2013 +0100

    397216: [Shared] Better shared configuration change discovery

    Perform dropins reindexing after master configuration had been changed.

    https://bugs.eclipse.org/bugs/show_bug.cgi?id=397216

commit 6981ca8bd3c1db9ab2dd9484a1f7c8950fcd1abe
Merge: dfec14b 33ca260
Author: Pascal Rapicault <pascal@rapicault.net>
Date:   Mon Jan 21 15:04:28 2013 -0500

    Merge branch 'master' into prapicau/sharedInstall-part1

commit dfec14b67a69b6fa14efb860ef8a986053a58917
Merge: 6067d05 ba5f048
Author: Pascal Rapicault <pascal@rapicault.net>
Date:   Mon Jan 21 11:34:38 2013 -0500

    Merge branch 'master' into prapicau/sharedInstall-part1

commit ba5f048a3ac5563430104adeb173dc4f7dda6eca
Author: Pascal Rapicault <pascal@rapicault.net>
Date:   Mon Jan 21 11:28:20 2013 -0500

    Bug 398539 - Got a NPE trying to add a new update site

commit 6067d05e402fe796debd9d25604cae7026df5b48
Author: Pascal Rapicault <pascal@rapicault.net>
Date:   Fri Jan 18 16:16:18 2013 -0500

    only write timestamp file for shared install

commit 8ab9410d8c797e6a8d2a97e4ba46da3d548440fa
Author: Pascal Rapicault (Ericsson) <pascal.rapicault@ericsson.com>
Date:   Fri Jan 18 13:56:46 2013 -0500

    Cache the fact that the state.properties is missing

commit fefbc5bdec2ce6cdb7fd71b1790bf8abdee8737a
Author: Pascal Rapicault (Ericsson) <pascal.rapicault@ericsson.com>
Date:   Fri Jan 18 13:51:54 2013 -0500

    Fix bug in change detection logic

commit 3de6f8593d5c1b21be3bd21000e34acb945056b1
Author: Pascal Rapicault (Ericsson) <pascal.rapicault@ericsson.com>
Date:   Wed Jan 16 19:50:32 2013 -0500

    Detect changes in the bundles.info

commit 446649c95063dca689f4d2c886b26975a11f3499
Author: Pascal Rapicault <pascal@rapicault.net>
Date:   Tue Jan 15 14:04:57 2013 -0500

    Simple notification to let the user know that the base has changed.

commit e004dc5270abd33a60da9a8d0340409bc8e4a38d
Author: Pascal Rapicault <pascal@rapicault.net>
Date:   Fri Jan 11 14:15:20 2013 +0100

    ignore user config.ini if out of sync with base

commit a0235c0c95b9047e64d6e24c9d8f6b8588087113
Author: Pascal Rapicault (Ericsson) <pascal.rapicault@ericsson.com>
Date:   Wed Dec 12 09:57:36 2012 -0500

    Obtain specific profile state properties without locking

commit 1d0f129ca70716e7a181631e1ba0e71f16e35e08
Author: Pascal Rapicault (Ericsson) <pascal.rapicault@ericsson.com>
Date:   Mon Dec 10 16:06:38 2012 -0500

    Remember the timestamp of the base config.ini

commit 3134caecfd244fd88386f3ce4bd1a6fc71fe8007
Author: Pascal Rapicault (Ericsson) <pascal.rapicault@ericsson.com>
Date:   Wed Dec 5 16:21:50 2012 -0500

    Support to ignore the existing profile if the base has changed

commit 7f0ba4e643f40bc0143617b93b2238388d38216d
Author: Pascal Rapicault (Ericsson) <pascal.rapicault@ericsson.com>
Date:   Tue Dec 4 11:23:37 2012 -0500

    Remove externalization warning

1 files changed, 106 insertions, 0 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/SimpleConfiguratorTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/SimpleConfiguratorTest.java
new file mode 100644
index 000000000..0d964ac49
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/SimpleConfiguratorTest.java
@@ -0,0 +1,106 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc. and others. 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: Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.equinox.p2.tests.simpleconfigurator;
+
+import java.io.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Properties;
+import org.eclipse.equinox.internal.simpleconfigurator.SimpleConfiguratorImpl;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
+
+public class SimpleConfiguratorTest extends AbstractProvisioningTest {
+
+	private URL relativeURL;
+	private File userConfiguration;
+	private File masterConfguration;
+	private URL[] sharedConfiguration = new URL[2];
+	private URL[] localConfiguration = new URL[1];
+	private SimpleConfiguratorImpl configurator;
+
+	public void setUp() throws Exception {
+		relativeURL = new URL("file://bundles.info");
+		userConfiguration = getTestData("userConfiguration", "testData/simpleconfigurator/user");
+		sharedConfiguration[0] = userConfiguration.toURL();
+		masterConfguration = getTestData("userConfiguration", "testData/simpleconfigurator/master");
+		sharedConfiguration[1] = masterConfguration.toURL();
+		localConfiguration[0] = sharedConfiguration[1];
+		configurator = getSimpleConfigurator();
+	}
+
+	private SimpleConfiguratorImpl getSimpleConfigurator() {
+		return new SimpleConfiguratorImpl(null, null);
+	}
+
+	private void storeTimestamp(long timestamp) throws IOException {
+		File f = new File(userConfiguration.getParent(), SimpleConfiguratorImpl.BASE_TIMESTAMP_FILE_BUNDLESINFO);
+		Properties p = new Properties();
+		p.put(SimpleConfiguratorImpl.KEY_BUNDLESINFO_TIMESTAMP, "" + timestamp);
+		p.store(new FileWriter(f), "");
+	}
+
+	@Override
+	protected void tearDown() throws Exception {
+		System.setProperty(SimpleConfiguratorImpl.PROP_IGNORE_USER_CONFIGURATION, "false");
+		File f = new File(userConfiguration.getParent(), SimpleConfiguratorImpl.BASE_TIMESTAMP_FILE_BUNDLESINFO);
+		if (f.exists()) {
+			f.delete();
+		}
+		super.tearDown();
+	}
+
+	private void assertIsPropertySet(boolean set) {
+		assertEquals(set, Boolean.TRUE.toString().equalsIgnoreCase(System.getProperty(SimpleConfiguratorImpl.PROP_IGNORE_USER_CONFIGURATION)));
+	}
+
+	public void testSimpleConfiguration() throws MalformedURLException {
+		assertEquals(localConfiguration[0], configurator.chooseConfigurationURL(relativeURL, localConfiguration));
+		assertIsPropertySet(false);
+	}
+
+	public void testNotExistingConfigiration() throws MalformedURLException {
+		assertNull(configurator.chooseConfigurationURL(relativeURL, new URL[] {new File(".", "notexisting").toURL()}));
+		assertIsPropertySet(false);
+	}
+
+	public void testSharedConfigurationUserNotExisting() throws MalformedURLException {
+		sharedConfiguration[0] = new File(".", "notexisting").toURL();
+		assertEquals(sharedConfiguration[1], configurator.chooseConfigurationURL(relativeURL, sharedConfiguration));
+		assertIsPropertySet(false);
+	}
+
+	// no timestamp -> pick user
+	public void testSharedConfigurationNoTimestamp() throws MalformedURLException {
+		assertEquals(sharedConfiguration[0], configurator.chooseConfigurationURL(relativeURL, sharedConfiguration));
+		assertIsPropertySet(false);
+	}
+
+	//master modified -> pick master
+	public void testSharedConfigurationMasterModified() throws IOException {
+		storeTimestamp(1000);
+		assertEquals(sharedConfiguration[1], configurator.chooseConfigurationURL(relativeURL, sharedConfiguration));
+		assertIsPropertySet(true);
+	}
+
+	//master not modified -> pick user
+	public void testSharedConfigurationMasterUnmodified() throws IOException {
+		storeTimestamp(new File(masterConfguration, relativeURL.getFile()).lastModified());
+		assertEquals(sharedConfiguration[0], configurator.chooseConfigurationURL(relativeURL, sharedConfiguration));
+		assertIsPropertySet(false);
+	}
+
+	//master not modified, but property present -> pick master
+	public void testSharedConfigurationMasterUnmodifiedPropertySet() throws IOException {
+		System.setProperty(SimpleConfiguratorImpl.PROP_IGNORE_USER_CONFIGURATION, "true");
+		storeTimestamp(new File(masterConfguration, relativeURL.getFile()).lastModified());
+		assertEquals(sharedConfiguration[1], configurator.chooseConfigurationURL(relativeURL, sharedConfiguration));
+		assertIsPropertySet(true);
+	}
+
+}