Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2011-11-15 11:47:10 -0500
committerThomas Watson2011-11-15 11:47:10 -0500
commit08eef7fc562968530312ced2d25b4937718b5451 (patch)
treeb1543101af383da75aa7592ea4ba481c384fa46c /bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test
parent6299155b2708b26f4b36084d7c67a9cdca977e86 (diff)
parent5a42c6ea2f82c3769228b69b3b1e4d706e0f0f4e (diff)
downloadrt.equinox.framework-08eef7fc562968530312ced2d25b4937718b5451.tar.gz
rt.equinox.framework-08eef7fc562968530312ced2d25b4937718b5451.tar.xz
rt.equinox.framework-08eef7fc562968530312ced2d25b4937718b5451.zip
Merge branch 'R3_6_maintenance' into R3_6_maintenance_Java7R36x_v20111115-1500
Conflicts: bundles/org.eclipse.osgi.tests/.gitignore bundles/org.eclipse.osgi/.gitignore
Diffstat (limited to 'bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test')
-rw-r--r--bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/META-INF/MANIFEST.MF5
-rw-r--r--bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/file1.txt1
-rw-r--r--bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/file2.txt1
-rw-r--r--bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/file1.txt1
-rw-r--r--bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/file2.txt1
-rw-r--r--bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/paren(1
-rw-r--r--bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/paren(.txt1
-rw-r--r--bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/paren)1
-rw-r--r--bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/paren).txt1
-rw-r--r--bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/plugin.xml4
10 files changed, 17 insertions, 0 deletions
diff --git a/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..a7adf220c
--- /dev/null
+++ b/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: test
+Bundle-SymbolicName: bundle.resource.test
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/file1.txt b/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/file1.txt
new file mode 100644
index 000000000..8d043451c
--- /dev/null
+++ b/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/file1.txt
@@ -0,0 +1 @@
+Test Content \ No newline at end of file
diff --git a/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/file2.txt b/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/file2.txt
new file mode 100644
index 000000000..8d043451c
--- /dev/null
+++ b/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/file2.txt
@@ -0,0 +1 @@
+Test Content \ No newline at end of file
diff --git a/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/file1.txt b/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/file1.txt
new file mode 100644
index 000000000..8d043451c
--- /dev/null
+++ b/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/file1.txt
@@ -0,0 +1 @@
+Test Content \ No newline at end of file
diff --git a/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/file2.txt b/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/file2.txt
new file mode 100644
index 000000000..8d043451c
--- /dev/null
+++ b/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/file2.txt
@@ -0,0 +1 @@
+Test Content \ No newline at end of file
diff --git a/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/paren( b/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/paren(
new file mode 100644
index 000000000..8d043451c
--- /dev/null
+++ b/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/paren(
@@ -0,0 +1 @@
+Test Content \ No newline at end of file
diff --git a/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/paren(.txt b/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/paren(.txt
new file mode 100644
index 000000000..8d043451c
--- /dev/null
+++ b/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/paren(.txt
@@ -0,0 +1 @@
+Test Content \ No newline at end of file
diff --git a/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/paren) b/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/paren)
new file mode 100644
index 000000000..8d043451c
--- /dev/null
+++ b/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/paren)
@@ -0,0 +1 @@
+Test Content \ No newline at end of file
diff --git a/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/paren).txt b/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/paren).txt
new file mode 100644
index 000000000..8d043451c
--- /dev/null
+++ b/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/folder/paren).txt
@@ -0,0 +1 @@
+Test Content \ No newline at end of file
diff --git a/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/plugin.xml b/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/plugin.xml
new file mode 100644
index 000000000..40a35562f
--- /dev/null
+++ b/bundles/org.eclipse.osgi.tests/test_files/resourcetests/bundles/test/plugin.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+</plugin>

Back to the top