Re: pom reviews

From: Romain Grecourt <romain.grecourt_at_oracle.com>
Date: Fri, 29 Mar 2013 19:38:14 +0100

Generally looks good.
Could you try to manage versions (testng, cdi-api, appserver
dependencies like utils-ng or gf-client) in appserver/tests/cdi/pom.xml ?

Thanks,
Romain

On 3/29/13 7:23 PM, John Wells wrote:
> This adds a test case for http://java.net/jira/browse/GLASSFISH-18802.
>
> It also establishes a framework for future CDI test cases.
>
> Index: appserver/tests/cdi/pom.xml
> ===================================================================
> --- appserver/tests/cdi/pom.xml (revision 61000)
> +++ appserver/tests/cdi/pom.xml (working copy)
> @@ -57,5 +57,6 @@
> <name>GlassFish CDI Tests</name>
> <modules>
> <module>negative</module>
> + <module>cases</module>
> </modules>
> </project>
> Index:
> appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/Interceptor1.java
> ===================================================================
> ---
> appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/Interceptor1.java
> (revision 0)
> +++
> appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/Interceptor1.java
> (revision 0)
> @@ -0,0 +1,70 @@
> +/*
> + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
> + *
> + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
> + *
> + * The contents of this file are subject to the terms of either the GNU
> + * General Public License Version 2 only ("GPL") or the Common
> Development
> + * and Distribution License("CDDL") (collectively, the "License"). You
> + * may not use this file except in compliance with the License. You can
> + * obtain a copy of the License at
> + * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
> + * or packager/legal/LICENSE.txt. See the License for the specific
> + * language governing permissions and limitations under the License.
> + *
> + * When distributing the software, include this License Header Notice
> in each
> + * file and include the License file at packager/legal/LICENSE.txt.
> + *
> + * GPL Classpath Exception:
> + * Oracle designates this particular file as subject to the "Classpath"
> + * exception as provided by Oracle in the GPL Version 2 section of
> the License
> + * file that accompanied this code.
> + *
> + * Modifications:
> + * If applicable, add the following below the License Header, with
> the fields
> + * enclosed by brackets [] replaced by your own identifying information:
> + * "Portions Copyright [year] [name of copyright owner]"
> + *
> + * Contributor(s):
> + * If you wish your version of this file to be governed by only the
> CDDL or
> + * only the GPL Version 2, indicate your decision by adding
> "[Contributor]
> + * elects to include this software in this distribution under the
> [CDDL or GPL
> + * Version 2] license." If you don't indicate a single choice of
> license, a
> + * recipient has the option to distribute your version of this file
> under
> + * either the CDDL, the GPL Version 2 or to extend the choice of
> license to
> + * its licensees as provided above. However, if you add GPL Version
> 2 code
> + * and therefore, elected the GPL Version 2 license, then the option
> applies
> + * only if the new code is made subject to such option by the copyright
> + * holder.
> + */
> +package com.oracle.cdi.cases.devtests.multiejb1;
> +
> +import java.util.List;
> +
> +import javax.interceptor.AroundInvoke;
> +import javax.interceptor.Interceptor;
> +import javax.interceptor.InvocationContext;
> +
> +/**
> + * @author jwells
> + *
> + */
> +_at_Interceptor
> +_at_RecordingInterceptor
> +public class Interceptor1 {
> +
> + @SuppressWarnings("unchecked")
> + @AroundInvoke
> + public Object intercept(InvocationContext context) throws
> Exception {
> + Object params[] = context.getParameters();
> + if (params.length != 1 || !(params[0] instanceof List)) {
> + return context.proceed();
> + }
> +
> + List<String> param = (List<String>) params[0];
> + param.add(MultiBeansXmlEjb1.INTERCEPTOR1);
> +
> + return context.proceed();
> + }
> +
> +}
>
> Property changes on:
> appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/Interceptor1.java
> ___________________________________________________________________
> Added: svn:mime-type
> + text/plain
>
> Index:
> appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/MultiBeansXmlEjb1.java
> ===================================================================
> ---
> appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/MultiBeansXmlEjb1.java
> (revision 0)
> +++
> appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/MultiBeansXmlEjb1.java
> (revision 0)
> @@ -0,0 +1,60 @@
> +/*
> + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
> + *
> + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
> + *
> + * The contents of this file are subject to the terms of either the GNU
> + * General Public License Version 2 only ("GPL") or the Common
> Development
> + * and Distribution License("CDDL") (collectively, the "License"). You
> + * may not use this file except in compliance with the License. You can
> + * obtain a copy of the License at
> + * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
> + * or packager/legal/LICENSE.txt. See the License for the specific
> + * language governing permissions and limitations under the License.
> + *
> + * When distributing the software, include this License Header Notice
> in each
> + * file and include the License file at packager/legal/LICENSE.txt.
> + *
> + * GPL Classpath Exception:
> + * Oracle designates this particular file as subject to the "Classpath"
> + * exception as provided by Oracle in the GPL Version 2 section of
> the License
> + * file that accompanied this code.
> + *
> + * Modifications:
> + * If applicable, add the following below the License Header, with
> the fields
> + * enclosed by brackets [] replaced by your own identifying information:
> + * "Portions Copyright [year] [name of copyright owner]"
> + *
> + * Contributor(s):
> + * If you wish your version of this file to be governed by only the
> CDDL or
> + * only the GPL Version 2, indicate your decision by adding
> "[Contributor]
> + * elects to include this software in this distribution under the
> [CDDL or GPL
> + * Version 2] license." If you don't indicate a single choice of
> license, a
> + * recipient has the option to distribute your version of this file
> under
> + * either the CDDL, the GPL Version 2 or to extend the choice of
> license to
> + * its licensees as provided above. However, if you add GPL Version
> 2 code
> + * and therefore, elected the GPL Version 2 license, then the option
> applies
> + * only if the new code is made subject to such option by the copyright
> + * holder.
> + */
> +package com.oracle.cdi.cases.devtests.multiejb1;
> +
> +import java.util.List;
> +
> +/**
> + * @author jwells
> + *
> + */
> +public interface MultiBeansXmlEjb1 {
> + public final static String INTERCEPTOR1 = "Interceptor1";
> + public final static String CALL_ME1 = "CallMe1";
> +
> + /**
> + * This method should have all interceptors listed in the return
> list
> + *
> + * @param callerList An empty, non-null list
> + * @return The list of all the classes that intercepted (and the
> final impl class) this call
> + */
> + public List<String> callMe(List<String> callerList);
> +
> +}
>
> Property changes on:
> appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/MultiBeansXmlEjb1.java
> ___________________________________________________________________
> Added: svn:mime-type
> + text/plain
>
> Index:
> appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/InterceptedEjb1.java
> ===================================================================
> ---
> appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/InterceptedEjb1.java
> (revision 0)
> +++
> appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/InterceptedEjb1.java
> (revision 0)
> @@ -0,0 +1,67 @@
> +/*
> + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
> + *
> + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
> + *
> + * The contents of this file are subject to the terms of either the GNU
> + * General Public License Version 2 only ("GPL") or the Common
> Development
> + * and Distribution License("CDDL") (collectively, the "License"). You
> + * may not use this file except in compliance with the License. You can
> + * obtain a copy of the License at
> + * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
> + * or packager/legal/LICENSE.txt. See the License for the specific
> + * language governing permissions and limitations under the License.
> + *
> + * When distributing the software, include this License Header Notice
> in each
> + * file and include the License file at packager/legal/LICENSE.txt.
> + *
> + * GPL Classpath Exception:
> + * Oracle designates this particular file as subject to the "Classpath"
> + * exception as provided by Oracle in the GPL Version 2 section of
> the License
> + * file that accompanied this code.
> + *
> + * Modifications:
> + * If applicable, add the following below the License Header, with
> the fields
> + * enclosed by brackets [] replaced by your own identifying information:
> + * "Portions Copyright [year] [name of copyright owner]"
> + *
> + * Contributor(s):
> + * If you wish your version of this file to be governed by only the
> CDDL or
> + * only the GPL Version 2, indicate your decision by adding
> "[Contributor]
> + * elects to include this software in this distribution under the
> [CDDL or GPL
> + * Version 2] license." If you don't indicate a single choice of
> license, a
> + * recipient has the option to distribute your version of this file
> under
> + * either the CDDL, the GPL Version 2 or to extend the choice of
> license to
> + * its licensees as provided above. However, if you add GPL Version
> 2 code
> + * and therefore, elected the GPL Version 2 license, then the option
> applies
> + * only if the new code is made subject to such option by the copyright
> + * holder.
> + */
> +package com.oracle.cdi.cases.devtests.multiejb1;
> +
> +import java.util.List;
> +
> +import javax.ejb.Remote;
> +import javax.ejb.Stateless;
> +import javax.enterprise.inject.spi.BeanManager;
> +import javax.inject.Inject;
> +
> +/**
> + *
> + * @author jwells
> + *
> + */
> +_at_Stateless
> +_at_Remote(MultiBeansXmlEjb1.class)
> +public class InterceptedEjb1 implements MultiBeansXmlEjb1 {
> + @SuppressWarnings("unused")
> + @Inject
> + private BeanManager manager; // Forces this to be a CDI bean
> +
> + @RecordingInterceptor
> + @Override
> + public List<String> callMe(List<String> callerList) {
> + callerList.add(CALL_ME1);
> + return callerList;
> + }
> +}
> Index:
> appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/RecordingInterceptor.java
> ===================================================================
> ---
> appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/RecordingInterceptor.java
> (revision 0)
> +++
> appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/RecordingInterceptor.java
> (revision 0)
> @@ -0,0 +1,62 @@
> +/*
> + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
> + *
> + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
> + *
> + * The contents of this file are subject to the terms of either the GNU
> + * General Public License Version 2 only ("GPL") or the Common
> Development
> + * and Distribution License("CDDL") (collectively, the "License"). You
> + * may not use this file except in compliance with the License. You can
> + * obtain a copy of the License at
> + * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
> + * or packager/legal/LICENSE.txt. See the License for the specific
> + * language governing permissions and limitations under the License.
> + *
> + * When distributing the software, include this License Header Notice
> in each
> + * file and include the License file at packager/legal/LICENSE.txt.
> + *
> + * GPL Classpath Exception:
> + * Oracle designates this particular file as subject to the "Classpath"
> + * exception as provided by Oracle in the GPL Version 2 section of
> the License
> + * file that accompanied this code.
> + *
> + * Modifications:
> + * If applicable, add the following below the License Header, with
> the fields
> + * enclosed by brackets [] replaced by your own identifying information:
> + * "Portions Copyright [year] [name of copyright owner]"
> + *
> + * Contributor(s):
> + * If you wish your version of this file to be governed by only the
> CDDL or
> + * only the GPL Version 2, indicate your decision by adding
> "[Contributor]
> + * elects to include this software in this distribution under the
> [CDDL or GPL
> + * Version 2] license." If you don't indicate a single choice of
> license, a
> + * recipient has the option to distribute your version of this file
> under
> + * either the CDDL, the GPL Version 2 or to extend the choice of
> license to
> + * its licensees as provided above. However, if you add GPL Version
> 2 code
> + * and therefore, elected the GPL Version 2 license, then the option
> applies
> + * only if the new code is made subject to such option by the copyright
> + * holder.
> + */
> +package com.oracle.cdi.cases.devtests.multiejb1;
> +
> +import java.lang.annotation.Inherited;
> +import java.lang.annotation.Retention;
> +import java.lang.annotation.Target;
> +
> +import static java.lang.annotation.ElementType.METHOD;
> +import static java.lang.annotation.ElementType.TYPE;
> +import static java.lang.annotation.RetentionPolicy.RUNTIME;
> +
> +import javax.interceptor.InterceptorBinding;
> +
> +/**
> + * @author jwells
> + *
> + */
> +_at_Inherited
> +_at_InterceptorBinding
> +_at_Retention(RUNTIME)
> +_at_Target({METHOD,TYPE})
> +public @interface RecordingInterceptor {
> +
> +}
>
> Property changes on:
> appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/RecordingInterceptor.java
> ___________________________________________________________________
> Added: svn:mime-type
> + text/plain
>
> Index:
> appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/resources/META-INF/beans.xml
> ===================================================================
> ---
> appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/resources/META-INF/beans.xml
> (revision 0)
> +++
> appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/resources/META-INF/beans.xml
> (revision 0)
> @@ -0,0 +1,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">
> + <interceptors>
> + <class>com.oracle.cdi.cases.devtests.multiejb1.Interceptor1</class>
> + </interceptors>
> +
> +</beans>
> \ No newline at end of file
> Index: appserver/tests/cdi/cases/multiBeansXml/ejb1/pom.xml
> ===================================================================
> --- appserver/tests/cdi/cases/multiBeansXml/ejb1/pom.xml (revision 0)
> +++ appserver/tests/cdi/cases/multiBeansXml/ejb1/pom.xml (revision 0)
> @@ -0,0 +1,73 @@
> +<?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/maven-v4_0_0.xsd">
> + <modelVersion>4.0.0</modelVersion>
> + <parent>
> + <groupId>org.glassfish.tests.cdi.cases</groupId>
> + <artifactId>multiBeansXml</artifactId>
> + <version>4.0-SNAPSHOT</version>
> + <relativePath>../pom.xml</relativePath>
> + </parent>
> +
> + <groupId>org.glassfish.tests.cdi.cases.multiBeansXml</groupId>
> + <artifactId>ejb1</artifactId>
> + <version>4.0-SNAPSHOT</version>
> +
> + <name>GlassFish Ejb1 With Specific beans.xml</name>
> +
> + <dependencies>
> + <dependency>
> + <groupId>javax.enterprise</groupId>
> + <artifactId>cdi-api</artifactId>
> + <version>1.1-PRD</version>
> + <scope>provided</scope>
> + </dependency>
> + <dependency>
> + <groupId>javax.ejb</groupId>
> + <artifactId>javax.ejb-api</artifactId>
> + <scope>provided</scope>
> + </dependency>
> + </dependencies>
> +</project>
>
> Property changes on: appserver/tests/cdi/cases/multiBeansXml/ejb1/pom.xml
> ___________________________________________________________________
> Added: svn:executable
> + *
>
> Index:
> appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/Interceptor2.java
> ===================================================================
> ---
> appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/Interceptor2.java
> (revision 0)
> +++
> appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/Interceptor2.java
> (revision 0)
> @@ -0,0 +1,69 @@
> +/*
> + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
> + *
> + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
> + *
> + * The contents of this file are subject to the terms of either the GNU
> + * General Public License Version 2 only ("GPL") or the Common
> Development
> + * and Distribution License("CDDL") (collectively, the "License"). You
> + * may not use this file except in compliance with the License. You can
> + * obtain a copy of the License at
> + * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
> + * or packager/legal/LICENSE.txt. See the License for the specific
> + * language governing permissions and limitations under the License.
> + *
> + * When distributing the software, include this License Header Notice
> in each
> + * file and include the License file at packager/legal/LICENSE.txt.
> + *
> + * GPL Classpath Exception:
> + * Oracle designates this particular file as subject to the "Classpath"
> + * exception as provided by Oracle in the GPL Version 2 section of
> the License
> + * file that accompanied this code.
> + *
> + * Modifications:
> + * If applicable, add the following below the License Header, with
> the fields
> + * enclosed by brackets [] replaced by your own identifying information:
> + * "Portions Copyright [year] [name of copyright owner]"
> + *
> + * Contributor(s):
> + * If you wish your version of this file to be governed by only the
> CDDL or
> + * only the GPL Version 2, indicate your decision by adding
> "[Contributor]
> + * elects to include this software in this distribution under the
> [CDDL or GPL
> + * Version 2] license." If you don't indicate a single choice of
> license, a
> + * recipient has the option to distribute your version of this file
> under
> + * either the CDDL, the GPL Version 2 or to extend the choice of
> license to
> + * its licensees as provided above. However, if you add GPL Version
> 2 code
> + * and therefore, elected the GPL Version 2 license, then the option
> applies
> + * only if the new code is made subject to such option by the copyright
> + * holder.
> + */
> +package com.oracle.cdi.cases.devtests.multiejb2;
> +
> +import java.util.List;
> +
> +import javax.interceptor.AroundInvoke;
> +import javax.interceptor.Interceptor;
> +import javax.interceptor.InvocationContext;
> +
> +/**
> + * @author jwells
> + *
> + */
> +_at_Interceptor
> +_at_RecordingInterceptor
> +public class Interceptor2 {
> + @SuppressWarnings("unchecked")
> + @AroundInvoke
> + public Object intercept(InvocationContext context) throws
> Exception {
> + Object params[] = context.getParameters();
> + if (params.length != 1 || !(params[0] instanceof List)) {
> + return context.proceed();
> + }
> +
> + List<String> param = (List<String>) params[0];
> + param.add(MultiBeansXmlEjb2.INTERCEPTOR2);
> +
> + return context.proceed();
> + }
> +
> +}
>
> Property changes on:
> appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/Interceptor2.java
> ___________________________________________________________________
> Added: svn:mime-type
> + text/plain
>
> Index:
> appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/MultiBeansXmlEjb2.java
> ===================================================================
> ---
> appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/MultiBeansXmlEjb2.java
> (revision 0)
> +++
> appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/MultiBeansXmlEjb2.java
> (revision 0)
> @@ -0,0 +1,60 @@
> +/*
> + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
> + *
> + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
> + *
> + * The contents of this file are subject to the terms of either the GNU
> + * General Public License Version 2 only ("GPL") or the Common
> Development
> + * and Distribution License("CDDL") (collectively, the "License"). You
> + * may not use this file except in compliance with the License. You can
> + * obtain a copy of the License at
> + * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
> + * or packager/legal/LICENSE.txt. See the License for the specific
> + * language governing permissions and limitations under the License.
> + *
> + * When distributing the software, include this License Header Notice
> in each
> + * file and include the License file at packager/legal/LICENSE.txt.
> + *
> + * GPL Classpath Exception:
> + * Oracle designates this particular file as subject to the "Classpath"
> + * exception as provided by Oracle in the GPL Version 2 section of
> the License
> + * file that accompanied this code.
> + *
> + * Modifications:
> + * If applicable, add the following below the License Header, with
> the fields
> + * enclosed by brackets [] replaced by your own identifying information:
> + * "Portions Copyright [year] [name of copyright owner]"
> + *
> + * Contributor(s):
> + * If you wish your version of this file to be governed by only the
> CDDL or
> + * only the GPL Version 2, indicate your decision by adding
> "[Contributor]
> + * elects to include this software in this distribution under the
> [CDDL or GPL
> + * Version 2] license." If you don't indicate a single choice of
> license, a
> + * recipient has the option to distribute your version of this file
> under
> + * either the CDDL, the GPL Version 2 or to extend the choice of
> license to
> + * its licensees as provided above. However, if you add GPL Version
> 2 code
> + * and therefore, elected the GPL Version 2 license, then the option
> applies
> + * only if the new code is made subject to such option by the copyright
> + * holder.
> + */
> +package com.oracle.cdi.cases.devtests.multiejb2;
> +
> +import java.util.List;
> +
> +/**
> + * @author jwells
> + *
> + */
> +public interface MultiBeansXmlEjb2 {
> + public final static String INTERCEPTOR2 = "Interceptor2";
> + public final static String CALL_ME2 = "CallMe2";
> +
> + /**
> + * This method should have all interceptors listed in the return
> list
> + *
> + * @param callerList An empty, non-null list
> + * @return The list of all the classes that intercepted (and the
> final impl class) this call
> + */
> + public List<String> callMe(List<String> callerList);
> +
> +}
>
> Property changes on:
> appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/MultiBeansXmlEjb2.java
> ___________________________________________________________________
> Added: svn:mime-type
> + text/plain
>
> Index:
> appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/InterceptedEjb2.java
> ===================================================================
> ---
> appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/InterceptedEjb2.java
> (revision 0)
> +++
> appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/InterceptedEjb2.java
> (revision 0)
> @@ -0,0 +1,66 @@
> +/*
> + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
> + *
> + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
> + *
> + * The contents of this file are subject to the terms of either the GNU
> + * General Public License Version 2 only ("GPL") or the Common
> Development
> + * and Distribution License("CDDL") (collectively, the "License"). You
> + * may not use this file except in compliance with the License. You can
> + * obtain a copy of the License at
> + * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
> + * or packager/legal/LICENSE.txt. See the License for the specific
> + * language governing permissions and limitations under the License.
> + *
> + * When distributing the software, include this License Header Notice
> in each
> + * file and include the License file at packager/legal/LICENSE.txt.
> + *
> + * GPL Classpath Exception:
> + * Oracle designates this particular file as subject to the "Classpath"
> + * exception as provided by Oracle in the GPL Version 2 section of
> the License
> + * file that accompanied this code.
> + *
> + * Modifications:
> + * If applicable, add the following below the License Header, with
> the fields
> + * enclosed by brackets [] replaced by your own identifying information:
> + * "Portions Copyright [year] [name of copyright owner]"
> + *
> + * Contributor(s):
> + * If you wish your version of this file to be governed by only the
> CDDL or
> + * only the GPL Version 2, indicate your decision by adding
> "[Contributor]
> + * elects to include this software in this distribution under the
> [CDDL or GPL
> + * Version 2] license." If you don't indicate a single choice of
> license, a
> + * recipient has the option to distribute your version of this file
> under
> + * either the CDDL, the GPL Version 2 or to extend the choice of
> license to
> + * its licensees as provided above. However, if you add GPL Version
> 2 code
> + * and therefore, elected the GPL Version 2 license, then the option
> applies
> + * only if the new code is made subject to such option by the copyright
> + * holder.
> + */
> +package com.oracle.cdi.cases.devtests.multiejb2;
> +
> +import java.util.List;
> +
> +import javax.ejb.Remote;
> +import javax.ejb.Stateless;
> +import javax.enterprise.inject.spi.BeanManager;
> +import javax.inject.Inject;
> +
> +/**
> + *
> + * @author jwells
> + */
> +_at_Stateless
> +_at_Remote(MultiBeansXmlEjb2.class)
> +public class InterceptedEjb2 implements MultiBeansXmlEjb2 {
> + @SuppressWarnings("unused")
> + @Inject
> + private BeanManager manager; // Forces this to be a CDI bean
> +
> + @RecordingInterceptor
> + @Override
> + public List<String> callMe(List<String> callerList) {
> + callerList.add(CALL_ME2);
> + return callerList;
> + }
> +}
> Index:
> appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/RecordingInterceptor.java
> ===================================================================
> ---
> appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/RecordingInterceptor.java
> (revision 0)
> +++
> appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/RecordingInterceptor.java
> (revision 0)
> @@ -0,0 +1,62 @@
> +/*
> + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
> + *
> + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
> + *
> + * The contents of this file are subject to the terms of either the GNU
> + * General Public License Version 2 only ("GPL") or the Common
> Development
> + * and Distribution License("CDDL") (collectively, the "License"). You
> + * may not use this file except in compliance with the License. You can
> + * obtain a copy of the License at
> + * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
> + * or packager/legal/LICENSE.txt. See the License for the specific
> + * language governing permissions and limitations under the License.
> + *
> + * When distributing the software, include this License Header Notice
> in each
> + * file and include the License file at packager/legal/LICENSE.txt.
> + *
> + * GPL Classpath Exception:
> + * Oracle designates this particular file as subject to the "Classpath"
> + * exception as provided by Oracle in the GPL Version 2 section of
> the License
> + * file that accompanied this code.
> + *
> + * Modifications:
> + * If applicable, add the following below the License Header, with
> the fields
> + * enclosed by brackets [] replaced by your own identifying information:
> + * "Portions Copyright [year] [name of copyright owner]"
> + *
> + * Contributor(s):
> + * If you wish your version of this file to be governed by only the
> CDDL or
> + * only the GPL Version 2, indicate your decision by adding
> "[Contributor]
> + * elects to include this software in this distribution under the
> [CDDL or GPL
> + * Version 2] license." If you don't indicate a single choice of
> license, a
> + * recipient has the option to distribute your version of this file
> under
> + * either the CDDL, the GPL Version 2 or to extend the choice of
> license to
> + * its licensees as provided above. However, if you add GPL Version
> 2 code
> + * and therefore, elected the GPL Version 2 license, then the option
> applies
> + * only if the new code is made subject to such option by the copyright
> + * holder.
> + */
> +package com.oracle.cdi.cases.devtests.multiejb2;
> +
> +import static java.lang.annotation.ElementType.METHOD;
> +import static java.lang.annotation.ElementType.TYPE;
> +import static java.lang.annotation.RetentionPolicy.RUNTIME;
> +
> +import java.lang.annotation.Inherited;
> +import java.lang.annotation.Retention;
> +import java.lang.annotation.Target;
> +
> +import javax.interceptor.InterceptorBinding;
> +
> +/**
> + * @author jwells
> + *
> + */
> +_at_Inherited
> +_at_InterceptorBinding
> +_at_Retention(RUNTIME)
> +_at_Target({METHOD,TYPE})
> +public @interface RecordingInterceptor {
> +
> +}
>
> Property changes on:
> appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/RecordingInterceptor.java
> ___________________________________________________________________
> Added: svn:mime-type
> + text/plain
>
> Index:
> appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/resources/META-INF/beans.xml
> ===================================================================
> ---
> appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/resources/META-INF/beans.xml
> (revision 0)
> +++
> appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/resources/META-INF/beans.xml
> (revision 0)
> @@ -0,0 +1,7 @@
> +<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">
> + <interceptors>
> + <class>com.oracle.cdi.cases.devtests.multiejb2.Interceptor2</class>
> + </interceptors>
> +</beans>
> \ No newline at end of file
> Index: appserver/tests/cdi/cases/multiBeansXml/ejb2/pom.xml
> ===================================================================
> --- appserver/tests/cdi/cases/multiBeansXml/ejb2/pom.xml (revision 0)
> +++ appserver/tests/cdi/cases/multiBeansXml/ejb2/pom.xml (revision 0)
> @@ -0,0 +1,73 @@
> +<?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/maven-v4_0_0.xsd">
> + <modelVersion>4.0.0</modelVersion>
> + <parent>
> + <groupId>org.glassfish.tests.cdi.cases</groupId>
> + <artifactId>multiBeansXml</artifactId>
> + <version>4.0-SNAPSHOT</version>
> + <relativePath>../pom.xml</relativePath>
> + </parent>
> +
> + <groupId>org.glassfish.tests.cdi.cases.multiBeansXml</groupId>
> + <artifactId>ejb2</artifactId>
> + <version>4.0-SNAPSHOT</version>
> +
> + <name>GlassFish Ejb2 With Specific beans.xml</name>
> +
> + <dependencies>
> + <dependency>
> + <groupId>javax.enterprise</groupId>
> + <artifactId>cdi-api</artifactId>
> + <version>1.1-PRD</version>
> + <scope>provided</scope>
> + </dependency>
> + <dependency>
> + <groupId>javax.ejb</groupId>
> + <artifactId>javax.ejb-api</artifactId>
> + <scope>provided</scope>
> + </dependency>
> + </dependencies>
> +</project>
>
> Property changes on: appserver/tests/cdi/cases/multiBeansXml/ejb2/pom.xml
> ___________________________________________________________________
> Added: svn:executable
> + *
>
> Index: appserver/tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml
> ===================================================================
> --- appserver/tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml
> (revision 0)
> +++ appserver/tests/cdi/cases/multiBeansXml/multiBeansApp/pom.xml
> (revision 0)
> @@ -0,0 +1,111 @@
> +<?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/maven-v4_0_0.xsd">
> + <modelVersion>4.0.0</modelVersion>
> + <parent>
> + <groupId>org.glassfish.tests.cdi.cases</groupId>
> + <artifactId>multiBeansXml</artifactId>
> + <version>4.0-SNAPSHOT</version>
> + </parent>
> +
> + <groupId>org.glassfish.tests.cdi.cases.multiBeansXml</groupId>
> + <artifactId>multiBeansApp</artifactId>
> + <packaging>ear</packaging>
> +
> + <name>HK2 CDI MultiBeansApp EAR</name>
> +
> + <build>
> + <plugins>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-ear-plugin</artifactId>
> + <configuration>
> + <modules>
> + <ejbModule>
> + <groupId>org.glassfish.tests.cdi.cases.multiBeansXml</groupId>
> + <artifactId>ejb1</artifactId>
> + <bundleFileName>ejb1.jar</bundleFileName>
> + </ejbModule>
> + <ejbModule>
> + <groupId>org.glassfish.tests.cdi.cases.multiBeansXml</groupId>
> + <artifactId>ejb2</artifactId>
> + <bundleFileName>ejb2.jar</bundleFileName>
> + </ejbModule>
> + </modules>
> + </configuration>
> + </plugin>
> + </plugins>
> + </build>
> +
> + <dependencies>
> + <dependency>
> + <groupId>org.glassfish.tests.cdi.cases.multiBeansXml</groupId>
> + <artifactId>ejb1</artifactId>
> + <type>ejb</type>
> + <version>${project.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.glassfish.tests.cdi.cases.multiBeansXml</groupId>
> + <artifactId>ejb2</artifactId>
> + <type>ejb</type>
> + <version>${project.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>javax.ejb</groupId>
> + <artifactId>javax.ejb-api</artifactId>
> + <scope>provided</scope>
> + </dependency>
> + <dependency>
> + <groupId>javax.xml.rpc</groupId>
> + <artifactId>javax.xml.rpc-api</artifactId>
> + <scope>provided</scope>
> + </dependency>
> + <dependency>
> + <groupId>javax.transaction</groupId>
> + <artifactId>javax.transaction-api</artifactId>
> + <scope>provided</scope>
> + </dependency>
> + </dependencies>
> +</project>
> Index: appserver/tests/cdi/cases/multiBeansXml/pom.xml
> ===================================================================
> --- appserver/tests/cdi/cases/multiBeansXml/pom.xml (revision 0)
> +++ appserver/tests/cdi/cases/multiBeansXml/pom.xml (revision 0)
> @@ -0,0 +1,65 @@
> +<?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/maven-v4_0_0.xsd">
> + <modelVersion>4.0.0</modelVersion>
> + <parent>
> + <groupId>org.glassfish.tests.cdi</groupId>
> + <artifactId>cases</artifactId>
> + <version>4.0-SNAPSHOT</version>
> + <relativePath>../pom.xml</relativePath>
> + </parent>
> +
> + <groupId>org.glassfish.tests.cdi.cases</groupId>
> + <artifactId>multiBeansXml</artifactId>
> + <packaging>pom</packaging>
> + <version>4.0-SNAPSHOT</version>
> +
> + <name>GlassFish CDI MultiBeanXml Test</name>
> + <modules>
> + <module>ejb1</module>
> + <module>ejb2</module>
> + <module>multiBeansApp</module>
> + </modules>
> +</project>
>
> Property changes on: appserver/tests/cdi/cases/multiBeansXml/pom.xml
> ___________________________________________________________________
> Added: svn:executable
> + *
>
> Index:
> appserver/tests/cdi/cases/runner/src/test/java/com/oracle/cdi/devtests/cases/runner/CasesTest.java
> ===================================================================
> ---
> appserver/tests/cdi/cases/runner/src/test/java/com/oracle/cdi/devtests/cases/runner/CasesTest.java
> (revision 0)
> +++
> appserver/tests/cdi/cases/runner/src/test/java/com/oracle/cdi/devtests/cases/runner/CasesTest.java
> (revision 0)
> @@ -0,0 +1,139 @@
> +/*
> + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
> + *
> + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
> + *
> + * The contents of this file are subject to the terms of either the GNU
> + * General Public License Version 2 only ("GPL") or the Common
> Development
> + * and Distribution License("CDDL") (collectively, the "License"). You
> + * may not use this file except in compliance with the License. You can
> + * obtain a copy of the License at
> + * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
> + * or packager/legal/LICENSE.txt. See the License for the specific
> + * language governing permissions and limitations under the License.
> + *
> + * When distributing the software, include this License Header Notice
> in each
> + * file and include the License file at packager/legal/LICENSE.txt.
> + *
> + * GPL Classpath Exception:
> + * Oracle designates this particular file as subject to the "Classpath"
> + * exception as provided by Oracle in the GPL Version 2 section of
> the License
> + * file that accompanied this code.
> + *
> + * Modifications:
> + * If applicable, add the following below the License Header, with
> the fields
> + * enclosed by brackets [] replaced by your own identifying information:
> + * "Portions Copyright [year] [name of copyright owner]"
> + *
> + * Contributor(s):
> + * If you wish your version of this file to be governed by only the
> CDDL or
> + * only the GPL Version 2, indicate your decision by adding
> "[Contributor]
> + * elects to include this software in this distribution under the
> [CDDL or GPL
> + * Version 2] license." If you don't indicate a single choice of
> license, a
> + * recipient has the option to distribute your version of this file
> under
> + * either the CDDL, the GPL Version 2 or to extend the choice of
> license to
> + * its licensees as provided above. However, if you add GPL Version
> 2 code
> + * and therefore, elected the GPL Version 2 license, then the option
> applies
> + * only if the new code is made subject to such option by the copyright
> + * holder.
> + */
> +package com.oracle.cdi.devtests.cases.runner;
> +
> +import java.util.LinkedList;
> +import java.util.List;
> +
> +import javax.naming.Context;
> +import javax.naming.InitialContext;
> +import javax.naming.NamingException;
> +
> +import org.glassfish.tests.utils.NucleusStartStopTest;
> +import org.glassfish.tests.utils.NucleusTestUtils;
> +import org.testng.Assert;
> +import org.testng.annotations.BeforeTest;
> +import org.testng.annotations.Test;
> +
> +import com.oracle.cdi.cases.devtests.multiejb1.MultiBeansXmlEjb1;
> +import com.oracle.cdi.cases.devtests.multiejb2.MultiBeansXmlEjb2;
> +
> +/**
> + *
> + * @author jwells
> + */
> +public class CasesTest extends NucleusStartStopTest {
> + private final static String SOURCE_HOME =
> System.getProperty("source.home", "$");
> + private final static String SOURCE_HOME_CDI =
> "/appserver/tests/cdi/";
> +
> + private Context context;
> +
> + @BeforeTest
> + public void beforeTest() throws NamingException {
> + context = new InitialContext();
> + }
> +
> + private static String getDeployablePath(String endPath) {
> + if (!SOURCE_HOME.startsWith("$")) {
> + return SOURCE_HOME + SOURCE_HOME_CDI + endPath;
> + }
> +
> + return endPath;
> + }
> +
> + private static void deploy(String deployPath) {
> + String dp = getDeployablePath(deployPath);
> +
> + boolean success = NucleusTestUtils.nadmin("deploy", dp);
> + Assert.assertTrue(success);
> + }
> +
> + private static void undeploy(String appName) {
> + boolean success = NucleusTestUtils.nadmin("undeploy", appName);
> + Assert.assertTrue(success);
> + }
> +
> + private final static String MULTI_BEANS_XML_JAR =
> "cases/multiBeansXml/multiBeansApp/target/multiBeansApp.ear";
> + private final static String MULTI_BEANS_XML_APP = "multiBeansApp";
> + private final static String MULTI_BEANS_EJB1_JNDI =
> "java:global/multiBeansApp/ejb1/InterceptedEjb1!com.oracle.cdi.cases.devtests.multiejb1.MultiBeansXmlEjb1";
> + private final static String MULTI_BEANS_EJB2_JNDI =
> "java:global/multiBeansApp/ejb2/InterceptedEjb2!com.oracle.cdi.cases.devtests.multiejb2.MultiBeansXmlEjb2";
> + @Test
> + public void testMultiBeansXml() throws NamingException {
> + deploy(MULTI_BEANS_XML_JAR);
> + try {
> + {
> + MultiBeansXmlEjb1 ejb1 = (MultiBeansXmlEjb1)
> context.lookup(MULTI_BEANS_EJB1_JNDI);
> + Assert.assertNotNull(ejb1);
> +
> + List<String> ejb1List = ejb1.callMe(new
> LinkedList<String>());
> + Assert.assertNotNull(ejb1List);
> +
> + Assert.assertEquals(2, ejb1List.size());
> +
> + String interceptor1 = ejb1List.get(0);
> + String callMe1 = ejb1List.get(1);
> +
> + Assert.assertEquals(MultiBeansXmlEjb1.INTERCEPTOR1, interceptor1);
> + Assert.assertEquals(MultiBeansXmlEjb1.CALL_ME1,
> callMe1);
> + }
> +
> + {
> + MultiBeansXmlEjb2 ejb2 = (MultiBeansXmlEjb2)
> context.lookup(MULTI_BEANS_EJB2_JNDI);
> + Assert.assertNotNull(ejb2);
> +
> + List<String> ejb2List = ejb2.callMe(new
> LinkedList<String>());
> + Assert.assertNotNull(ejb2List);
> +
> + Assert.assertEquals(2, ejb2List.size());
> +
> + String interceptor2 = ejb2List.get(0);
> + String callMe2 = ejb2List.get(1);
> +
> + Assert.assertEquals(MultiBeansXmlEjb2.INTERCEPTOR2, interceptor2);
> + Assert.assertEquals(MultiBeansXmlEjb2.CALL_ME2,
> callMe2);
> + }
> +
> + }
> + finally {
> + undeploy(MULTI_BEANS_XML_APP);
> + }
> +
> + }
> +}
> Index:
> appserver/tests/cdi/cases/runner/src/main/java/com/oracle/cdi/devtests/runner/main/Main.java
> ===================================================================
> ---
> appserver/tests/cdi/cases/runner/src/main/java/com/oracle/cdi/devtests/runner/main/Main.java
> (revision 0)
> +++
> appserver/tests/cdi/cases/runner/src/main/java/com/oracle/cdi/devtests/runner/main/Main.java
> (revision 0)
> @@ -0,0 +1,48 @@
> +/*
> + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
> + *
> + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
> + *
> + * The contents of this file are subject to the terms of either the GNU
> + * General Public License Version 2 only ("GPL") or the Common
> Development
> + * and Distribution License("CDDL") (collectively, the "License"). You
> + * may not use this file except in compliance with the License. You can
> + * obtain a copy of the License at
> + * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
> + * or packager/legal/LICENSE.txt. See the License for the specific
> + * language governing permissions and limitations under the License.
> + *
> + * When distributing the software, include this License Header Notice
> in each
> + * file and include the License file at packager/legal/LICENSE.txt.
> + *
> + * GPL Classpath Exception:
> + * Oracle designates this particular file as subject to the "Classpath"
> + * exception as provided by Oracle in the GPL Version 2 section of
> the License
> + * file that accompanied this code.
> + *
> + * Modifications:
> + * If applicable, add the following below the License Header, with
> the fields
> + * enclosed by brackets [] replaced by your own identifying information:
> + * "Portions Copyright [year] [name of copyright owner]"
> + *
> + * Contributor(s):
> + * If you wish your version of this file to be governed by only the
> CDDL or
> + * only the GPL Version 2, indicate your decision by adding
> "[Contributor]
> + * elects to include this software in this distribution under the
> [CDDL or GPL
> + * Version 2] license." If you don't indicate a single choice of
> license, a
> + * recipient has the option to distribute your version of this file
> under
> + * either the CDDL, the GPL Version 2 or to extend the choice of
> license to
> + * its licensees as provided above. However, if you add GPL Version
> 2 code
> + * and therefore, elected the GPL Version 2 license, then the option
> applies
> + * only if the new code is made subject to such option by the copyright
> + * holder.
> + */
> +package com.oracle.cdi.devtests.runner.main;
> +
> +/**
> + *
> + * @author jwells
> + *
> + */
> +public class Main {
> +}
> Index: appserver/tests/cdi/cases/runner/pom.xml
> ===================================================================
> --- appserver/tests/cdi/cases/runner/pom.xml (revision 0)
> +++ appserver/tests/cdi/cases/runner/pom.xml (revision 0)
> @@ -0,0 +1,109 @@
> +<?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/maven-v4_0_0.xsd">
> + <modelVersion>4.0.0</modelVersion>
> + <parent>
> + <groupId>org.glassfish.tests.cdi</groupId>
> + <artifactId>cases</artifactId>
> + <version>4.0-SNAPSHOT</version>
> + </parent>
> +
> + <groupId>org.glassfish.tests.cdi.cases</groupId>
> + <artifactId>runner</artifactId>
> +
> + <name>CDI Test Case Runner</name>
> +
> + <build>
> + <plugins>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-surefire-plugin</artifactId>
> + <version>2.12</version>
> + <configuration>
> + <systemPropertyVariables>
> + <nucleus.home>${glassfish.home}</nucleus.home>
> + <source.home>${source.home}</source.home>
> + </systemPropertyVariables>
> + </configuration>
> + </plugin>
> + </plugins>
> + </build>
> +
> + <dependencies>
> + <dependency>
> + <groupId>org.glassfish.tests.cdi.cases.multiBeansXml</groupId>
> + <artifactId>ejb1</artifactId>
> + <version>${project.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.glassfish.tests.cdi.cases.multiBeansXml</groupId>
> + <artifactId>ejb2</artifactId>
> + <version>${project.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.glassfish.tests.cdi.cases.multiBeansXml</groupId>
> + <artifactId>multiBeansApp</artifactId>
> + <type>ear</type>
> + <version>${project.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.testng</groupId>
> + <artifactId>testng</artifactId>
> + <version>6.5.2</version>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>org.glassfish.main.tests</groupId>
> + <artifactId>utils-ng</artifactId>
> + <version>${project.version}</version>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>org.glassfish.main.appclient</groupId>
> + <artifactId>gf-client</artifactId>
> + <version>${project.version}</version>
> + </dependency>
> + </dependencies>
> +</project>
> Index: appserver/tests/cdi/cases/pom.xml
> ===================================================================
> --- appserver/tests/cdi/cases/pom.xml (revision 0)
> +++ appserver/tests/cdi/cases/pom.xml (revision 0)
> @@ -0,0 +1,64 @@
> +<?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/maven-v4_0_0.xsd">
> + <modelVersion>4.0.0</modelVersion>
> + <parent>
> + <groupId>org.glassfish.tests</groupId>
> + <artifactId>cdi</artifactId>
> + <version>4.0-SNAPSHOT</version>
> + <relativePath>../pom.xml</relativePath>
> + </parent>
> +
> + <groupId>org.glassfish.tests.cdi</groupId>
> + <artifactId>cases</artifactId>
> + <packaging>pom</packaging>
> + <version>4.0-SNAPSHOT</version>
> +
> + <name>GlassFish CDI Test Cases</name>
> + <modules>
> + <module>multiBeansXml</module>
> + <module>runner</module>
> + </modules>
> +</project>
>
> Property changes on: appserver/tests/cdi/cases/pom.xml
> ___________________________________________________________________
> Added: svn:executable
> + *
>
>