tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1614739 - in /tomee/tomee/trunk: ./ arquillian/ arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ container/openejb-core/src/ma...
Date Wed, 30 Jul 2014 18:47:07 GMT
Author: rmannibucau
Date: Wed Jul 30 18:47:07 2014
New Revision: 1614739

URL: http://svn.apache.org/r1614739
Log:
bval tck on tomee

Added:
    tomee/tomee/trunk/tck/bval-tomee/src/test/resources/arquillian.xml
    tomee/tomee/trunk/tck/bval-tomee/src/test/resources/dev.xml
      - copied, changed from r1614468, tomee/tomee/trunk/tck/bval-embedded/src/test/resources/dev.xml
Removed:
    tomee/tomee/trunk/tck/bval-tomee/src/main/
    tomee/tomee/trunk/tck/bval-tomee/src/test/resources/jsr303-tck-suite.xml
Modified:
    tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
    tomee/tomee/trunk/arquillian/pom.xml
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
    tomee/tomee/trunk/pom.xml
    tomee/tomee/trunk/tck/bval-embedded/pom.xml
    tomee/tomee/trunk/tck/bval-tomee/pom.xml

Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java?rev=1614739&r1=1614738&r2=1614739&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
(original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TomEEContainer.java
Wed Jul 30 18:47:07 2014
@@ -317,7 +317,6 @@ public abstract class TomEEContainer<Con
 
             return new ProtocolMetaData().addContext(httpContext);
         } catch (final Exception e) {
-            e.printStackTrace();
             throw new DeploymentException("Unable to deploy", e);
         }
     }
