From 402d756ea5806e07d4322cf01a623b9e18166150 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Tue, 29 Jan 2019 10:29:38 +1100
Subject: [PATCH] rename websocket-tests module to jetty-websocket-tests

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 .../pom.xml                                   | 111 +++++++++---------
 .../websocket/tests/JettyWebsocketTest.java   |   0
 .../tests/WebSocketServletExamplesTest.java   |   0
 .../tests/examples/MyAdvancedEchoCreator.java |   0
 .../tests/examples/MyAdvancedEchoServlet.java |   0
 .../tests/examples/MyAuthedCreator.java       |   0
 .../tests/examples/MyAuthedServlet.java       |   0
 .../tests/examples/MyBinaryEchoSocket.java    |   0
 .../tests/examples/MyEchoServlet.java         |   0
 .../tests/examples/MyEchoSocket.java          |   0
 .../test/resources/jetty-logging.properties   |   0
 jetty-websocket/pom.xml                       |   2 +-
 12 files changed, 57 insertions(+), 56 deletions(-)
 rename jetty-websocket/{websocket-tests => jetty-websocket-tests}/pom.xml (50%)
 rename jetty-websocket/{websocket-tests => jetty-websocket-tests}/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebsocketTest.java (100%)
 rename jetty-websocket/{websocket-tests => jetty-websocket-tests}/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketServletExamplesTest.java (100%)
 rename jetty-websocket/{websocket-tests => jetty-websocket-tests}/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoCreator.java (100%)
 rename jetty-websocket/{websocket-tests => jetty-websocket-tests}/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoServlet.java (100%)
 rename jetty-websocket/{websocket-tests => jetty-websocket-tests}/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAuthedCreator.java (100%)
 rename jetty-websocket/{websocket-tests => jetty-websocket-tests}/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAuthedServlet.java (100%)
 rename jetty-websocket/{websocket-tests => jetty-websocket-tests}/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyBinaryEchoSocket.java (100%)
 rename jetty-websocket/{websocket-tests => jetty-websocket-tests}/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoServlet.java (100%)
 rename jetty-websocket/{websocket-tests => jetty-websocket-tests}/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoSocket.java (100%)
 rename jetty-websocket/{websocket-tests => jetty-websocket-tests}/src/test/resources/jetty-logging.properties (100%)

diff --git a/jetty-websocket/websocket-tests/pom.xml b/jetty-websocket/jetty-websocket-tests/pom.xml
similarity index 50%
rename from jetty-websocket/websocket-tests/pom.xml
rename to jetty-websocket/jetty-websocket-tests/pom.xml
index 41d155b96f3..f39c2d6e406 100644
--- a/jetty-websocket/websocket-tests/pom.xml
+++ b/jetty-websocket/jetty-websocket-tests/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.eclipse.jetty.websocket</groupId>
@@ -7,15 +8,15 @@
     <version>10.0.0-SNAPSHOT</version>
   </parent>
 
-  <modelVersion>4.0.0</modelVersion>
+   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-websocket-tests</artifactId>
-  <name>Jetty :: Websocket :: Tests</name>
+  <name>Jetty :: Websocket :: org.eclipse.jetty.websocket :: Tests</name>
 
-  <properties>
-    <bundle-symbolic-name>${project.groupId}.tests</bundle-symbolic-name>
+   <properties>
+    <bundle-symbolic-name>${project.groupId}.jetty.tests</bundle-symbolic-name>
   </properties>
 
-  <dependencies>
+   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>jetty-websocket-api</artifactId>
@@ -23,54 +24,66 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-server</artifactId>
+      <artifactId>jetty-websocket-client</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-client</artifactId>
+      <artifactId>jetty-websocket-server</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-annotations</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>${project.version}</version>
+      <classifier>tests</classifier>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.2.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.25</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
       <artifactId>jetty-test-helper</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-core</artifactId>
+      <version>${project.version}</version>
+      <classifier>tests</classifier>
     </dependency>
   </dependencies>
 
-  <build>
+   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>artifact-jars</id>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
         <executions>
-          <execution>
-            <id>ban-ws-apis</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <bannedDependencies>
-                  <includes>
-                    <include>org.eclipse.jetty.websocket:jetty-websocket-api</include>
-                    <include>javax.websocket</include>
-                  </includes>
-                </bannedDependencies>
-              </rules>
-            </configuration>
-          </execution>
           <execution>
             <id>ban-java-servlet-api</id>
             <goals>
@@ -93,25 +106,13 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <executions>
-          <execution>
-            <goals>
-              <goal>manifest</goal>
-            </goals>
-            <configuration>
-              <instructions>
-                <Bundle-Description>javax.websocket.servlet Implementation</Bundle-Description>
-                <Export-Package>
-                  org.eclipse.jetty.websocket.servlet.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
-                </Export-Package>
-              </instructions>
-            </configuration>
-          </execution>
-        </executions>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
       </plugin>
     </plugins>
   </build>
 </project>
+
diff --git a/jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebsocketTest.java b/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebsocketTest.java
similarity index 100%
rename from jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebsocketTest.java
rename to jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/JettyWebsocketTest.java
diff --git a/jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketServletExamplesTest.java b/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketServletExamplesTest.java
similarity index 100%
rename from jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketServletExamplesTest.java
rename to jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/WebSocketServletExamplesTest.java
diff --git a/jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoCreator.java b/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoCreator.java
similarity index 100%
rename from jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoCreator.java
rename to jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoCreator.java
diff --git a/jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoServlet.java b/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoServlet.java
similarity index 100%
rename from jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoServlet.java
rename to jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAdvancedEchoServlet.java
diff --git a/jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAuthedCreator.java b/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAuthedCreator.java
similarity index 100%
rename from jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAuthedCreator.java
rename to jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAuthedCreator.java
diff --git a/jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAuthedServlet.java b/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAuthedServlet.java
similarity index 100%
rename from jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAuthedServlet.java
rename to jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyAuthedServlet.java
diff --git a/jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyBinaryEchoSocket.java b/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyBinaryEchoSocket.java
similarity index 100%
rename from jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyBinaryEchoSocket.java
rename to jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyBinaryEchoSocket.java
diff --git a/jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoServlet.java b/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoServlet.java
similarity index 100%
rename from jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoServlet.java
rename to jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoServlet.java
diff --git a/jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoSocket.java b/jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoSocket.java
similarity index 100%
rename from jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoSocket.java
rename to jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/examples/MyEchoSocket.java
diff --git a/jetty-websocket/websocket-tests/src/test/resources/jetty-logging.properties b/jetty-websocket/jetty-websocket-tests/src/test/resources/jetty-logging.properties
similarity index 100%
rename from jetty-websocket/websocket-tests/src/test/resources/jetty-logging.properties
rename to jetty-websocket/jetty-websocket-tests/src/test/resources/jetty-logging.properties
diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml
index c4dd30cd7df..23e1a5b1a44 100644
--- a/jetty-websocket/pom.xml
+++ b/jetty-websocket/pom.xml
@@ -17,12 +17,12 @@
   <modules>
     <module>websocket-core</module>
     <module>websocket-servlet</module>
-    <module>websocket-tests</module>
     <!-- Jetty WebSocket Implementation -->
     <module>jetty-websocket-api</module>
     <module>jetty-websocket-common</module>
     <module>jetty-websocket-client</module>
     <module>jetty-websocket-server</module>
+    <module>jetty-websocket-tests</module>
     <!-- Javax WebSocket Implementation -->
     <module>javax-websocket-common</module>
     <module>javax-websocket-client</module>