rename tck module to remove version
Project: http://git-wip-us.apache.org/repos/asf/bval/repo Commit: http://git-wip-us.apache.org/repos/asf/bval/commit/ebc06167 Tree: http://git-wip-us.apache.org/repos/asf/bval/tree/ebc06167 Diff: http://git-wip-us.apache.org/repos/asf/bval/diff/ebc06167 Branch: refs/heads/bv2 Commit: ebc06167b26c91f16737606d65decd8dfe429998 Parents: 9610691 Author: Matt Benson <[email protected]> Authored: Sat Feb 24 14:09:34 2018 -0600 Committer: Matt Benson <[email protected]> Committed: Sat Feb 24 14:09:34 2018 -0600 ---------------------------------------------------------------------- bval-tck/pom.xml | 247 +++++++++++++++++++ .../arquillian/BValArquillianExtension.java | 28 +++ .../org/apache/bval/arquillian/EJBEnricher.java | 58 +++++ .../bval/arquillian/jndi/BValJndiFactory.java | 49 ++++ ....jboss.arquillian.core.spi.LoadableExtension | 1 + bval-tck/src/main/resources/jndi.properties | 17 ++ bval-tck/src/test/resources/arquillian.xml | 28 +++ bval-tck/work-tests-suite.xml | 30 +++ bval-tck11/pom.xml | 247 ------------------- .../arquillian/BValArquillianExtension.java | 28 --- .../org/apache/bval/arquillian/EJBEnricher.java | 58 ----- .../bval/arquillian/jndi/BValJndiFactory.java | 49 ---- ....jboss.arquillian.core.spi.LoadableExtension | 1 - bval-tck11/src/main/resources/jndi.properties | 17 -- bval-tck11/src/test/resources/arquillian.xml | 28 --- bval-tck11/work-tests-suite.xml | 30 --- pom.xml | 2 +- 17 files changed, 459 insertions(+), 459 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bval/blob/ebc06167/bval-tck/pom.xml ---------------------------------------------------------------------- diff --git a/bval-tck/pom.xml b/bval-tck/pom.xml new file mode 100644 index 0000000..cd338b7 --- /dev/null +++ b/bval-tck/pom.xml @@ -0,0 +1,247 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> +<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> + <artifactId>bval-parent</artifactId> + <groupId>org.apache.bval</groupId> + <version>2.0.0-SNAPSHOT</version> + </parent> + + <artifactId>bval-tck-runner</artifactId> + <name>Apache BVal :: bval-tck (TCK Runner)</name> + <description>Aggregates dependencies and runs the JSR-349 TCK</description> + + <properties> + <tck.version>2.0.2.Final</tck.version> + <owb.version>2.0.4</owb.version> + <arquillian.version>1.1.11.Final</arquillian.version> + <validation.provider>org.apache.bval.jsr.ApacheValidationProvider</validation.provider> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-validation_2.0_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-atinject_1.0_spec</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jcdi_2.0_spec</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.3_spec</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-interceptor_1.2_spec</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-ejb_3.1_spec</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-el-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.bval</groupId> + <artifactId>bval-core</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.bval</groupId> + <artifactId>bval-jsr</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-container-test-spi</artifactId> + <version>${arquillian.version}</version> + </dependency> + <dependency> + <groupId>org.apache.openwebbeans.arquillian</groupId> + <artifactId>owb-arquillian-standalone</artifactId> + <version>${owb.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.openwebbeans</groupId> + <artifactId>openwebbeans-impl</artifactId> + <version>${owb.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat-jasper-el</artifactId> + <version>9.0.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate.beanvalidation.tck</groupId> + <artifactId>beanvalidation-tck-tests</artifactId> + <version>${tck.version}</version> + <exclusions> + <exclusion> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.spec.javax.interceptor</groupId> + <artifactId>jboss-interceptors-api_1.2_spec</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.testng</groupId> + <artifactId>arquillian-testng-container</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.protocol</groupId> + <artifactId>arquillian-protocol-servlet</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>6.8.21</version> + <scope>test</scope> + </dependency> + </dependencies> + + <profiles> + <profile> + <id>tck</id> + <activation> + <activeByDefault>true</activeByDefault> + <property> + <name>tck</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <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.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> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml + </suiteXmlFile> + </suiteXmlFiles> + <systemProperties> + <property> + <name>validation.provider</name> + <value>${validation.provider}</value> + </property> + </systemProperties> + <parallel>methods</parallel> + <threadCount>4</threadCount> + + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <executions> + <execution> + <id>generate-test-report</id> + <phase>test</phase> + <goals> + <goal>report-only</goal> + </goals> + </execution> + </executions> + <configuration> + <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> + <outputName>test-report</outputName> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> http://git-wip-us.apache.org/repos/asf/bval/blob/ebc06167/bval-tck/src/main/java/org/apache/bval/arquillian/BValArquillianExtension.java ---------------------------------------------------------------------- diff --git a/bval-tck/src/main/java/org/apache/bval/arquillian/BValArquillianExtension.java b/bval-tck/src/main/java/org/apache/bval/arquillian/BValArquillianExtension.java new file mode 100644 index 0000000..7ad860c --- /dev/null +++ b/bval-tck/src/main/java/org/apache/bval/arquillian/BValArquillianExtension.java @@ -0,0 +1,28 @@ +/* + * 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. + */ +package org.apache.bval.arquillian; + +import org.jboss.arquillian.core.spi.LoadableExtension; +import org.jboss.arquillian.test.spi.TestEnricher; + +public class BValArquillianExtension implements LoadableExtension { + public void register(final ExtensionBuilder builder) { + builder.service(TestEnricher.class, EJBEnricher.class); + } +} http://git-wip-us.apache.org/repos/asf/bval/blob/ebc06167/bval-tck/src/main/java/org/apache/bval/arquillian/EJBEnricher.java ---------------------------------------------------------------------- diff --git a/bval-tck/src/main/java/org/apache/bval/arquillian/EJBEnricher.java b/bval-tck/src/main/java/org/apache/bval/arquillian/EJBEnricher.java new file mode 100644 index 0000000..da55ba5 --- /dev/null +++ b/bval-tck/src/main/java/org/apache/bval/arquillian/EJBEnricher.java @@ -0,0 +1,58 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2013, Red Hat, Inc. and/or its affiliates, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* 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.apache.bval.arquillian; + +import org.jboss.arquillian.test.spi.TestEnricher; + +import javax.annotation.Resource; +import javax.ejb.EJB; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; +import java.lang.reflect.Field; +import java.lang.reflect.Method; + +// mock a very very simple EJB container (in fact only local bean @Resource Validator* injections) +public class EJBEnricher implements TestEnricher { + public void enrich(final Object testCase) { + for (final Field field : testCase.getClass().getDeclaredFields()) { + if (field.getAnnotation(EJB.class) != null) { + try { + final Object instance = field.getType().getConstructor().newInstance(); + for (final Field f : field.getType().getDeclaredFields()) { + if (f.getAnnotation(Resource.class) != null) { + if (f.getType().equals(Validator.class)) { + f.set(instance, + Validation.byDefaultProvider().configure().buildValidatorFactory().getValidator()); + } else if (f.getType().equals(ValidatorFactory.class)) { + f.set(instance, Validation.byDefaultProvider().configure().buildValidatorFactory()); + } + } + } + field.setAccessible(true); + field.set(testCase, instance); + } catch (final Exception e) { + // no-op + } + } + } + } + + public Object[] resolve(Method method) { + return new Object[0]; + } +} http://git-wip-us.apache.org/repos/asf/bval/blob/ebc06167/bval-tck/src/main/java/org/apache/bval/arquillian/jndi/BValJndiFactory.java ---------------------------------------------------------------------- diff --git a/bval-tck/src/main/java/org/apache/bval/arquillian/jndi/BValJndiFactory.java b/bval-tck/src/main/java/org/apache/bval/arquillian/jndi/BValJndiFactory.java new file mode 100644 index 0000000..3b3d71c --- /dev/null +++ b/bval-tck/src/main/java/org/apache/bval/arquillian/jndi/BValJndiFactory.java @@ -0,0 +1,49 @@ +/* + * 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. + */ +package org.apache.bval.arquillian.jndi; + +import javax.naming.Context; +import javax.naming.NamingException; +import javax.naming.spi.InitialContextFactory; +import javax.validation.Validation; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.util.Hashtable; + +// mock a context to satisfy lookups +public class BValJndiFactory implements InitialContextFactory { + public Context getInitialContext(final Hashtable<?, ?> environment) throws NamingException { + return Context.class.cast(Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), + new Class<?>[] { Context.class }, new InvocationHandler() { + public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { + if (method.getName().equals("lookup") && args != null && args.length == 1 + && String.class.isInstance(args[0])) { + if ("java:comp/ValidatorFactory".equals(args[0])) { + return Validation.byDefaultProvider().configure().buildValidatorFactory(); + } + if ("java:comp/Validator".equals(args[0])) { + return Validation.byDefaultProvider().configure().buildValidatorFactory().getValidator(); + } + } + return null; + } + })); + } +} http://git-wip-us.apache.org/repos/asf/bval/blob/ebc06167/bval-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension ---------------------------------------------------------------------- diff --git a/bval-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/bval-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension new file mode 100644 index 0000000..7e1dc48 --- /dev/null +++ b/bval-tck/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension @@ -0,0 +1 @@ +org.apache.bval.arquillian.BValArquillianExtension http://git-wip-us.apache.org/repos/asf/bval/blob/ebc06167/bval-tck/src/main/resources/jndi.properties ---------------------------------------------------------------------- diff --git a/bval-tck/src/main/resources/jndi.properties b/bval-tck/src/main/resources/jndi.properties new file mode 100644 index 0000000..8a42146 --- /dev/null +++ b/bval-tck/src/main/resources/jndi.properties @@ -0,0 +1,17 @@ +# 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. +java.naming.factory.initial = org.apache.bval.arquillian.jndi.BValJndiFactory http://git-wip-us.apache.org/repos/asf/bval/blob/ebc06167/bval-tck/src/test/resources/arquillian.xml ---------------------------------------------------------------------- diff --git a/bval-tck/src/test/resources/arquillian.xml b/bval-tck/src/test/resources/arquillian.xml new file mode 100644 index 0000000..20bb121 --- /dev/null +++ b/bval-tck/src/test/resources/arquillian.xml @@ -0,0 +1,28 @@ +<?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="owb" default="true"> + <configuration> + <property name="useOnlyArchiveResources">true</property> + <property name="useOnlyArchiveResourcesExcludes">META-INF/services/javax.validation.spi.ValidationProvider</property> + </configuration> + </container> +</arquillian> http://git-wip-us.apache.org/repos/asf/bval/blob/ebc06167/bval-tck/work-tests-suite.xml ---------------------------------------------------------------------- diff --git a/bval-tck/work-tests-suite.xml b/bval-tck/work-tests-suite.xml new file mode 100644 index 0000000..3bb8b11 --- /dev/null +++ b/bval-tck/work-tests-suite.xml @@ -0,0 +1,30 @@ +<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; > +<!-- + 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. +--> +<!-- +JUST HERE TO BE ABLE TO RUN TCK ONE BY ONE WHEN DEVELOPING +think to add -Dvalidation.provider=org.apache.bval.jsr.ApacheValidationProvider to your runner config +--> +<suite name="tmp" verbose="1"> + <test name="tmp"> + <classes> + <class name="org.hibernate.beanvalidation.tck.tests.xmlconfiguration.groupconversion.containerelement.XmlBasedContainerElementGroupConversionValidationTest"/> +<!-- + <class name="org.hibernate.beanvalidation.tck.tests.util.ConstraintViolationAssertTest"/> +--> + </classes> + </test> +</suite> http://git-wip-us.apache.org/repos/asf/bval/blob/ebc06167/bval-tck11/pom.xml ---------------------------------------------------------------------- diff --git a/bval-tck11/pom.xml b/bval-tck11/pom.xml deleted file mode 100644 index ed72752..0000000 --- a/bval-tck11/pom.xml +++ /dev/null @@ -1,247 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -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. ---> -<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> - <artifactId>bval-parent</artifactId> - <groupId>org.apache.bval</groupId> - <version>2.0.0-SNAPSHOT</version> - </parent> - - <artifactId>bval-tck11-runner</artifactId> - <name>Apache BVal :: bval-tck11 (TCK Runner)</name> - <description>Aggregates dependencies and runs the JSR-349 TCK</description> - - <properties> - <tck.version>2.0.2.Final</tck.version> - <owb.version>2.0.4</owb.version> - <arquillian.version>1.1.11.Final</arquillian.version> - <validation.provider>org.apache.bval.jsr.ApacheValidationProvider</validation.provider> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-validation_2.0_spec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-atinject_1.0_spec</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jcdi_2.0_spec</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.3_spec</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-interceptor_1.2_spec</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-ejb_3.1_spec</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-el-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.bval</groupId> - <artifactId>bval-core</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.bval</groupId> - <artifactId>bval-jsr</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.arquillian.container</groupId> - <artifactId>arquillian-container-test-spi</artifactId> - <version>${arquillian.version}</version> - </dependency> - <dependency> - <groupId>org.apache.openwebbeans.arquillian</groupId> - <artifactId>owb-arquillian-standalone</artifactId> - <version>${owb.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.openwebbeans</groupId> - <artifactId>openwebbeans-impl</artifactId> - <version>${owb.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-jasper-el</artifactId> - <version>9.0.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate.beanvalidation.tck</groupId> - <artifactId>beanvalidation-tck-tests</artifactId> - <version>${tck.version}</version> - <exclusions> - <exclusion> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.spec.javax.interceptor</groupId> - <artifactId>jboss-interceptors-api_1.2_spec</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.arquillian.testng</groupId> - <artifactId>arquillian-testng-container</artifactId> - <version>${arquillian.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.arquillian.protocol</groupId> - <artifactId>arquillian-protocol-servlet</artifactId> - <version>${arquillian.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>6.8.21</version> - <scope>test</scope> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>tck</id> - <activation> - <activeByDefault>true</activeByDefault> - <property> - <name>tck11</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <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.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> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml - </suiteXmlFile> - </suiteXmlFiles> - <systemProperties> - <property> - <name>validation.provider</name> - <value>${validation.provider}</value> - </property> - </systemProperties> - <parallel>methods</parallel> - <threadCount>4</threadCount> - - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <executions> - <execution> - <id>generate-test-report</id> - <phase>test</phase> - <goals> - <goal>report-only</goal> - </goals> - </execution> - </executions> - <configuration> - <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> - <outputName>test-report</outputName> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> http://git-wip-us.apache.org/repos/asf/bval/blob/ebc06167/bval-tck11/src/main/java/org/apache/bval/arquillian/BValArquillianExtension.java ---------------------------------------------------------------------- diff --git a/bval-tck11/src/main/java/org/apache/bval/arquillian/BValArquillianExtension.java b/bval-tck11/src/main/java/org/apache/bval/arquillian/BValArquillianExtension.java deleted file mode 100644 index 7ad860c..0000000 --- a/bval-tck11/src/main/java/org/apache/bval/arquillian/BValArquillianExtension.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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. - */ -package org.apache.bval.arquillian; - -import org.jboss.arquillian.core.spi.LoadableExtension; -import org.jboss.arquillian.test.spi.TestEnricher; - -public class BValArquillianExtension implements LoadableExtension { - public void register(final ExtensionBuilder builder) { - builder.service(TestEnricher.class, EJBEnricher.class); - } -} http://git-wip-us.apache.org/repos/asf/bval/blob/ebc06167/bval-tck11/src/main/java/org/apache/bval/arquillian/EJBEnricher.java ---------------------------------------------------------------------- diff --git a/bval-tck11/src/main/java/org/apache/bval/arquillian/EJBEnricher.java b/bval-tck11/src/main/java/org/apache/bval/arquillian/EJBEnricher.java deleted file mode 100644 index da55ba5..0000000 --- a/bval-tck11/src/main/java/org/apache/bval/arquillian/EJBEnricher.java +++ /dev/null @@ -1,58 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2013, Red Hat, Inc. and/or its affiliates, and individual contributors -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* 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.apache.bval.arquillian; - -import org.jboss.arquillian.test.spi.TestEnricher; - -import javax.annotation.Resource; -import javax.ejb.EJB; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; -import java.lang.reflect.Field; -import java.lang.reflect.Method; - -// mock a very very simple EJB container (in fact only local bean @Resource Validator* injections) -public class EJBEnricher implements TestEnricher { - public void enrich(final Object testCase) { - for (final Field field : testCase.getClass().getDeclaredFields()) { - if (field.getAnnotation(EJB.class) != null) { - try { - final Object instance = field.getType().getConstructor().newInstance(); - for (final Field f : field.getType().getDeclaredFields()) { - if (f.getAnnotation(Resource.class) != null) { - if (f.getType().equals(Validator.class)) { - f.set(instance, - Validation.byDefaultProvider().configure().buildValidatorFactory().getValidator()); - } else if (f.getType().equals(ValidatorFactory.class)) { - f.set(instance, Validation.byDefaultProvider().configure().buildValidatorFactory()); - } - } - } - field.setAccessible(true); - field.set(testCase, instance); - } catch (final Exception e) { - // no-op - } - } - } - } - - public Object[] resolve(Method method) { - return new Object[0]; - } -} http://git-wip-us.apache.org/repos/asf/bval/blob/ebc06167/bval-tck11/src/main/java/org/apache/bval/arquillian/jndi/BValJndiFactory.java ---------------------------------------------------------------------- diff --git a/bval-tck11/src/main/java/org/apache/bval/arquillian/jndi/BValJndiFactory.java b/bval-tck11/src/main/java/org/apache/bval/arquillian/jndi/BValJndiFactory.java deleted file mode 100644 index 3b3d71c..0000000 --- a/bval-tck11/src/main/java/org/apache/bval/arquillian/jndi/BValJndiFactory.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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. - */ -package org.apache.bval.arquillian.jndi; - -import javax.naming.Context; -import javax.naming.NamingException; -import javax.naming.spi.InitialContextFactory; -import javax.validation.Validation; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.util.Hashtable; - -// mock a context to satisfy lookups -public class BValJndiFactory implements InitialContextFactory { - public Context getInitialContext(final Hashtable<?, ?> environment) throws NamingException { - return Context.class.cast(Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), - new Class<?>[] { Context.class }, new InvocationHandler() { - public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable { - if (method.getName().equals("lookup") && args != null && args.length == 1 - && String.class.isInstance(args[0])) { - if ("java:comp/ValidatorFactory".equals(args[0])) { - return Validation.byDefaultProvider().configure().buildValidatorFactory(); - } - if ("java:comp/Validator".equals(args[0])) { - return Validation.byDefaultProvider().configure().buildValidatorFactory().getValidator(); - } - } - return null; - } - })); - } -} http://git-wip-us.apache.org/repos/asf/bval/blob/ebc06167/bval-tck11/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension ---------------------------------------------------------------------- diff --git a/bval-tck11/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/bval-tck11/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension deleted file mode 100644 index 7e1dc48..0000000 --- a/bval-tck11/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension +++ /dev/null @@ -1 +0,0 @@ -org.apache.bval.arquillian.BValArquillianExtension http://git-wip-us.apache.org/repos/asf/bval/blob/ebc06167/bval-tck11/src/main/resources/jndi.properties ---------------------------------------------------------------------- diff --git a/bval-tck11/src/main/resources/jndi.properties b/bval-tck11/src/main/resources/jndi.properties deleted file mode 100644 index 8a42146..0000000 --- a/bval-tck11/src/main/resources/jndi.properties +++ /dev/null @@ -1,17 +0,0 @@ -# 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. -java.naming.factory.initial = org.apache.bval.arquillian.jndi.BValJndiFactory http://git-wip-us.apache.org/repos/asf/bval/blob/ebc06167/bval-tck11/src/test/resources/arquillian.xml ---------------------------------------------------------------------- diff --git a/bval-tck11/src/test/resources/arquillian.xml b/bval-tck11/src/test/resources/arquillian.xml deleted file mode 100644 index 20bb121..0000000 --- a/bval-tck11/src/test/resources/arquillian.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?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="owb" default="true"> - <configuration> - <property name="useOnlyArchiveResources">true</property> - <property name="useOnlyArchiveResourcesExcludes">META-INF/services/javax.validation.spi.ValidationProvider</property> - </configuration> - </container> -</arquillian> http://git-wip-us.apache.org/repos/asf/bval/blob/ebc06167/bval-tck11/work-tests-suite.xml ---------------------------------------------------------------------- diff --git a/bval-tck11/work-tests-suite.xml b/bval-tck11/work-tests-suite.xml deleted file mode 100644 index 3bb8b11..0000000 --- a/bval-tck11/work-tests-suite.xml +++ /dev/null @@ -1,30 +0,0 @@ -<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; > -<!-- - 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. ---> -<!-- -JUST HERE TO BE ABLE TO RUN TCK ONE BY ONE WHEN DEVELOPING -think to add -Dvalidation.provider=org.apache.bval.jsr.ApacheValidationProvider to your runner config ---> -<suite name="tmp" verbose="1"> - <test name="tmp"> - <classes> - <class name="org.hibernate.beanvalidation.tck.tests.xmlconfiguration.groupconversion.containerelement.XmlBasedContainerElementGroupConversionValidationTest"/> -<!-- - <class name="org.hibernate.beanvalidation.tck.tests.util.ConstraintViolationAssertTest"/> ---> - </classes> - </test> -</suite> http://git-wip-us.apache.org/repos/asf/bval/blob/ebc06167/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1ea9278..cc73e25 100644 --- a/pom.xml +++ b/pom.xml @@ -697,7 +697,7 @@ <module>bval-jsr</module> <module>bval-json</module> <module>bval-extras</module> - <module>bval-tck11</module> + <module>bval-tck</module> <module>bundle</module> </modules>
