diff --git a/containers/pax-exam-container-weld/pom.xml b/containers/pax-exam-container-weld/pom.xml deleted file mode 100644 index 5914dc5b6..000000000 --- a/containers/pax-exam-container-weld/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - 4.0.0 - - org.ops4j.pax - exam - 4.13.6-SNAPSHOT - ../../pom - - org.ops4j.pax.exam - pax-exam-container-weld - - OPS4J Pax Exam Weld CDI Container - - - - - org.kohsuke.metainf-services - metainf-services - provided - - - - org.ops4j.pax.exam - pax-exam-cdi - ${project.version} - - - - org.ops4j.pax.exam - pax-exam-spi - ${project.version} - - - - org.jboss.weld.se - weld-se-core - - - - jakarta.inject - jakarta.inject-api - provided - - - - jakarta.enterprise - jakarta.enterprise.cdi-api - provided - - - - - \ No newline at end of file diff --git a/containers/pax-exam-container-weld/src/main/java/org/ops4j/pax/exam/weld/WeldBeanManagerProvider.java b/containers/pax-exam-container-weld/src/main/java/org/ops4j/pax/exam/weld/WeldBeanManagerProvider.java deleted file mode 100644 index 08029d47c..000000000 --- a/containers/pax-exam-container-weld/src/main/java/org/ops4j/pax/exam/weld/WeldBeanManagerProvider.java +++ /dev/null @@ -1,36 +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.weld; - -import javax.enterprise.inject.spi.BeanManager; - -import org.kohsuke.MetaInfServices; -import org.ops4j.pax.exam.cdi.spi.BeanManagerProvider; - -/** - * @author Harald Wellmann - * @since 3.0.0 - */ -@MetaInfServices -public class WeldBeanManagerProvider implements BeanManagerProvider { - - @Override - public BeanManager getBeanManager() { - return WeldTestContainer.getWeldContainer().getBeanManager(); - } -} diff --git a/containers/pax-exam-container-weld/src/main/java/org/ops4j/pax/exam/weld/WeldTestContainer.java b/containers/pax-exam-container-weld/src/main/java/org/ops4j/pax/exam/weld/WeldTestContainer.java deleted file mode 100644 index f6e3dd5d4..000000000 --- a/containers/pax-exam-container-weld/src/main/java/org/ops4j/pax/exam/weld/WeldTestContainer.java +++ /dev/null @@ -1,148 +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.weld; - -import java.io.File; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.UUID; - -import org.jboss.weld.environment.se.Weld; -import org.jboss.weld.environment.se.WeldContainer; -import org.ops4j.pax.exam.ConfigurationManager; -import org.ops4j.pax.exam.Constants; -import org.ops4j.pax.exam.ExamSystem; -import org.ops4j.pax.exam.TestAddress; -import org.ops4j.pax.exam.TestContainer; -import org.ops4j.pax.exam.TestContainerException; -import org.ops4j.pax.exam.options.JarProbeOption; -import org.ops4j.pax.exam.spi.war.JarBuilder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * @author Harald Wellmann - * @since 3.0.0 - */ -public class WeldTestContainer implements TestContainer { - - private static final Logger LOG = LoggerFactory.getLogger(WeldTestContainer.class); - - private static WeldContainer weldContainer; - - private Weld weld; - - private boolean isValid; - - private ExamSystem system; - - private ClassLoader contextClassLoader; - - private File probeDir; - - public WeldTestContainer(ExamSystem system) { - this.system = system; - } - - public void call(TestAddress address) { - } - - public long install(String location, InputStream stream) { - return -1; - } - - public long install(InputStream stream) { - return -1; - } - - public TestContainer start() { - validateConfiguration(); - setProbeClassLoader(); - LOG.debug("starting Weld container"); - weld = new Weld(); - weldContainer = weld.initialize(); - isValid = true; - return this; - } - - private void setProbeClassLoader() { - JarProbeOption probeOption = system.getSingleOption(JarProbeOption.class); - if (probeOption == null) { - return; - } - - probeDir = new File(system.getTempFolder(), UUID.randomUUID().toString()); - probeDir.mkdir(); - JarBuilder builder = new JarBuilder(probeDir, probeOption); - URI jar = builder.buildJar(); - try { - URLClassLoader classLoader = new URLClassLoader(new URL[]{jar.toURL()}); - contextClassLoader = Thread.currentThread().getContextClassLoader(); - Thread.currentThread().setContextClassLoader(classLoader); - } - catch (MalformedURLException exc) { - throw new TestContainerException(exc); - } - } - - private void validateConfiguration() { - ConfigurationManager cm = new ConfigurationManager(); - String systemType = cm.getProperty(Constants.EXAM_SYSTEM_KEY); - if (! Constants.EXAM_SYSTEM_CDI.equals(systemType)) { - String msg = "WeldTestContainer requires pax.exam.system = cdi"; - throw new TestContainerException(msg); - } - } - - public TestContainer stop() { - if (weld != null && isValid) { - LOG.debug("stopping Weld container"); - weld.shutdown(); - unsetProbeClassLoader(); - } - return this; - } - - private void unsetProbeClassLoader() { - if (contextClassLoader != null) { - Thread.currentThread().setContextClassLoader(contextClassLoader); - } - } - - @Override - public String toString() { - return "Weld"; - } - - public static WeldContainer getWeldContainer() { - return weldContainer; - } - - @Override - public long installProbe(InputStream stream) { - return -1; - } - - @Override - public void uninstallProbe() { - // not used - } -} diff --git a/containers/pax-exam-container-weld/src/main/java/org/ops4j/pax/exam/weld/WeldTestContainerFactory.java b/containers/pax-exam-container-weld/src/main/java/org/ops4j/pax/exam/weld/WeldTestContainerFactory.java deleted file mode 100644 index cc4dc24f5..000000000 --- a/containers/pax-exam-container-weld/src/main/java/org/ops4j/pax/exam/weld/WeldTestContainerFactory.java +++ /dev/null @@ -1,36 +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.weld; - -import org.kohsuke.MetaInfServices; -import org.ops4j.pax.exam.ExamSystem; -import org.ops4j.pax.exam.TestContainer; -import org.ops4j.pax.exam.TestContainerFactory; - -/** - * @author Harald Wellmann - * @since 3.0.0 - */ -@MetaInfServices -public class WeldTestContainerFactory implements TestContainerFactory { - - public TestContainer[] create(ExamSystem system) { - WeldTestContainer container = new WeldTestContainer(system); - return new TestContainer[] { container }; - } -} diff --git a/pom.xml b/pom.xml index 20a80cbf5..2bbab9672 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,6 @@ containers/pax-exam-container-native containers/pax-exam-container-remote containers/pax-exam-container-forked - containers/pax-exam-container-weld containers/pax-exam-container-tomcat containers/pax-exam-container-karaf diff --git a/pom/pom.xml b/pom/pom.xml index 581080f3e..239774649 100644 --- a/pom/pom.xml +++ b/pom/pom.xml @@ -38,7 +38,6 @@ 1.3_1 4.13.2_1 9.0.87 - 3.1.9.Final 3.16 @@ -483,18 +482,6 @@ 1.11 - - org.jboss.weld.se - weld-se-core - ${dependency.weld.version} - - - javax.enterprise - cdi-api - - - - org.jboss.classfilewriter jboss-classfilewriter @@ -576,30 +563,6 @@ 1.2.2.GA - - org.jboss.weld.servlet - weld-servlet-core - ${dependency.weld.version} - - - javax.enterprise - cdi-api - - - - - - org.jboss.weld - weld-core-impl - ${dependency.weld.version} - - - javax.enterprise - cdi-api - - - - org.apache.tomcat.embed tomcat-embed-core diff --git a/samples/pax-exam-sample4-model/pom.xml b/samples/pax-exam-sample4-model/pom.xml deleted file mode 100644 index 0916ddfe7..000000000 --- a/samples/pax-exam-sample4-model/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - 4.0.0 - - pax-exam-samples - org.ops4j.pax.exam - 4.13.6-SNAPSHOT - - - org.ops4j.pax.exam.samples - pax-exam-sample4-model - - OPS4J Pax Exam Sample4 Model - - - - jakarta.platform - jakarta.jakartaee-api - provided - - - - \ No newline at end of file diff --git a/samples/pax-exam-sample4-model/src/main/java/org/ops4j/pax/exam/sample4/model/Author.java b/samples/pax-exam-sample4-model/src/main/java/org/ops4j/pax/exam/sample4/model/Author.java deleted file mode 100644 index 792a536b4..000000000 --- a/samples/pax-exam-sample4-model/src/main/java/org/ops4j/pax/exam/sample4/model/Author.java +++ /dev/null @@ -1,99 +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.sample4.model; - -import java.util.HashSet; -import java.util.Set; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; - -@Entity -public class Author { - - @Id - @GeneratedValue - @Column(name = "author_id") - private int id; - - private String firstName; - - private String lastName; - - @OneToMany(mappedBy = "author") - private Set books = new HashSet(); - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - - public Set getBooks() { - return books; - } - - public void setBooks(Set books) { - this.books = books; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + id; - return result; - } - - // CHECKSTYLE:OFF : generated code - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - Author other = (Author) obj; - if (id != other.id) - return false; - return true; - } - // CHECKSTYLE:ON -} diff --git a/samples/pax-exam-sample4-model/src/main/java/org/ops4j/pax/exam/sample4/model/Book.java b/samples/pax-exam-sample4-model/src/main/java/org/ops4j/pax/exam/sample4/model/Book.java deleted file mode 100644 index d5d9a185e..000000000 --- a/samples/pax-exam-sample4-model/src/main/java/org/ops4j/pax/exam/sample4/model/Book.java +++ /dev/null @@ -1,88 +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.sample4.model; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; - -@Entity -public class Book { - - @Id - @GeneratedValue - @Column(name = "book_id") - private int id; - - private String title; - - @ManyToOne - @JoinColumn(name = "author_id") - private Author author; - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public Author getAuthor() { - return author; - } - - public void setAuthor(Author author) { - this.author = author; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + id; - return result; - } - - // CHECKSTYLE:OFF : generated code - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - Book other = (Book) obj; - if (id != other.id) - return false; - return true; - } - // CHECKSTYLE:ON -} diff --git a/samples/pax-exam-sample4-model/src/main/resources/META-INF/persistence.xml b/samples/pax-exam-sample4-model/src/main/resources/META-INF/persistence.xml deleted file mode 100644 index 1df63a32a..000000000 --- a/samples/pax-exam-sample4-model/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - java:comp/env/jdbc/__default - - - - - - - diff --git a/samples/pax-exam-sample4-service/pom.xml b/samples/pax-exam-sample4-service/pom.xml deleted file mode 100644 index 0206ac9e0..000000000 --- a/samples/pax-exam-sample4-service/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - 4.0.0 - - pax-exam-samples - org.ops4j.pax.exam - 4.13.6-SNAPSHOT - - org.ops4j.pax.exam.samples - pax-exam-sample4-service - - OPS4J Pax Exam Sample4 Service - - - - org.ops4j.pax.exam.samples - pax-exam-sample4-model - ${project.version} - - - org.slf4j - slf4j-api - - - - jakarta.platform - jakarta.jakartaee-api - provided - - - - \ No newline at end of file diff --git a/samples/pax-exam-sample4-service/src/main/java/org/ops4j/pax/exam/sample4/service/LibraryService.java b/samples/pax-exam-sample4-service/src/main/java/org/ops4j/pax/exam/sample4/service/LibraryService.java deleted file mode 100644 index 98fd6960a..000000000 --- a/samples/pax-exam-sample4-service/src/main/java/org/ops4j/pax/exam/sample4/service/LibraryService.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright 2011 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.sample4.service; - -import java.io.Serializable; -import java.util.List; - -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; - -import org.ops4j.pax.exam.sample4.model.Author; -import org.ops4j.pax.exam.sample4.model.Book; - -public class LibraryService implements Serializable { - - private static final long serialVersionUID = 1L; - - @Inject - private EntityManager em; - - public void fillLibrary() { - if (getNumBooks() != 0) { - return; - } - - Author mann = createAuthor("Thomas", "Mann"); - Author steinbeck = createAuthor("John", "Steinbeck"); - - createBook("Buddenbrooks", mann); - createBook("East of Eden", steinbeck); - } - - public List findBooks() { - em.getTransaction().begin(); - String jpql = "select b from Book b"; - TypedQuery query = em.createQuery(jpql, Book.class); - List books = query.getResultList(); - em.getTransaction().commit(); - return books; - } - - public List findBooksByAuthor(String lastName) { - String jpql = "select b from Book b where b.author.lastName = :lastName"; - TypedQuery query = em.createQuery(jpql, Book.class); - query.setParameter("lastName", lastName); - List books = query.getResultList(); - return books; - } - - public List findBooksByTitle(String title) { - String jpql = "select b from Book b where b.title = :title"; - TypedQuery query = em.createQuery(jpql, Book.class); - query.setParameter("title", title); - List books = query.getResultList(); - return books; - } - - public Author createAuthor(String firstName, String lastName) { - em.getTransaction().begin(); - Author author = new Author(); - author.setFirstName(firstName); - author.setLastName(lastName); - em.persist(author); - em.flush(); - em.getTransaction().commit(); - return author; - } - - public Book createBook(String title, Author author) { - em.getTransaction().begin(); - Book book = new Book(); - book.setTitle(title); - book.setAuthor(author); - author.getBooks().add(book); - em.persist(book); - em.flush(); - em.getTransaction().commit(); - return book; - } - - public long getNumBooks() { - String jpql = "select count(b) from Book b"; - Long numBooks = (Long) em.createQuery(jpql).getSingleResult(); - return numBooks; - } - - public long getNumAuthors() { - String jpql = "select count(a) from Author a"; - Long numAuthors = (Long) em.createQuery(jpql).getSingleResult(); - return numAuthors; - } -} diff --git a/samples/pax-exam-sample4-service/src/main/java/org/ops4j/pax/exam/sample4/service/PersistenceContextProvider.java b/samples/pax-exam-sample4-service/src/main/java/org/ops4j/pax/exam/sample4/service/PersistenceContextProvider.java deleted file mode 100644 index 586230437..000000000 --- a/samples/pax-exam-sample4-service/src/main/java/org/ops4j/pax/exam/sample4/service/PersistenceContextProvider.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright 2011 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.sample4.service; - -import java.util.HashMap; -import java.util.Map; - -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Provides a persistence context just for testing. - * - * @author Harald Wellmann - * - */ -public class PersistenceContextProvider { - - private static Logger log = LoggerFactory.getLogger(PersistenceContextProvider.class); - - /** - * Use a producer method so that CDI will find this EntityManager. - * - * @param emf - * entity manager factory - * @return entity manager - */ - @Produces - @RequestScoped - public EntityManager getEntityManager(EntityManagerFactory emf) { - log.debug("producing EntityManager"); - return emf.createEntityManager(); - } - - @Produces - @ApplicationScoped - public EntityManagerFactory getEntityManagerFactory() { - log.debug("producing EntityManagerFactory"); - Map props = new HashMap(); - props.put("javax.persistence.jdbc.driver", "org.apache.derby.jdbc.EmbeddedDriver"); - props.put("javax.persistence.jdbc.url", "jdbc:derby:target/libraryDb;create=true"); - props.put("hibernate.hbm2ddl.auto", "create"); - - EntityManagerFactory emf = Persistence.createEntityManagerFactory("library", props); - return emf; - } - - public void closeEntityManager(@Disposes EntityManager em) { - log.debug("disposing EntityManager"); - em.close(); - } - - public void closeEntityManager(@Disposes EntityManagerFactory emf) { - log.debug("disposing EntityManagerFactory"); - emf.close(); - } - -} diff --git a/samples/pax-exam-sample4-service/src/main/resources/META-INF/beans.xml b/samples/pax-exam-sample4-service/src/main/resources/META-INF/beans.xml deleted file mode 100644 index e69de29bb..000000000 diff --git a/samples/pax-exam-sample4-web/pom.xml b/samples/pax-exam-sample4-web/pom.xml deleted file mode 100644 index 9193b1a9a..000000000 --- a/samples/pax-exam-sample4-web/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - 4.0.0 - - pax-exam-samples - org.ops4j.pax.exam - 4.13.6-SNAPSHOT - .. - - - org.ops4j.pax.exam.samples - pax-exam-sample4-web - - OPS4J Pax Exam Sample4 Web - - war - - - org.ops4j.pax.exam.samples - pax-exam-sample4-service - ${project.version} - - - org.slf4j - slf4j-api - - - ch.qos.logback - logback-classic - - - - ch.qos.logback - logback-core - - - - com.sun.faces - jsf-impl - - - - com.sun.faces - jsf-api - - - - org.jboss.weld.servlet - weld-servlet-core - - - - org.jboss.weld - weld-core-impl - - - - org.hibernate - hibernate-entitymanager - - - - jakarta.platform - jakarta.jakartaee-api - provided - - - - \ No newline at end of file diff --git a/samples/pax-exam-sample4-web/src/main/java/org/ops4j/pax/exam/sample4/web/LibraryBean.java b/samples/pax-exam-sample4-web/src/main/java/org/ops4j/pax/exam/sample4/web/LibraryBean.java deleted file mode 100644 index 43045f774..000000000 --- a/samples/pax-exam-sample4-web/src/main/java/org/ops4j/pax/exam/sample4/web/LibraryBean.java +++ /dev/null @@ -1,47 +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.sample4.web; - -import java.util.List; - -import javax.annotation.PostConstruct; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.inject.Named; - -import org.ops4j.pax.exam.sample4.model.Book; -import org.ops4j.pax.exam.sample4.service.LibraryService; - -@RequestScoped -@Named("library") -public class LibraryBean { - - @Inject - private LibraryService libraryService; - - private List books; - - @PostConstruct - public void init() { - libraryService.fillLibrary(); - books = libraryService.findBooks(); - } - - public List getBooks() { - return books; - } -} diff --git a/samples/pax-exam-sample4-web/src/main/resources/logback.xml b/samples/pax-exam-sample4-web/src/main/resources/logback.xml deleted file mode 100644 index 7c732563a..000000000 --- a/samples/pax-exam-sample4-web/src/main/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/samples/pax-exam-sample4-web/src/main/webapp/META-INF/context.xml b/samples/pax-exam-sample4-web/src/main/webapp/META-INF/context.xml deleted file mode 100644 index 65706db94..000000000 --- a/samples/pax-exam-sample4-web/src/main/webapp/META-INF/context.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - \ No newline at end of file diff --git a/samples/pax-exam-sample4-web/src/main/webapp/WEB-INF/beans.xml b/samples/pax-exam-sample4-web/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index e69de29bb..000000000 diff --git a/samples/pax-exam-sample4-web/src/main/webapp/WEB-INF/faces-config.xml b/samples/pax-exam-sample4-web/src/main/webapp/WEB-INF/faces-config.xml deleted file mode 100644 index e69de29bb..000000000 diff --git a/samples/pax-exam-sample4-web/src/main/webapp/WEB-INF/web.xml b/samples/pax-exam-sample4-web/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 39ef39dd2..000000000 --- a/samples/pax-exam-sample4-web/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - books.jsf - - - - org.jboss.weld.environment.servlet.Listener - - - \ No newline at end of file diff --git a/samples/pax-exam-sample4-web/src/main/webapp/books.xhtml b/samples/pax-exam-sample4-web/src/main/webapp/books.xhtml deleted file mode 100644 index f4285d20d..000000000 --- a/samples/pax-exam-sample4-web/src/main/webapp/books.xhtml +++ /dev/null @@ -1,15 +0,0 @@ - - - Books in the Library - - - - #{book.author.lastName} - #{book.author.firstName} - #{book.title} - - - diff --git a/samples/pom.xml b/samples/pom.xml index 9fd560dae..570395dad 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -17,9 +17,6 @@ pax-exam-sample1-service pax-exam-sample1-web pax-exam-sample3-beans - pax-exam-sample4-model - pax-exam-sample4-service - pax-exam-sample4-web pax-exam-sample5-mdb pax-exam-sample6-service pax-exam-sample6-web