Prepare for merging servertools and servertools.tests repos

Signed-off-by: eyuen <eyuen@ca.ibm.com>
diff --git a/tests/org.eclipse.jst.server.core.tests/pom.xml b/tests/org.eclipse.jst.server.core.tests/pom.xml
index 4c3b455..6977722 100644
--- a/tests/org.eclipse.jst.server.core.tests/pom.xml
+++ b/tests/org.eclipse.jst.server.core.tests/pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.servertools</groupId>
-    <artifactId>org.eclipse.webtools.servertools.tests</artifactId>
+    <artifactId>org.eclipse.webtools.servertools</artifactId>
     <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
diff --git a/tests/org.eclipse.jst.server.generic.tests/pom.xml b/tests/org.eclipse.jst.server.generic.tests/pom.xml
index c98912b..6b7b289 100644
--- a/tests/org.eclipse.jst.server.generic.tests/pom.xml
+++ b/tests/org.eclipse.jst.server.generic.tests/pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>

   <parent>

     <groupId>org.eclipse.webtools.servertools</groupId>

-    <artifactId>org.eclipse.webtools.servertools.tests</artifactId>

+    <artifactId>org.eclipse.webtools.servertools</artifactId>

     <version>3.6.0-SNAPSHOT</version>

     <relativePath>../../</relativePath>

   </parent>

diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/pom.xml b/tests/org.eclipse.jst.server.tomcat.core.tests/pom.xml
index 1509fd9..20b8493 100644
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/pom.xml
+++ b/tests/org.eclipse.jst.server.tomcat.core.tests/pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>

   <parent>

     <groupId>org.eclipse.webtools.servertools</groupId>

-    <artifactId>org.eclipse.webtools.servertools.tests</artifactId>

+    <artifactId>org.eclipse.webtools.servertools</artifactId>

     <version>3.6.0-SNAPSHOT</version>

     <relativePath>../../</relativePath>

   </parent>

diff --git a/tests/org.eclipse.jst.server.tomcat.tests.performance/pom.xml b/tests/org.eclipse.jst.server.tomcat.tests.performance/pom.xml
index 1d5f11b..bff2c86 100644
--- a/tests/org.eclipse.jst.server.tomcat.tests.performance/pom.xml
+++ b/tests/org.eclipse.jst.server.tomcat.tests.performance/pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>

   <parent>

     <groupId>org.eclipse.webtools.servertools</groupId>

-    <artifactId>org.eclipse.webtools.servertools.tests</artifactId>

+    <artifactId>org.eclipse.webtools.servertools</artifactId>

     <version>3.6.0-SNAPSHOT</version>

     <relativePath>../../</relativePath>

   </parent>

diff --git a/tests/org.eclipse.jst.server.tomcat.ui.tests/pom.xml b/tests/org.eclipse.jst.server.tomcat.ui.tests/pom.xml
index bbc0e95..648b41c 100644
--- a/tests/org.eclipse.jst.server.tomcat.ui.tests/pom.xml
+++ b/tests/org.eclipse.jst.server.tomcat.ui.tests/pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>

   <parent>

     <groupId>org.eclipse.webtools.servertools</groupId>

-    <artifactId>org.eclipse.webtools.servertools.tests</artifactId>

+    <artifactId>org.eclipse.webtools.servertools</artifactId>

     <version>3.6.0-SNAPSHOT</version>

     <relativePath>../../</relativePath>

   </parent>

diff --git a/tests/org.eclipse.jst.server.ui.tests/pom.xml b/tests/org.eclipse.jst.server.ui.tests/pom.xml
index d0134e7..e4fb04e 100644
--- a/tests/org.eclipse.jst.server.ui.tests/pom.xml
+++ b/tests/org.eclipse.jst.server.ui.tests/pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>

   <parent>

     <groupId>org.eclipse.webtools.servertools</groupId>

-    <artifactId>org.eclipse.webtools.servertools.tests</artifactId>

+    <artifactId>org.eclipse.webtools.servertools</artifactId>

     <version>3.6.0-SNAPSHOT</version>

     <relativePath>../../</relativePath>

   </parent>

diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/pom.xml b/tests/org.eclipse.wst.internet.monitor.core.tests/pom.xml
index f8ff89e..8d1acad 100644
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/pom.xml
+++ b/tests/org.eclipse.wst.internet.monitor.core.tests/pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>

   <parent>

     <groupId>org.eclipse.webtools.servertools</groupId>

