books = service.findBooksByAuthor("Mann");
- assertEquals(1, books.size());
-
- Book book = books.get(0);
- assertEquals("Buddenbrooks", book.getTitle());
- }
-
- @Test
- public void numAuthors() {
- assertEquals(2, service.getNumAuthors());
- service.createAuthor("Theodor", "Storm");
- assertEquals(3, service.getNumAuthors());
- }
-
-}
diff --git a/itest/web/src/it/regression-web-spring-userprobe/src/test/java/org/ops4j/pax/exam/regression/web/spring/UserProbeTest.java b/itest/web/src/it/regression-web-spring-userprobe/src/test/java/org/ops4j/pax/exam/regression/web/spring/UserProbeTest.java
deleted file mode 100644
index 17531c63a..000000000
--- a/itest/web/src/it/regression-web-spring-userprobe/src/test/java/org/ops4j/pax/exam/regression/web/spring/UserProbeTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2012 Harald Wellmann
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.ops4j.pax.exam.regression.web.spring;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.warProbe;
-import static org.ops4j.pax.exam.Info.getOps4jBaseVersion;
-import static org.ops4j.pax.exam.Info.getPaxExamVersion;
-
-import javax.inject.Inject;
-
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.sample6.service.LibraryService;
-import org.ops4j.pax.exam.spi.container.ContainerConstants;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class UserProbeTest {
-
- @Inject
- private LibraryService service;
-
- @Configuration
- public Option[] createConfiguration() {
- System.setProperty("java.protocol.handler.pkgs", "org.ops4j.pax.url");
- return options(
- warProbe()
- .library("target/test-classes")
- .overlay(
- maven("org.ops4j.pax.exam.samples", "pax-exam-sample6-web", getPaxExamVersion())
- .type("war"))
- .library(maven("org.ops4j.pax.exam", "pax-exam-servlet-bridge", getPaxExamVersion()))
- .library(maven("org.ops4j.pax.exam", "pax-exam-spring", getPaxExamVersion()))
- .library(maven("org.ops4j.pax.exam", "pax-exam", getPaxExamVersion()))
- .library(maven("org.ops4j.base", "ops4j-base-spi", getOps4jBaseVersion()))
- .library(maven().groupId("org.hamcrest").artifactId("hamcrest-core").versionAsInProject())
- .library(maven().groupId("junit").artifactId("junit").versionAsInProject())
- );
- }
-
- @Before
- public void setUp() {
- service.fillLibrary();
- }
-
- /**
- * Gets books.html which contains the list of books in a library.
- *
- * The html content is based on the defined books.jsp in the sample web module.
- */
- @Test
- public void testGetBooksHttpContent() throws Exception {
-
- HttpGet httpGet = new HttpGet("http://localhost:9080" + ContainerConstants.EXAM_CONTEXT_ROOT + "/books.html");
-
- try (CloseableHttpClient httpclient = HttpClients.createDefault();
- CloseableHttpResponse response = httpclient.execute(httpGet)) {
- assertThat("Status code must be 200 - OK",
- response.getStatusLine().getStatusCode(), is(200));
-
- // verify html content
- String content = EntityUtils.toString(response.getEntity());
- assertThat(content, is(notNullValue()));
- // TODO Why does CoreMatchers.containsString() not work?
- assertThat(content.contains("Steinbeck"), is(true));
- }
- }
-}
diff --git a/itest/web/src/it/regression-web-spring-userprobe/src/test/resources/exam.properties b/itest/web/src/it/regression-web-spring-userprobe/src/test/resources/exam.properties
deleted file mode 100644
index 5839663a3..000000000
--- a/itest/web/src/it/regression-web-spring-userprobe/src/test/resources/exam.properties
+++ /dev/null
@@ -1 +0,0 @@
-pax.exam.system = javaee
diff --git a/itest/web/src/it/regression-web-spring-userprobe/src/test/resources/logback.xml b/itest/web/src/it/regression-web-spring-userprobe/src/test/resources/logback.xml
deleted file mode 100644
index 6803a64b9..000000000
--- a/itest/web/src/it/regression-web-spring-userprobe/src/test/resources/logback.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
- %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-
-
-
-
-
- target/test.log
-
- %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/itest/web/src/it/regression-web-spring/pom.xml b/itest/web/src/it/regression-web-spring/pom.xml
deleted file mode 100644
index d03ad4220..000000000
--- a/itest/web/src/it/regression-web-spring/pom.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-
-
-
-
- 4.0.0
-
-
- org.ops4j.pax.exam.itest
- exam-itest-web
- 4.13.6-SNAPSHOT
- ../../..
-
-
- org.ops4j.pax.exam
- regression-web-spring
- jar
-
- OPS4J Pax Exam Web-Only Container + Spring Regression Tests
-
-
-
-
- jakarta.inject
- jakarta.inject-api
- test
-
-
-
- org.ops4j.pax.exam
- pax-exam-invoker-jaxrs2
- ${project.version}
- test
-
-
-
- org.jboss.resteasy
- resteasy-client
- test
-
-
-
- org.ops4j.pax.exam
- pax-exam-servlet-bridge
- ${project.version}
- test
-
-
-
- org.ops4j.pax.exam.samples
- pax-exam-sample6-service
- ${project.version}
- test
-
-
-
- org.ops4j.pax.exam
- pax-exam-junit4
- ${project.version}
- test
-
-
-
- org.ops4j.pax.exam
- pax-exam-spring
- ${project.version}
- test
-
-
-
- org.ops4j.pax.exam
- pax-exam-link-mvn
- ${project.version}
- test
-
-
-
-
- ch.qos.logback
- logback-core
- test
-
-
-
- ch.qos.logback
- logback-classic
- test
-
-
-
- org.slf4j
- jul-to-slf4j
- test
-
-
-
- org.slf4j
- jcl-over-slf4j
- test
-
-
-
- org.slf4j
- slf4j-api
- test
-
-
-
- org.slf4j
- slf4j-ext
- test
-
-
-
- javax.transaction
- javax.transaction-api
- 1.2
- test
-
-
-
- javax.ejb
- javax.ejb-api
- 3.2
- test
-
-
-
- org.hibernate
- hibernate-entitymanager
- test
-
-
-
- org.apache.derby
- derby
- test
-
-
-
- org.osgi
- osgi.core
- test
-
-
-
- org.springframework
- spring-web
- test
-
-
-
-
-
-
-
-
- src/test/resources
- true
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- true
- none
-
-
-
-
-
-
diff --git a/itest/web/src/it/regression-web-spring/src/main/webapp/WEB-INF/web.xml b/itest/web/src/it/regression-web-spring/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index d9f466f75..000000000
--- a/itest/web/src/it/regression-web-spring/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
- index.jsp
-
-
-
-
- contextConfigLocation
- org.ops4j.pax.exam.regression.web.spring.TestSpringConfig
-
-
-
- contextClass
- org.springframework.web.context.support.AnnotationConfigWebApplicationContext
-
-
-
- org.springframework.web.context.ContextLoaderListener
-
-
-
\ No newline at end of file
diff --git a/itest/web/src/it/regression-web-spring/src/test/java/org/ops4j/pax/exam/regression/web/spring/AuthorTest.java b/itest/web/src/it/regression-web-spring/src/test/java/org/ops4j/pax/exam/regression/web/spring/AuthorTest.java
deleted file mode 100644
index 836ed6986..000000000
--- a/itest/web/src/it/regression-web-spring/src/test/java/org/ops4j/pax/exam/regression/web/spring/AuthorTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2010 Harald Wellmann
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.ops4j.pax.exam.regression.web.spring;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.sample6.model.Book;
-import org.ops4j.pax.exam.sample6.service.LibraryService;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerSuite;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerSuite.class)
-public class AuthorTest {
-
- @Inject
- private LibraryService service;
-
- @Before
- public void setUp() {
- service.fillLibrary();
- }
-
- @Test
- public void byAuthor() {
- List books = service.findBooksByAuthor("Mann");
- assertEquals(1, books.size());
-
- Book book = books.get(0);
- assertEquals("Buddenbrooks", book.getTitle());
- }
-
- @Test
- public void numAuthors() {
- assertEquals(2, service.getNumAuthors());
- service.createAuthor("Theodor", "Storm");
- assertEquals(3, service.getNumAuthors());
- }
-}
diff --git a/itest/web/src/it/regression-web-spring/src/test/java/org/ops4j/pax/exam/regression/web/spring/TestSpringConfig.java b/itest/web/src/it/regression-web-spring/src/test/java/org/ops4j/pax/exam/regression/web/spring/TestSpringConfig.java
deleted file mode 100644
index 37f619f58..000000000
--- a/itest/web/src/it/regression-web-spring/src/test/java/org/ops4j/pax/exam/regression/web/spring/TestSpringConfig.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2012 Harald Wellmann
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.ops4j.pax.exam.regression.web.spring;
-
-import javax.persistence.EntityManagerFactory;
-import javax.sql.DataSource;
-
-import org.apache.derby.jdbc.EmbeddedDataSource;
-import org.ops4j.pax.exam.sample6.service.LibraryService;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-@Configuration
-@EnableTransactionManagement(proxyTargetClass = true)
-public class TestSpringConfig {
-
- @Bean
- public DataSource dataSource() {
- EmbeddedDataSource dataSource = new EmbeddedDataSource();
- dataSource.setDatabaseName("memory:library");
- dataSource.setCreateDatabase("create");
- return dataSource;
- }
-
- @Bean
- public PlatformTransactionManager transactionManager() {
- return new JpaTransactionManager(entityManagerFactory());
- }
-
- @Bean
- public EntityManagerFactory entityManagerFactory() {
- LocalContainerEntityManagerFactoryBean bean = new LocalContainerEntityManagerFactoryBean();
- bean.setDataSource(dataSource());
- bean.setPersistenceXmlLocation("classpath:META-INF/persistence.xml");
- bean.afterPropertiesSet();
- return bean.getObject();
- }
-
- @Bean
- public LibraryService libraryService() {
- return new LibraryService();
- }
-}
diff --git a/itest/web/src/it/regression-web-spring/src/test/java/org/ops4j/pax/exam/regression/web/spring/TitleTest.java b/itest/web/src/it/regression-web-spring/src/test/java/org/ops4j/pax/exam/regression/web/spring/TitleTest.java
deleted file mode 100644
index ccbcf94b0..000000000
--- a/itest/web/src/it/regression-web-spring/src/test/java/org/ops4j/pax/exam/regression/web/spring/TitleTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2012 Harald Wellmann
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.ops4j.pax.exam.regression.web.spring;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.sample6.model.Book;
-import org.ops4j.pax.exam.sample6.service.LibraryService;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerSuite;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerSuite.class)
-public class TitleTest {
-
- @Inject
- private LibraryService service;
-
- @Test
- public void byTitle() {
- service.fillLibrary();
- List books = service.findBooksByTitle("East of Eden");
- assertEquals(1, books.size());
-
- Book book = books.get(0);
- assertEquals("Steinbeck", book.getAuthor().getLastName());
- }
-}
diff --git a/itest/web/src/it/regression-web-spring/src/test/resources/exam.properties b/itest/web/src/it/regression-web-spring/src/test/resources/exam.properties
deleted file mode 100644
index 5839663a3..000000000
--- a/itest/web/src/it/regression-web-spring/src/test/resources/exam.properties
+++ /dev/null
@@ -1 +0,0 @@
-pax.exam.system = javaee
diff --git a/itest/web/src/it/regression-web-spring/src/test/resources/logback.xml b/itest/web/src/it/regression-web-spring/src/test/resources/logback.xml
deleted file mode 100644
index 6803a64b9..000000000
--- a/itest/web/src/it/regression-web-spring/src/test/resources/logback.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
- %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-
-
-
-
-
- target/test.log
-
- %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/itest/web/src/it/regression-web/pom.xml b/itest/web/src/it/regression-web/pom.xml
deleted file mode 100644
index 6cfdb954f..000000000
--- a/itest/web/src/it/regression-web/pom.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-
-
-
-
- 4.0.0
-
-
- org.ops4j.pax.exam.itest
- exam-itest-web
- 4.13.6-SNAPSHOT
- ../../..
-
-
- org.ops4j.pax.exam
- regression-web
- jar
-
- OPS4J Pax Exam Web-Only Container Regression Tests
-
-
-
-
- org.ops4j.pax.exam
- pax-exam-invoker-jaxrs2
- ${project.version}
- test
-
-
-
- org.jboss.resteasy
- resteasy-client
- test
-
-
-
- org.ops4j.pax.exam
- pax-exam-servlet-bridge
- ${project.version}
- test
-
-
-
- org.ops4j.pax.exam.samples
- pax-exam-sample4-service
- ${project.version}
- test
-
-
-
- org.ops4j.pax.exam
- pax-exam-junit4
- ${project.version}
- test
-
-
-
- org.ops4j.pax.exam
- pax-exam-cdi
- ${project.version}
- test
-
-
-
- jakarta.enterprise
- jakarta.enterprise.cdi-api
- test
-
-
-
- jakarta.inject
- jakarta.inject-api
- test
-
-
-
- org.ops4j.pax.exam
- pax-exam-link-assembly
- ${project.version}
- test
-
-
-
-
- ch.qos.logback
- logback-core
- test
-
-
-
- ch.qos.logback
- logback-classic
- test
-
-
-
- org.slf4j
- jul-to-slf4j
- test
-
-
-
- org.slf4j
- jcl-over-slf4j
- test
-
-
-
- org.slf4j
- slf4j-api
- test
-
-
-
- org.slf4j
- slf4j-ext
- test
-
-
-
- org.hibernate
- hibernate-entitymanager
- test
-
-
-
- org.glassfish
- javax.el
- 3.0.0
- test
-
-
-
- org.apache.derby
- derby
- test
-
-
-
-
-
-
-
-
- src/test/resources
- true
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- true
- none
-
-
-
-
-
-
diff --git a/itest/web/src/it/regression-web/src/test/java/org/ops4j/pax/exam/regression/web/AuthorTest.java b/itest/web/src/it/regression-web/src/test/java/org/ops4j/pax/exam/regression/web/AuthorTest.java
deleted file mode 100644
index 4590f7d45..000000000
--- a/itest/web/src/it/regression-web/src/test/java/org/ops4j/pax/exam/regression/web/AuthorTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2010 Harald Wellmann
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.ops4j.pax.exam.regression.web;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.sample4.model.Book;
-import org.ops4j.pax.exam.sample4.service.LibraryService;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerSuite;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerSuite.class)
-public class AuthorTest {
-
- @Inject
- private LibraryService service;
-
- @Before
- public void setUp() {
- service.fillLibrary();
- }
-
- @Test
- public void byAuthor() {
- List books = service.findBooksByAuthor("Mann");
- assertEquals(1, books.size());
-
- Book book = books.get(0);
- assertEquals("Buddenbrooks", book.getTitle());
- }
-
- @Test
- public void numAuthors() {
- assertEquals(2, service.getNumAuthors());
- service.createAuthor("Theodor", "Storm");
- assertEquals(3, service.getNumAuthors());
- }
-}
diff --git a/itest/web/src/it/regression-web/src/test/java/org/ops4j/pax/exam/regression/web/ParameterizedAuthorTest.java b/itest/web/src/it/regression-web/src/test/java/org/ops4j/pax/exam/regression/web/ParameterizedAuthorTest.java
deleted file mode 100644
index dcdb178a0..000000000
--- a/itest/web/src/it/regression-web/src/test/java/org/ops4j/pax/exam/regression/web/ParameterizedAuthorTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2013 Harald Wellmann
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.ops4j.pax.exam.regression.web;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-import org.ops4j.pax.exam.junit.PaxExamParameterized;
-import org.ops4j.pax.exam.sample4.model.Book;
-import org.ops4j.pax.exam.sample4.service.LibraryService;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerSuite;
-
-@RunWith(PaxExamParameterized.class)
-@ExamReactorStrategy(PerSuite.class)
-public class ParameterizedAuthorTest {
-
- @Inject
- private LibraryService service;
-
- private String authorLastName;
- private String bookTitle;
-
-
- public ParameterizedAuthorTest(String authorLastName, String bookTitle) {
- this.authorLastName = authorLastName;
- this.bookTitle = bookTitle;
- }
-
-
- @Parameters
- public static List