Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2015-03-26 00:23:23 +0000
committerJoakim Erdfelt2015-03-26 00:23:23 +0000
commitea8a0f0e9affc53098031aa23547a1515d98d038 (patch)
tree75f5014077548db30ba7a414d4b0684ac117dcd5
parent739b6c9556ee736638d7c876519800284ff6d764 (diff)
downloadorg.eclipse.jetty.project-ea8a0f0e9affc53098031aa23547a1515d98d038.tar.gz
org.eclipse.jetty.project-ea8a0f0e9affc53098031aa23547a1515d98d038.tar.xz
org.eclipse.jetty.project-ea8a0f0e9affc53098031aa23547a1515d98d038.zip
Moving CDI tests into /jetty-cdi/ tree
-rw-r--r--jetty-cdi/pom.xml4
-rw-r--r--jetty-cdi/test-cdi-it/pom.xml (renamed from tests/test-cdi/cdi-webapp-it/pom.xml)20
-rw-r--r--jetty-cdi/test-cdi-it/src/test/java/org/eclipse/jetty/tests/HelloIT.java (renamed from tests/test-cdi/cdi-webapp-it/src/test/java/org/eclipse/jetty/tests/HelloIT.java)0
-rw-r--r--jetty-cdi/test-cdi-it/src/test/java/org/eclipse/jetty/tests/ServerInfoIT.java (renamed from tests/test-cdi/cdi-webapp-it/src/test/java/org/eclipse/jetty/tests/ServerInfoIT.java)0
-rw-r--r--jetty-cdi/test-cdi-it/src/test/java/org/eclipse/jetty/tests/ws/SessionInfoIT.java (renamed from tests/test-cdi/cdi-webapp-it/src/test/java/org/eclipse/jetty/tests/ws/SessionInfoIT.java)0
-rw-r--r--jetty-cdi/test-cdi-it/src/test/resources/jetty-logging.properties (renamed from tests/test-cdi/cdi-webapp-it/src/test/resources/jetty-logging.properties)0
-rwxr-xr-xjetty-cdi/test-cdi-it/src/test/scripts/setup-jetty.sh (renamed from tests/test-cdi/cdi-webapp-it/src/test/scripts/setup-jetty.sh)0
-rwxr-xr-xjetty-cdi/test-cdi-it/src/test/scripts/start-jetty.sh (renamed from tests/test-cdi/cdi-webapp-it/src/test/scripts/start-jetty.sh)0
-rwxr-xr-xjetty-cdi/test-cdi-it/src/test/scripts/stop-jetty.sh (renamed from tests/test-cdi/cdi-webapp-it/src/test/scripts/stop-jetty.sh)0
-rw-r--r--jetty-cdi/test-cdi-webapp/pom.xml (renamed from tests/test-cdi/cdi-webapp/pom.xml)46
-rw-r--r--jetty-cdi/test-cdi-webapp/src/assembly/with-weld.xml31
-rw-r--r--jetty-cdi/test-cdi-webapp/src/main/java/org/eclipse/jetty/tests/HelloServlet.java (renamed from tests/test-cdi/cdi-webapp/src/main/java/org/eclipse/jetty/tests/HelloServlet.java)0
-rw-r--r--jetty-cdi/test-cdi-webapp/src/main/java/org/eclipse/jetty/tests/ServerInfoServlet.java (renamed from tests/test-cdi/cdi-webapp/src/main/java/org/eclipse/jetty/tests/ServerInfoServlet.java)0
-rw-r--r--jetty-cdi/test-cdi-webapp/src/main/java/org/eclipse/jetty/tests/logging/JULog.java (renamed from tests/test-cdi/cdi-webapp/src/main/java/org/eclipse/jetty/tests/logging/JULog.java)0
-rw-r--r--jetty-cdi/test-cdi-webapp/src/main/java/org/eclipse/jetty/tests/logging/JULogFactory.java (renamed from tests/test-cdi/cdi-webapp/src/main/java/org/eclipse/jetty/tests/logging/JULogFactory.java)0
-rw-r--r--jetty-cdi/test-cdi-webapp/src/main/java/org/eclipse/jetty/tests/ws/SessionInfoSocket.java (renamed from tests/test-cdi/cdi-webapp/src/main/java/org/eclipse/jetty/tests/ws/SessionInfoSocket.java)0
-rw-r--r--jetty-cdi/test-cdi-webapp/src/main/webapp/WEB-INF/beans.xml (renamed from tests/test-cdi/cdi-webapp/src/main/webapp/WEB-INF/beans.xml)0
-rw-r--r--jetty-cdi/test-cdi-webapp/src/main/webapp/WEB-INF/web.xml (renamed from tests/test-cdi/cdi-webapp/src/main/webapp/WEB-INF/web.xml)0
-rw-r--r--tests/test-cdi/cdi-client/pom.xml37
-rw-r--r--tests/test-cdi/pom.xml35
20 files changed, 87 insertions, 86 deletions
diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml
index da858ba064..7e260df39f 100644
--- a/jetty-cdi/pom.xml
+++ b/jetty-cdi/pom.xml
@@ -18,5 +18,9 @@
<module>cdi-core</module>
<module>cdi-servlet</module>
<module>cdi-websocket</module>
+ <module>test-cdi-webapp</module>
+ <!-- needs to be fixed still
+ <module>test-cdi-it</module>
+ -->
</modules>
</project>
diff --git a/tests/test-cdi/cdi-webapp-it/pom.xml b/jetty-cdi/test-cdi-it/pom.xml
index 465cd06a41..160bdb00b9 100644
--- a/tests/test-cdi/cdi-webapp-it/pom.xml
+++ b/jetty-cdi/test-cdi-it/pom.xml
@@ -19,14 +19,14 @@
<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.tests</groupId>
- <artifactId>test-cdi-parent</artifactId>
+ <groupId>org.eclipse.jetty.cdi</groupId>
+ <artifactId>jetty-cdi-parent</artifactId>
<version>9.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cdi-webapp-it</artifactId>
<packaging>jar</packaging>
- <name>Jetty Tests :: CDI :: WebApp Integration Tests</name>
+ <name>Jetty :: CDI :: Test :: WebApp Integration Tests</name>
<url>http://www.eclipse.org/jetty</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -45,8 +45,8 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty.tests</groupId>
- <artifactId>cdi-webapp</artifactId>
+ <groupId>org.eclipse.jetty.cdi</groupId>
+ <artifactId>test-cdi-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
<scope>runtime</scope>
@@ -61,6 +61,14 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <!-- DO NOT DEPLOY (or Release) -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
@@ -70,7 +78,7 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <includeArtifactIds>cdi-webapp</includeArtifactIds>
+ <includeArtifactIds>test-cdi-webapp</includeArtifactIds>
<includeScope>runtime</includeScope>
<includeTypes>war</includeTypes>
<overwriteSnapshots>true</overwriteSnapshots>
diff --git a/tests/test-cdi/cdi-webapp-it/src/test/java/org/eclipse/jetty/tests/HelloIT.java b/jetty-cdi/test-cdi-it/src/test/java/org/eclipse/jetty/tests/HelloIT.java
index 72a9c525e3..72a9c525e3 100644
--- a/tests/test-cdi/cdi-webapp-it/src/test/java/org/eclipse/jetty/tests/HelloIT.java
+++ b/jetty-cdi/test-cdi-it/src/test/java/org/eclipse/jetty/tests/HelloIT.java
diff --git a/tests/test-cdi/cdi-webapp-it/src/test/java/org/eclipse/jetty/tests/ServerInfoIT.java b/jetty-cdi/test-cdi-it/src/test/java/org/eclipse/jetty/tests/ServerInfoIT.java
index 6357812732..6357812732 100644
--- a/tests/test-cdi/cdi-webapp-it/src/test/java/org/eclipse/jetty/tests/ServerInfoIT.java
+++ b/jetty-cdi/test-cdi-it/src/test/java/org/eclipse/jetty/tests/ServerInfoIT.java
diff --git a/tests/test-cdi/cdi-webapp-it/src/test/java/org/eclipse/jetty/tests/ws/SessionInfoIT.java b/jetty-cdi/test-cdi-it/src/test/java/org/eclipse/jetty/tests/ws/SessionInfoIT.java
index 719dcd4df5..719dcd4df5 100644
--- a/tests/test-cdi/cdi-webapp-it/src/test/java/org/eclipse/jetty/tests/ws/SessionInfoIT.java
+++ b/jetty-cdi/test-cdi-it/src/test/java/org/eclipse/jetty/tests/ws/SessionInfoIT.java
diff --git a/tests/test-cdi/cdi-webapp-it/src/test/resources/jetty-logging.properties b/jetty-cdi/test-cdi-it/src/test/resources/jetty-logging.properties
index a3e0efd35f..a3e0efd35f 100644
--- a/tests/test-cdi/cdi-webapp-it/src/test/resources/jetty-logging.properties
+++ b/jetty-cdi/test-cdi-it/src/test/resources/jetty-logging.properties
diff --git a/tests/test-cdi/cdi-webapp-it/src/test/scripts/setup-jetty.sh b/jetty-cdi/test-cdi-it/src/test/scripts/setup-jetty.sh
index 3dc240f073..3dc240f073 100755
--- a/tests/test-cdi/cdi-webapp-it/src/test/scripts/setup-jetty.sh
+++ b/jetty-cdi/test-cdi-it/src/test/scripts/setup-jetty.sh
diff --git a/tests/test-cdi/cdi-webapp-it/src/test/scripts/start-jetty.sh b/jetty-cdi/test-cdi-it/src/test/scripts/start-jetty.sh
index 1d0f9eb89c..1d0f9eb89c 100755
--- a/tests/test-cdi/cdi-webapp-it/src/test/scripts/start-jetty.sh
+++ b/jetty-cdi/test-cdi-it/src/test/scripts/start-jetty.sh
diff --git a/tests/test-cdi/cdi-webapp-it/src/test/scripts/stop-jetty.sh b/jetty-cdi/test-cdi-it/src/test/scripts/stop-jetty.sh
index 32e4077490..32e4077490 100755
--- a/tests/test-cdi/cdi-webapp-it/src/test/scripts/stop-jetty.sh
+++ b/jetty-cdi/test-cdi-it/src/test/scripts/stop-jetty.sh
diff --git a/tests/test-cdi/cdi-webapp/pom.xml b/jetty-cdi/test-cdi-webapp/pom.xml
index b1580b9f5f..15ca5299f3 100644
--- a/tests/test-cdi/cdi-webapp/pom.xml
+++ b/jetty-cdi/test-cdi-webapp/pom.xml
@@ -19,18 +19,18 @@
<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.tests</groupId>
- <artifactId>test-cdi-parent</artifactId>
+ <groupId>org.eclipse.jetty.cdi</groupId>
+ <artifactId>jetty-cdi-parent</artifactId>
<version>9.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>cdi-webapp</artifactId>
+ <artifactId>test-cdi-webapp</artifactId>
<packaging>war</packaging>
- <name>Jetty Tests :: CDI :: WebApp</name>
+ <name>Jetty :: CDI :: Test :: WebApp</name>
<url>http://www.eclipse.org/jetty</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <bundle-symbolic-name>${project.groupId}.cdi.webapp</bundle-symbolic-name>
+ <bundle-symbolic-name>${project.groupId}.cdi.webapp.noweld</bundle-symbolic-name>
</properties>
<dependencies>
<dependency>
@@ -50,12 +50,42 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.websocket</groupId>
- <artifactId>javax.websocket-api</artifactId>
- <scope>provided</scope>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
+ <version>${weld.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
<build>
<finalName>cdi-webapp</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <!-- DO NOT DEPLOY (or Release) -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.5.3</version>
+ <executions>
+ <execution>
+ <id>with-weld</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/with-weld.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/jetty-cdi/test-cdi-webapp/src/assembly/with-weld.xml b/jetty-cdi/test-cdi-webapp/src/assembly/with-weld.xml
new file mode 100644
index 0000000000..ca1747115d
--- /dev/null
+++ b/jetty-cdi/test-cdi-webapp/src/assembly/with-weld.xml
@@ -0,0 +1,31 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>with-weld</id>
+ <formats>
+ <format>war</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/src/main/webapp</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.outputDirectory}</directory>
+ <outputDirectory>/WEB-INF/classes</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/WEB-INF/lib</outputDirectory>
+ <useProjectArtifact>true</useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>test</scope>
+ <includes>
+ <include>*:cdi-api</include>
+ <include>*:weld-servlet</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
diff --git a/tests/test-cdi/cdi-webapp/src/main/java/org/eclipse/jetty/tests/HelloServlet.java b/jetty-cdi/test-cdi-webapp/src/main/java/org/eclipse/jetty/tests/HelloServlet.java
index 489d7ce9e6..489d7ce9e6 100644
--- a/tests/test-cdi/cdi-webapp/src/main/java/org/eclipse/jetty/tests/HelloServlet.java
+++ b/jetty-cdi/test-cdi-webapp/src/main/java/org/eclipse/jetty/tests/HelloServlet.java
diff --git a/tests/test-cdi/cdi-webapp/src/main/java/org/eclipse/jetty/tests/ServerInfoServlet.java b/jetty-cdi/test-cdi-webapp/src/main/java/org/eclipse/jetty/tests/ServerInfoServlet.java
index fe4dd1c567..fe4dd1c567 100644
--- a/tests/test-cdi/cdi-webapp/src/main/java/org/eclipse/jetty/tests/ServerInfoServlet.java
+++ b/jetty-cdi/test-cdi-webapp/src/main/java/org/eclipse/jetty/tests/ServerInfoServlet.java
diff --git a/tests/test-cdi/cdi-webapp/src/main/java/org/eclipse/jetty/tests/logging/JULog.java b/jetty-cdi/test-cdi-webapp/src/main/java/org/eclipse/jetty/tests/logging/JULog.java
index 8f7d02f41e..8f7d02f41e 100644
--- a/tests/test-cdi/cdi-webapp/src/main/java/org/eclipse/jetty/tests/logging/JULog.java
+++ b/jetty-cdi/test-cdi-webapp/src/main/java/org/eclipse/jetty/tests/logging/JULog.java
diff --git a/tests/test-cdi/cdi-webapp/src/main/java/org/eclipse/jetty/tests/logging/JULogFactory.java b/jetty-cdi/test-cdi-webapp/src/main/java/org/eclipse/jetty/tests/logging/JULogFactory.java
index 6a6a1f8f2a..6a6a1f8f2a 100644
--- a/tests/test-cdi/cdi-webapp/src/main/java/org/eclipse/jetty/tests/logging/JULogFactory.java
+++ b/jetty-cdi/test-cdi-webapp/src/main/java/org/eclipse/jetty/tests/logging/JULogFactory.java
diff --git a/tests/test-cdi/cdi-webapp/src/main/java/org/eclipse/jetty/tests/ws/SessionInfoSocket.java b/jetty-cdi/test-cdi-webapp/src/main/java/org/eclipse/jetty/tests/ws/SessionInfoSocket.java
index 53d15fe5f1..53d15fe5f1 100644
--- a/tests/test-cdi/cdi-webapp/src/main/java/org/eclipse/jetty/tests/ws/SessionInfoSocket.java
+++ b/jetty-cdi/test-cdi-webapp/src/main/java/org/eclipse/jetty/tests/ws/SessionInfoSocket.java
diff --git a/tests/test-cdi/cdi-webapp/src/main/webapp/WEB-INF/beans.xml b/jetty-cdi/test-cdi-webapp/src/main/webapp/WEB-INF/beans.xml
index e69de29bb2..e69de29bb2 100644
--- a/tests/test-cdi/cdi-webapp/src/main/webapp/WEB-INF/beans.xml
+++ b/jetty-cdi/test-cdi-webapp/src/main/webapp/WEB-INF/beans.xml
diff --git a/tests/test-cdi/cdi-webapp/src/main/webapp/WEB-INF/web.xml b/jetty-cdi/test-cdi-webapp/src/main/webapp/WEB-INF/web.xml
index fe2940c4f8..fe2940c4f8 100644
--- a/tests/test-cdi/cdi-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/jetty-cdi/test-cdi-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/tests/test-cdi/cdi-client/pom.xml b/tests/test-cdi/cdi-client/pom.xml
deleted file mode 100644
index 73d1245e58..0000000000
--- a/tests/test-cdi/cdi-client/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-// ========================================================================
-// Copyright (c) Webtide LLC
-//
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-//
-// The Eclipse Public License is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// The Apache License v2.0 is available at
-// http://www.apache.org/licenses/LICENSE-2.0.txt
-//
-// You may elect to redistribute this code under either of these licenses.
-// ========================================================================
- -->
-<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.tests</groupId>
- <artifactId>test-cdi-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>cdi-client</artifactId>
- <packaging>jar</packaging>
- <name>Jetty Tests :: CDI :: Clients</name>
- <url>http://www.eclipse.org/jetty</url>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <bundle-symbolic-name>${project.groupId}.cdi.clients</bundle-symbolic-name>
- </properties>
- <dependencies>
- </dependencies>
-</project>
diff --git a/tests/test-cdi/pom.xml b/tests/test-cdi/pom.xml
deleted file mode 100644
index 16e201325e..0000000000
--- a/tests/test-cdi/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-// ========================================================================
-// Copyright (c) Webtide LLC
-//
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-//
-// The Eclipse Public License is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// The Apache License v2.0 is available at
-// http://www.apache.org/licenses/LICENSE-2.0.txt
-//
-// You may elect to redistribute this code under either of these licenses.
-// ========================================================================
- -->
-<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.tests</groupId>
- <artifactId>tests-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>test-cdi-parent</artifactId>
- <packaging>pom</packaging>
- <name>Jetty Tests :: CDI Parent</name>
- <url>http://www.eclipse.org/jetty</url>
- <modules>
- <module>cdi-webapp</module>
- <module>cdi-webapp-it</module>
- <module>cdi-client</module>
- </modules>
-</project>

Back to the top