20 fix some test issues

Unknow0 · Nov 15, 2023 · acbd886 · acbd886
1 parent 72abf1d
commit acbd886
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 1 deletion.
diff --git a/.github/workflows/bench.yaml b/.github/workflows/bench.yaml
@@ -84,5 +84,9 @@ jobs:
       with:
         name: results-native
         path: out/
+    - uses: actions/download-artifact@v3
+      with:
+        name: results-cxf
+        path: out/
     - name: result
       run: bash bench/result.sh out
diff --git a/unknow-server-test/unknow-server-test-cxf/src/main/java/unknow/server/http/test/CxfRs.java b/unknow-server-test/unknow-server-test-cxf/src/main/java/unknow/server/http/test/CxfRs.java
@@ -21,7 +21,7 @@
 /**
  * @author unknow
  */
-@WebServlet(value = "/*")
+@WebServlet(value = "/rest/*")
 public class CxfRs extends CXFNonSpringJaxrsServlet {
 	private static final long serialVersionUID = 1L;
 

diff --git a/unknow-server-test/unknow-server-test-tomcat/pom.xml b/unknow-server-test/unknow-server-test-tomcat/pom.xml
@@ -8,11 +8,73 @@
 	<artifactId>unknow-server-test-tomcat</artifactId>
 	<packaging>war</packaging>
 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>unknow.server</groupId>
+				<artifactId>unknow-server-maven</artifactId>
+				<version>${project.version}</version>
+				<executions>
+					<execution>
+						<id>jaxrs</id>
+						<goals>
+							<goal>jaxrs-generator</goal>
+						</goals>
+						<phase>generate-sources</phase>
+						<configuration>
+							<basePath>/rest</basePath>
+							<packageName>unknow.server.http.test.generated</packageName>
+							<artifacts>
+								<artifact>${project.groupId}:unknow-server-test-pojo:${project.version}</artifact>
+							</artifacts>
+						</configuration>
+					</execution>
+					<execution>
+						<id>all</id>
+						<goals>
+							<goal>jaxb-generator</goal>
+							<goal>jaxws-generator</goal>
+						</goals>
+						<phase>generate-sources</phase>
+						<configuration>
+							<addAccessLog>false</addAccessLog>
+							<packageName>unknow.server.http.test.generated</packageName>
+							<!--sessionFactory>bla</sessionFactory-->
+							<artifacts>
+								<artifact>${project.groupId}:unknow-server-test-pojo:${project.version}</artifact>
+							</artifacts>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>unknow-server-test-pojo</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>unknow-server-jaxb</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>unknow-server-jaxws</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>unknow-server-jaxrs</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+			<artifactId>jackson-jakarta-rs-json-provider</artifactId>
+		</dependency>
 	</dependencies>
 </project>