@@ -421,9 +420,12 @@ public abstract class TomEEContainer<Con
     public void undeploy(final Archive<?> archive) throws DeploymentException {
         final DeployedApp deployed = moduleIds.remove(archive.getName());
         try {
+            if (deployed == null) {
+                LOGGER.warning(archive.getName() + " was not deployed");
+                return;
+            }
             deployer().undeploy(deployed.path);
         } catch (final Exception e) {
-            e.printStackTrace();
             throw new DeploymentException("Unable to undeploy " + archive.getName(), e);
         } finally {
             LOGGER.info("cleaning " + deployed.file.getAbsolutePath());

Modified: tomee/tomee/trunk/arquillian/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/pom.xml?rev=1614739&r1=1614738&r2=1614739&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/pom.xml (original)
+++ tomee/tomee/trunk/arquillian/pom.xml Wed Jul 30 18:47:07 2014
@@ -32,9 +32,6 @@
   <name>OpenEJB :: Arquillian Adaptors Parent</name>
 
   <properties>
-    <version.arquillian>1.1.5.Final</version.arquillian>
-    <version.shrinkwrap.descriptor>2.0.0-alpha-6</version.shrinkwrap.descriptor>
-    <version.shrinkwrap.shrinkwrap>1.1.2</version.shrinkwrap.shrinkwrap>
     <test.coverage.skip>true</test.coverage.skip>
   </properties>
 

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1614739&r1=1614738&r2=1614739&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Wed Jul 30 18:47:07 2014
@@ -833,15 +833,19 @@ public class Assembler extends Assembler
                 for (final Entry<String, LazyValidator> lazyValidator : lazyValidators.entrySet())
{
                     final String id = lazyValidator.getKey();
                     final ValidatorFactory factory = lazyValidatorFactories.get(lazyValidator.getKey()).getFactory();
-                    final Validator validator = lazyValidator.getValue().getValidator();
                     try {
                         final String factoryName = VALIDATOR_FACTORY_NAMING_CONTEXT + id;
                         containerSystemContext.unbind(factoryName);
                         containerSystemContext.bind(factoryName, factory);
 
                         final String validatoryName = VALIDATOR_NAMING_CONTEXT + id;
-                        containerSystemContext.unbind(validatoryName);
-                        containerSystemContext.bind(validatoryName, validator);
+                        try { // do it after factory cause of TCKs which expects validator
to be created later
+                            final Validator val = lazyValidator.getValue().getValidator();
+                            containerSystemContext.unbind(validatoryName);
+                            containerSystemContext.bind(validatoryName, val);
+                        } catch (final Exception e) {
+                            logger.error(e.getMessage(), e);
+                        }
                     } catch (final NameAlreadyBoundException e) {
                         throw new OpenEJBException("ValidatorFactory already exists for module
" + id, e);
                     } catch (final Exception e) {

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java?rev=1614739&r1=1614738&r2=1614739&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java
Wed Jul 30 18:47:07 2014
@@ -488,9 +488,5 @@ public final class ValidatorBuilder {
                 // no-op
             }
         }
-
-        private T getInstance() {
-            return instance;
-        }
     }
 }

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java?rev=1614739&r1=1614738&r2=1614739&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
Wed Jul 30 18:47:07 2014
@@ -637,6 +637,10 @@ public class Logger {
      * @return String
      */
     private String getMessage(final String key, final String baseName) {
+        if (key == null) { // hehe, can happen
+            return "null";
+        }
+
         try {
 
             final ResourceBundle bundle = bundleCache.compute(baseName);

Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1614739&r1=1614738&r2=1614739&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Wed Jul 30 18:47:07 2014
@@ -126,6 +126,10 @@
     <!-- to change easily the javaee api version -->
     <javaee-api.version>7.0-SNAPSHOT</javaee-api.version>
 
+    <version.arquillian>1.1.5.Final</version.arquillian>
+    <version.shrinkwrap.descriptor>2.0.0-alpha-6</version.shrinkwrap.descriptor>
+    <version.shrinkwrap.shrinkwrap>1.1.2</version.shrinkwrap.shrinkwrap>
+
     <tomcat.version>8.0.9</tomcat.version>
 
     <cxf.version>3.0.2-SNAPSHOT</cxf.version>

Modified: tomee/tomee/trunk/tck/bval-embedded/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/bval-embedded/pom.xml?rev=1614739&r1=1614738&r2=1614739&view=diff
==============================================================================
--- tomee/tomee/trunk/tck/bval-embedded/pom.xml (original)
+++ tomee/tomee/trunk/tck/bval-embedded/pom.xml Wed Jul 30 18:47:07 2014
@@ -28,7 +28,6 @@
 
   <properties>
     <tck.version>1.1.0.Final</tck.version>
-    <arquillian.version>1.1.5.Final</arquillian.version>
     <validation.provider>org.apache.bval.jsr.ApacheValidationProvider</validation.provider>
   </properties>
 
@@ -55,11 +54,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jboss.arquillian.container</groupId>
-      <artifactId>arquillian-container-test-spi</artifactId>
-      <version>${arquillian.version}</version>
-    </dependency>
-    <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>arquillian-openejb-embedded-4</artifactId>
       <version>${project.version}</version>
@@ -79,13 +73,13 @@
     <dependency>
       <groupId>org.jboss.arquillian.testng</groupId>
       <artifactId>arquillian-testng-container</artifactId>
-      <version>${arquillian.version}</version>
+      <version>${version.arquillian}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.arquillian.protocol</groupId>
       <artifactId>arquillian-protocol-servlet</artifactId>
-      <version>${arquillian.version}</version>
+      <version>${version.arquillian}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: tomee/tomee/trunk/tck/bval-tomee/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/bval-tomee/pom.xml?rev=1614739&r1=1614738&r2=1614739&view=diff
==============================================================================
--- tomee/tomee/trunk/tck/bval-tomee/pom.xml (original)
+++ tomee/tomee/trunk/tck/bval-tomee/pom.xml Wed Jul 30 18:47:07 2014
@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-<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">
+<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">
   <parent>
     <artifactId>tck</artifactId>
     <groupId>org.apache.openejb</groupId>
@@ -25,25 +26,19 @@
 
   <artifactId>bval-tomee</artifactId>
   <name>OpenEJB :: TCK :: Bean Validation TomEE</name>
-  <description>Aggregates dependencies and runs the JSR-303 TCK in TomEE</description>
 
   <properties>
     <openejb.home>${project.build.directory}${file.separator}apache-tomee-webprofile-${tomee.version}</openejb.home>
+    <tck.version>1.1.0.Final</tck.version>
+    <validation.provider>org.apache.bval.jsr.ApacheValidationProvider</validation.provider>
   </properties>
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.bval</groupId>
-      <artifactId>bval-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.bval</groupId>
-      <artifactId>bval-jsr</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>tck-common</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
       <exclusions>
         <exclusion>
           <groupId>org.jboss.test-harness</groupId>
@@ -58,16 +53,12 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>apache-tomee</artifactId>
       <type>zip</type>
       <version>${tomee.version}</version>
       <classifier>webprofile</classifier>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>
@@ -75,20 +66,46 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.hibernate.jsr303.tck</groupId>
-      <artifactId>jsr303-tck</artifactId>
-      <version>1.0.6.GA</version>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>arquillian-tomee-remote</artifactId>
+      <version>${tomee.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate.beanvalidation.tck</groupId>
+      <artifactId>beanvalidation-tck-tests</artifactId>
+      <version>${tck.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.arquillian.testng</groupId>
+      <artifactId>arquillian-testng-container</artifactId>
+      <version>${version.arquillian}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.arquillian.protocol</groupId>
+      <artifactId>arquillian-protocol-servlet</artifactId>
+      <version>${version.arquillian}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.shrinkwrap.descriptors</groupId>
+      <artifactId>shrinkwrap-descriptors-spi</artifactId>
+      <version>${version.shrinkwrap.descriptor}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.shrinkwrap</groupId>
+      <artifactId>shrinkwrap-api</artifactId>
+      <version>${version.shrinkwrap.shrinkwrap}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.shrinkwrap</groupId>
+      <artifactId>shrinkwrap-impl-base</artifactId>
+      <version>${version.shrinkwrap.shrinkwrap}</version>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.testng</groupId>
-          <artifactId>testng</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.validation</groupId>
-          <artifactId>validation-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
   </dependencies>
 
@@ -99,119 +116,49 @@
         <filtering>true</filtering>
       </resource>
     </resources>
+
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.7</version>
-        <executions>
-          <execution>
-            <id>reserve-network-port</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>reserve-network-port</goal>
-            </goals>
-            <configuration>
-              <portNames>
-                <portName>tomee.ssl.port</portName>
-                <portName>tomee.ajp.port</portName>
-                <portName>tomee.http.port</portName>
-                <portName>tomee.shutdown.port</portName>
-              </portNames>
-            </configuration>
-          </execution>
-        </executions>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.17</version>
+        <configuration>
+          <useFile>false</useFile>
+          <disableXmlReport>true</disableXmlReport>
+          <skip>true</skip>
+        </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.6</version>
+        <version>2.8</version>
         <executions>
           <execution>
-            <id>unpack</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.apache.openejb</groupId>
-                  <artifactId>apache-tomee</artifactId>
-                  <version>${tomee.version}</version>
-                  <type>zip</type>
-                  <classifier>webprofile</classifier>
-                  <outputDirectory>${project.build.directory}</outputDirectory>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-          <execution>
-            <id>copy</id>
-            <phase>pre-integration-test</phase>
+            <id>copy-tck-test-suite-file</id>
+            <phase>generate-test-sources</phase>
             <goals>
               <goal>copy</goal>
             </goals>
             <configuration>
+              <stripVersion>true</stripVersion>
               <artifactItems>
                 <artifactItem>
-                  <groupId>org.apache.openejb</groupId>
-                  <artifactId>tck-common</artifactId>
-                  <version>${project.version}</version>
-                  <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.apache.openejb</groupId>
-                  <artifactId>bval-tomee</artifactId>
-                  <version>${project.version}</version>
-                  <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+                  <groupId>org.hibernate.beanvalidation.tck</groupId>
+                  <artifactId>beanvalidation-tck-tests</artifactId>
+                  <type>xml</type>
+                  <classifier>suite</classifier>
+                  <overWrite>false</overWrite>
                 </artifactItem>
               </artifactItems>
             </configuration>
           </execution>
         </executions>
       </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.17</version>
-        <configuration>
-		  <useFile>false</useFile>
-		  <disableXmlReport>true</disableXmlReport>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
         <version>2.13</version>
-        <configuration>
-          <suiteXmlFiles>
-            <suiteXmlFile>src/test/resources/jsr303-tck-suite.xml</suiteXmlFile>
-          </suiteXmlFiles>
-          <systemPropertyVariables>
-            <org.jboss.testharness.standalone>false</org.jboss.testharness.standalone>
-            <org.jboss.testharness.runIntegrationTests>true</org.jboss.testharness.runIntegrationTests>
-            <org.jboss.testharness.container.forceRestart>true</org.jboss.testharness.container.forceRestart>
-            <org.jboss.testharness.libraryDirectory>${project.build.directory}/dependency/lib</org.jboss.testharness.libraryDirectory>
-            <org.jboss.testharness.host>localhost:${tomee.http.port}</org.jboss.testharness.host>
-            <deleteArtifacts>true</deleteArtifacts>
-
-            <force.deployment>true</force.deployment>
-            <validation.provider>org.apache.bval.jsr.ApacheValidationProvider</validation.provider>
-
-            <!--<maven.failsafe.debug>true</maven.failsafe.debug>-->
-            <!--<openejb.server.debug>true</openejb.server.debug>-->
-            <java.naming.provider.url>http://localhost:${tomee.http.port}/tomee/ejb</java.naming.provider.url>
-            <connect.tries>90</connect.tries>
-            <server.http.port>${tomee.http.port}</server.http.port>
-            <server.shutdown.port>${tomee.shutdown.port}</server.shutdown.port>
-            <java.opts>-Xmx512m -Xss2048k -XX:PermSize=64m -XX:MaxPermSize=256m -XX:ReservedCodeCacheSize=64m</java.opts>
-            <openejb.home>${openejb.home}</openejb.home>
-          </systemPropertyVariables>
-        </configuration>
         <executions>
           <execution>
             <id>integration-test</id>
@@ -228,35 +175,16 @@
             </goals>
           </execution>
         </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.7</version>
-        <executions>
-          <execution>
-            <id>remove-apps</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target>
-                <delete dir="${openejb.home}/webapps/docs" />
-                <delete dir="${openejb.home}/webapps/ROOT" />
-                <delete dir="${openejb.home}/webapps/manager" />
-                <delete dir="${openejb.home}/webapps/host-manager" />
-                <replace file="${openejb.home}/conf/server.xml" token="8080" value="${tomee.http.port}"
/>
-                <replace file="${openejb.home}/conf/server.xml" token="8443" value="${tomee.ssl.port}"
/>
-                <replace file="${openejb.home}/conf/server.xml" token="8005" value="${tomee.shutdown.port}"
/>
-                <replace file="${openejb.home}/conf/server.xml" token="8009" value="${tomee.ajp.port}"
/>
-
-                <!-- validator provider property -->
-                <copy file="src/main/tomcat/conf/system.properties" tofile="${openejb.home}/conf/system.properties"
overwrite="true" />
-              </target>
-            </configuration>
-          </execution>
-        </executions>
+        <configuration>
+          <systemPropertyVariables>
+            <validation.provider>org.apache.bval.jsr.ApacheValidationProvider</validation.provider>
+          </systemPropertyVariables>
+          <suiteXmlFiles>
+            <suiteXmlFile>${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml</suiteXmlFile>
+          </suiteXmlFiles>
+          <parallel>methods</parallel>
+          <threadCount>4</threadCount>
+        </configuration>
       </plugin>
     </plugins>
   </build>

Added: tomee/tomee/trunk/tck/bval-tomee/src/test/resources/arquillian.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/bval-tomee/src/test/resources/arquillian.xml?rev=1614739&view=auto
==============================================================================
--- tomee/tomee/trunk/tck/bval-tomee/src/test/resources/arquillian.xml (added)
+++ tomee/tomee/trunk/tck/bval-tomee/src/test/resources/arquillian.xml Wed Jul 30 18:47:07
2014
@@ -0,0 +1,37 @@
+<?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"
+    xsi:schemaLocation="
+      http://jboss.org/schema/arquillian
+      http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+  <container qualifier="tomee" default="true">
+    <configuration>
+      <property name="catalina_opts">-Xmx512m</property>
+      <property name="httpPort">-1</property>
+      <property name="stopPort">-1</property>
+      <property name="ajpPort">-1</property>
+      <property name="dir">target/tomee-tck</property>
+      <property name="appWorkingDir">target/tck-workdir</property>
+      <property name="simpleLog">true</property>
+      <property name="properties">validation.provider = org.apache.bval.jsr.ApacheValidationProvider</property>
+    </configuration>
+  </container>
+</arquillian>

Copied: tomee/tomee/trunk/tck/bval-tomee/src/test/resources/dev.xml (from r1614468, tomee/tomee/trunk/tck/bval-embedded/src/test/resources/dev.xml)
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/bval-tomee/src/test/resources/dev.xml?p2=tomee/tomee/trunk/tck/bval-tomee/src/test/resources/dev.xml&p1=tomee/tomee/trunk/tck/bval-embedded/src/test/resources/dev.xml&r1=1614468&r2=1614739&rev=1614739&view=diff
==============================================================================
--- tomee/tomee/trunk/tck/bval-embedded/src/test/resources/dev.xml (original)
+++ tomee/tomee/trunk/tck/bval-tomee/src/test/resources/dev.xml Wed Jul 30 18:47:07 2014
@@ -16,10 +16,10 @@
   limitations under the License.
   -->
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-<suite name="JSR-303-TCK" verbose="1">
-    <test name="JSR-303-TCK">
+<suite name="BVal-TCK" verbose="1">
+    <test name="BVal-TCK">
       <classes>
-        <class name="org.hibernate.beanvalidation.tck.tests.integration.cdi.executable.types.ExecutableTypesTest"
/>
+        <class name="org.hibernate.beanvalidation.tck.tests.bootstrap.ConfigurationTest"
/>
       </classes>
     </test>
 </suite>



Mime
View raw message