-    <artifactId>org.eclipse.webtools.servertools.tests</artifactId>

+    <artifactId>org.eclipse.webtools.servertools</artifactId>

     <version>3.6.0-SNAPSHOT</version>

     <relativePath>../../</relativePath>

   </parent>

diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/pom.xml b/tests/org.eclipse.wst.internet.monitor.ui.tests/pom.xml
index fa5facb..db70d95 100644
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/pom.xml
+++ b/tests/org.eclipse.wst.internet.monitor.ui.tests/pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>

   <parent>

     <groupId>org.eclipse.webtools.servertools</groupId>

-    <artifactId>org.eclipse.webtools.servertools.tests</artifactId>

+    <artifactId>org.eclipse.webtools.servertools</artifactId>

     <version>3.6.0-SNAPSHOT</version>

     <relativePath>../../</relativePath>

   </parent>

diff --git a/tests/org.eclipse.wst.server.core.tests/pom.xml b/tests/org.eclipse.wst.server.core.tests/pom.xml
index bae2a11..6aea2bd 100644
--- a/tests/org.eclipse.wst.server.core.tests/pom.xml
+++ b/tests/org.eclipse.wst.server.core.tests/pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>

   <parent>

     <groupId>org.eclipse.webtools.servertools</groupId>

-    <artifactId>org.eclipse.webtools.servertools.tests</artifactId>

+    <artifactId>org.eclipse.webtools.servertools</artifactId>

     <version>3.6.0-SNAPSHOT</version>

     <relativePath>../../</relativePath>

   </parent>

diff --git a/tests/org.eclipse.wst.server.http.core.tests/pom.xml b/tests/org.eclipse.wst.server.http.core.tests/pom.xml
index 604a610..5e8761d 100644
--- a/tests/org.eclipse.wst.server.http.core.tests/pom.xml
+++ b/tests/org.eclipse.wst.server.http.core.tests/pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>

   <parent>

     <groupId>org.eclipse.webtools.servertools</groupId>

-    <artifactId>org.eclipse.webtools.servertools.tests</artifactId>

+    <artifactId>org.eclipse.webtools.servertools</artifactId>

     <version>3.6.0-SNAPSHOT</version>

     <relativePath>../../</relativePath>

   </parent>

diff --git a/tests/org.eclipse.wst.server.tests.performance/pom.xml b/tests/org.eclipse.wst.server.tests.performance/pom.xml
index 00779de..65ab6bd 100644
--- a/tests/org.eclipse.wst.server.tests.performance/pom.xml
+++ b/tests/org.eclipse.wst.server.tests.performance/pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>

   <parent>

     <groupId>org.eclipse.webtools.servertools</groupId>

-    <artifactId>org.eclipse.webtools.servertools.tests</artifactId>

+    <artifactId>org.eclipse.webtools.servertools</artifactId>

     <version>3.6.0-SNAPSHOT</version>

     <relativePath>../../</relativePath>

   </parent>

diff --git a/tests/org.eclipse.wst.server.ui.tests/pom.xml b/tests/org.eclipse.wst.server.ui.tests/pom.xml
index ffa7acb..477b731 100644
--- a/tests/org.eclipse.wst.server.ui.tests/pom.xml
+++ b/tests/org.eclipse.wst.server.ui.tests/pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.eclipse.webtools.servertools</groupId>
-    <artifactId>org.eclipse.webtools.servertools.tests</artifactId>
+    <artifactId>org.eclipse.webtools.servertools</artifactId>
     <version>3.6.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
diff --git a/tests/org.eclipse.wst.server.util.tests/pom.xml b/tests/org.eclipse.wst.server.util.tests/pom.xml
index 7708222..a17ee24 100644
--- a/tests/org.eclipse.wst.server.util.tests/pom.xml
+++ b/tests/org.eclipse.wst.server.util.tests/pom.xml
@@ -15,7 +15,7 @@
   <modelVersion>4.0.0</modelVersion>

   <parent>

     <groupId>org.eclipse.webtools.servertools</groupId>

-    <artifactId>org.eclipse.webtools.servertools.tests</artifactId>

+    <artifactId>org.eclipse.webtools.servertools</artifactId>

     <version>3.6.0-SNAPSHOT</version>

     <relativePath>../../</relativePath>

   </parent>