You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/06/25 14:14:57 UTC
svn commit: r1605365 - in
/tomee/tomee/trunk/examples/bval-evaluation-redeployment: ./ WebApp1/
WebApp1/src/ WebApp1/src/main/ WebApp1/src/main/java/
WebApp1/src/main/java/org/ WebApp1/src/main/java/org/superbiz/
WebApp1/src/main/java/org/superbiz/weba...
Author: andygumbrecht
Date: Wed Jun 25 12:14:56 2014
New Revision: 1605365
URL: http://svn.apache.org/r1605365
Log:
Example that may help resolve: http://tomee-openejb.979440.n4.nabble.com/tomee-redeployment-issue-tp4670067p4670176.html
Added:
tomee/tomee/trunk/examples/bval-evaluation-redeployment/ (with props)
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/ (with props)
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/nb-configuration.xml
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/pom.xml
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/ejb/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/ejb/BusinessBean.java
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/messages/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/messages/ErrorList.java
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/messages/ErrorResponse.java
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/provider/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/provider/ConstraintViolationExceptionMapper.java
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/service/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/service/WebApp1Service.java
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/META-INF/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/META-INF/context.xml
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/beans.xml
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/ejb-jar.xml
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/openejb-jar.xml
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/web.xml
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/index.jsp
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/ (with props)
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/nb-configuration.xml
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/pom.xml
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/messages/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/messages/ErrorList.java
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/messages/ErrorResponse.java
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/provider/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/provider/ConstraintViolationExceptionMapper.java
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/service/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/service/WebApp2Service.java
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/META-INF/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/META-INF/context.xml
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/ejb-jar.xml
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/openejb-jar.xml
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/web.xml
tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/index.jsp
tomee/tomee/trunk/examples/bval-evaluation-redeployment/pom.xml
tomee/tomee/trunk/examples/bval-evaluation-redeployment/runner/ (with props)
tomee/tomee/trunk/examples/bval-evaluation-redeployment/runner/pom.xml
tomee/tomee/trunk/examples/bval-evaluation-redeployment/runner/src/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/runner/src/test/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/runner/src/test/java/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/runner/src/test/java/RedeploymentTest.java
tomee/tomee/trunk/examples/bval-evaluation-redeployment/runner/src/test/resources/
tomee/tomee/trunk/examples/bval-evaluation-redeployment/runner/src/test/resources/arquillian.xml
Propchange: tomee/tomee/trunk/examples/bval-evaluation-redeployment/
------------------------------------------------------------------------------
--- svn:global-ignores (added)
+++ svn:global-ignores Wed Jun 25 12:14:56 2014
@@ -0,0 +1,2 @@
+*.iml
+.idea
Propchange: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jun 25 12:14:56 2014
@@ -0,0 +1 @@
+target
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/nb-configuration.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/nb-configuration.xml?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/nb-configuration.xml (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/nb-configuration.xml Wed Jun 25 12:14:56 2014
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+ <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+-->
+ <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+ <!--
+Properties that influence various parts of the IDE, especially code formatting and the like.
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
+-->
+ <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion>1.6-web</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion>
+ <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>Tomcat</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>
+ <org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
+ </properties>
+</project-shared-configuration>
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/pom.xml?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/pom.xml (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/pom.xml Wed Jun 25 12:14:56 2014
@@ -0,0 +1,85 @@
+<?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"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.superbiz</groupId>
+ <artifactId>bval-evaluation-redeployment</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>WebApp1</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+
+ <name>WebApp1</name>
+
+ <properties>
+ <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-cxf-rs</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <compilerArguments>
+ <endorseddirs>${endorsed.dir}</endorseddirs>
+ </compilerArguments>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${endorsed.dir}</outputDirectory>
+ <silent>true</silent>
+ <artifactItems>
+ <artifactItem>
+ <groupId>javax</groupId>
+ <artifactId>javaee-endorsed-api</artifactId>
+ <version>6.0</version>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/ejb/BusinessBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/ejb/BusinessBean.java?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/ejb/BusinessBean.java (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/ejb/BusinessBean.java Wed Jun 25 12:14:56 2014
@@ -0,0 +1,18 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.superbiz.webapp1.ejb;
+
+import javax.ejb.Stateless;
+import javax.validation.constraints.Pattern;
+
+@Stateless
+public class BusinessBean {
+
+ public void doStuff(@Pattern(regexp = "valid") final String txt) {
+ System.out.println("Received: " + txt);
+ }
+
+}
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/messages/ErrorList.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/messages/ErrorList.java?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/messages/ErrorList.java (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/messages/ErrorList.java Wed Jun 25 12:14:56 2014
@@ -0,0 +1,26 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.superbiz.webapp1.messages;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import java.util.ArrayList;
+import java.util.Collection;
+
+@XmlRootElement
+@XmlSeeAlso(ErrorResponse.class)
+public class ErrorList<T> extends ArrayList<T> {
+
+ private static final long serialVersionUID = -8861634470374757349L;
+
+ public ErrorList() {
+ }
+
+ public ErrorList(final Collection<? extends T> clctn) {
+ addAll(clctn);
+ }
+
+}
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/messages/ErrorResponse.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/messages/ErrorResponse.java?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/messages/ErrorResponse.java (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/messages/ErrorResponse.java Wed Jun 25 12:14:56 2014
@@ -0,0 +1,66 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.superbiz.webapp1.messages;
+
+import javax.ws.rs.core.Response;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+import java.util.Date;
+
+@XmlRootElement
+public class ErrorResponse implements Serializable {
+ private static final long serialVersionUID = 8888101217538645771L;
+
+ private Long id;
+ private Response.Status status;
+ private String message;
+
+ public ErrorResponse() {
+ this.id = new Date().getTime();
+ }
+
+ public ErrorResponse(final Response.Status status, final String message) {
+ this.id = new Date().getTime();
+ this.status = status;
+ this.message = message;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(final Long id) {
+ this.id = id;
+ }
+
+ public Response.Status getStatus() {
+ return status;
+ }
+
+ @XmlAttribute
+ public void setStatus(final Response.Status status) {
+ this.status = status;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ @XmlAttribute
+ public void setMessage(final String message) {
+ this.message = message;
+ }
+
+ // @Override
+// public String toString() {
+// return "{" + "id:" + id + ", status:" + status + ", message:" + message + '}';
+// }
+ @Override
+ public String toString() {
+ return "ErrorResponse:" + "id=" + id + ", status=" + status + ", message=" + message;
+ }
+}
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/provider/ConstraintViolationExceptionMapper.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/provider/ConstraintViolationExceptionMapper.java?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/provider/ConstraintViolationExceptionMapper.java (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/provider/ConstraintViolationExceptionMapper.java Wed Jun 25 12:14:56 2014
@@ -0,0 +1,50 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.superbiz.webapp1.provider;
+
+import org.superbiz.webapp1.messages.ErrorList;
+import org.superbiz.webapp1.messages.ErrorResponse;
+
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+@Provider
+@Produces(MediaType.APPLICATION_JSON)
+public class ConstraintViolationExceptionMapper implements ExceptionMapper<ConstraintViolationException> {
+
+ @Context
+ private HttpHeaders headers;
+
+ @Override
+ public Response toResponse(final ConstraintViolationException t) {
+ final MediaType type = headers.getMediaType();
+ final Locale locale = headers.getLanguage();
+
+ final Object responsObject = getConstraintViolationErrors(t);
+ return Response.status(Response.Status.NOT_ACCEPTABLE).type(type).language(locale).entity(responsObject).build();
+ }
+
+ private static Object getConstraintViolationErrors(final ConstraintViolationException ex) {
+ final List<ErrorResponse> errors = new ArrayList<ErrorResponse>();
+ for (final ConstraintViolation violation : ex.getConstraintViolations()) {
+ final ErrorResponse error = new ErrorResponse();
+ error.setMessage(violation.getMessage());
+ errors.add(error);
+ }
+ return new ErrorList<ErrorResponse>(errors);
+ }
+
+}
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/service/WebApp1Service.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/service/WebApp1Service.java?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/service/WebApp1Service.java (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/java/org/superbiz/webapp1/service/WebApp1Service.java Wed Jun 25 12:14:56 2014
@@ -0,0 +1,28 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.superbiz.webapp1.service;
+
+import javax.ejb.Singleton;
+import javax.validation.constraints.Pattern;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+@Path("test")
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+@Singleton
+public class WebApp1Service {
+
+ @POST
+ public Response getInfo(@Pattern(regexp = "valid") final String input) {
+ return Response.ok().build();
+ }
+
+}
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/META-INF/context.xml?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/META-INF/context.xml (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/META-INF/context.xml Wed Jun 25 12:14:56 2014
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Context antiJARLocking="true" path="/WebApp1"/>
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/beans.xml?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/beans.xml (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/beans.xml Wed Jun 25 12:14:56 2014
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+</beans>
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/ejb-jar.xml?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/ejb-jar.xml (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/ejb-jar.xml Wed Jun 25 12:14:56 2014
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
+ version="3.1"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd">
+ <assembly-descriptor>
+ <interceptor-binding>
+ <ejb-name>WebApp1Service</ejb-name>
+ <interceptor-class>org.apache.openejb.bval.BeanValidationAppendixInterceptor</interceptor-class>
+ </interceptor-binding>
+ </assembly-descriptor>
+</ejb-jar>
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/openejb-jar.xml?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/openejb-jar.xml (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/openejb-jar.xml Wed Jun 25 12:14:56 2014
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openejb-jar xmlns="http://www.openejb.org/openejb-jar/1.1">
+ <pojo-deployment class-name="jaxrs-application">
+ <properties>
+ cxf.jaxrs.providers = com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider,org.superbiz.webapp1.provider.ConstraintViolationExceptionMapper
+ </properties>
+ </pojo-deployment>
+</openejb-jar>
\ No newline at end of file
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/web.xml?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/web.xml (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/WEB-INF/web.xml Wed Jun 25 12:14:56 2014
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+ version="3.0">
+ <session-config>
+ <session-timeout>
+ 30
+ </session-timeout>
+ </session-config>
+</web-app>
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/index.jsp?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/index.jsp (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp1/src/main/webapp/index.jsp Wed Jun 25 12:14:56 2014
@@ -0,0 +1,13 @@
+<%@page contentType="text/html" pageEncoding="UTF-8" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>JSP Page</title>
+</head>
+<body>
+<h1>Hello World!</h1>
+</body>
+</html>
Propchange: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jun 25 12:14:56 2014
@@ -0,0 +1 @@
+target
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/nb-configuration.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/nb-configuration.xml?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/nb-configuration.xml (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/nb-configuration.xml Wed Jun 25 12:14:56 2014
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+ <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+-->
+ <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+ <!--
+Properties that influence various parts of the IDE, especially code formatting and the like.
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
+-->
+ <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion>1.6-web</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion>
+ <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>Tomcat</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>
+ <org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
+ </properties>
+</project-shared-configuration>
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/pom.xml?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/pom.xml (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/pom.xml Wed Jun 25 12:14:56 2014
@@ -0,0 +1,80 @@
+<?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"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.superbiz</groupId>
+ <artifactId>bval-evaluation-redeployment</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>WebApp2</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+
+ <name>WebApp2</name>
+
+ <properties>
+ <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <compilerArguments>
+ <endorseddirs>${endorsed.dir}</endorseddirs>
+ </compilerArguments>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${endorsed.dir}</outputDirectory>
+ <silent>true</silent>
+ <artifactItems>
+ <artifactItem>
+ <groupId>javax</groupId>
+ <artifactId>javaee-endorsed-api</artifactId>
+ <version>6.0</version>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/messages/ErrorList.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/messages/ErrorList.java?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/messages/ErrorList.java (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/messages/ErrorList.java Wed Jun 25 12:14:56 2014
@@ -0,0 +1,26 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.superbiz.webapp2.messages;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import java.util.ArrayList;
+import java.util.Collection;
+
+@XmlRootElement
+@XmlSeeAlso(ErrorResponse.class)
+public class ErrorList<T> extends ArrayList<T> {
+
+ private static final long serialVersionUID = -8861634470374757349L;
+
+ public ErrorList() {
+ }
+
+ public ErrorList(final Collection<? extends T> clctn) {
+ addAll(clctn);
+ }
+
+}
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/messages/ErrorResponse.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/messages/ErrorResponse.java?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/messages/ErrorResponse.java (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/messages/ErrorResponse.java Wed Jun 25 12:14:56 2014
@@ -0,0 +1,66 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.superbiz.webapp2.messages;
+
+import javax.ws.rs.core.Response;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
+import java.util.Date;
+
+@XmlRootElement
+public class ErrorResponse implements Serializable {
+ private static final long serialVersionUID = 8888101217538645771L;
+
+ private Long id;
+ private Response.Status status;
+ private String message;
+
+ public ErrorResponse() {
+ this.id = new Date().getTime();
+ }
+
+ public ErrorResponse(final Response.Status status, final String message) {
+ this.id = new Date().getTime();
+ this.status = status;
+ this.message = message;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(final Long id) {
+ this.id = id;
+ }
+
+ public Response.Status getStatus() {
+ return status;
+ }
+
+ @XmlAttribute
+ public void setStatus(final Response.Status status) {
+ this.status = status;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ @XmlAttribute
+ public void setMessage(final String message) {
+ this.message = message;
+ }
+
+ // @Override
+// public String toString() {
+// return "{" + "id:" + id + ", status:" + status + ", message:" + message + '}';
+// }
+ @Override
+ public String toString() {
+ return "ErrorResponse:" + "id=" + id + ", status=" + status + ", message=" + message;
+ }
+}
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/provider/ConstraintViolationExceptionMapper.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/provider/ConstraintViolationExceptionMapper.java?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/provider/ConstraintViolationExceptionMapper.java (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/provider/ConstraintViolationExceptionMapper.java Wed Jun 25 12:14:56 2014
@@ -0,0 +1,50 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.superbiz.webapp2.provider;
+
+import org.superbiz.webapp2.messages.ErrorList;
+import org.superbiz.webapp2.messages.ErrorResponse;
+
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+@Provider
+@Produces(MediaType.APPLICATION_JSON)
+public class ConstraintViolationExceptionMapper implements ExceptionMapper<ConstraintViolationException> {
+
+ @Context
+ private HttpHeaders headers;
+
+ @Override
+ public Response toResponse(final ConstraintViolationException t) {
+ final MediaType type = headers.getMediaType();
+ final Locale locale = headers.getLanguage();
+
+ final Object responsObject = getConstraintViolationErrors(t);
+ return Response.status(Response.Status.NOT_ACCEPTABLE).type(type).language(locale).entity(responsObject).build();
+ }
+
+ private static Object getConstraintViolationErrors(final ConstraintViolationException ex) {
+ final List<ErrorResponse> errors = new ArrayList<ErrorResponse>();
+ for (final ConstraintViolation violation : ex.getConstraintViolations()) {
+ final ErrorResponse error = new ErrorResponse();
+ error.setMessage(violation.getMessage());
+ errors.add(error);
+ }
+ return new ErrorList<ErrorResponse>(errors);
+ }
+
+}
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/service/WebApp2Service.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/service/WebApp2Service.java?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/service/WebApp2Service.java (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/java/org/superbiz/webapp2/service/WebApp2Service.java Wed Jun 25 12:14:56 2014
@@ -0,0 +1,28 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.superbiz.webapp2.service;
+
+import javax.ejb.Singleton;
+import javax.validation.constraints.Pattern;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+@Singleton
+@Path("test")
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+public class WebApp2Service {
+
+ @POST
+ public Response getInfo(@Pattern(regexp = "valid") final String input) {
+ return Response.ok().build();
+ }
+
+}
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/META-INF/context.xml?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/META-INF/context.xml (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/META-INF/context.xml Wed Jun 25 12:14:56 2014
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Context antiJARLocking="true" path="/WebApp2"/>
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/ejb-jar.xml?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/ejb-jar.xml (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/ejb-jar.xml Wed Jun 25 12:14:56 2014
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
+ version="3.1"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd">
+ <assembly-descriptor>
+ <interceptor-binding>
+ <ejb-name>WebApp2Service</ejb-name>
+ <interceptor-class>org.apache.openejb.bval.BeanValidationAppendixInterceptor</interceptor-class>
+ </interceptor-binding>
+ </assembly-descriptor>
+</ejb-jar>
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/openejb-jar.xml?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/openejb-jar.xml (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/openejb-jar.xml Wed Jun 25 12:14:56 2014
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openejb-jar xmlns="http://www.openejb.org/openejb-jar/1.1">
+ <pojo-deployment class-name="jaxrs-application">
+ <properties>
+ cxf.jaxrs.providers = com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider,org.superbiz.webapp2.provider.ConstraintViolationExceptionMapper
+ </properties>
+ </pojo-deployment>
+</openejb-jar>
\ No newline at end of file
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/web.xml?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/web.xml (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/WEB-INF/web.xml Wed Jun 25 12:14:56 2014
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+ version="3.0">
+ <session-config>
+ <session-timeout>
+ 30
+ </session-timeout>
+ </session-config>
+</web-app>
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/index.jsp?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/index.jsp (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/WebApp2/src/main/webapp/index.jsp Wed Jun 25 12:14:56 2014
@@ -0,0 +1,13 @@
+<%@page contentType="text/html" pageEncoding="UTF-8" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>JSP Page</title>
+</head>
+<body>
+<h1>Hello World!</h1>
+</body>
+</html>
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/pom.xml?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/pom.xml (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/pom.xml Wed Jun 25 12:14:56 2014
@@ -0,0 +1,156 @@
+<?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"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.superbiz</groupId>
+ <artifactId>bval-evaluation-redeployment</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <tomee.test.version>1.7.0-SNAPSHOT</tomee.test.version>
+ <openejb.test.version>4.7.0-SNAPSHOT</openejb.test.version>
+ </properties>
+
+ <modules>
+ <module>WebApp1</module>
+ <module>WebApp2</module>
+ <module>runner</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>6.0-6</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${openejb.test.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-cxf-rs</artifactId>
+ <version>${openejb.test.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.omnifaces</groupId>
+ <artifactId>omnifaces</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.deltaspike.core</groupId>
+ <artifactId>deltaspike-core-api</artifactId>
+ <version>0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.deltaspike.core</groupId>
+ <artifactId>deltaspike-core-impl</artifactId>
+ <scope>runtime</scope>
+ <version>0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>arquillian-tomee-remote</artifactId>
+ <version>1.7.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <version>1.1.4.Final</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>2.6.13</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <repositories>
+ <repository>
+ <id>apache-m2-snapshot</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <id>Codehaus Snapshots</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ <pluginRepository>
+ <id>apache-m2-snapshot-plugin</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+</project>
\ No newline at end of file
Propchange: tomee/tomee/trunk/examples/bval-evaluation-redeployment/runner/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jun 25 12:14:56 2014
@@ -0,0 +1 @@
+target
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/runner/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/runner/pom.xml?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/runner/pom.xml (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/runner/pom.xml Wed Jun 25 12:14:56 2014
@@ -0,0 +1,35 @@
+<?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"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.superbiz</groupId>
+ <artifactId>bval-evaluation-redeployment</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>runner</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>arquillian-tomee-remote</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/runner/src/test/java/RedeploymentTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/runner/src/test/java/RedeploymentTest.java?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/runner/src/test/java/RedeploymentTest.java (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/runner/src/test/java/RedeploymentTest.java Wed Jun 25 12:14:56 2014
@@ -0,0 +1,49 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.ws.rs.core.MediaType;
+import java.io.File;
+
+@RunWith(Arquillian.class)
+public class RedeploymentTest {
+
+ public RedeploymentTest() {
+ }
+
+ @Deployment(name = "webapp1")
+ public static Archive<?> webapp1() {
+ return ShrinkWrap.createFromZipFile(WebArchive.class, new File("../WebApp1/target/WebApp1-1.1.0-SNAPSHOT.war"));
+ }
+
+ @Deployment(name = "webapp2")
+ public static Archive<?> webapp2() {
+ return ShrinkWrap.createFromZipFile(WebArchive.class, new File("../WebApp2/target/WebApp2-1.1.0-SNAPSHOT.war"));
+ }
+
+ @Test
+ public void valid() throws Exception {
+ final String port = System.getProperty("server.http.port");
+ System.out.println("Running test on port: " + port);
+ System.out.println("===========================================");
+ System.out.println(WebClient.create("http://localhost:" + port + "/WebApp1/test/")
+ .type(MediaType.APPLICATION_JSON_TYPE).post("valid").getStatus());
+ System.out.println("-------------------------------------------");
+ System.out.println(WebClient.create("http://localhost:" + port + "/WebApp2/test/")
+ .type(MediaType.APPLICATION_JSON_TYPE).post("valid").getStatus());
+ System.out.println("===========================================");
+ System.out.println("");
+ }
+
+}
Added: tomee/tomee/trunk/examples/bval-evaluation-redeployment/runner/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bval-evaluation-redeployment/runner/src/test/resources/arquillian.xml?rev=1605365&view=auto
==============================================================================
--- tomee/tomee/trunk/examples/bval-evaluation-redeployment/runner/src/test/resources/arquillian.xml (added)
+++ tomee/tomee/trunk/examples/bval-evaluation-redeployment/runner/src/test/resources/arquillian.xml Wed Jun 25 12:14:56 2014
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<arquillian
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ >
+
+ <container qualifier="tomee" default="true">
+ <configuration>
+ <property name="conf">src/test/conf/</property>
+ <property name="httpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="ajpPort">-1</property>
+ <property name="simpleLog">true</property>
+ <property name="dir">target/apache-tomee-remote</property>
+ <property name="appWorkingDir">target/arquillian-test-working-dir</property>
+ </configuration>
+ </container>
+</arquillian>