Bug 416565 - p2 shared install test failures

This commit rebuilds internal test repository containing verifier
application, and makes further rebuilds easier by providing complete
sources of a repository projects that can be build immediately after
checkout.

Change-Id: Iea19e78024ec65dfe24c4e7e21932b016531f3b9
Signed-off-by: Krzysztof Daniel <kdaniel@redhat.com>

23 files changed, 72 insertions, 4 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/artifacts.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/artifacts.jar
index e4c6ba919..711c98b92 100644
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/artifacts.jar
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/artifacts.jar
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/content.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/content.jar
index c4f2050ac..36decf23b 100644
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/content.jar
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/content.jar
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201309272034.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201309272034.jar
deleted file mode 100644
index 186ac6144..000000000
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201309272034.jar
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201310141350.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201310141350.jar
new file mode 100644
index 000000000..b55d00b24
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/Verifier_1.0.0.201310141350.jar
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201309272034.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201309272034.jar
deleted file mode 100644
index 35d3aad0f..000000000
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201309272034.jar
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201310141350.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201310141350.jar
new file mode 100644
index 000000000..08f32afd2
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature1_1.0.0.201310141350.jar
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201309272034.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201309272034.jar
deleted file mode 100644
index 243b7fb89..000000000
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201309272034.jar
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201310141350.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201310141350.jar
new file mode 100644
index 000000000..a3adfb67b
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/features/p2TestFeature2_1.0.0.201310141350.jar
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.1.0.201309272034.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.1.0.201309272034.jar
deleted file mode 100644
index 0dab386c1..000000000
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.1.0.201309272034.jar
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.1.0.201310141350.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.1.0.201310141350.jar
new file mode 100644
index 000000000..b1b19eefd
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/org.eclipse.equinox.p2.tests.verifier_1.1.0.201310141350.jar
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201309272034.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201309272034.jar
deleted file mode 100644
index f6bf4dcca..000000000
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201309272034.jar
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201310141350.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201310141350.jar
new file mode 100644
index 000000000..a869298fb
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle1_1.0.0.201310141350.jar
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201309272034.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201309272034.jar
deleted file mode 100644
index a4ac9a6a9..000000000
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201309272034.jar
+++ /dev/null
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201310141350.jar b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201310141350.jar
new file mode 100644
index 000000000..ae9c676f2
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/plugins/p2TestBundle2_1.0.0.201310141350.jar
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/readme.txt b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/readme.txt
index 237255145..aa70f28b2 100644
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/readme.txt
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/repo/readme.txt
@@ -2,4 +2,7 @@ This repository is used by the SharedInstallEnd2End test.
 It contains two dummy bundles installable by two dummy features. Those are just used to install content into the base or the user install.
 It also contains the code of the p2 verifier bundle wrapped by a feature to make it easily installable. 
 
-The source code is available in the folder called source sibling of the folder containing this file.
\ No newline at end of file
+The source code is available in the folder called source sibling of the folder containing this file.
+
+Detailed instructions how to build the repository are located next to the test source,
+in a README.txt file located in bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/.
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/Verifier/.project b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/Verifier/.project
new file mode 100644
index 000000000..e2ad03273
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/Verifier/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>verifier_feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/Verifier/build.properties b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/Verifier/build.properties
new file mode 100644
index 000000000..64f93a9f0
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/Verifier/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/Verifier/feature.xml b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/Verifier/feature.xml
new file mode 100644
index 000000000..fc4308dcd
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/Verifier/feature.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="Verifier"
+      label="Verifier feature"
+      version="1.0.0.qualifier">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <plugin
+         id="org.eclipse.equinox.p2.tests.verifier"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/p2TestBundle1/src/directoryplaceholder.txt b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/p2TestBundle1/src/directoryplaceholder.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/p2TestBundle1/src/directoryplaceholder.txt
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/p2TestBundle2/src/directoryplaceholder.txt b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/p2TestBundle2/src/directoryplaceholder.txt
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/p2TestBundle2/src/directoryplaceholder.txt
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/.gitignore b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/.gitignore
new file mode 100644
index 000000000..bb8f6dcf2
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/.gitignore
@@ -0,0 +1,4 @@
+features
+plugins
+artifacts.jar
+content.jar
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/.project b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/.project
new file mode 100644
index 000000000..4386b9207
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>site</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.UpdateSiteBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.UpdateSiteNature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/site.xml b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/site.xml
index 0befa6292..41c966787 100644
--- a/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/site.xml
+++ b/bundles/org.eclipse.equinox.p2.tests/testData/sharedInstall/source/site/site.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/Verifier_1.0.0.201304051618.jar" id="Verifier" version="1.0.0.201304051618">
+   <feature url="features/Verifier_0.0.0.jar" id="Verifier" version="0.0.0">
       <category name="c1"/>
    </feature>
-   <feature url="features/p2TestFeature1_1.0.0.201304051618.jar" id="p2TestFeature1" version="1.0.0.201304051618">
+   <feature url="features/p2TestFeature1_0.0.0.jar" id="p2TestFeature1" version="0.0.0">
       <category name="c1"/>
    </feature>
-   <feature url="features/p2TestFeature2_1.0.0.201304051618.jar" id="p2TestFeature2" version="1.0.0.201304051618">
+   <feature url="features/p2TestFeature2_0.0.0.jar" id="p2TestFeature2" version="0.0.0">
       <category name="c1"/>
    </feature>
    <category-def name="c1" label="c1"/>