[309834] WTP 3.2 releng fixes for URI resolver and Internet cache
diff --git a/tests/org.eclipse.wst.common.tests.validation.guard/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.common.tests.validation.guard/META-INF/MANIFEST.MF
index 4d5fefe..4bbfa9f 100644
--- a/tests/org.eclipse.wst.common.tests.validation.guard/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.common.tests.validation.guard/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.wst.common.tests.validation.guard;singleton:=true
-Bundle-Version: 1.0.2.qualifier
+Bundle-Version: 1.0.200.qualifier
Bundle-Activator: org.eclipse.wst.common.tests.validation.guard.Activator
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.eclipse.core.runtime,
diff --git a/tests/org.eclipse.wst.common.tests.validation.guard/about.html b/tests/org.eclipse.wst.common.tests.validation.guard/about.html
new file mode 100644
index 0000000..2199df3
--- /dev/null
+++ b/tests/org.eclipse.wst.common.tests.validation.guard/about.html
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<HTML>
+
+<head>
+<title>About</title>
+<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+</head>
+
+<BODY lang="EN-US">
+
+<H3>About This Content</H3>
+
+<P>June, 2008</P>
+
+<H3>License</H3>
+
+<P>The Eclipse Foundation makes available all content in this plug-in
+("Content"). Unless otherwise indicated below, the Content is provided to you
+under the terms and conditions of the Eclipse Public License Version 1.0
+("EPL"). A copy of the EPL is available at
+<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
+For purposes of the EPL, "Program" will mean the Content.</P>
+
+<P>If you did not receive this Content directly from the Eclipse Foundation, the
+Content is being redistributed by another party ("Redistributor") and different
+terms and conditions may apply to your use of any object code in the Content.
+Check the Redistributors license that was provided with the Content. If no such
+license exists, contact the Redistributor. Unless otherwise indicated below, the
+terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at
+<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
+
+</BODY>
+</HTML>
diff --git a/tests/org.eclipse.wst.common.uriresolver.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.common.uriresolver.tests/META-INF/MANIFEST.MF
index 3af8f4e..81966b2 100644
--- a/tests/org.eclipse.wst.common.uriresolver.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.common.uriresolver.tests/META-INF/MANIFEST.MF
@@ -7,6 +7,6 @@
Require-Bundle: org.eclipse.wst.common.uriresolver,
org.junit,
org.eclipse.core.resources
-Bundle-Vendor: %Bundle-Vendor
+Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.eclipse.wst.common.uriresolver.tests,
org.eclipse.wst.common.uriresolver.tests.util
diff --git a/tests/org.eclipse.wst.common.uriresolver.tests/build.properties b/tests/org.eclipse.wst.common.uriresolver.tests/build.properties
index 3e5f9ad..e453a5a 100644
--- a/tests/org.eclipse.wst.common.uriresolver.tests/build.properties
+++ b/tests/org.eclipse.wst.common.uriresolver.tests/build.properties
@@ -3,4 +3,5 @@
bin.includes = META-INF/,\
.,\
plugin.xml,\
- OSGI-INF/
+ OSGI-INF/,\
+ plugin.properties
diff --git a/tests/org.eclipse.wst.common.uriresolver.tests/plugin.properties b/tests/org.eclipse.wst.common.uriresolver.tests/plugin.properties
new file mode 100644
index 0000000..051b5d3
--- /dev/null
+++ b/tests/org.eclipse.wst.common.uriresolver.tests/plugin.properties
@@ -0,0 +1,13 @@
+###############################################################################
+# Copyright (c) 2010 IBM Corporation 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:
+# IBM Corporation - initial API and implementation
+###############################################################################
+
+Bundle-Vendor.0 = Eclipse Web Tools Platform
+Bundle-Name.0 = URI Resolver Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.common.uriresolver.tests/src/org/eclipse/wst/common/uriresolver/tests/AllTests.java b/tests/org.eclipse.wst.common.uriresolver.tests/src/org/eclipse/wst/common/uriresolver/tests/AllTests.java
index f63b20f..4741d5a 100644
--- a/tests/org.eclipse.wst.common.uriresolver.tests/src/org/eclipse/wst/common/uriresolver/tests/AllTests.java
+++ b/tests/org.eclipse.wst.common.uriresolver.tests/src/org/eclipse/wst/common/uriresolver/tests/AllTests.java
@@ -1,7 +1,5 @@
package org.eclipse.wst.common.uriresolver.tests;
-import org.eclipse.wst.common.uriresolver.internal.ExtensibleURIResolver;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
diff --git a/tests/org.eclipse.wst.common.uriresolver.tests/src/org/eclipse/wst/common/uriresolver/tests/ExtensibleURIResolverTest.java b/tests/org.eclipse.wst.common.uriresolver.tests/src/org/eclipse/wst/common/uriresolver/tests/ExtensibleURIResolverTest.java
index a5bde76..728f962 100644
--- a/tests/org.eclipse.wst.common.uriresolver.tests/src/org/eclipse/wst/common/uriresolver/tests/ExtensibleURIResolverTest.java
+++ b/tests/org.eclipse.wst.common.uriresolver.tests/src/org/eclipse/wst/common/uriresolver/tests/ExtensibleURIResolverTest.java
@@ -11,16 +11,14 @@
*******************************************************************************/
package org.eclipse.wst.common.uriresolver.tests;
+import junit.framework.TestCase;
+
import org.eclipse.wst.common.uriresolver.internal.ExtensibleURIResolver;
import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
import org.eclipse.wst.common.uriresolver.tests.util.AuxiliaryCounter;
import org.eclipse.wst.common.uriresolver.tests.util.ResolverExtensionForText;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
public class ExtensibleURIResolverTest extends TestCase {
diff --git a/tests/org.eclipse.wst.internet.cache.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.internet.cache.tests/META-INF/MANIFEST.MF
index c289649..8533a9a 100644
--- a/tests/org.eclipse.wst.internet.cache.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.internet.cache.tests/META-INF/MANIFEST.MF
@@ -1,8 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
+Bundle-Vendor: %Bundle-Vendor.0
Bundle-SymbolicName: org.eclipse.wst.internet.cache.tests
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.0.100.qualifier
Bundle-ClassPath: tests.jar
Bundle-Activator: org.eclipse.wst.internet.cache.tests.internal.CacheTestsPlugin
Bundle-Localization: plugin
diff --git a/tests/org.eclipse.wst.internet.cache.tests/plugin.properties b/tests/org.eclipse.wst.internet.cache.tests/plugin.properties
index 6ee48b6..ddf19d2 100644
--- a/tests/org.eclipse.wst.internet.cache.tests/plugin.properties
+++ b/tests/org.eclipse.wst.internet.cache.tests/plugin.properties
@@ -1,3 +1,13 @@
-# properties file for org.eclipse.wst.internet.cache.tests
-Bundle-Vendor.0 = Eclipse
+###############################################################################
+# Copyright (c) 2001, 2010 IBM Corporation 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:
+# IBM Corporation - initial API and implementation
+###############################################################################
+
+Bundle-Vendor.0 = Eclipse Web Tools Platform
Bundle-Name.0 = Cache Tests Plug-in
\ No newline at end of file