Initial Contribution

Signed-off-by: Vinay Vishal <vinay.vishal@oracle.com>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/README b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/README
new file mode 100644
index 0000000..a954e0a
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/README
@@ -0,0 +1,10 @@
+This directory has skeleton harnesses for testing CDI usecases. They also test simple typesafe injection.
+- Simple EAR
+- Simple EJB
+- Simple EJB Singleton
+- Simple ManagedBean
+- Simple ManagedBean with Interceptors
+- Simple MDB
+- Simple Servlet 3.0 Annotations
+
+Use these to implement particular CDI usecases.
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/build.xml
new file mode 100644
index 0000000..7dee092
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/build.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<!DOCTYPE project [
+<!ENTITY commonSetup SYSTEM "./../../../config/properties.xml">
+<!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
+<!ENTITY commonRun SYSTEM "./../../../config/run.xml">
+<!ENTITY reporting   SYSTEM "../report.xml">
+]>
+
+<project name="smoke-test" default="usage" basedir=".">
+
+    &commonSetup;
+    &commonBuild;
+    &commonRun;
+    &reporting;
+    
+    <property name="smoke-target" value="all"/>
+
+    <taskdef resource="net/sf/antcontrib/antcontrib.properties">
+        <classpath>
+            <pathelement location="${env.APS_HOME}/devtests/cdi/lib/ant-contrib-1.0b3.jar"/>
+        </classpath>
+    </taskdef>
+
+    <target name="run-test">
+        <antcall target="smoke">
+        <param name="smoke-target" value="run-test"/>
+        </antcall>
+    </target>
+
+    <target name="all">
+        <antcall target="smoke">
+        <param name="smoke-target" value="all"/>
+        </antcall>
+    </target>
+
+    <target name="clean">
+        <antcall target="smoke">
+        <param name="smoke-target" value="clean"/>
+        </antcall>
+    </target>
+
+    <target name="build">
+        <antcall target="smoke">
+        <param name="smoke-target" value="build"/>
+        </antcall>
+    </target>
+
+    <target name="setup">
+        <antcall target="smoke">
+        <param name="smoke-target" value="setup"/>
+        </antcall>
+    </target>
+
+    <target name="deploy">
+        <antcall target="smoke">
+        <param name="smoke-target" value="deploy"/>
+        </antcall>
+    </target>
+
+    <target name="undeploy">
+        <antcall target="smoke">
+        <param name="smoke-target" value="undeploy"/>
+        </antcall>
+    </target>
+
+    <target name="unsetup">
+        <antcall target="smoke">
+        <param name="smoke-target" value="unsetup"/>
+        </antcall>
+    </target>
+
+    <target name="run">
+        <antcall target="smoke">
+        <param name="smoke-target" value="run"/>
+        </antcall>
+    </target>
+
+    <target name="smoke">
+        <record name="smoke.output" action="start" />
+            <if>
+                <equals arg1="${test.embedded.mode}" arg2="true"/>
+                <then>
+                    <echo> Excluding testcase simple-wab-with-cdi and slf4j-visibility for embedded mode</echo>
+                </then>
+                <else>
+                    <ant dir="simple-wab-with-cdi" target="${smoke-target}"/>
+                    <ant dir="slf4j-visibility" target="${smoke-target}"/>
+                </else>
+            </if>
+            <ant dir="simple-ejb-cdi" target="${smoke-target}"/>
+
+        <!--
+        Not running until
+        https://issues.jboss.org/browse/WELD-1345 is fixed.
+        In 1.1.10.Final the test passes.
+        In 2.0 Beta it fails.
+        -->
+        <ant dir="simple-mdb" target="${smoke-target}"/>
+        <ant dir="simple-ejb-singleton/hello" target="${smoke-target}"/>
+<!--
+            <ant dir="singleton-startup/hello" target="${smoke-target}"/>
+-->
+            <ant dir="simple-managed-bean" target="${smoke-target}"/>
+            <ant dir="simple-managed-bean-interceptor-nonnull-package" target="${smoke-target}"/>
+            <ant dir="cdi-servlet-3.0-annotation" target="${smoke-target}"/>
+            <ant dir="cdi-servlet-filter-3.0-annotation" target="${smoke-target}"/>
+            <ant dir="simple-ear" target="${smoke-target}"/>
+            <ant dir="optional-unbundled-beans" target="${smoke-target}"/>
+        <record name="smoke.output" action="stop" />
+    </target>
+
+    <target name="usage">
+	<echo> Usage:
+		ant all (Executes all the smoke tests)
+		ant clean (cleans all the smoke tests)
+		ant build (builds all the smoke tests)
+		ant setup (sets up all resources for smoke tests)
+		ant deploy (deploys all the smoke apps)
+		ant run (Executes all the smoke tests)
+		ant undeploy (undeploys all the  smoke apps)
+		ant unsetup (unsets all resources for smoke tests)
+	</echo>
+    </target>
+</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/WebTest.java
new file mode 100644
index 0000000..fee7d18
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/WebTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import java.io.*;
+import java.net.*;
+import com.sun.ejte.ccl.reporter.*;
+
+/*
+ * Unit test for @WebServlet
+ */
+public class WebTest {
+
+    private static SimpleReporterAdapter stat
+        = new SimpleReporterAdapter("appserv-tests");
+    private static final String TEST_NAME = "cdi-servlet-annotation";
+    private static final String EXPECTED_RESPONSE = "Hello from Servlet 3.0. initParams: n1=v1, n2=v2";
+
+    private String host;
+    private String port;
+    private String contextRoot;
+
+    public WebTest(String[] args) {
+        host = args[0];
+        port = args[1];
+        contextRoot = args[2];
+    }
+    
+    public static void main(String[] args) {
+        stat.addDescription("Unit test for @WebServlet");
+        WebTest webTest = new WebTest(args);
+        webTest.doTest();
+        stat.printSummary(TEST_NAME);
+    }
+
+    public void doTest() {
+        try { 
+            invoke();
+        } catch (Exception ex) {
+            System.out.println(TEST_NAME + " test failed");
+            stat.addStatus(TEST_NAME, stat.FAIL);
+            ex.printStackTrace();
+        }
+    }
+
+    private void invoke() throws Exception {
+        
+        String url = "http://" + host + ":" + port + contextRoot
+                     + "/myurl";
+        System.out.println("opening connection to " + url);
+        HttpURLConnection conn = (HttpURLConnection)
+            (new URL(url)).openConnection();
+
+        int code = conn.getResponseCode();
+        if (code != 200) {
+            System.out.println("Unexpected return code: " + code);
+            stat.addStatus(TEST_NAME, stat.FAIL);
+        } else {
+            InputStream is = null;
+            BufferedReader input = null;
+            String line = null;
+            try {
+                is = conn.getInputStream();
+                input = new BufferedReader(new InputStreamReader(is));
+                line = input.readLine();
+                System.out.println("line = " + line);
+            } finally {
+                try {
+                    if (is != null) {
+                        is.close();
+                    }
+                } catch(IOException ioe) {
+                    // ignore
+                }
+                try {
+                    if (input != null) {
+                        input.close();
+                    }
+                } catch(IOException ioe) {
+                    // ignore
+                }
+            }
+            if (EXPECTED_RESPONSE.equals(line)) {
+                stat.addStatus(TEST_NAME, stat.PASS);
+            } else {
+                System.out.println("Wrong response. Expected: " + 
+                        EXPECTED_RESPONSE + ", received: " + line);
+                stat.addStatus(TEST_NAME, stat.FAIL);
+            }
+        }    
+    }
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/build.properties
new file mode 100644
index 0000000..d2f36aa
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/build.properties
@@ -0,0 +1,24 @@
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+ 
+
+<property name="module" value="cdi"/>
+<property name="appname" value="${module}-servlet-annotation"/>
+<property name="assemble" value="${build.classes.dir}/archive"/>
+<property name="contextroot" value="/${appname}"/>
+<property name="beans.xml" value="descriptor/beans.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/build.xml
new file mode 100644
index 0000000..83ad666
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/build.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<!DOCTYPE project [
+<!ENTITY commonSetup SYSTEM "./../../../../config/properties.xml">
+<!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
+<!ENTITY run SYSTEM "./../../../../config/run.xml">
+<!ENTITY testproperties SYSTEM "./build.properties">
+]>
+
+<project name="webcontainer_unittest" default="all" basedir=".">
+
+    &commonSetup;
+    &commonBuild;
+    &testproperties;
+    &run;
+
+    <target name="all" depends="build,deploy,run,undeploy"/>
+
+    <target name="clean" depends="init-common">
+        <antcall target="clean-common"/>
+        <delete>
+            <fileset dir="." includes="*.class"/>
+        </delete>
+    </target>
+       
+    <target name="compile" depends="clean">
+        <antcall target="compile-common">
+            <param name="src" value="servlet"/>
+        </antcall>
+    </target>
+
+    <target name="build" depends="compile">
+        <property name="hasWebclient" value="yes"/> 
+        <antcall target="webclient-war-common">
+            <param name="hasWebclient" value="yes"/>
+            <param name="webclient.war.classes" value="**/*.class"/> 
+        </antcall>
+
+        <javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
+               includes="WebTest.java"/>
+
+    </target> 
+
+    <target name="build-publish-war" depends="build, publish-war-common" />
+    
+    <target name="deploy" depends="init-common">
+        <antcall target="deploy-war-common"/>
+    </target>
+    
+    <target name="run" depends="init-common">
+        <java classname="WebTest">
+          <arg value="${http.host}"/>
+          <arg value="${http.port}"/>
+          <arg value="${contextroot}"/>
+          <classpath>
+           <pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
+           <pathelement location="."/>
+         </classpath>
+        </java>
+    </target>
+ 
+    <target name="undeploy" depends="init-common">
+        <antcall target="undeploy-war-common"/>
+    </target>   
+
+    <target name="usage">
+        <antcall target="usage-common"/>
+    </target>
+</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/descriptor/beans.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/descriptor/beans.xml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/descriptor/beans.xml
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/lib/slf4j-api-1.7.25.jar b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/lib/slf4j-api-1.7.25.jar
new file mode 100644
index 0000000..0143c09
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/lib/slf4j-api-1.7.25.jar
Binary files differ
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/lib/slf4j-simple-1.7.25.jar b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/lib/slf4j-simple-1.7.25.jar
new file mode 100644
index 0000000..a7260f3
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/lib/slf4j-simple-1.7.25.jar
Binary files differ
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestBean.java
new file mode 100644
index 0000000..6d059e2
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestBean.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+//Simple TestBean to test CDI. 
+//This bean implements Serializable as it needs to be placed into a Stateful Bean
+public class TestBean
+{}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestLoggerProducer.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestLoggerProducer.java
new file mode 100644
index 0000000..04785e9
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestLoggerProducer.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import javax.enterprise.inject.Produces;
+import org.jboss.logging.Logger;
+
+
+public class TestLoggerProducer {
+    @Produces
+    public org.jboss.logging.Logger getLogger(){
+        Logger l = Logger.getLogger(TestLoggerProducer.class);
+        System.out.println("getLogger:: " + l);
+        return l;
+    }
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestServlet.java
new file mode 100644
index 0000000..baa7aae
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-3.0-annotation/servlet/TestServlet.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Enumeration;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.inject.Inject;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.naming.InitialContext;
+
+@WebServlet(name="mytest",
+        urlPatterns={"/myurl"},
+        initParams={ @WebInitParam(name="n1", value="v1"), @WebInitParam(name="n2", value="v2") } )
+public class TestServlet extends HttpServlet {
+    @Inject TestBean tb;
+    @Inject BeanManager bm;
+    BeanManager bm1;
+    
+    @Inject 
+    private transient org.jboss.logging.Logger log;
+
+    public void service(HttpServletRequest req, HttpServletResponse res)
+            throws IOException, ServletException {
+
+        PrintWriter writer = res.getWriter();
+        writer.write("Hello from Servlet 3.0. ");
+        String msg = "n1=" + getInitParameter("n1") +
+            ", n2=" + getInitParameter("n2");
+        if (tb == null) msg += "Bean injection into Servlet failed";
+        if (bm == null) msg += "BeanManager Injection via @Inject failed";
+        try {
+            bm1 = (BeanManager)((new InitialContext()).lookup("java:comp/BeanManager"));
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            msg += "BeanManager Injection via component environment lookup failed";
+        }
+        if (bm1 == null) msg += "BeanManager Injection via component environment lookup failed";
+        
+        System.out.println("BeanManager is " + bm);
+        System.out.println("BeanManager via lookup is " + bm1);
+        writer.write("initParams: " + msg + "\n");
+    }
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/WebTest.java
new file mode 100644
index 0000000..b2da7d5
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/WebTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import java.io.*;
+import java.net.*;
+import com.sun.ejte.ccl.reporter.*;
+
+/*
+ * Unit test for @WebServlet
+ */
+public class WebTest {
+
+    private static SimpleReporterAdapter stat
+        = new SimpleReporterAdapter("appserv-tests");
+    private static final String TEST_NAME = "cdi-servlet-filter-annotation";
+    private static final String EXPECTED_RESPONSE = "Hello from Servlet 3.0.";
+
+    private String host;
+    private String port;
+    private String contextRoot;
+
+    public WebTest(String[] args) {
+        host = args[0];
+        port = args[1];
+        contextRoot = args[2];
+    }
+    
+    public static void main(String[] args) {
+        stat.addDescription("Unit test for @WebServlet");
+        WebTest webTest = new WebTest(args);
+        webTest.doTest();
+        stat.printSummary(TEST_NAME);
+    }
+
+    public void doTest() {
+        try { 
+            invoke();
+        } catch (Exception ex) {
+            System.out.println(TEST_NAME + " test failed");
+            stat.addStatus(TEST_NAME, stat.FAIL);
+            ex.printStackTrace();
+        }
+    }
+
+    private void invoke() throws Exception {
+        
+        String url = "http://" + host + ":" + port + contextRoot
+                     + "/myurl";
+        System.out.println("opening connection to " + url);
+        HttpURLConnection conn = (HttpURLConnection)
+            (new URL(url)).openConnection();
+
+        int code = conn.getResponseCode();
+        if (code != 200) {
+            System.out.println("Unexpected return code: " + code);
+            stat.addStatus(TEST_NAME, stat.FAIL);
+        } else {
+            InputStream is = null;
+            BufferedReader input = null;
+            String line = null;
+            try {
+                is = conn.getInputStream();
+                input = new BufferedReader(new InputStreamReader(is));
+                line = input.readLine();
+                System.out.println("line = " + line);
+            } finally {
+                try {
+                    if (is != null) {
+                        is.close();
+                    }
+                } catch(IOException ioe) {
+                    // ignore
+                }
+                try {
+                    if (input != null) {
+                        input.close();
+                    }
+                } catch(IOException ioe) {
+                    // ignore
+                }
+            }
+            if (EXPECTED_RESPONSE.equals(line)) {
+                stat.addStatus(TEST_NAME, stat.PASS);
+            } else {
+                System.out.println("Wrong response. Expected: " + 
+                        EXPECTED_RESPONSE + ", received: " + line);
+                stat.addStatus(TEST_NAME, stat.FAIL);
+            }
+        }    
+    }
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/build.properties
new file mode 100644
index 0000000..a9ba810
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/build.properties
@@ -0,0 +1,24 @@
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+ 
+
+<property name="module" value="cdi"/>
+<property name="appname" value="${module}-servlet-filter-annotation"/>
+<property name="assemble" value="${build.classes.dir}/archive"/>
+<property name="contextroot" value="/${appname}"/>
+<property name="beans.xml" value="descriptor/beans.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/build.xml
new file mode 100644
index 0000000..83ad666
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/build.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<!DOCTYPE project [
+<!ENTITY commonSetup SYSTEM "./../../../../config/properties.xml">
+<!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
+<!ENTITY run SYSTEM "./../../../../config/run.xml">
+<!ENTITY testproperties SYSTEM "./build.properties">
+]>
+
+<project name="webcontainer_unittest" default="all" basedir=".">
+
+    &commonSetup;
+    &commonBuild;
+    &testproperties;
+    &run;
+
+    <target name="all" depends="build,deploy,run,undeploy"/>
+
+    <target name="clean" depends="init-common">
+        <antcall target="clean-common"/>
+        <delete>
+            <fileset dir="." includes="*.class"/>
+        </delete>
+    </target>
+       
+    <target name="compile" depends="clean">
+        <antcall target="compile-common">
+            <param name="src" value="servlet"/>
+        </antcall>
+    </target>
+
+    <target name="build" depends="compile">
+        <property name="hasWebclient" value="yes"/> 
+        <antcall target="webclient-war-common">
+            <param name="hasWebclient" value="yes"/>
+            <param name="webclient.war.classes" value="**/*.class"/> 
+        </antcall>
+
+        <javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
+               includes="WebTest.java"/>
+
+    </target> 
+
+    <target name="build-publish-war" depends="build, publish-war-common" />
+    
+    <target name="deploy" depends="init-common">
+        <antcall target="deploy-war-common"/>
+    </target>
+    
+    <target name="run" depends="init-common">
+        <java classname="WebTest">
+          <arg value="${http.host}"/>
+          <arg value="${http.port}"/>
+          <arg value="${contextroot}"/>
+          <classpath>
+           <pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
+           <pathelement location="."/>
+         </classpath>
+        </java>
+    </target>
+ 
+    <target name="undeploy" depends="init-common">
+        <antcall target="undeploy-war-common"/>
+    </target>   
+
+    <target name="usage">
+        <antcall target="usage-common"/>
+    </target>
+</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/descriptor/beans.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/descriptor/beans.xml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/descriptor/beans.xml
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestBean.java
new file mode 100644
index 0000000..6d059e2
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestBean.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+//Simple TestBean to test CDI. 
+//This bean implements Serializable as it needs to be placed into a Stateful Bean
+public class TestBean
+{}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestFilter.java
new file mode 100644
index 0000000..7137f70
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestFilter.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import java.io.IOException;
+
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.annotation.WebFilter;
+
+@WebFilter(urlPatterns = "/*")
+public class TestFilter implements Filter {
+    @Inject
+    TestBean tb;
+    @Inject
+    BeanManager bm;
+
+    @Override
+    public void destroy() {
+        System.out.println("TestFilter:destroy()");
+
+    }
+
+    @Override
+    public void doFilter(ServletRequest req, ServletResponse res,
+            FilterChain fc) throws IOException, ServletException {
+        System.out.println("TestFilter:doFilter()");
+        System.out.println("TestBean injected:"+ tb);
+        System.out.println("BeanManager injected:"+ bm);
+        if (tb == null)
+            throw new ServletException("Injection of TestBean in ServletFilter failed");
+        if (bm == null)
+            throw new ServletException("Injection of BeanManager in ServletFilter failed");
+        fc.doFilter(req, res);
+    }
+
+    @Override
+    public void init(FilterConfig arg0) throws ServletException {
+        System.out.println("TestFilter:init()");
+    }
+
+}
+
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestServlet.java
new file mode 100644
index 0000000..475d9fa
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/cdi-servlet-filter-3.0-annotation/servlet/TestServlet.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import javax.naming.InitialContext;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@WebServlet(name="mytest", urlPatterns={"/myurl"})
+public class TestServlet extends HttpServlet {
+    public void service(HttpServletRequest req, HttpServletResponse res)
+            throws IOException, ServletException {
+        PrintWriter writer = res.getWriter();
+        writer.write("Hello from Servlet 3.0.");
+    }
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/README b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/README
new file mode 100644
index 0000000..b38dca5
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/README
@@ -0,0 +1,2 @@
+Regression test for GLASSFISH-16318
+
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/WebTest.java
new file mode 100644
index 0000000..bcd25ae
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/WebTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import java.io.*;
+import java.net.*;
+import com.sun.ejte.ccl.reporter.*;
+
+/*
+ * Unit test for @WebServlet
+ */
+public class WebTest {
+
+    private static SimpleReporterAdapter stat
+        = new SimpleReporterAdapter("appserv-tests");
+    private static final String TEST_NAME = "optional-unbundled-beans";
+    private static final String EXPECTED_RESPONSE = "Hello from Servlet 3.0. initParams: n1=v1, n2=v2";
+
+    private String host;
+    private String port;
+    private String contextRoot;
+
+    public WebTest(String[] args) {
+        host = args[0];
+        port = args[1];
+        contextRoot = args[2];
+    }
+    
+    public static void main(String[] args) {
+        stat.addDescription("Unit test for @WebServlet");
+        WebTest webTest = new WebTest(args);
+        webTest.doTest();
+        stat.printSummary(TEST_NAME);
+    }
+
+    public void doTest() {
+        try { 
+            invoke();
+        } catch (Exception ex) {
+            System.out.println(TEST_NAME + " test failed");
+            stat.addStatus(TEST_NAME, stat.FAIL);
+            ex.printStackTrace();
+        }
+    }
+
+    private void invoke() throws Exception {
+        
+        String url = "http://" + host + ":" + port + contextRoot
+                     + "/myurl";
+        System.out.println("opening connection to " + url);
+        HttpURLConnection conn = (HttpURLConnection)
+            (new URL(url)).openConnection();
+
+        int code = conn.getResponseCode();
+        if (code != 200) {
+            System.out.println("Unexpected return code: " + code);
+            stat.addStatus(TEST_NAME, stat.FAIL);
+        } else {
+            InputStream is = null;
+            BufferedReader input = null;
+            String line = null;
+            try {
+                is = conn.getInputStream();
+                input = new BufferedReader(new InputStreamReader(is));
+                line = input.readLine();
+                System.out.println("line = " + line);
+            } finally {
+                try {
+                    if (is != null) {
+                        is.close();
+                    }
+                } catch(IOException ioe) {
+                    // ignore
+                }
+                try {
+                    if (input != null) {
+                        input.close();
+                    }
+                } catch(IOException ioe) {
+                    // ignore
+                }
+            }
+            if (EXPECTED_RESPONSE.equals(line)) {
+                stat.addStatus(TEST_NAME, stat.PASS);
+            } else {
+                System.out.println("Wrong response. Expected: " + 
+                        EXPECTED_RESPONSE + ", received: " + line);
+                stat.addStatus(TEST_NAME, stat.FAIL);
+            }
+        }    
+    }
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.properties
new file mode 100644
index 0000000..36b4298
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.properties
@@ -0,0 +1,24 @@
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+ 
+
+<property name="module" value="cdi"/>
+<property name="appname" value="${module}-optional-unbundled-beans"/>
+<property name="assemble" value="${build.classes.dir}/archive"/>
+<property name="contextroot" value="/${appname}"/>
+<property name="beans.xml" value="descriptor/beans.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml
new file mode 100644
index 0000000..2ba7c3a
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<!DOCTYPE project [
+<!ENTITY commonSetup SYSTEM "./../../../../config/properties.xml">
+<!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
+<!ENTITY run SYSTEM "./../../../../config/run.xml">
+<!ENTITY testproperties SYSTEM "./build.properties">
+]>
+
+<project name="webcontainer_unittest" default="all" basedir=".">
+
+    &commonSetup;
+    &commonBuild;
+    &testproperties;
+    &run;
+
+    <target name="all" depends="build,deploy,run,undeploy"/>
+
+    <target name="clean" depends="init-common">
+        <antcall target="clean-common"/>
+        <delete>
+            <fileset dir="." includes="*.class"/>
+        </delete>
+    </target>
+       
+    <target name="compile" depends="clean">
+        <antcall target="compile-common">
+            <param name="src" value="servlet"/>
+        </antcall>
+
+        <!-- remove the class that needs to be unavailable in the deployment archive -->
+        <delete file="${build.classes.dir}/ClassUnavailableAtRuntime.class"/>
+ 
+    </target>
+
+    <target name="build" depends="compile">
+        <property name="hasWebclient" value="yes"/> 
+        <antcall target="webclient-war-common">
+            <param name="hasWebclient" value="yes"/>
+            <param name="webclient.war.classes" value="**/*.class"/> 
+        </antcall>
+
+        <javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
+               includes="WebTest.java"/>
+
+    </target> 
+
+    <target name="build-publish-war" depends="build, publish-war-common" />
+    
+    <target name="deploy" depends="init-common">
+        <antcall target="deploy-war-common"/>
+    </target>
+    
+    <target name="run" depends="init-common">
+        <java classname="WebTest">
+          <arg value="${http.host}"/>
+          <arg value="${http.port}"/>
+          <arg value="${contextroot}"/>
+          <classpath>
+           <pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
+           <pathelement location="."/>
+         </classpath>
+        </java>
+    </target>
+ 
+    <target name="undeploy" depends="init-common">
+        <antcall target="undeploy-war-common"/>
+    </target>   
+
+    <target name="usage">
+        <antcall target="usage-common"/>
+    </target>
+</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/descriptor/beans.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/descriptor/beans.xml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/descriptor/beans.xml
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/foo.txt b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/foo.txt
new file mode 100644
index 0000000..34945c0
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/foo.txt
@@ -0,0 +1,1987 @@
+Apache Ant version 1.7.1 compiled on June 27 2008
+Buildfile: build.xml
+Detected Java version: 1.6 in: /space/apps/jdk1.6.0_22/jre
+Detected OS: Linux
+parsing buildfile /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml with URI = file:/export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml
+Project base dir set to: /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/properties.xml
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/common.xml
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.properties
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/run.xml
+[antlib:org.apache.tools.ant] Could not load definitions from resource org/apache/tools/ant/antlib.xml. It could not be found.
+ [property] Loading Environment env.
+Property "BASH_SOURCE" has not been set
+Property "LINENO" has not been set
+Property "FUNCNAME[0]" has not been set
+Property "NEW_PWD" has not been set
+Property "build.classes.dir" has not been set
+ [macrodef] creating macro  run-test
+Build sequence for target(s) `clean' is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean]
+Complete build sequence is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean, restart-instance-common, execute-sql-common, deploy-rar-common, undeploy, deploy-jdbc-common, undeploy-rar-common, set-derby-connpool-props, create-sql-common, deploy-war-no-context-root-pe, verifier-common, start-server-unix, test-tagfiles-exist, create-PermSize, execute-ejb-sql-common, undeploy-client-common, prepare-keystore-common, deploy-verify-common-ee, startDerby, confirmMissingReport-common, create-connector-resource-common, asadmin-common, create-connector-connpool, delete-connector-connpool-common, verifier, start-clean-server, runwebclient-common, deploy-common-ee, startDerbyNonMac, webclient-war-common, flush-connpool-common, stopDerby, clean-webapps-common, delete-jdbc-connpool-common, prepare-truststore-common, deploy-verify-common, run, test-tlds-exist, deploy-verify-common-pe, undeploy-common, undeploy-jar-common, deploy-client-common, enterprise-common, create-javamail-resource-common, package-persistence-common, deploy-war-commonee, startDomainWindows, set-derby-driver-connpool-props, deploy-war-no-context-root, undeploy-jdbc-common, deploy-common-pe, clear, copy-tagfiles, compile, build, deploy, restart-server-instance-common, deploy-jar-common, delete-domain-common, stopPB, compile-common-with-endorsed-dir, import-wsdl, deploy-war-commonpe, compile-common, restart-server, runclient-common, package-appclientjar-common, ee-common, copy-tlds, delete-persistence-resource-common, undeploy-jms-common, asadmin-common-ignore-fail, startDomainUnix, startDomain, fixFiles, ejb-jar-common, appclient-jar-common, build-ear-common, publish-war-common, build-publish-war, stop-server-unix, clean-classes-common, clean-common, create-jdbc-connpool-common, dev-report, startDerbyMac, deploy-jms-common, package-war-common, package-ejbjar-common, delete-connector-resource-common, deploy-jsp-common, unsetupTimer, undeploy-war-common, change-orb-port, delete-javamail-resource-common, deploy-common, create-jms-resource-common, setup-mq-common, delete-jdbc-resource-common, start-server-windows, dumpThreadStack, setupTimer, deploy-war-common, start-server, ee, checkReporting-common, testTimer, stop-server, create-jdbc-driver-connpool-common, all, platform-common, create-jms-connection-common, undeploy-war-name, cleanAS, deploy-dir, preparePB, stop-server-windows, confirmReportPresent-common, delete-jms-resource-common, pb, runtest, create-jvm-options, clean-jars-common, restart-instance, stopDomain, create-connector-connpool-common, set-pointbase-driver-connpool-props, delete-sql-common, deploy-jdbc-driver-common, create-domain-common, delete-jvm-options, create-jdbc-resource-common, prepare-truststore-certutil-common, create-user-common, asadmin-batch-common, delete-user-common, prepare-truststore-keytool-common, convWin, create-persistence-resource-common, get-version-common, startPB, delete-jms-connection-common, usage-common, deploy-war-no-context-root-ee, set-pointbase-connpool-props, usage, convUnix, staticCheck-common, ear-common, deploy-war-name, ]
+
+setToolWin:
+Skipped because property 'isWindows' not set.
+
+setS1ASclassPath:
+[pathconvert] Set property s1as.classpath = /export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/acc-config.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/admin-cli.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/admin-core.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/admin-util.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/amx-all.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/annotation-framework.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/ant.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/antlr-repackaged.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/api-exporter.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/appclient-connector.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/appclient-server-core.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/appclient.security.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/asm-all-repackaged.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/auto-depends.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/org.apache.felix.bundlerepository.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/org.apache.felix.eventadmin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/org.apache.felix.scr.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/osgi-cdi.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/osgi-ee-resources.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/osgi-ejb-container.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/osgi-javaee-base.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/osgi-jdbc.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/osgi-jpa.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/osgi-jta.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/osgi-web-container.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/backup.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/bean-validator.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/branding.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/class-model.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cli-optional.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cluster-admin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cluster-cli.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cluster-common.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cluster-ssh.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cmp-ejb-mapping.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cmp-enhancer.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cmp-generator-database.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cmp-internal-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cmp-model.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cmp-support-ejb.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cmp-support-sqlstore.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cmp-utility.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/common-util.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/config-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/config-types.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/config.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/connectors-admin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/connectors-inbound-runtime.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/connectors-internal-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/connectors-runtime.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-cluster-plugin-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-cluster-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-common-full-plugin-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-common-full-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-common-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-common.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-community-branding-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-corba-plugin-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-corba-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-ejb-lite-plugin-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-ejb-lite-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-ejb-plugin-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-ejb-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-jca-plugin-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-jca-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-jdbc-plugin-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-jdbc-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-jms-plugin-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-jms-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-jts-plugin-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-jts-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-plugin-service.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-updatecenter-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-web-plugin-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-web-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/container-common.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/dataprovider.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/dbschema-repackaged.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/deployment-admin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/deployment-autodeploy.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/deployment-client.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/deployment-common.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/deployment-javaee-core.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/deployment-javaee-full.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/dol.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/ejb-container.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/ejb-internal-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/ejb.security.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/el-impl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/endorsed/javax.annotation.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/endorsed/jaxb-api-osgi.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/endorsed/webservices-api-osgi.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/flashlight-extra-jdk-packages.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/flashlight-framework.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/gf-client-module.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/gf-connectors-connector.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/gf-ejb-connector.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/gf-web-connector.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-corba-asm.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-corba-codegen.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-corba-csiv2-idl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-corba-internal-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-corba-newtimer.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-corba-omgapi.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-corba-orb.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-corba-orbgeneric.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-ee-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-extra-jre-packages.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-mbeanserver.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-naming.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-oracle-jdbc-driver-packages.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-registration.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/gmbal-api-only.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/gmbal.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/gms-adapter.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/gms-bootstrap.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-comet.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-config.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-container.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-framework-tests.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-framework.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-http-ajp.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-http-server.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-http-servlet.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-http.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-portunif.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-rcm.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-websockets.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/ha-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/ha-file-store.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/ha-shoal-cache-bootstrap.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/ha-shoal-cache-store.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/hk2-core.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/hk2.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/inmemory.jacc.provider.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/internal-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jackson-core-asl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jackson-jaxrs.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jackson-mapper-asl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jackson-xc.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jaspic.provider.framework.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javaee-kernel.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.ejb.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.enterprise.deploy.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.jms.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.mail.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.management.j2ee.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.persistence.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.resource.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.security.auth.message.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.security.jacc.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.servlet.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.servlet.jsp.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.servlet.jsp.jstl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.transaction.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jaxb-osgi.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jaxrpc-api-osgi.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jdbc-admin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jersey-client.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jersey-core.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jersey-gf-server.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jersey-gf-statsproviders.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jersey-grizzly2.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jersey-json.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jersey-multipart.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jettison.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jms-admin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jms-core.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jmxremote_optional-repackaged.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jpa-connector.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jsf-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jsf-connector.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jsf-impl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jsftemplating.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jsp-impl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jspcaching-connector.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jsr109-impl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jstl-connector.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jstl-impl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jta.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jts.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/kernel.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/launcher.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/ldapbp-repackaged.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/libpam4j-repackaged.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/libvirt.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/load-balancer-admin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/logging.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/management-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/metro-glue.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/mimepull.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/monitoring-core.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/orb-connector.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/orb-enabler.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/orb-iiop.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.apache.felix.configadmin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.apache.felix.fileinstall.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.apache.felix.gogo.command.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.apache.felix.gogo.runtime.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.apache.felix.gogo.shell.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.apache.felix.shell.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.apache.felix.shell.remote.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.apache.felix.shell.tui.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.eclipse.persistence.antlr.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.eclipse.persistence.asm.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.eclipse.persistence.core.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.eclipse.persistence.jpa.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.eclipse.persistence.jpa.modelgen.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.eclipse.persistence.oracle.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/osgi-adapter.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/osgi-container.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/osgi-jpa-extension.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/osgi-main.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/osgi-resource-locator.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/persistence-common.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/pkg-client.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/registration-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/registration-impl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/rest-service.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/scattered-archive-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/schema2beans-repackaged.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/security.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/server-mgmt.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/shoal-cache.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/shoal-gms-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/shoal-gms-impl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/simple-glassfish-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/soap-tcp.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/ssl-impl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/stats77.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/transaction-internal-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/trilead-ssh2-repackaged.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/virt-core.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/war-util.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/web-cli.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/web-core.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/web-embed-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/web-embed-impl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/web-glue.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/web-gui-plugin-common.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/web-ha.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/web-naming.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/websecurity.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/webservices-connector.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/webservices-extra-jdk-packages.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/webservices-osgi.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/webservices.security.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/weld-integration-fragment.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/weld-integration.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/weld-osgi-bundle.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/woodstox-osgi.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/work-management.jar
+
+init-common:
+     [echo] Loading props from file /export/work/workspaces/gfv3/appserv-tests/config.properties
+ [property] Loading /export/work/workspaces/gfv3/appserv-tests/config.properties
+     [echo] admin.domain domain1
+     [echo] admin.user admin
+     [echo] admin.port 4848
+     [echo] http.port 8080
+     [echo] http.host localhost
+ [property] Loading /export/work/workspaces/gfv3/appserv-tests/config/derby.properties
+Property "env.JAVKE_HOME" has not been set
+Property "Derby.classpath" has not been set
+Override ignored for property "cluster.name"
+
+clean:
+Project base dir set to: /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans
+  [antcall] calling target(s) [clean-common] in build file /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml
+parsing buildfile /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml with URI = file:/export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml
+Project base dir set to: /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/properties.xml
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/common.xml
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.properties
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/run.xml
+ [property] Loading Environment env.
+Override ignored for property "env.SESSION_MANAGER"
+Override ignored for property "env.LESSOPEN"
+Override ignored for property "env.NORMBGCOLOR"
+Override ignored for property "env.CVSROOT"
+Override ignored for property "env.MY_ANT_HOME"
+Override ignored for property "env.PWD"
+Override ignored for property "env.XDG_SESSION_COOKIE"
+Override ignored for property "env.LANG"
+Override ignored for property "env.WS"
+Override ignored for property "env.AWT_TOOLKIT"
+Override ignored for property "env.DEFAULTS_PATH"
+Override ignored for property "env.HISTSIZE"
+Override ignored for property "env.INSTALL_ROOT"
+Override ignored for property "env.DISPLAY"
+Override ignored for property "env._"
+Override ignored for property "env.USER"
+Override ignored for property "env.HISTCONTROL"
+Override ignored for property "env.SHELL"
+Override ignored for property "env.NLSPATH"
+Override ignored for property "env.XDG_DATA_DIRS"
+Override ignored for property "env.DESKTOP_SESSION"
+Override ignored for property "env.HISTFILESIZE"
+Override ignored for property "env.APS_HOME"
+Override ignored for property "env.WIDTH"
+Override ignored for property "env.JAVANETCVSROOT"
+Override ignored for property "env.PATH"
+Override ignored for property "env.no_proxy"
+Override ignored for property "env.NORMFGCOLOR"
+Override ignored for property "env.LC_CTYPE"
+Override ignored for property "env.DBUS_SESSION_BUS_ADDRESS"
+Override ignored for property "env.REALPLAYER_HOME"
+Override ignored for property "env.SSH_AGENT_PID"
+Override ignored for property "env.SHLVL"
+Override ignored for property "env.GDMSESSION"
+Override ignored for property "env.GNOME_DESKTOP_SESSION_ID"
+Override ignored for property "env.GDM_KEYBOARD_LAYOUT"
+Override ignored for property "env.GNOME_KEYRING_PID"
+Override ignored for property "env.OS"
+Override ignored for property "env.LOGNAME"
+Override ignored for property "env.ALSA_OUTPUT_PORTS"
+Override ignored for property "env.SCUMMVM_PORT"
+Override ignored for property "env.JAVA_HOME"
+Override ignored for property "env.TERM"
+Override ignored for property "env.QLTESTRES"
+Override ignored for property "env.NO_PROXY"
+Override ignored for property "env.GDM_LANG"
+Override ignored for property "env.DTACH_HOME"
+Override ignored for property "env.OLDPWD"
+Override ignored for property "env.DEBUG"
+Override ignored for property "env.GCONF_LOCAL_LOCKS"
+Override ignored for property "env.M2_HOME"
+Override ignored for property "env.EC2_CERT"
+Override ignored for property "env.WINDOWID"
+Override ignored for property "env.EC2_PRIVATE_KEY"
+Override ignored for property "env.REDCVSROOT"
+Override ignored for property "env.MOZ_DISABLE_PANGO"
+Override ignored for property "env.XFILESEARCHPATH"
+Override ignored for property "env.HOME"
+Override ignored for property "env.ANT_HOME"
+Override ignored for property "env.LD_LIBRARY_PATH"
+Override ignored for property "env.MAVEN_OPTS"
+Override ignored for property "env.SSH_AUTH_SOCK"
+Override ignored for property "env.RBARWIDTH"
+Override ignored for property "env.S1AS_HOME"
+Property "BASH_SOURCE" has not been set
+Property "LINENO" has not been set
+Property "FUNCNAME[0]" has not been set
+Override ignored for property "env.PS4"
+Override ignored for property "env.MAVEN_HOME"
+Override ignored for property "env.XAUTHORITY"
+Property "NEW_PWD" has not been set
+Override ignored for property "env.PS1"
+Override ignored for property "env.MANDATORY_PATH"
+Override ignored for property "env.SPEECHD_PORT"
+Override ignored for property "env.GTK_MODULES"
+Override ignored for property "env.WINDOW_MANAGER"
+Override ignored for property "env.DTRX_HOME"
+Override ignored for property "env.COLORTERM"
+Override ignored for property "env.EDITOR"
+Override ignored for property "env.MALLOC_CHECK_"
+Override ignored for property "env.ORBIT_SOCKETDIR"
+Override ignored for property "env.WP_INSTALL_ROOT"
+Override ignored for property "env.USERNAME"
+Override ignored for property "env.SCALA_HOME"
+Override ignored for property "env.COPE_PATH"
+Override ignored for property "env.QL_HOME"
+Override ignored for property "env.AS_ADMIN_READTIMEOUT"
+Override ignored for property "env.MY_SCRIPT_DIR"
+Override ignored for property "env.GNOME_KEYRING_CONTROL"
+Override ignored for property "env.XDG_CONFIG_DIRS"
+Override ignored for property "env.TODOTXT_HOME"
+Override ignored for property "env.LESSCLOSE"
+Override ignored for property "module"
+Override ignored for property "appname"
+Override ignored for property "assemble"
+Override ignored for property "contextroot"
+Override ignored for property "beans.xml"
+Override ignored for property "target-to-run"
+ [macrodef] creating macro  run-test
+Build sequence for target(s) `clean-common' is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-common]
+Complete build sequence is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-common, restart-instance-common, execute-sql-common, deploy-rar-common, undeploy, deploy-jdbc-common, undeploy-rar-common, set-derby-connpool-props, create-sql-common, deploy-war-no-context-root-pe, verifier-common, start-server-unix, test-tagfiles-exist, create-PermSize, execute-ejb-sql-common, undeploy-client-common, prepare-keystore-common, deploy-verify-common-ee, startDerby, confirmMissingReport-common, create-connector-resource-common, asadmin-common, create-connector-connpool, delete-connector-connpool-common, verifier, start-clean-server, runwebclient-common, deploy-common-ee, startDerbyNonMac, webclient-war-common, flush-connpool-common, stopDerby, clean-webapps-common, delete-jdbc-connpool-common, prepare-truststore-common, deploy-verify-common, run, test-tlds-exist, deploy-verify-common-pe, undeploy-common, undeploy-jar-common, deploy-client-common, enterprise-common, create-javamail-resource-common, package-persistence-common, deploy-war-commonee, startDomainWindows, set-derby-driver-connpool-props, deploy-war-no-context-root, undeploy-jdbc-common, deploy-common-pe, clear, copy-tagfiles, clean, compile, build, deploy, restart-server-instance-common, deploy-jar-common, delete-domain-common, stopPB, compile-common-with-endorsed-dir, import-wsdl, deploy-war-commonpe, compile-common, restart-server, runclient-common, package-appclientjar-common, ee-common, copy-tlds, delete-persistence-resource-common, undeploy-jms-common, asadmin-common-ignore-fail, startDomainUnix, startDomain, fixFiles, ejb-jar-common, appclient-jar-common, build-ear-common, publish-war-common, build-publish-war, stop-server-unix, clean-classes-common, create-jdbc-connpool-common, dev-report, startDerbyMac, deploy-jms-common, package-war-common, package-ejbjar-common, delete-connector-resource-common, deploy-jsp-common, unsetupTimer, undeploy-war-common, change-orb-port, delete-javamail-resource-common, deploy-common, create-jms-resource-common, setup-mq-common, delete-jdbc-resource-common, start-server-windows, dumpThreadStack, setupTimer, deploy-war-common, start-server, ee, checkReporting-common, testTimer, stop-server, create-jdbc-driver-connpool-common, all, platform-common, create-jms-connection-common, undeploy-war-name, cleanAS, deploy-dir, preparePB, stop-server-windows, confirmReportPresent-common, delete-jms-resource-common, pb, runtest, create-jvm-options, clean-jars-common, restart-instance, stopDomain, create-connector-connpool-common, set-pointbase-driver-connpool-props, delete-sql-common, deploy-jdbc-driver-common, create-domain-common, delete-jvm-options, create-jdbc-resource-common, prepare-truststore-certutil-common, create-user-common, asadmin-batch-common, delete-user-common, prepare-truststore-keytool-common, convWin, create-persistence-resource-common, get-version-common, startPB, delete-jms-connection-common, usage-common, deploy-war-no-context-root-ee, set-pointbase-connpool-props, usage, convUnix, staticCheck-common, ear-common, deploy-war-name, ]
+  [antcall] Entering /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml...
+Build sequence for target(s) `clean-common' is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-common]
+Complete build sequence is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-common, restart-instance-common, execute-sql-common, deploy-rar-common, undeploy, deploy-jdbc-common, undeploy-rar-common, set-derby-connpool-props, create-sql-common, deploy-war-no-context-root-pe, verifier-common, start-server-unix, test-tagfiles-exist, create-PermSize, execute-ejb-sql-common, undeploy-client-common, prepare-keystore-common, deploy-verify-common-ee, startDerby, confirmMissingReport-common, create-connector-resource-common, asadmin-common, create-connector-connpool, delete-connector-connpool-common, verifier, start-clean-server, runwebclient-common, deploy-common-ee, startDerbyNonMac, webclient-war-common, flush-connpool-common, stopDerby, clean-webapps-common, delete-jdbc-connpool-common, prepare-truststore-common, deploy-verify-common, run, test-tlds-exist, deploy-verify-common-pe, undeploy-common, undeploy-jar-common, deploy-client-common, enterprise-common, create-javamail-resource-common, package-persistence-common, deploy-war-commonee, startDomainWindows, set-derby-driver-connpool-props, deploy-war-no-context-root, undeploy-jdbc-common, deploy-common-pe, clear, copy-tagfiles, clean, compile, build, deploy, restart-server-instance-common, deploy-jar-common, delete-domain-common, stopPB, compile-common-with-endorsed-dir, import-wsdl, deploy-war-commonpe, compile-common, restart-server, runclient-common, package-appclientjar-common, ee-common, copy-tlds, delete-persistence-resource-common, undeploy-jms-common, asadmin-common-ignore-fail, startDomainUnix, startDomain, fixFiles, ejb-jar-common, appclient-jar-common, build-ear-common, publish-war-common, build-publish-war, stop-server-unix, clean-classes-common, create-jdbc-connpool-common, dev-report, startDerbyMac, deploy-jms-common, package-war-common, package-ejbjar-common, delete-connector-resource-common, deploy-jsp-common, unsetupTimer, undeploy-war-common, change-orb-port, delete-javamail-resource-common, deploy-common, create-jms-resource-common, setup-mq-common, delete-jdbc-resource-common, start-server-windows, dumpThreadStack, setupTimer, deploy-war-common, start-server, ee, checkReporting-common, testTimer, stop-server, create-jdbc-driver-connpool-common, all, platform-common, create-jms-connection-common, undeploy-war-name, cleanAS, deploy-dir, preparePB, stop-server-windows, confirmReportPresent-common, delete-jms-resource-common, pb, runtest, create-jvm-options, clean-jars-common, restart-instance, stopDomain, create-connector-connpool-common, set-pointbase-driver-connpool-props, delete-sql-common, deploy-jdbc-driver-common, create-domain-common, delete-jvm-options, create-jdbc-resource-common, prepare-truststore-certutil-common, create-user-common, asadmin-batch-common, delete-user-common, prepare-truststore-keytool-common, convWin, create-persistence-resource-common, get-version-common, startPB, delete-jms-connection-common, usage-common, deploy-war-no-context-root-ee, set-pointbase-connpool-props, usage, convUnix, staticCheck-common, ear-common, deploy-war-name, ]
+
+setOSConditions:
+Override ignored for property "isUnix"
+
+setToolWin:
+Skipped because property 'isWindows' not set.
+
+setToolUnix:
+Override ignored for property "APPCLIENT"
+Override ignored for property "ASADMIN"
+Override ignored for property "ASANT"
+Override ignored for property "CAPTURESCHEMA"
+Override ignored for property "CHECKPATCH"
+Override ignored for property "INSTALLPATCH"
+Override ignored for property "JSPC"
+Override ignored for property "LISTPATCH"
+Override ignored for property "PACKAGE-APPCLIENT"
+Override ignored for property "VERIFIER"
+Override ignored for property "RMIC"
+Override ignored for property "TNAMESERV"
+Override ignored for property "WSCOMPILE"
+Override ignored for property "WSIMPORT"
+Override ignored for property "pb.start.server"
+Override ignored for property "pb.start.server1"
+Override ignored for property "IMQDBMGR"
+Override ignored for property "ld.library.path"
+
+setS1ASclassPath:
+Skipped because property 's1as.classpath' set.
+
+init-common:
+     [echo] Loading props from file /export/work/workspaces/gfv3/appserv-tests/config.properties
+Override ignored for property "pe"
+ [property] Loading /export/work/workspaces/gfv3/appserv-tests/config.properties
+Override ignored for property "instance.https.port"
+Override ignored for property "admin.domain"
+Override ignored for property "admin.password"
+Override ignored for property "http.address"
+Override ignored for property "http.alternate.port"
+Override ignored for property "ssl.password"
+Override ignored for property "instance.http.port"
+Override ignored for property "resources.dottedname.prefix"
+Override ignored for property "results.mailer"
+Override ignored for property "admin.domain.dir"
+Override ignored for property "admin.user"
+Override ignored for property "config.dottedname.prefix"
+Override ignored for property "instance.name"
+Override ignored for property "precompilejsp"
+Override ignored for property "admin.password.file"
+Override ignored for property "http.port"
+Override ignored for property "https.port"
+Override ignored for property "results.mailee"
+Override ignored for property "appserver.instance.name"
+Override ignored for property "master.password"
+Override ignored for property "http.host"
+Override ignored for property "instance.http.port.3"
+Override ignored for property "instance.http.port.2"
+Override ignored for property "admin.port"
+Override ignored for property "cluster.name"
+Override ignored for property "appserver.instance.dir"
+Override ignored for property "autodeploy.dir"
+Override ignored for property "orb.port"
+Override ignored for property "admin.host"
+Override ignored for property "instance.name.3"
+Override ignored for property "instance.name.2"
+Override ignored for property "results.mailhost"
+     [echo] admin.domain domain1
+     [echo] admin.user admin
+     [echo] admin.port 4848
+     [echo] http.port 8080
+     [echo] http.host localhost
+Override ignored for property "as.props"
+Override ignored for property "authrealmname"
+Override ignored for property "apptype"
+Override ignored for property "db.root"
+Override ignored for property "db.dir"
+Override ignored for property "db.classpath"
+ [property] Loading /export/work/workspaces/gfv3/appserv-tests/config/derby.properties
+Override ignored for property "db.host"
+Override ignored for property "db.url"
+Override ignored for property "db.xaclass"
+Override ignored for property "db.name"
+Override ignored for property "db.driver"
+Override ignored for property "db.port"
+Override ignored for property "db.port.2"
+Override ignored for property "db.class"
+Override ignored for property "db.user"
+Override ignored for property "db.pwd"
+Override ignored for property "db.type"
+Property "env.JAVKE_HOME" has not been set
+Override ignored for property "javke.home"
+Override ignored for property "dest.type"
+Override ignored for property "dest.name"
+Override ignored for property "jms.factory.name"
+Override ignored for property "jms.factory.type"
+Override ignored for property "jms.resource.name"
+Override ignored for property "jms.resource.type"
+Override ignored for property "jdbc.conpool.name"
+Override ignored for property "jdbc.resource.name"
+Override ignored for property "jdbc.resource.type"
+Override ignored for property "pm.resource.name"
+Override ignored for property "pm.factory.class"
+Override ignored for property "appclient.application.args"
+Override ignored for property "build.base.dir"
+Override ignored for property "build.webapps.dir"
+Override ignored for property "build.classes.dir"
+Override ignored for property "assemble.dir"
+Override ignored for property "results.dir"
+Property "Derby.classpath" has not been set
+Override ignored for property "s1astest.classpath"
+Override ignored for property "ejbjar.classes"
+Override ignored for property "appclientjar.classes"
+Override ignored for property "webclient.war.files"
+Override ignored for property "webclient.war.classes"
+Override ignored for property "test.name"
+Override ignored for property "test.description"
+Override ignored for property "test.count"
+Override ignored for property "cluster.name"
+Override ignored for property "clustered.server.name"
+Override ignored for property "clustered.server.name.two"
+Override ignored for property "nodeagent.name"
+Override ignored for property "das.host"
+Override ignored for property "das.jmx.port"
+Override ignored for property "http.listener1.port"
+Override ignored for property "http.listener2.port"
+Override ignored for property "orb.listener1.port"
+Override ignored for property "ssl.port"
+Override ignored for property "ssl.mutualauth.port"
+Override ignored for property "jmx.system.connector.port"
+Override ignored for property "http.listener1.port.two"
+Override ignored for property "http.listener2.port.two"
+Override ignored for property "orb.listener1.port.two"
+Override ignored for property "ssl.port.two"
+Override ignored for property "ssl.mutualauth.port.two"
+Override ignored for property "jmx.system.connector.port.two"
+Override ignored for property "cert.nickname"
+
+clean-common:
+Project base dir set to: /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans
+  [antcall] calling target(s) [clean-classes-common] in build file /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml
+parsing buildfile /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml with URI = file:/export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml
+Project base dir set to: /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/properties.xml
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/common.xml
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.properties
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/run.xml
+ [property] Loading Environment env.
+Override ignored for property "env.SESSION_MANAGER"
+Override ignored for property "env.LESSOPEN"
+Override ignored for property "env.NORMBGCOLOR"
+Override ignored for property "env.CVSROOT"
+Override ignored for property "env.MY_ANT_HOME"
+Override ignored for property "env.PWD"
+Override ignored for property "env.XDG_SESSION_COOKIE"
+Override ignored for property "env.LANG"
+Override ignored for property "env.WS"
+Override ignored for property "env.AWT_TOOLKIT"
+Override ignored for property "env.DEFAULTS_PATH"
+Override ignored for property "env.HISTSIZE"
+Override ignored for property "env.INSTALL_ROOT"
+Override ignored for property "env.DISPLAY"
+Override ignored for property "env._"
+Override ignored for property "env.USER"
+Override ignored for property "env.HISTCONTROL"
+Override ignored for property "env.SHELL"
+Override ignored for property "env.NLSPATH"
+Override ignored for property "env.XDG_DATA_DIRS"
+Override ignored for property "env.DESKTOP_SESSION"
+Override ignored for property "env.HISTFILESIZE"
+Override ignored for property "env.APS_HOME"
+Override ignored for property "env.WIDTH"
+Override ignored for property "env.JAVANETCVSROOT"
+Override ignored for property "env.PATH"
+Override ignored for property "env.no_proxy"
+Override ignored for property "env.NORMFGCOLOR"
+Override ignored for property "env.LC_CTYPE"
+Override ignored for property "env.DBUS_SESSION_BUS_ADDRESS"
+Override ignored for property "env.REALPLAYER_HOME"
+Override ignored for property "env.SSH_AGENT_PID"
+Override ignored for property "env.SHLVL"
+Override ignored for property "env.GDMSESSION"
+Override ignored for property "env.GNOME_DESKTOP_SESSION_ID"
+Override ignored for property "env.GDM_KEYBOARD_LAYOUT"
+Override ignored for property "env.GNOME_KEYRING_PID"
+Override ignored for property "env.OS"
+Override ignored for property "env.LOGNAME"
+Override ignored for property "env.ALSA_OUTPUT_PORTS"
+Override ignored for property "env.SCUMMVM_PORT"
+Override ignored for property "env.JAVA_HOME"
+Override ignored for property "env.TERM"
+Override ignored for property "env.QLTESTRES"
+Override ignored for property "env.NO_PROXY"
+Override ignored for property "env.GDM_LANG"
+Override ignored for property "env.DTACH_HOME"
+Override ignored for property "env.OLDPWD"
+Override ignored for property "env.DEBUG"
+Override ignored for property "env.GCONF_LOCAL_LOCKS"
+Override ignored for property "env.M2_HOME"
+Override ignored for property "env.EC2_CERT"
+Override ignored for property "env.WINDOWID"
+Override ignored for property "env.EC2_PRIVATE_KEY"
+Override ignored for property "env.REDCVSROOT"
+Override ignored for property "env.MOZ_DISABLE_PANGO"
+Override ignored for property "env.XFILESEARCHPATH"
+Override ignored for property "env.HOME"
+Override ignored for property "env.ANT_HOME"
+Override ignored for property "env.LD_LIBRARY_PATH"
+Override ignored for property "env.MAVEN_OPTS"
+Override ignored for property "env.SSH_AUTH_SOCK"
+Override ignored for property "env.RBARWIDTH"
+Override ignored for property "env.S1AS_HOME"
+Property "BASH_SOURCE" has not been set
+Property "LINENO" has not been set
+Property "FUNCNAME[0]" has not been set
+Override ignored for property "env.PS4"
+Override ignored for property "env.MAVEN_HOME"
+Override ignored for property "env.XAUTHORITY"
+Property "NEW_PWD" has not been set
+Override ignored for property "env.PS1"
+Override ignored for property "env.MANDATORY_PATH"
+Override ignored for property "env.SPEECHD_PORT"
+Override ignored for property "env.GTK_MODULES"
+Override ignored for property "env.WINDOW_MANAGER"
+Override ignored for property "env.DTRX_HOME"
+Override ignored for property "env.COLORTERM"
+Override ignored for property "env.EDITOR"
+Override ignored for property "env.MALLOC_CHECK_"
+Override ignored for property "env.ORBIT_SOCKETDIR"
+Override ignored for property "env.WP_INSTALL_ROOT"
+Override ignored for property "env.USERNAME"
+Override ignored for property "env.SCALA_HOME"
+Override ignored for property "env.COPE_PATH"
+Override ignored for property "env.QL_HOME"
+Override ignored for property "env.AS_ADMIN_READTIMEOUT"
+Override ignored for property "env.MY_SCRIPT_DIR"
+Override ignored for property "env.GNOME_KEYRING_CONTROL"
+Override ignored for property "env.XDG_CONFIG_DIRS"
+Override ignored for property "env.TODOTXT_HOME"
+Override ignored for property "env.LESSCLOSE"
+Override ignored for property "module"
+Override ignored for property "appname"
+Override ignored for property "assemble"
+Override ignored for property "contextroot"
+Override ignored for property "beans.xml"
+Override ignored for property "target-to-run"
+ [macrodef] creating macro  run-test
+Build sequence for target(s) `clean-classes-common' is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-classes-common]
+Complete build sequence is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-classes-common, restart-instance-common, execute-sql-common, deploy-rar-common, undeploy, deploy-jdbc-common, undeploy-rar-common, set-derby-connpool-props, create-sql-common, deploy-war-no-context-root-pe, verifier-common, start-server-unix, test-tagfiles-exist, create-PermSize, execute-ejb-sql-common, undeploy-client-common, prepare-keystore-common, deploy-verify-common-ee, startDerby, confirmMissingReport-common, create-connector-resource-common, asadmin-common, create-connector-connpool, delete-connector-connpool-common, verifier, start-clean-server, runwebclient-common, deploy-common-ee, startDerbyNonMac, webclient-war-common, flush-connpool-common, stopDerby, clean-webapps-common, delete-jdbc-connpool-common, prepare-truststore-common, deploy-verify-common, run, test-tlds-exist, deploy-verify-common-pe, undeploy-common, undeploy-jar-common, deploy-client-common, enterprise-common, create-javamail-resource-common, package-persistence-common, deploy-war-commonee, startDomainWindows, set-derby-driver-connpool-props, deploy-war-no-context-root, undeploy-jdbc-common, deploy-common-pe, clear, copy-tagfiles, clean, compile, build, deploy, restart-server-instance-common, deploy-jar-common, delete-domain-common, stopPB, compile-common-with-endorsed-dir, import-wsdl, deploy-war-commonpe, compile-common, restart-server, runclient-common, package-appclientjar-common, ee-common, copy-tlds, delete-persistence-resource-common, undeploy-jms-common, asadmin-common-ignore-fail, startDomainUnix, startDomain, fixFiles, ejb-jar-common, appclient-jar-common, build-ear-common, publish-war-common, build-publish-war, stop-server-unix, clean-common, create-jdbc-connpool-common, dev-report, startDerbyMac, deploy-jms-common, package-war-common, package-ejbjar-common, delete-connector-resource-common, deploy-jsp-common, unsetupTimer, undeploy-war-common, change-orb-port, delete-javamail-resource-common, deploy-common, create-jms-resource-common, setup-mq-common, delete-jdbc-resource-common, start-server-windows, dumpThreadStack, setupTimer, deploy-war-common, start-server, ee, checkReporting-common, testTimer, stop-server, create-jdbc-driver-connpool-common, all, platform-common, create-jms-connection-common, undeploy-war-name, cleanAS, deploy-dir, preparePB, stop-server-windows, confirmReportPresent-common, delete-jms-resource-common, pb, runtest, create-jvm-options, clean-jars-common, restart-instance, stopDomain, create-connector-connpool-common, set-pointbase-driver-connpool-props, delete-sql-common, deploy-jdbc-driver-common, create-domain-common, delete-jvm-options, create-jdbc-resource-common, prepare-truststore-certutil-common, create-user-common, asadmin-batch-common, delete-user-common, prepare-truststore-keytool-common, convWin, create-persistence-resource-common, get-version-common, startPB, delete-jms-connection-common, usage-common, deploy-war-no-context-root-ee, set-pointbase-connpool-props, usage, convUnix, staticCheck-common, ear-common, deploy-war-name, ]
+  [antcall] Entering /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml...
+Build sequence for target(s) `clean-classes-common' is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-classes-common]
+Complete build sequence is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-classes-common, restart-instance-common, execute-sql-common, deploy-rar-common, undeploy, deploy-jdbc-common, undeploy-rar-common, set-derby-connpool-props, create-sql-common, deploy-war-no-context-root-pe, verifier-common, start-server-unix, test-tagfiles-exist, create-PermSize, execute-ejb-sql-common, undeploy-client-common, prepare-keystore-common, deploy-verify-common-ee, startDerby, confirmMissingReport-common, create-connector-resource-common, asadmin-common, create-connector-connpool, delete-connector-connpool-common, verifier, start-clean-server, runwebclient-common, deploy-common-ee, startDerbyNonMac, webclient-war-common, flush-connpool-common, stopDerby, clean-webapps-common, delete-jdbc-connpool-common, prepare-truststore-common, deploy-verify-common, run, test-tlds-exist, deploy-verify-common-pe, undeploy-common, undeploy-jar-common, deploy-client-common, enterprise-common, create-javamail-resource-common, package-persistence-common, deploy-war-commonee, startDomainWindows, set-derby-driver-connpool-props, deploy-war-no-context-root, undeploy-jdbc-common, deploy-common-pe, clear, copy-tagfiles, clean, compile, build, deploy, restart-server-instance-common, deploy-jar-common, delete-domain-common, stopPB, compile-common-with-endorsed-dir, import-wsdl, deploy-war-commonpe, compile-common, restart-server, runclient-common, package-appclientjar-common, ee-common, copy-tlds, delete-persistence-resource-common, undeploy-jms-common, asadmin-common-ignore-fail, startDomainUnix, startDomain, fixFiles, ejb-jar-common, appclient-jar-common, build-ear-common, publish-war-common, build-publish-war, stop-server-unix, clean-common, create-jdbc-connpool-common, dev-report, startDerbyMac, deploy-jms-common, package-war-common, package-ejbjar-common, delete-connector-resource-common, deploy-jsp-common, unsetupTimer, undeploy-war-common, change-orb-port, delete-javamail-resource-common, deploy-common, create-jms-resource-common, setup-mq-common, delete-jdbc-resource-common, start-server-windows, dumpThreadStack, setupTimer, deploy-war-common, start-server, ee, checkReporting-common, testTimer, stop-server, create-jdbc-driver-connpool-common, all, platform-common, create-jms-connection-common, undeploy-war-name, cleanAS, deploy-dir, preparePB, stop-server-windows, confirmReportPresent-common, delete-jms-resource-common, pb, runtest, create-jvm-options, clean-jars-common, restart-instance, stopDomain, create-connector-connpool-common, set-pointbase-driver-connpool-props, delete-sql-common, deploy-jdbc-driver-common, create-domain-common, delete-jvm-options, create-jdbc-resource-common, prepare-truststore-certutil-common, create-user-common, asadmin-batch-common, delete-user-common, prepare-truststore-keytool-common, convWin, create-persistence-resource-common, get-version-common, startPB, delete-jms-connection-common, usage-common, deploy-war-no-context-root-ee, set-pointbase-connpool-props, usage, convUnix, staticCheck-common, ear-common, deploy-war-name, ]
+
+setOSConditions:
+Override ignored for property "isUnix"
+
+setToolWin:
+Skipped because property 'isWindows' not set.
+
+setToolUnix:
+Override ignored for property "APPCLIENT"
+Override ignored for property "ASADMIN"
+Override ignored for property "ASANT"
+Override ignored for property "CAPTURESCHEMA"
+Override ignored for property "CHECKPATCH"
+Override ignored for property "INSTALLPATCH"
+Override ignored for property "JSPC"
+Override ignored for property "LISTPATCH"
+Override ignored for property "PACKAGE-APPCLIENT"
+Override ignored for property "VERIFIER"
+Override ignored for property "RMIC"
+Override ignored for property "TNAMESERV"
+Override ignored for property "WSCOMPILE"
+Override ignored for property "WSIMPORT"
+Override ignored for property "pb.start.server"
+Override ignored for property "pb.start.server1"
+Override ignored for property "IMQDBMGR"
+Override ignored for property "ld.library.path"
+
+setS1ASclassPath:
+Skipped because property 's1as.classpath' set.
+
+init-common:
+     [echo] Loading props from file /export/work/workspaces/gfv3/appserv-tests/config.properties
+Override ignored for property "pe"
+ [property] Loading /export/work/workspaces/gfv3/appserv-tests/config.properties
+Override ignored for property "instance.https.port"
+Override ignored for property "admin.domain"
+Override ignored for property "admin.password"
+Override ignored for property "http.address"
+Override ignored for property "http.alternate.port"
+Override ignored for property "ssl.password"
+Override ignored for property "instance.http.port"
+Override ignored for property "resources.dottedname.prefix"
+Override ignored for property "results.mailer"
+Override ignored for property "admin.domain.dir"
+Override ignored for property "admin.user"
+Override ignored for property "config.dottedname.prefix"
+Override ignored for property "instance.name"
+Override ignored for property "precompilejsp"
+Override ignored for property "admin.password.file"
+Override ignored for property "http.port"
+Override ignored for property "https.port"
+Override ignored for property "results.mailee"
+Override ignored for property "appserver.instance.name"
+Override ignored for property "master.password"
+Override ignored for property "http.host"
+Override ignored for property "instance.http.port.3"
+Override ignored for property "instance.http.port.2"
+Override ignored for property "admin.port"
+Override ignored for property "cluster.name"
+Override ignored for property "appserver.instance.dir"
+Override ignored for property "autodeploy.dir"
+Override ignored for property "orb.port"
+Override ignored for property "admin.host"
+Override ignored for property "instance.name.3"
+Override ignored for property "instance.name.2"
+Override ignored for property "results.mailhost"
+     [echo] admin.domain domain1
+     [echo] admin.user admin
+     [echo] admin.port 4848
+     [echo] http.port 8080
+     [echo] http.host localhost
+Override ignored for property "as.props"
+Override ignored for property "authrealmname"
+Override ignored for property "apptype"
+Override ignored for property "db.root"
+Override ignored for property "db.dir"
+Override ignored for property "db.classpath"
+ [property] Loading /export/work/workspaces/gfv3/appserv-tests/config/derby.properties
+Override ignored for property "db.host"
+Override ignored for property "db.url"
+Override ignored for property "db.xaclass"
+Override ignored for property "db.name"
+Override ignored for property "db.driver"
+Override ignored for property "db.port"
+Override ignored for property "db.port.2"
+Override ignored for property "db.class"
+Override ignored for property "db.user"
+Override ignored for property "db.pwd"
+Override ignored for property "db.type"
+Property "env.JAVKE_HOME" has not been set
+Override ignored for property "javke.home"
+Override ignored for property "dest.type"
+Override ignored for property "dest.name"
+Override ignored for property "jms.factory.name"
+Override ignored for property "jms.factory.type"
+Override ignored for property "jms.resource.name"
+Override ignored for property "jms.resource.type"
+Override ignored for property "jdbc.conpool.name"
+Override ignored for property "jdbc.resource.name"
+Override ignored for property "jdbc.resource.type"
+Override ignored for property "pm.resource.name"
+Override ignored for property "pm.factory.class"
+Override ignored for property "appclient.application.args"
+Override ignored for property "build.base.dir"
+Override ignored for property "build.webapps.dir"
+Override ignored for property "build.classes.dir"
+Override ignored for property "assemble.dir"
+Override ignored for property "results.dir"
+Property "Derby.classpath" has not been set
+Override ignored for property "s1astest.classpath"
+Override ignored for property "ejbjar.classes"
+Override ignored for property "appclientjar.classes"
+Override ignored for property "webclient.war.files"
+Override ignored for property "webclient.war.classes"
+Override ignored for property "test.name"
+Override ignored for property "test.description"
+Override ignored for property "test.count"
+Override ignored for property "cluster.name"
+Override ignored for property "clustered.server.name"
+Override ignored for property "clustered.server.name.two"
+Override ignored for property "nodeagent.name"
+Override ignored for property "das.host"
+Override ignored for property "das.jmx.port"
+Override ignored for property "http.listener1.port"
+Override ignored for property "http.listener2.port"
+Override ignored for property "orb.listener1.port"
+Override ignored for property "ssl.port"
+Override ignored for property "ssl.mutualauth.port"
+Override ignored for property "jmx.system.connector.port"
+Override ignored for property "http.listener1.port.two"
+Override ignored for property "http.listener2.port.two"
+Override ignored for property "orb.listener1.port.two"
+Override ignored for property "ssl.port.two"
+Override ignored for property "ssl.mutualauth.port.two"
+Override ignored for property "jmx.system.connector.port.two"
+Override ignored for property "cert.nickname"
+
+clean-classes-common:
+     [echo] common.xml: Cleaning test source files: /export/work/workspaces/gfv3/appserv-tests/build/module
+   [delete] Deleting directory /export/work/workspaces/gfv3/appserv-tests/build/module
+   [delete] Deleting /export/work/workspaces/gfv3/appserv-tests/build/module/classes/TestServlet$1.class
+   [delete] Deleting /export/work/workspaces/gfv3/appserv-tests/build/module/classes/TestServlet.class
+   [delete] Deleting /export/work/workspaces/gfv3/appserv-tests/build/module/classes/TestBean.class
+   [delete] Deleting /export/work/workspaces/gfv3/appserv-tests/build/module/classes/TestLoggerProducer.class
+   [delete] Deleting /export/work/workspaces/gfv3/appserv-tests/build/module/classes/ClassUnavailableAtRuntime.class
+   [delete] Deleting /export/work/workspaces/gfv3/appserv-tests/build/module/classes/OptionalService.class
+   [delete] Deleting directory /export/work/workspaces/gfv3/appserv-tests/build/module/classes
+   [delete] Deleting directory /export/work/workspaces/gfv3/appserv-tests/build/module
+  [antcall] Exiting /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml.
+Project base dir set to: /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans
+  [antcall] calling target(s) [clean-jars-common] in build file /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml
+parsing buildfile /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml with URI = file:/export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml
+Project base dir set to: /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/properties.xml
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/common.xml
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.properties
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/run.xml
+ [property] Loading Environment env.
+Override ignored for property "env.SESSION_MANAGER"
+Override ignored for property "env.LESSOPEN"
+Override ignored for property "env.NORMBGCOLOR"
+Override ignored for property "env.CVSROOT"
+Override ignored for property "env.MY_ANT_HOME"
+Override ignored for property "env.PWD"
+Override ignored for property "env.XDG_SESSION_COOKIE"
+Override ignored for property "env.LANG"
+Override ignored for property "env.WS"
+Override ignored for property "env.AWT_TOOLKIT"
+Override ignored for property "env.DEFAULTS_PATH"
+Override ignored for property "env.HISTSIZE"
+Override ignored for property "env.INSTALL_ROOT"
+Override ignored for property "env.DISPLAY"
+Override ignored for property "env._"
+Override ignored for property "env.USER"
+Override ignored for property "env.HISTCONTROL"
+Override ignored for property "env.SHELL"
+Override ignored for property "env.NLSPATH"
+Override ignored for property "env.XDG_DATA_DIRS"
+Override ignored for property "env.DESKTOP_SESSION"
+Override ignored for property "env.HISTFILESIZE"
+Override ignored for property "env.APS_HOME"
+Override ignored for property "env.WIDTH"
+Override ignored for property "env.JAVANETCVSROOT"
+Override ignored for property "env.PATH"
+Override ignored for property "env.no_proxy"
+Override ignored for property "env.NORMFGCOLOR"
+Override ignored for property "env.LC_CTYPE"
+Override ignored for property "env.DBUS_SESSION_BUS_ADDRESS"
+Override ignored for property "env.REALPLAYER_HOME"
+Override ignored for property "env.SSH_AGENT_PID"
+Override ignored for property "env.SHLVL"
+Override ignored for property "env.GDMSESSION"
+Override ignored for property "env.GNOME_DESKTOP_SESSION_ID"
+Override ignored for property "env.GDM_KEYBOARD_LAYOUT"
+Override ignored for property "env.GNOME_KEYRING_PID"
+Override ignored for property "env.OS"
+Override ignored for property "env.LOGNAME"
+Override ignored for property "env.ALSA_OUTPUT_PORTS"
+Override ignored for property "env.SCUMMVM_PORT"
+Override ignored for property "env.JAVA_HOME"
+Override ignored for property "env.TERM"
+Override ignored for property "env.QLTESTRES"
+Override ignored for property "env.NO_PROXY"
+Override ignored for property "env.GDM_LANG"
+Override ignored for property "env.DTACH_HOME"
+Override ignored for property "env.OLDPWD"
+Override ignored for property "env.DEBUG"
+Override ignored for property "env.GCONF_LOCAL_LOCKS"
+Override ignored for property "env.M2_HOME"
+Override ignored for property "env.EC2_CERT"
+Override ignored for property "env.WINDOWID"
+Override ignored for property "env.EC2_PRIVATE_KEY"
+Override ignored for property "env.REDCVSROOT"
+Override ignored for property "env.MOZ_DISABLE_PANGO"
+Override ignored for property "env.XFILESEARCHPATH"
+Override ignored for property "env.HOME"
+Override ignored for property "env.ANT_HOME"
+Override ignored for property "env.LD_LIBRARY_PATH"
+Override ignored for property "env.MAVEN_OPTS"
+Override ignored for property "env.SSH_AUTH_SOCK"
+Override ignored for property "env.RBARWIDTH"
+Override ignored for property "env.S1AS_HOME"
+Property "BASH_SOURCE" has not been set
+Property "LINENO" has not been set
+Property "FUNCNAME[0]" has not been set
+Override ignored for property "env.PS4"
+Override ignored for property "env.MAVEN_HOME"
+Override ignored for property "env.XAUTHORITY"
+Property "NEW_PWD" has not been set
+Override ignored for property "env.PS1"
+Override ignored for property "env.MANDATORY_PATH"
+Override ignored for property "env.SPEECHD_PORT"
+Override ignored for property "env.GTK_MODULES"
+Override ignored for property "env.WINDOW_MANAGER"
+Override ignored for property "env.DTRX_HOME"
+Override ignored for property "env.COLORTERM"
+Override ignored for property "env.EDITOR"
+Override ignored for property "env.MALLOC_CHECK_"
+Override ignored for property "env.ORBIT_SOCKETDIR"
+Override ignored for property "env.WP_INSTALL_ROOT"
+Override ignored for property "env.USERNAME"
+Override ignored for property "env.SCALA_HOME"
+Override ignored for property "env.COPE_PATH"
+Override ignored for property "env.QL_HOME"
+Override ignored for property "env.AS_ADMIN_READTIMEOUT"
+Override ignored for property "env.MY_SCRIPT_DIR"
+Override ignored for property "env.GNOME_KEYRING_CONTROL"
+Override ignored for property "env.XDG_CONFIG_DIRS"
+Override ignored for property "env.TODOTXT_HOME"
+Override ignored for property "env.LESSCLOSE"
+Override ignored for property "module"
+Override ignored for property "appname"
+Override ignored for property "assemble"
+Override ignored for property "contextroot"
+Override ignored for property "beans.xml"
+Override ignored for property "target-to-run"
+ [macrodef] creating macro  run-test
+Build sequence for target(s) `clean-jars-common' is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-jars-common]
+Complete build sequence is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-jars-common, restart-instance-common, execute-sql-common, deploy-rar-common, undeploy, deploy-jdbc-common, undeploy-rar-common, set-derby-connpool-props, create-sql-common, deploy-war-no-context-root-pe, verifier-common, start-server-unix, test-tagfiles-exist, create-PermSize, execute-ejb-sql-common, undeploy-client-common, prepare-keystore-common, deploy-verify-common-ee, startDerby, confirmMissingReport-common, create-connector-resource-common, asadmin-common, create-connector-connpool, delete-connector-connpool-common, verifier, start-clean-server, runwebclient-common, deploy-common-ee, startDerbyNonMac, webclient-war-common, flush-connpool-common, stopDerby, clean-webapps-common, delete-jdbc-connpool-common, prepare-truststore-common, deploy-verify-common, run, test-tlds-exist, deploy-verify-common-pe, undeploy-common, undeploy-jar-common, deploy-client-common, enterprise-common, create-javamail-resource-common, package-persistence-common, deploy-war-commonee, startDomainWindows, set-derby-driver-connpool-props, deploy-war-no-context-root, undeploy-jdbc-common, deploy-common-pe, clear, copy-tagfiles, clean, compile, build, deploy, restart-server-instance-common, deploy-jar-common, delete-domain-common, stopPB, compile-common-with-endorsed-dir, import-wsdl, deploy-war-commonpe, compile-common, restart-server, runclient-common, package-appclientjar-common, ee-common, copy-tlds, delete-persistence-resource-common, undeploy-jms-common, asadmin-common-ignore-fail, startDomainUnix, startDomain, fixFiles, ejb-jar-common, appclient-jar-common, build-ear-common, publish-war-common, build-publish-war, stop-server-unix, clean-classes-common, clean-common, create-jdbc-connpool-common, dev-report, startDerbyMac, deploy-jms-common, package-war-common, package-ejbjar-common, delete-connector-resource-common, deploy-jsp-common, unsetupTimer, undeploy-war-common, change-orb-port, delete-javamail-resource-common, deploy-common, create-jms-resource-common, setup-mq-common, delete-jdbc-resource-common, start-server-windows, dumpThreadStack, setupTimer, deploy-war-common, start-server, ee, checkReporting-common, testTimer, stop-server, create-jdbc-driver-connpool-common, all, platform-common, create-jms-connection-common, undeploy-war-name, cleanAS, deploy-dir, preparePB, stop-server-windows, confirmReportPresent-common, delete-jms-resource-common, pb, runtest, create-jvm-options, restart-instance, stopDomain, create-connector-connpool-common, set-pointbase-driver-connpool-props, delete-sql-common, deploy-jdbc-driver-common, create-domain-common, delete-jvm-options, create-jdbc-resource-common, prepare-truststore-certutil-common, create-user-common, asadmin-batch-common, delete-user-common, prepare-truststore-keytool-common, convWin, create-persistence-resource-common, get-version-common, startPB, delete-jms-connection-common, usage-common, deploy-war-no-context-root-ee, set-pointbase-connpool-props, usage, convUnix, staticCheck-common, ear-common, deploy-war-name, ]
+  [antcall] Entering /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml...
+Build sequence for target(s) `clean-jars-common' is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-jars-common]
+Complete build sequence is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-jars-common, restart-instance-common, execute-sql-common, deploy-rar-common, undeploy, deploy-jdbc-common, undeploy-rar-common, set-derby-connpool-props, create-sql-common, deploy-war-no-context-root-pe, verifier-common, start-server-unix, test-tagfiles-exist, create-PermSize, execute-ejb-sql-common, undeploy-client-common, prepare-keystore-common, deploy-verify-common-ee, startDerby, confirmMissingReport-common, create-connector-resource-common, asadmin-common, create-connector-connpool, delete-connector-connpool-common, verifier, start-clean-server, runwebclient-common, deploy-common-ee, startDerbyNonMac, webclient-war-common, flush-connpool-common, stopDerby, clean-webapps-common, delete-jdbc-connpool-common, prepare-truststore-common, deploy-verify-common, run, test-tlds-exist, deploy-verify-common-pe, undeploy-common, undeploy-jar-common, deploy-client-common, enterprise-common, create-javamail-resource-common, package-persistence-common, deploy-war-commonee, startDomainWindows, set-derby-driver-connpool-props, deploy-war-no-context-root, undeploy-jdbc-common, deploy-common-pe, clear, copy-tagfiles, clean, compile, build, deploy, restart-server-instance-common, deploy-jar-common, delete-domain-common, stopPB, compile-common-with-endorsed-dir, import-wsdl, deploy-war-commonpe, compile-common, restart-server, runclient-common, package-appclientjar-common, ee-common, copy-tlds, delete-persistence-resource-common, undeploy-jms-common, asadmin-common-ignore-fail, startDomainUnix, startDomain, fixFiles, ejb-jar-common, appclient-jar-common, build-ear-common, publish-war-common, build-publish-war, stop-server-unix, clean-classes-common, clean-common, create-jdbc-connpool-common, dev-report, startDerbyMac, deploy-jms-common, package-war-common, package-ejbjar-common, delete-connector-resource-common, deploy-jsp-common, unsetupTimer, undeploy-war-common, change-orb-port, delete-javamail-resource-common, deploy-common, create-jms-resource-common, setup-mq-common, delete-jdbc-resource-common, start-server-windows, dumpThreadStack, setupTimer, deploy-war-common, start-server, ee, checkReporting-common, testTimer, stop-server, create-jdbc-driver-connpool-common, all, platform-common, create-jms-connection-common, undeploy-war-name, cleanAS, deploy-dir, preparePB, stop-server-windows, confirmReportPresent-common, delete-jms-resource-common, pb, runtest, create-jvm-options, restart-instance, stopDomain, create-connector-connpool-common, set-pointbase-driver-connpool-props, delete-sql-common, deploy-jdbc-driver-common, create-domain-common, delete-jvm-options, create-jdbc-resource-common, prepare-truststore-certutil-common, create-user-common, asadmin-batch-common, delete-user-common, prepare-truststore-keytool-common, convWin, create-persistence-resource-common, get-version-common, startPB, delete-jms-connection-common, usage-common, deploy-war-no-context-root-ee, set-pointbase-connpool-props, usage, convUnix, staticCheck-common, ear-common, deploy-war-name, ]
+
+setOSConditions:
+Override ignored for property "isUnix"
+
+setToolWin:
+Skipped because property 'isWindows' not set.
+
+setToolUnix:
+Override ignored for property "APPCLIENT"
+Override ignored for property "ASADMIN"
+Override ignored for property "ASANT"
+Override ignored for property "CAPTURESCHEMA"
+Override ignored for property "CHECKPATCH"
+Override ignored for property "INSTALLPATCH"
+Override ignored for property "JSPC"
+Override ignored for property "LISTPATCH"
+Override ignored for property "PACKAGE-APPCLIENT"
+Override ignored for property "VERIFIER"
+Override ignored for property "RMIC"
+Override ignored for property "TNAMESERV"
+Override ignored for property "WSCOMPILE"
+Override ignored for property "WSIMPORT"
+Override ignored for property "pb.start.server"
+Override ignored for property "pb.start.server1"
+Override ignored for property "IMQDBMGR"
+Override ignored for property "ld.library.path"
+
+setS1ASclassPath:
+Skipped because property 's1as.classpath' set.
+
+init-common:
+     [echo] Loading props from file /export/work/workspaces/gfv3/appserv-tests/config.properties
+Override ignored for property "pe"
+ [property] Loading /export/work/workspaces/gfv3/appserv-tests/config.properties
+Override ignored for property "instance.https.port"
+Override ignored for property "admin.domain"
+Override ignored for property "admin.password"
+Override ignored for property "http.address"
+Override ignored for property "http.alternate.port"
+Override ignored for property "ssl.password"
+Override ignored for property "instance.http.port"
+Override ignored for property "resources.dottedname.prefix"
+Override ignored for property "results.mailer"
+Override ignored for property "admin.domain.dir"
+Override ignored for property "admin.user"
+Override ignored for property "config.dottedname.prefix"
+Override ignored for property "instance.name"
+Override ignored for property "precompilejsp"
+Override ignored for property "admin.password.file"
+Override ignored for property "http.port"
+Override ignored for property "https.port"
+Override ignored for property "results.mailee"
+Override ignored for property "appserver.instance.name"
+Override ignored for property "master.password"
+Override ignored for property "http.host"
+Override ignored for property "instance.http.port.3"
+Override ignored for property "instance.http.port.2"
+Override ignored for property "admin.port"
+Override ignored for property "cluster.name"
+Override ignored for property "appserver.instance.dir"
+Override ignored for property "autodeploy.dir"
+Override ignored for property "orb.port"
+Override ignored for property "admin.host"
+Override ignored for property "instance.name.3"
+Override ignored for property "instance.name.2"
+Override ignored for property "results.mailhost"
+     [echo] admin.domain domain1
+     [echo] admin.user admin
+     [echo] admin.port 4848
+     [echo] http.port 8080
+     [echo] http.host localhost
+Override ignored for property "as.props"
+Override ignored for property "authrealmname"
+Override ignored for property "apptype"
+Override ignored for property "db.root"
+Override ignored for property "db.dir"
+Override ignored for property "db.classpath"
+ [property] Loading /export/work/workspaces/gfv3/appserv-tests/config/derby.properties
+Override ignored for property "db.host"
+Override ignored for property "db.url"
+Override ignored for property "db.xaclass"
+Override ignored for property "db.name"
+Override ignored for property "db.driver"
+Override ignored for property "db.port"
+Override ignored for property "db.port.2"
+Override ignored for property "db.class"
+Override ignored for property "db.user"
+Override ignored for property "db.pwd"
+Override ignored for property "db.type"
+Property "env.JAVKE_HOME" has not been set
+Override ignored for property "javke.home"
+Override ignored for property "dest.type"
+Override ignored for property "dest.name"
+Override ignored for property "jms.factory.name"
+Override ignored for property "jms.factory.type"
+Override ignored for property "jms.resource.name"
+Override ignored for property "jms.resource.type"
+Override ignored for property "jdbc.conpool.name"
+Override ignored for property "jdbc.resource.name"
+Override ignored for property "jdbc.resource.type"
+Override ignored for property "pm.resource.name"
+Override ignored for property "pm.factory.class"
+Override ignored for property "appclient.application.args"
+Override ignored for property "build.base.dir"
+Override ignored for property "build.webapps.dir"
+Override ignored for property "build.classes.dir"
+Override ignored for property "assemble.dir"
+Override ignored for property "results.dir"
+Property "Derby.classpath" has not been set
+Override ignored for property "s1astest.classpath"
+Override ignored for property "ejbjar.classes"
+Override ignored for property "appclientjar.classes"
+Override ignored for property "webclient.war.files"
+Override ignored for property "webclient.war.classes"
+Override ignored for property "test.name"
+Override ignored for property "test.description"
+Override ignored for property "test.count"
+Override ignored for property "cluster.name"
+Override ignored for property "clustered.server.name"
+Override ignored for property "clustered.server.name.two"
+Override ignored for property "nodeagent.name"
+Override ignored for property "das.host"
+Override ignored for property "das.jmx.port"
+Override ignored for property "http.listener1.port"
+Override ignored for property "http.listener2.port"
+Override ignored for property "orb.listener1.port"
+Override ignored for property "ssl.port"
+Override ignored for property "ssl.mutualauth.port"
+Override ignored for property "jmx.system.connector.port"
+Override ignored for property "http.listener1.port.two"
+Override ignored for property "http.listener2.port.two"
+Override ignored for property "orb.listener1.port.two"
+Override ignored for property "ssl.port.two"
+Override ignored for property "ssl.mutualauth.port.two"
+Override ignored for property "jmx.system.connector.port.two"
+Override ignored for property "cert.nickname"
+  [antcall] Exiting /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml.
+  [antcall] Exiting /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml.
+Build sequence for target(s) `compile' is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean, compile]
+Complete build sequence is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean, compile, restart-instance-common, execute-sql-common, deploy-rar-common, undeploy, deploy-jdbc-common, undeploy-rar-common, set-derby-connpool-props, create-sql-common, deploy-war-no-context-root-pe, verifier-common, start-server-unix, test-tagfiles-exist, create-PermSize, execute-ejb-sql-common, undeploy-client-common, prepare-keystore-common, deploy-verify-common-ee, startDerby, confirmMissingReport-common, create-connector-resource-common, asadmin-common, create-connector-connpool, delete-connector-connpool-common, verifier, start-clean-server, runwebclient-common, deploy-common-ee, startDerbyNonMac, webclient-war-common, flush-connpool-common, stopDerby, clean-webapps-common, delete-jdbc-connpool-common, prepare-truststore-common, deploy-verify-common, run, test-tlds-exist, deploy-verify-common-pe, undeploy-common, undeploy-jar-common, deploy-client-common, enterprise-common, create-javamail-resource-common, package-persistence-common, deploy-war-commonee, startDomainWindows, set-derby-driver-connpool-props, deploy-war-no-context-root, undeploy-jdbc-common, deploy-common-pe, clear, copy-tagfiles, build, deploy, restart-server-instance-common, deploy-jar-common, delete-domain-common, stopPB, compile-common-with-endorsed-dir, import-wsdl, deploy-war-commonpe, compile-common, restart-server, runclient-common, package-appclientjar-common, ee-common, copy-tlds, delete-persistence-resource-common, undeploy-jms-common, asadmin-common-ignore-fail, startDomainUnix, startDomain, fixFiles, ejb-jar-common, appclient-jar-common, build-ear-common, publish-war-common, build-publish-war, stop-server-unix, clean-classes-common, clean-common, create-jdbc-connpool-common, dev-report, startDerbyMac, deploy-jms-common, package-war-common, package-ejbjar-common, delete-connector-resource-common, deploy-jsp-common, unsetupTimer, undeploy-war-common, change-orb-port, delete-javamail-resource-common, deploy-common, create-jms-resource-common, setup-mq-common, delete-jdbc-resource-common, start-server-windows, dumpThreadStack, setupTimer, deploy-war-common, start-server, ee, checkReporting-common, testTimer, stop-server, create-jdbc-driver-connpool-common, all, platform-common, create-jms-connection-common, undeploy-war-name, cleanAS, deploy-dir, preparePB, stop-server-windows, confirmReportPresent-common, delete-jms-resource-common, pb, runtest, create-jvm-options, clean-jars-common, restart-instance, stopDomain, create-connector-connpool-common, set-pointbase-driver-connpool-props, delete-sql-common, deploy-jdbc-driver-common, create-domain-common, delete-jvm-options, create-jdbc-resource-common, prepare-truststore-certutil-common, create-user-common, asadmin-batch-common, delete-user-common, prepare-truststore-keytool-common, convWin, create-persistence-resource-common, get-version-common, startPB, delete-jms-connection-common, usage-common, deploy-war-no-context-root-ee, set-pointbase-connpool-props, usage, convUnix, staticCheck-common, ear-common, deploy-war-name, ]
+
+setOSConditions:
+Override ignored for property "isUnix"
+
+setToolWin:
+Skipped because property 'isWindows' not set.
+
+setToolUnix:
+Override ignored for property "APPCLIENT"
+Override ignored for property "ASADMIN"
+Override ignored for property "ASANT"
+Override ignored for property "CAPTURESCHEMA"
+Override ignored for property "CHECKPATCH"
+Override ignored for property "INSTALLPATCH"
+Override ignored for property "JSPC"
+Override ignored for property "LISTPATCH"
+Override ignored for property "PACKAGE-APPCLIENT"
+Override ignored for property "VERIFIER"
+Override ignored for property "RMIC"
+Override ignored for property "TNAMESERV"
+Override ignored for property "WSCOMPILE"
+Override ignored for property "WSIMPORT"
+Override ignored for property "pb.start.server"
+Override ignored for property "pb.start.server1"
+Override ignored for property "IMQDBMGR"
+Override ignored for property "ld.library.path"
+
+setS1ASclassPath:
+Skipped because property 's1as.classpath' set.
+
+init-common:
+     [echo] Loading props from file /export/work/workspaces/gfv3/appserv-tests/config.properties
+Override ignored for property "pe"
+ [property] Loading /export/work/workspaces/gfv3/appserv-tests/config.properties
+Override ignored for property "instance.https.port"
+Override ignored for property "admin.domain"
+Override ignored for property "admin.password"
+Override ignored for property "http.address"
+Override ignored for property "http.alternate.port"
+Override ignored for property "ssl.password"
+Override ignored for property "instance.http.port"
+Override ignored for property "resources.dottedname.prefix"
+Override ignored for property "results.mailer"
+Override ignored for property "admin.domain.dir"
+Override ignored for property "admin.user"
+Override ignored for property "config.dottedname.prefix"
+Override ignored for property "instance.name"
+Override ignored for property "precompilejsp"
+Override ignored for property "admin.password.file"
+Override ignored for property "http.port"
+Override ignored for property "https.port"
+Override ignored for property "results.mailee"
+Override ignored for property "appserver.instance.name"
+Override ignored for property "master.password"
+Override ignored for property "http.host"
+Override ignored for property "instance.http.port.3"
+Override ignored for property "instance.http.port.2"
+Override ignored for property "admin.port"
+Override ignored for property "cluster.name"
+Override ignored for property "appserver.instance.dir"
+Override ignored for property "autodeploy.dir"
+Override ignored for property "orb.port"
+Override ignored for property "admin.host"
+Override ignored for property "instance.name.3"
+Override ignored for property "instance.name.2"
+Override ignored for property "results.mailhost"
+     [echo] admin.domain domain1
+     [echo] admin.user admin
+     [echo] admin.port 4848
+     [echo] http.port 8080
+     [echo] http.host localhost
+Override ignored for property "as.props"
+Override ignored for property "authrealmname"
+Override ignored for property "apptype"
+Override ignored for property "db.root"
+Override ignored for property "db.dir"
+Override ignored for property "db.classpath"
+ [property] Loading /export/work/workspaces/gfv3/appserv-tests/config/derby.properties
+Override ignored for property "db.host"
+Override ignored for property "db.url"
+Override ignored for property "db.xaclass"
+Override ignored for property "db.name"
+Override ignored for property "db.driver"
+Override ignored for property "db.port"
+Override ignored for property "db.port.2"
+Override ignored for property "db.class"
+Override ignored for property "db.user"
+Override ignored for property "db.pwd"
+Override ignored for property "db.type"
+Property "env.JAVKE_HOME" has not been set
+Override ignored for property "javke.home"
+Override ignored for property "dest.type"
+Override ignored for property "dest.name"
+Override ignored for property "jms.factory.name"
+Override ignored for property "jms.factory.type"
+Override ignored for property "jms.resource.name"
+Override ignored for property "jms.resource.type"
+Override ignored for property "jdbc.conpool.name"
+Override ignored for property "jdbc.resource.name"
+Override ignored for property "jdbc.resource.type"
+Override ignored for property "pm.resource.name"
+Override ignored for property "pm.factory.class"
+Override ignored for property "appclient.application.args"
+Override ignored for property "build.base.dir"
+Override ignored for property "build.webapps.dir"
+Override ignored for property "build.classes.dir"
+Override ignored for property "assemble.dir"
+Override ignored for property "results.dir"
+Property "Derby.classpath" has not been set
+Override ignored for property "s1astest.classpath"
+Override ignored for property "ejbjar.classes"
+Override ignored for property "appclientjar.classes"
+Override ignored for property "webclient.war.files"
+Override ignored for property "webclient.war.classes"
+Override ignored for property "test.name"
+Override ignored for property "test.description"
+Override ignored for property "test.count"
+Override ignored for property "cluster.name"
+Override ignored for property "clustered.server.name"
+Override ignored for property "clustered.server.name.two"
+Override ignored for property "nodeagent.name"
+Override ignored for property "das.host"
+Override ignored for property "das.jmx.port"
+Override ignored for property "http.listener1.port"
+Override ignored for property "http.listener2.port"
+Override ignored for property "orb.listener1.port"
+Override ignored for property "ssl.port"
+Override ignored for property "ssl.mutualauth.port"
+Override ignored for property "jmx.system.connector.port"
+Override ignored for property "http.listener1.port.two"
+Override ignored for property "http.listener2.port.two"
+Override ignored for property "orb.listener1.port.two"
+Override ignored for property "ssl.port.two"
+Override ignored for property "ssl.mutualauth.port.two"
+Override ignored for property "jmx.system.connector.port.two"
+Override ignored for property "cert.nickname"
+
+clean:
+Project base dir set to: /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans
+  [antcall] calling target(s) [clean-common] in build file /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml
+parsing buildfile /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml with URI = file:/export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml
+Project base dir set to: /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/properties.xml
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/common.xml
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.properties
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/run.xml
+ [property] Loading Environment env.
+Override ignored for property "env.SESSION_MANAGER"
+Override ignored for property "env.LESSOPEN"
+Override ignored for property "env.NORMBGCOLOR"
+Override ignored for property "env.CVSROOT"
+Override ignored for property "env.MY_ANT_HOME"
+Override ignored for property "env.PWD"
+Override ignored for property "env.XDG_SESSION_COOKIE"
+Override ignored for property "env.LANG"
+Override ignored for property "env.WS"
+Override ignored for property "env.AWT_TOOLKIT"
+Override ignored for property "env.DEFAULTS_PATH"
+Override ignored for property "env.HISTSIZE"
+Override ignored for property "env.INSTALL_ROOT"
+Override ignored for property "env.DISPLAY"
+Override ignored for property "env._"
+Override ignored for property "env.USER"
+Override ignored for property "env.HISTCONTROL"
+Override ignored for property "env.SHELL"
+Override ignored for property "env.NLSPATH"
+Override ignored for property "env.XDG_DATA_DIRS"
+Override ignored for property "env.DESKTOP_SESSION"
+Override ignored for property "env.HISTFILESIZE"
+Override ignored for property "env.APS_HOME"
+Override ignored for property "env.WIDTH"
+Override ignored for property "env.JAVANETCVSROOT"
+Override ignored for property "env.PATH"
+Override ignored for property "env.no_proxy"
+Override ignored for property "env.NORMFGCOLOR"
+Override ignored for property "env.LC_CTYPE"
+Override ignored for property "env.DBUS_SESSION_BUS_ADDRESS"
+Override ignored for property "env.REALPLAYER_HOME"
+Override ignored for property "env.SSH_AGENT_PID"
+Override ignored for property "env.SHLVL"
+Override ignored for property "env.GDMSESSION"
+Override ignored for property "env.GNOME_DESKTOP_SESSION_ID"
+Override ignored for property "env.GDM_KEYBOARD_LAYOUT"
+Override ignored for property "env.GNOME_KEYRING_PID"
+Override ignored for property "env.OS"
+Override ignored for property "env.LOGNAME"
+Override ignored for property "env.ALSA_OUTPUT_PORTS"
+Override ignored for property "env.SCUMMVM_PORT"
+Override ignored for property "env.JAVA_HOME"
+Override ignored for property "env.TERM"
+Override ignored for property "env.QLTESTRES"
+Override ignored for property "env.NO_PROXY"
+Override ignored for property "env.GDM_LANG"
+Override ignored for property "env.DTACH_HOME"
+Override ignored for property "env.OLDPWD"
+Override ignored for property "env.DEBUG"
+Override ignored for property "env.GCONF_LOCAL_LOCKS"
+Override ignored for property "env.M2_HOME"
+Override ignored for property "env.EC2_CERT"
+Override ignored for property "env.WINDOWID"
+Override ignored for property "env.EC2_PRIVATE_KEY"
+Override ignored for property "env.REDCVSROOT"
+Override ignored for property "env.MOZ_DISABLE_PANGO"
+Override ignored for property "env.XFILESEARCHPATH"
+Override ignored for property "env.HOME"
+Override ignored for property "env.ANT_HOME"
+Override ignored for property "env.LD_LIBRARY_PATH"
+Override ignored for property "env.MAVEN_OPTS"
+Override ignored for property "env.SSH_AUTH_SOCK"
+Override ignored for property "env.RBARWIDTH"
+Override ignored for property "env.S1AS_HOME"
+Property "BASH_SOURCE" has not been set
+Property "LINENO" has not been set
+Property "FUNCNAME[0]" has not been set
+Override ignored for property "env.PS4"
+Override ignored for property "env.MAVEN_HOME"
+Override ignored for property "env.XAUTHORITY"
+Property "NEW_PWD" has not been set
+Override ignored for property "env.PS1"
+Override ignored for property "env.MANDATORY_PATH"
+Override ignored for property "env.SPEECHD_PORT"
+Override ignored for property "env.GTK_MODULES"
+Override ignored for property "env.WINDOW_MANAGER"
+Override ignored for property "env.DTRX_HOME"
+Override ignored for property "env.COLORTERM"
+Override ignored for property "env.EDITOR"
+Override ignored for property "env.MALLOC_CHECK_"
+Override ignored for property "env.ORBIT_SOCKETDIR"
+Override ignored for property "env.WP_INSTALL_ROOT"
+Override ignored for property "env.USERNAME"
+Override ignored for property "env.SCALA_HOME"
+Override ignored for property "env.COPE_PATH"
+Override ignored for property "env.QL_HOME"
+Override ignored for property "env.AS_ADMIN_READTIMEOUT"
+Override ignored for property "env.MY_SCRIPT_DIR"
+Override ignored for property "env.GNOME_KEYRING_CONTROL"
+Override ignored for property "env.XDG_CONFIG_DIRS"
+Override ignored for property "env.TODOTXT_HOME"
+Override ignored for property "env.LESSCLOSE"
+Override ignored for property "module"
+Override ignored for property "appname"
+Override ignored for property "assemble"
+Override ignored for property "contextroot"
+Override ignored for property "beans.xml"
+Override ignored for property "target-to-run"
+ [macrodef] creating macro  run-test
+Build sequence for target(s) `clean-common' is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-common]
+Complete build sequence is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-common, restart-instance-common, execute-sql-common, deploy-rar-common, undeploy, deploy-jdbc-common, undeploy-rar-common, set-derby-connpool-props, create-sql-common, deploy-war-no-context-root-pe, verifier-common, start-server-unix, test-tagfiles-exist, create-PermSize, execute-ejb-sql-common, undeploy-client-common, prepare-keystore-common, deploy-verify-common-ee, startDerby, confirmMissingReport-common, create-connector-resource-common, asadmin-common, create-connector-connpool, delete-connector-connpool-common, verifier, start-clean-server, runwebclient-common, deploy-common-ee, startDerbyNonMac, webclient-war-common, flush-connpool-common, stopDerby, clean-webapps-common, delete-jdbc-connpool-common, prepare-truststore-common, deploy-verify-common, run, test-tlds-exist, deploy-verify-common-pe, undeploy-common, undeploy-jar-common, deploy-client-common, enterprise-common, create-javamail-resource-common, package-persistence-common, deploy-war-commonee, startDomainWindows, set-derby-driver-connpool-props, deploy-war-no-context-root, undeploy-jdbc-common, deploy-common-pe, clear, copy-tagfiles, clean, compile, build, deploy, restart-server-instance-common, deploy-jar-common, delete-domain-common, stopPB, compile-common-with-endorsed-dir, import-wsdl, deploy-war-commonpe, compile-common, restart-server, runclient-common, package-appclientjar-common, ee-common, copy-tlds, delete-persistence-resource-common, undeploy-jms-common, asadmin-common-ignore-fail, startDomainUnix, startDomain, fixFiles, ejb-jar-common, appclient-jar-common, build-ear-common, publish-war-common, build-publish-war, stop-server-unix, clean-classes-common, create-jdbc-connpool-common, dev-report, startDerbyMac, deploy-jms-common, package-war-common, package-ejbjar-common, delete-connector-resource-common, deploy-jsp-common, unsetupTimer, undeploy-war-common, change-orb-port, delete-javamail-resource-common, deploy-common, create-jms-resource-common, setup-mq-common, delete-jdbc-resource-common, start-server-windows, dumpThreadStack, setupTimer, deploy-war-common, start-server, ee, checkReporting-common, testTimer, stop-server, create-jdbc-driver-connpool-common, all, platform-common, create-jms-connection-common, undeploy-war-name, cleanAS, deploy-dir, preparePB, stop-server-windows, confirmReportPresent-common, delete-jms-resource-common, pb, runtest, create-jvm-options, clean-jars-common, restart-instance, stopDomain, create-connector-connpool-common, set-pointbase-driver-connpool-props, delete-sql-common, deploy-jdbc-driver-common, create-domain-common, delete-jvm-options, create-jdbc-resource-common, prepare-truststore-certutil-common, create-user-common, asadmin-batch-common, delete-user-common, prepare-truststore-keytool-common, convWin, create-persistence-resource-common, get-version-common, startPB, delete-jms-connection-common, usage-common, deploy-war-no-context-root-ee, set-pointbase-connpool-props, usage, convUnix, staticCheck-common, ear-common, deploy-war-name, ]
+  [antcall] Entering /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml...
+Build sequence for target(s) `clean-common' is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-common]
+Complete build sequence is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-common, restart-instance-common, execute-sql-common, deploy-rar-common, undeploy, deploy-jdbc-common, undeploy-rar-common, set-derby-connpool-props, create-sql-common, deploy-war-no-context-root-pe, verifier-common, start-server-unix, test-tagfiles-exist, create-PermSize, execute-ejb-sql-common, undeploy-client-common, prepare-keystore-common, deploy-verify-common-ee, startDerby, confirmMissingReport-common, create-connector-resource-common, asadmin-common, create-connector-connpool, delete-connector-connpool-common, verifier, start-clean-server, runwebclient-common, deploy-common-ee, startDerbyNonMac, webclient-war-common, flush-connpool-common, stopDerby, clean-webapps-common, delete-jdbc-connpool-common, prepare-truststore-common, deploy-verify-common, run, test-tlds-exist, deploy-verify-common-pe, undeploy-common, undeploy-jar-common, deploy-client-common, enterprise-common, create-javamail-resource-common, package-persistence-common, deploy-war-commonee, startDomainWindows, set-derby-driver-connpool-props, deploy-war-no-context-root, undeploy-jdbc-common, deploy-common-pe, clear, copy-tagfiles, clean, compile, build, deploy, restart-server-instance-common, deploy-jar-common, delete-domain-common, stopPB, compile-common-with-endorsed-dir, import-wsdl, deploy-war-commonpe, compile-common, restart-server, runclient-common, package-appclientjar-common, ee-common, copy-tlds, delete-persistence-resource-common, undeploy-jms-common, asadmin-common-ignore-fail, startDomainUnix, startDomain, fixFiles, ejb-jar-common, appclient-jar-common, build-ear-common, publish-war-common, build-publish-war, stop-server-unix, clean-classes-common, create-jdbc-connpool-common, dev-report, startDerbyMac, deploy-jms-common, package-war-common, package-ejbjar-common, delete-connector-resource-common, deploy-jsp-common, unsetupTimer, undeploy-war-common, change-orb-port, delete-javamail-resource-common, deploy-common, create-jms-resource-common, setup-mq-common, delete-jdbc-resource-common, start-server-windows, dumpThreadStack, setupTimer, deploy-war-common, start-server, ee, checkReporting-common, testTimer, stop-server, create-jdbc-driver-connpool-common, all, platform-common, create-jms-connection-common, undeploy-war-name, cleanAS, deploy-dir, preparePB, stop-server-windows, confirmReportPresent-common, delete-jms-resource-common, pb, runtest, create-jvm-options, clean-jars-common, restart-instance, stopDomain, create-connector-connpool-common, set-pointbase-driver-connpool-props, delete-sql-common, deploy-jdbc-driver-common, create-domain-common, delete-jvm-options, create-jdbc-resource-common, prepare-truststore-certutil-common, create-user-common, asadmin-batch-common, delete-user-common, prepare-truststore-keytool-common, convWin, create-persistence-resource-common, get-version-common, startPB, delete-jms-connection-common, usage-common, deploy-war-no-context-root-ee, set-pointbase-connpool-props, usage, convUnix, staticCheck-common, ear-common, deploy-war-name, ]
+
+setOSConditions:
+Override ignored for property "isUnix"
+
+setToolWin:
+Skipped because property 'isWindows' not set.
+
+setToolUnix:
+Override ignored for property "APPCLIENT"
+Override ignored for property "ASADMIN"
+Override ignored for property "ASANT"
+Override ignored for property "CAPTURESCHEMA"
+Override ignored for property "CHECKPATCH"
+Override ignored for property "INSTALLPATCH"
+Override ignored for property "JSPC"
+Override ignored for property "LISTPATCH"
+Override ignored for property "PACKAGE-APPCLIENT"
+Override ignored for property "VERIFIER"
+Override ignored for property "RMIC"
+Override ignored for property "TNAMESERV"
+Override ignored for property "WSCOMPILE"
+Override ignored for property "WSIMPORT"
+Override ignored for property "pb.start.server"
+Override ignored for property "pb.start.server1"
+Override ignored for property "IMQDBMGR"
+Override ignored for property "ld.library.path"
+
+setS1ASclassPath:
+Skipped because property 's1as.classpath' set.
+
+init-common:
+     [echo] Loading props from file /export/work/workspaces/gfv3/appserv-tests/config.properties
+Override ignored for property "pe"
+ [property] Loading /export/work/workspaces/gfv3/appserv-tests/config.properties
+Override ignored for property "instance.https.port"
+Override ignored for property "admin.domain"
+Override ignored for property "admin.password"
+Override ignored for property "http.address"
+Override ignored for property "http.alternate.port"
+Override ignored for property "ssl.password"
+Override ignored for property "instance.http.port"
+Override ignored for property "resources.dottedname.prefix"
+Override ignored for property "results.mailer"
+Override ignored for property "admin.domain.dir"
+Override ignored for property "admin.user"
+Override ignored for property "config.dottedname.prefix"
+Override ignored for property "instance.name"
+Override ignored for property "precompilejsp"
+Override ignored for property "admin.password.file"
+Override ignored for property "http.port"
+Override ignored for property "https.port"
+Override ignored for property "results.mailee"
+Override ignored for property "appserver.instance.name"
+Override ignored for property "master.password"
+Override ignored for property "http.host"
+Override ignored for property "instance.http.port.3"
+Override ignored for property "instance.http.port.2"
+Override ignored for property "admin.port"
+Override ignored for property "cluster.name"
+Override ignored for property "appserver.instance.dir"
+Override ignored for property "autodeploy.dir"
+Override ignored for property "orb.port"
+Override ignored for property "admin.host"
+Override ignored for property "instance.name.3"
+Override ignored for property "instance.name.2"
+Override ignored for property "results.mailhost"
+     [echo] admin.domain domain1
+     [echo] admin.user admin
+     [echo] admin.port 4848
+     [echo] http.port 8080
+     [echo] http.host localhost
+Override ignored for property "as.props"
+Override ignored for property "authrealmname"
+Override ignored for property "apptype"
+Override ignored for property "db.root"
+Override ignored for property "db.dir"
+Override ignored for property "db.classpath"
+ [property] Loading /export/work/workspaces/gfv3/appserv-tests/config/derby.properties
+Override ignored for property "db.host"
+Override ignored for property "db.url"
+Override ignored for property "db.xaclass"
+Override ignored for property "db.name"
+Override ignored for property "db.driver"
+Override ignored for property "db.port"
+Override ignored for property "db.port.2"
+Override ignored for property "db.class"
+Override ignored for property "db.user"
+Override ignored for property "db.pwd"
+Override ignored for property "db.type"
+Property "env.JAVKE_HOME" has not been set
+Override ignored for property "javke.home"
+Override ignored for property "dest.type"
+Override ignored for property "dest.name"
+Override ignored for property "jms.factory.name"
+Override ignored for property "jms.factory.type"
+Override ignored for property "jms.resource.name"
+Override ignored for property "jms.resource.type"
+Override ignored for property "jdbc.conpool.name"
+Override ignored for property "jdbc.resource.name"
+Override ignored for property "jdbc.resource.type"
+Override ignored for property "pm.resource.name"
+Override ignored for property "pm.factory.class"
+Override ignored for property "appclient.application.args"
+Override ignored for property "build.base.dir"
+Override ignored for property "build.webapps.dir"
+Override ignored for property "build.classes.dir"
+Override ignored for property "assemble.dir"
+Override ignored for property "results.dir"
+Property "Derby.classpath" has not been set
+Override ignored for property "s1astest.classpath"
+Override ignored for property "ejbjar.classes"
+Override ignored for property "appclientjar.classes"
+Override ignored for property "webclient.war.files"
+Override ignored for property "webclient.war.classes"
+Override ignored for property "test.name"
+Override ignored for property "test.description"
+Override ignored for property "test.count"
+Override ignored for property "cluster.name"
+Override ignored for property "clustered.server.name"
+Override ignored for property "clustered.server.name.two"
+Override ignored for property "nodeagent.name"
+Override ignored for property "das.host"
+Override ignored for property "das.jmx.port"
+Override ignored for property "http.listener1.port"
+Override ignored for property "http.listener2.port"
+Override ignored for property "orb.listener1.port"
+Override ignored for property "ssl.port"
+Override ignored for property "ssl.mutualauth.port"
+Override ignored for property "jmx.system.connector.port"
+Override ignored for property "http.listener1.port.two"
+Override ignored for property "http.listener2.port.two"
+Override ignored for property "orb.listener1.port.two"
+Override ignored for property "ssl.port.two"
+Override ignored for property "ssl.mutualauth.port.two"
+Override ignored for property "jmx.system.connector.port.two"
+Override ignored for property "cert.nickname"
+
+clean-common:
+Project base dir set to: /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans
+  [antcall] calling target(s) [clean-classes-common] in build file /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml
+parsing buildfile /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml with URI = file:/export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml
+Project base dir set to: /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/properties.xml
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/common.xml
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.properties
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/run.xml
+ [property] Loading Environment env.
+Override ignored for property "env.SESSION_MANAGER"
+Override ignored for property "env.LESSOPEN"
+Override ignored for property "env.NORMBGCOLOR"
+Override ignored for property "env.CVSROOT"
+Override ignored for property "env.MY_ANT_HOME"
+Override ignored for property "env.PWD"
+Override ignored for property "env.XDG_SESSION_COOKIE"
+Override ignored for property "env.LANG"
+Override ignored for property "env.WS"
+Override ignored for property "env.AWT_TOOLKIT"
+Override ignored for property "env.DEFAULTS_PATH"
+Override ignored for property "env.HISTSIZE"
+Override ignored for property "env.INSTALL_ROOT"
+Override ignored for property "env.DISPLAY"
+Override ignored for property "env._"
+Override ignored for property "env.USER"
+Override ignored for property "env.HISTCONTROL"
+Override ignored for property "env.SHELL"
+Override ignored for property "env.NLSPATH"
+Override ignored for property "env.XDG_DATA_DIRS"
+Override ignored for property "env.DESKTOP_SESSION"
+Override ignored for property "env.HISTFILESIZE"
+Override ignored for property "env.APS_HOME"
+Override ignored for property "env.WIDTH"
+Override ignored for property "env.JAVANETCVSROOT"
+Override ignored for property "env.PATH"
+Override ignored for property "env.no_proxy"
+Override ignored for property "env.NORMFGCOLOR"
+Override ignored for property "env.LC_CTYPE"
+Override ignored for property "env.DBUS_SESSION_BUS_ADDRESS"
+Override ignored for property "env.REALPLAYER_HOME"
+Override ignored for property "env.SSH_AGENT_PID"
+Override ignored for property "env.SHLVL"
+Override ignored for property "env.GDMSESSION"
+Override ignored for property "env.GNOME_DESKTOP_SESSION_ID"
+Override ignored for property "env.GDM_KEYBOARD_LAYOUT"
+Override ignored for property "env.GNOME_KEYRING_PID"
+Override ignored for property "env.OS"
+Override ignored for property "env.LOGNAME"
+Override ignored for property "env.ALSA_OUTPUT_PORTS"
+Override ignored for property "env.SCUMMVM_PORT"
+Override ignored for property "env.JAVA_HOME"
+Override ignored for property "env.TERM"
+Override ignored for property "env.QLTESTRES"
+Override ignored for property "env.NO_PROXY"
+Override ignored for property "env.GDM_LANG"
+Override ignored for property "env.DTACH_HOME"
+Override ignored for property "env.OLDPWD"
+Override ignored for property "env.DEBUG"
+Override ignored for property "env.GCONF_LOCAL_LOCKS"
+Override ignored for property "env.M2_HOME"
+Override ignored for property "env.EC2_CERT"
+Override ignored for property "env.WINDOWID"
+Override ignored for property "env.EC2_PRIVATE_KEY"
+Override ignored for property "env.REDCVSROOT"
+Override ignored for property "env.MOZ_DISABLE_PANGO"
+Override ignored for property "env.XFILESEARCHPATH"
+Override ignored for property "env.HOME"
+Override ignored for property "env.ANT_HOME"
+Override ignored for property "env.LD_LIBRARY_PATH"
+Override ignored for property "env.MAVEN_OPTS"
+Override ignored for property "env.SSH_AUTH_SOCK"
+Override ignored for property "env.RBARWIDTH"
+Override ignored for property "env.S1AS_HOME"
+Property "BASH_SOURCE" has not been set
+Property "LINENO" has not been set
+Property "FUNCNAME[0]" has not been set
+Override ignored for property "env.PS4"
+Override ignored for property "env.MAVEN_HOME"
+Override ignored for property "env.XAUTHORITY"
+Property "NEW_PWD" has not been set
+Override ignored for property "env.PS1"
+Override ignored for property "env.MANDATORY_PATH"
+Override ignored for property "env.SPEECHD_PORT"
+Override ignored for property "env.GTK_MODULES"
+Override ignored for property "env.WINDOW_MANAGER"
+Override ignored for property "env.DTRX_HOME"
+Override ignored for property "env.COLORTERM"
+Override ignored for property "env.EDITOR"
+Override ignored for property "env.MALLOC_CHECK_"
+Override ignored for property "env.ORBIT_SOCKETDIR"
+Override ignored for property "env.WP_INSTALL_ROOT"
+Override ignored for property "env.USERNAME"
+Override ignored for property "env.SCALA_HOME"
+Override ignored for property "env.COPE_PATH"
+Override ignored for property "env.QL_HOME"
+Override ignored for property "env.AS_ADMIN_READTIMEOUT"
+Override ignored for property "env.MY_SCRIPT_DIR"
+Override ignored for property "env.GNOME_KEYRING_CONTROL"
+Override ignored for property "env.XDG_CONFIG_DIRS"
+Override ignored for property "env.TODOTXT_HOME"
+Override ignored for property "env.LESSCLOSE"
+Override ignored for property "module"
+Override ignored for property "appname"
+Override ignored for property "assemble"
+Override ignored for property "contextroot"
+Override ignored for property "beans.xml"
+Override ignored for property "target-to-run"
+ [macrodef] creating macro  run-test
+Build sequence for target(s) `clean-classes-common' is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-classes-common]
+Complete build sequence is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-classes-common, restart-instance-common, execute-sql-common, deploy-rar-common, undeploy, deploy-jdbc-common, undeploy-rar-common, set-derby-connpool-props, create-sql-common, deploy-war-no-context-root-pe, verifier-common, start-server-unix, test-tagfiles-exist, create-PermSize, execute-ejb-sql-common, undeploy-client-common, prepare-keystore-common, deploy-verify-common-ee, startDerby, confirmMissingReport-common, create-connector-resource-common, asadmin-common, create-connector-connpool, delete-connector-connpool-common, verifier, start-clean-server, runwebclient-common, deploy-common-ee, startDerbyNonMac, webclient-war-common, flush-connpool-common, stopDerby, clean-webapps-common, delete-jdbc-connpool-common, prepare-truststore-common, deploy-verify-common, run, test-tlds-exist, deploy-verify-common-pe, undeploy-common, undeploy-jar-common, deploy-client-common, enterprise-common, create-javamail-resource-common, package-persistence-common, deploy-war-commonee, startDomainWindows, set-derby-driver-connpool-props, deploy-war-no-context-root, undeploy-jdbc-common, deploy-common-pe, clear, copy-tagfiles, clean, compile, build, deploy, restart-server-instance-common, deploy-jar-common, delete-domain-common, stopPB, compile-common-with-endorsed-dir, import-wsdl, deploy-war-commonpe, compile-common, restart-server, runclient-common, package-appclientjar-common, ee-common, copy-tlds, delete-persistence-resource-common, undeploy-jms-common, asadmin-common-ignore-fail, startDomainUnix, startDomain, fixFiles, ejb-jar-common, appclient-jar-common, build-ear-common, publish-war-common, build-publish-war, stop-server-unix, clean-common, create-jdbc-connpool-common, dev-report, startDerbyMac, deploy-jms-common, package-war-common, package-ejbjar-common, delete-connector-resource-common, deploy-jsp-common, unsetupTimer, undeploy-war-common, change-orb-port, delete-javamail-resource-common, deploy-common, create-jms-resource-common, setup-mq-common, delete-jdbc-resource-common, start-server-windows, dumpThreadStack, setupTimer, deploy-war-common, start-server, ee, checkReporting-common, testTimer, stop-server, create-jdbc-driver-connpool-common, all, platform-common, create-jms-connection-common, undeploy-war-name, cleanAS, deploy-dir, preparePB, stop-server-windows, confirmReportPresent-common, delete-jms-resource-common, pb, runtest, create-jvm-options, clean-jars-common, restart-instance, stopDomain, create-connector-connpool-common, set-pointbase-driver-connpool-props, delete-sql-common, deploy-jdbc-driver-common, create-domain-common, delete-jvm-options, create-jdbc-resource-common, prepare-truststore-certutil-common, create-user-common, asadmin-batch-common, delete-user-common, prepare-truststore-keytool-common, convWin, create-persistence-resource-common, get-version-common, startPB, delete-jms-connection-common, usage-common, deploy-war-no-context-root-ee, set-pointbase-connpool-props, usage, convUnix, staticCheck-common, ear-common, deploy-war-name, ]
+  [antcall] Entering /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml...
+Build sequence for target(s) `clean-classes-common' is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-classes-common]
+Complete build sequence is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-classes-common, restart-instance-common, execute-sql-common, deploy-rar-common, undeploy, deploy-jdbc-common, undeploy-rar-common, set-derby-connpool-props, create-sql-common, deploy-war-no-context-root-pe, verifier-common, start-server-unix, test-tagfiles-exist, create-PermSize, execute-ejb-sql-common, undeploy-client-common, prepare-keystore-common, deploy-verify-common-ee, startDerby, confirmMissingReport-common, create-connector-resource-common, asadmin-common, create-connector-connpool, delete-connector-connpool-common, verifier, start-clean-server, runwebclient-common, deploy-common-ee, startDerbyNonMac, webclient-war-common, flush-connpool-common, stopDerby, clean-webapps-common, delete-jdbc-connpool-common, prepare-truststore-common, deploy-verify-common, run, test-tlds-exist, deploy-verify-common-pe, undeploy-common, undeploy-jar-common, deploy-client-common, enterprise-common, create-javamail-resource-common, package-persistence-common, deploy-war-commonee, startDomainWindows, set-derby-driver-connpool-props, deploy-war-no-context-root, undeploy-jdbc-common, deploy-common-pe, clear, copy-tagfiles, clean, compile, build, deploy, restart-server-instance-common, deploy-jar-common, delete-domain-common, stopPB, compile-common-with-endorsed-dir, import-wsdl, deploy-war-commonpe, compile-common, restart-server, runclient-common, package-appclientjar-common, ee-common, copy-tlds, delete-persistence-resource-common, undeploy-jms-common, asadmin-common-ignore-fail, startDomainUnix, startDomain, fixFiles, ejb-jar-common, appclient-jar-common, build-ear-common, publish-war-common, build-publish-war, stop-server-unix, clean-common, create-jdbc-connpool-common, dev-report, startDerbyMac, deploy-jms-common, package-war-common, package-ejbjar-common, delete-connector-resource-common, deploy-jsp-common, unsetupTimer, undeploy-war-common, change-orb-port, delete-javamail-resource-common, deploy-common, create-jms-resource-common, setup-mq-common, delete-jdbc-resource-common, start-server-windows, dumpThreadStack, setupTimer, deploy-war-common, start-server, ee, checkReporting-common, testTimer, stop-server, create-jdbc-driver-connpool-common, all, platform-common, create-jms-connection-common, undeploy-war-name, cleanAS, deploy-dir, preparePB, stop-server-windows, confirmReportPresent-common, delete-jms-resource-common, pb, runtest, create-jvm-options, clean-jars-common, restart-instance, stopDomain, create-connector-connpool-common, set-pointbase-driver-connpool-props, delete-sql-common, deploy-jdbc-driver-common, create-domain-common, delete-jvm-options, create-jdbc-resource-common, prepare-truststore-certutil-common, create-user-common, asadmin-batch-common, delete-user-common, prepare-truststore-keytool-common, convWin, create-persistence-resource-common, get-version-common, startPB, delete-jms-connection-common, usage-common, deploy-war-no-context-root-ee, set-pointbase-connpool-props, usage, convUnix, staticCheck-common, ear-common, deploy-war-name, ]
+
+setOSConditions:
+Override ignored for property "isUnix"
+
+setToolWin:
+Skipped because property 'isWindows' not set.
+
+setToolUnix:
+Override ignored for property "APPCLIENT"
+Override ignored for property "ASADMIN"
+Override ignored for property "ASANT"
+Override ignored for property "CAPTURESCHEMA"
+Override ignored for property "CHECKPATCH"
+Override ignored for property "INSTALLPATCH"
+Override ignored for property "JSPC"
+Override ignored for property "LISTPATCH"
+Override ignored for property "PACKAGE-APPCLIENT"
+Override ignored for property "VERIFIER"
+Override ignored for property "RMIC"
+Override ignored for property "TNAMESERV"
+Override ignored for property "WSCOMPILE"
+Override ignored for property "WSIMPORT"
+Override ignored for property "pb.start.server"
+Override ignored for property "pb.start.server1"
+Override ignored for property "IMQDBMGR"
+Override ignored for property "ld.library.path"
+
+setS1ASclassPath:
+Skipped because property 's1as.classpath' set.
+
+init-common:
+     [echo] Loading props from file /export/work/workspaces/gfv3/appserv-tests/config.properties
+Override ignored for property "pe"
+ [property] Loading /export/work/workspaces/gfv3/appserv-tests/config.properties
+Override ignored for property "instance.https.port"
+Override ignored for property "admin.domain"
+Override ignored for property "admin.password"
+Override ignored for property "http.address"
+Override ignored for property "http.alternate.port"
+Override ignored for property "ssl.password"
+Override ignored for property "instance.http.port"
+Override ignored for property "resources.dottedname.prefix"
+Override ignored for property "results.mailer"
+Override ignored for property "admin.domain.dir"
+Override ignored for property "admin.user"
+Override ignored for property "config.dottedname.prefix"
+Override ignored for property "instance.name"
+Override ignored for property "precompilejsp"
+Override ignored for property "admin.password.file"
+Override ignored for property "http.port"
+Override ignored for property "https.port"
+Override ignored for property "results.mailee"
+Override ignored for property "appserver.instance.name"
+Override ignored for property "master.password"
+Override ignored for property "http.host"
+Override ignored for property "instance.http.port.3"
+Override ignored for property "instance.http.port.2"
+Override ignored for property "admin.port"
+Override ignored for property "cluster.name"
+Override ignored for property "appserver.instance.dir"
+Override ignored for property "autodeploy.dir"
+Override ignored for property "orb.port"
+Override ignored for property "admin.host"
+Override ignored for property "instance.name.3"
+Override ignored for property "instance.name.2"
+Override ignored for property "results.mailhost"
+     [echo] admin.domain domain1
+     [echo] admin.user admin
+     [echo] admin.port 4848
+     [echo] http.port 8080
+     [echo] http.host localhost
+Override ignored for property "as.props"
+Override ignored for property "authrealmname"
+Override ignored for property "apptype"
+Override ignored for property "db.root"
+Override ignored for property "db.dir"
+Override ignored for property "db.classpath"
+ [property] Loading /export/work/workspaces/gfv3/appserv-tests/config/derby.properties
+Override ignored for property "db.host"
+Override ignored for property "db.url"
+Override ignored for property "db.xaclass"
+Override ignored for property "db.name"
+Override ignored for property "db.driver"
+Override ignored for property "db.port"
+Override ignored for property "db.port.2"
+Override ignored for property "db.class"
+Override ignored for property "db.user"
+Override ignored for property "db.pwd"
+Override ignored for property "db.type"
+Property "env.JAVKE_HOME" has not been set
+Override ignored for property "javke.home"
+Override ignored for property "dest.type"
+Override ignored for property "dest.name"
+Override ignored for property "jms.factory.name"
+Override ignored for property "jms.factory.type"
+Override ignored for property "jms.resource.name"
+Override ignored for property "jms.resource.type"
+Override ignored for property "jdbc.conpool.name"
+Override ignored for property "jdbc.resource.name"
+Override ignored for property "jdbc.resource.type"
+Override ignored for property "pm.resource.name"
+Override ignored for property "pm.factory.class"
+Override ignored for property "appclient.application.args"
+Override ignored for property "build.base.dir"
+Override ignored for property "build.webapps.dir"
+Override ignored for property "build.classes.dir"
+Override ignored for property "assemble.dir"
+Override ignored for property "results.dir"
+Property "Derby.classpath" has not been set
+Override ignored for property "s1astest.classpath"
+Override ignored for property "ejbjar.classes"
+Override ignored for property "appclientjar.classes"
+Override ignored for property "webclient.war.files"
+Override ignored for property "webclient.war.classes"
+Override ignored for property "test.name"
+Override ignored for property "test.description"
+Override ignored for property "test.count"
+Override ignored for property "cluster.name"
+Override ignored for property "clustered.server.name"
+Override ignored for property "clustered.server.name.two"
+Override ignored for property "nodeagent.name"
+Override ignored for property "das.host"
+Override ignored for property "das.jmx.port"
+Override ignored for property "http.listener1.port"
+Override ignored for property "http.listener2.port"
+Override ignored for property "orb.listener1.port"
+Override ignored for property "ssl.port"
+Override ignored for property "ssl.mutualauth.port"
+Override ignored for property "jmx.system.connector.port"
+Override ignored for property "http.listener1.port.two"
+Override ignored for property "http.listener2.port.two"
+Override ignored for property "orb.listener1.port.two"
+Override ignored for property "ssl.port.two"
+Override ignored for property "ssl.mutualauth.port.two"
+Override ignored for property "jmx.system.connector.port.two"
+Override ignored for property "cert.nickname"
+
+clean-classes-common:
+     [echo] common.xml: Cleaning test source files: /export/work/workspaces/gfv3/appserv-tests/build/module
+  [antcall] Exiting /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml.
+Project base dir set to: /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans
+  [antcall] calling target(s) [clean-jars-common] in build file /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml
+parsing buildfile /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml with URI = file:/export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml
+Project base dir set to: /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/properties.xml
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/common.xml
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.properties
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/run.xml
+ [property] Loading Environment env.
+Override ignored for property "env.SESSION_MANAGER"
+Override ignored for property "env.LESSOPEN"
+Override ignored for property "env.NORMBGCOLOR"
+Override ignored for property "env.CVSROOT"
+Override ignored for property "env.MY_ANT_HOME"
+Override ignored for property "env.PWD"
+Override ignored for property "env.XDG_SESSION_COOKIE"
+Override ignored for property "env.LANG"
+Override ignored for property "env.WS"
+Override ignored for property "env.AWT_TOOLKIT"
+Override ignored for property "env.DEFAULTS_PATH"
+Override ignored for property "env.HISTSIZE"
+Override ignored for property "env.INSTALL_ROOT"
+Override ignored for property "env.DISPLAY"
+Override ignored for property "env._"
+Override ignored for property "env.USER"
+Override ignored for property "env.HISTCONTROL"
+Override ignored for property "env.SHELL"
+Override ignored for property "env.NLSPATH"
+Override ignored for property "env.XDG_DATA_DIRS"
+Override ignored for property "env.DESKTOP_SESSION"
+Override ignored for property "env.HISTFILESIZE"
+Override ignored for property "env.APS_HOME"
+Override ignored for property "env.WIDTH"
+Override ignored for property "env.JAVANETCVSROOT"
+Override ignored for property "env.PATH"
+Override ignored for property "env.no_proxy"
+Override ignored for property "env.NORMFGCOLOR"
+Override ignored for property "env.LC_CTYPE"
+Override ignored for property "env.DBUS_SESSION_BUS_ADDRESS"
+Override ignored for property "env.REALPLAYER_HOME"
+Override ignored for property "env.SSH_AGENT_PID"
+Override ignored for property "env.SHLVL"
+Override ignored for property "env.GDMSESSION"
+Override ignored for property "env.GNOME_DESKTOP_SESSION_ID"
+Override ignored for property "env.GDM_KEYBOARD_LAYOUT"
+Override ignored for property "env.GNOME_KEYRING_PID"
+Override ignored for property "env.OS"
+Override ignored for property "env.LOGNAME"
+Override ignored for property "env.ALSA_OUTPUT_PORTS"
+Override ignored for property "env.SCUMMVM_PORT"
+Override ignored for property "env.JAVA_HOME"
+Override ignored for property "env.TERM"
+Override ignored for property "env.QLTESTRES"
+Override ignored for property "env.NO_PROXY"
+Override ignored for property "env.GDM_LANG"
+Override ignored for property "env.DTACH_HOME"
+Override ignored for property "env.OLDPWD"
+Override ignored for property "env.DEBUG"
+Override ignored for property "env.GCONF_LOCAL_LOCKS"
+Override ignored for property "env.M2_HOME"
+Override ignored for property "env.EC2_CERT"
+Override ignored for property "env.WINDOWID"
+Override ignored for property "env.EC2_PRIVATE_KEY"
+Override ignored for property "env.REDCVSROOT"
+Override ignored for property "env.MOZ_DISABLE_PANGO"
+Override ignored for property "env.XFILESEARCHPATH"
+Override ignored for property "env.HOME"
+Override ignored for property "env.ANT_HOME"
+Override ignored for property "env.LD_LIBRARY_PATH"
+Override ignored for property "env.MAVEN_OPTS"
+Override ignored for property "env.SSH_AUTH_SOCK"
+Override ignored for property "env.RBARWIDTH"
+Override ignored for property "env.S1AS_HOME"
+Property "BASH_SOURCE" has not been set
+Property "LINENO" has not been set
+Property "FUNCNAME[0]" has not been set
+Override ignored for property "env.PS4"
+Override ignored for property "env.MAVEN_HOME"
+Override ignored for property "env.XAUTHORITY"
+Property "NEW_PWD" has not been set
+Override ignored for property "env.PS1"
+Override ignored for property "env.MANDATORY_PATH"
+Override ignored for property "env.SPEECHD_PORT"
+Override ignored for property "env.GTK_MODULES"
+Override ignored for property "env.WINDOW_MANAGER"
+Override ignored for property "env.DTRX_HOME"
+Override ignored for property "env.COLORTERM"
+Override ignored for property "env.EDITOR"
+Override ignored for property "env.MALLOC_CHECK_"
+Override ignored for property "env.ORBIT_SOCKETDIR"
+Override ignored for property "env.WP_INSTALL_ROOT"
+Override ignored for property "env.USERNAME"
+Override ignored for property "env.SCALA_HOME"
+Override ignored for property "env.COPE_PATH"
+Override ignored for property "env.QL_HOME"
+Override ignored for property "env.AS_ADMIN_READTIMEOUT"
+Override ignored for property "env.MY_SCRIPT_DIR"
+Override ignored for property "env.GNOME_KEYRING_CONTROL"
+Override ignored for property "env.XDG_CONFIG_DIRS"
+Override ignored for property "env.TODOTXT_HOME"
+Override ignored for property "env.LESSCLOSE"
+Override ignored for property "module"
+Override ignored for property "appname"
+Override ignored for property "assemble"
+Override ignored for property "contextroot"
+Override ignored for property "beans.xml"
+Override ignored for property "target-to-run"
+ [macrodef] creating macro  run-test
+Build sequence for target(s) `clean-jars-common' is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-jars-common]
+Complete build sequence is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-jars-common, restart-instance-common, execute-sql-common, deploy-rar-common, undeploy, deploy-jdbc-common, undeploy-rar-common, set-derby-connpool-props, create-sql-common, deploy-war-no-context-root-pe, verifier-common, start-server-unix, test-tagfiles-exist, create-PermSize, execute-ejb-sql-common, undeploy-client-common, prepare-keystore-common, deploy-verify-common-ee, startDerby, confirmMissingReport-common, create-connector-resource-common, asadmin-common, create-connector-connpool, delete-connector-connpool-common, verifier, start-clean-server, runwebclient-common, deploy-common-ee, startDerbyNonMac, webclient-war-common, flush-connpool-common, stopDerby, clean-webapps-common, delete-jdbc-connpool-common, prepare-truststore-common, deploy-verify-common, run, test-tlds-exist, deploy-verify-common-pe, undeploy-common, undeploy-jar-common, deploy-client-common, enterprise-common, create-javamail-resource-common, package-persistence-common, deploy-war-commonee, startDomainWindows, set-derby-driver-connpool-props, deploy-war-no-context-root, undeploy-jdbc-common, deploy-common-pe, clear, copy-tagfiles, clean, compile, build, deploy, restart-server-instance-common, deploy-jar-common, delete-domain-common, stopPB, compile-common-with-endorsed-dir, import-wsdl, deploy-war-commonpe, compile-common, restart-server, runclient-common, package-appclientjar-common, ee-common, copy-tlds, delete-persistence-resource-common, undeploy-jms-common, asadmin-common-ignore-fail, startDomainUnix, startDomain, fixFiles, ejb-jar-common, appclient-jar-common, build-ear-common, publish-war-common, build-publish-war, stop-server-unix, clean-classes-common, clean-common, create-jdbc-connpool-common, dev-report, startDerbyMac, deploy-jms-common, package-war-common, package-ejbjar-common, delete-connector-resource-common, deploy-jsp-common, unsetupTimer, undeploy-war-common, change-orb-port, delete-javamail-resource-common, deploy-common, create-jms-resource-common, setup-mq-common, delete-jdbc-resource-common, start-server-windows, dumpThreadStack, setupTimer, deploy-war-common, start-server, ee, checkReporting-common, testTimer, stop-server, create-jdbc-driver-connpool-common, all, platform-common, create-jms-connection-common, undeploy-war-name, cleanAS, deploy-dir, preparePB, stop-server-windows, confirmReportPresent-common, delete-jms-resource-common, pb, runtest, create-jvm-options, restart-instance, stopDomain, create-connector-connpool-common, set-pointbase-driver-connpool-props, delete-sql-common, deploy-jdbc-driver-common, create-domain-common, delete-jvm-options, create-jdbc-resource-common, prepare-truststore-certutil-common, create-user-common, asadmin-batch-common, delete-user-common, prepare-truststore-keytool-common, convWin, create-persistence-resource-common, get-version-common, startPB, delete-jms-connection-common, usage-common, deploy-war-no-context-root-ee, set-pointbase-connpool-props, usage, convUnix, staticCheck-common, ear-common, deploy-war-name, ]
+  [antcall] Entering /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml...
+Build sequence for target(s) `clean-jars-common' is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-jars-common]
+Complete build sequence is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, clean-jars-common, restart-instance-common, execute-sql-common, deploy-rar-common, undeploy, deploy-jdbc-common, undeploy-rar-common, set-derby-connpool-props, create-sql-common, deploy-war-no-context-root-pe, verifier-common, start-server-unix, test-tagfiles-exist, create-PermSize, execute-ejb-sql-common, undeploy-client-common, prepare-keystore-common, deploy-verify-common-ee, startDerby, confirmMissingReport-common, create-connector-resource-common, asadmin-common, create-connector-connpool, delete-connector-connpool-common, verifier, start-clean-server, runwebclient-common, deploy-common-ee, startDerbyNonMac, webclient-war-common, flush-connpool-common, stopDerby, clean-webapps-common, delete-jdbc-connpool-common, prepare-truststore-common, deploy-verify-common, run, test-tlds-exist, deploy-verify-common-pe, undeploy-common, undeploy-jar-common, deploy-client-common, enterprise-common, create-javamail-resource-common, package-persistence-common, deploy-war-commonee, startDomainWindows, set-derby-driver-connpool-props, deploy-war-no-context-root, undeploy-jdbc-common, deploy-common-pe, clear, copy-tagfiles, clean, compile, build, deploy, restart-server-instance-common, deploy-jar-common, delete-domain-common, stopPB, compile-common-with-endorsed-dir, import-wsdl, deploy-war-commonpe, compile-common, restart-server, runclient-common, package-appclientjar-common, ee-common, copy-tlds, delete-persistence-resource-common, undeploy-jms-common, asadmin-common-ignore-fail, startDomainUnix, startDomain, fixFiles, ejb-jar-common, appclient-jar-common, build-ear-common, publish-war-common, build-publish-war, stop-server-unix, clean-classes-common, clean-common, create-jdbc-connpool-common, dev-report, startDerbyMac, deploy-jms-common, package-war-common, package-ejbjar-common, delete-connector-resource-common, deploy-jsp-common, unsetupTimer, undeploy-war-common, change-orb-port, delete-javamail-resource-common, deploy-common, create-jms-resource-common, setup-mq-common, delete-jdbc-resource-common, start-server-windows, dumpThreadStack, setupTimer, deploy-war-common, start-server, ee, checkReporting-common, testTimer, stop-server, create-jdbc-driver-connpool-common, all, platform-common, create-jms-connection-common, undeploy-war-name, cleanAS, deploy-dir, preparePB, stop-server-windows, confirmReportPresent-common, delete-jms-resource-common, pb, runtest, create-jvm-options, restart-instance, stopDomain, create-connector-connpool-common, set-pointbase-driver-connpool-props, delete-sql-common, deploy-jdbc-driver-common, create-domain-common, delete-jvm-options, create-jdbc-resource-common, prepare-truststore-certutil-common, create-user-common, asadmin-batch-common, delete-user-common, prepare-truststore-keytool-common, convWin, create-persistence-resource-common, get-version-common, startPB, delete-jms-connection-common, usage-common, deploy-war-no-context-root-ee, set-pointbase-connpool-props, usage, convUnix, staticCheck-common, ear-common, deploy-war-name, ]
+
+setOSConditions:
+Override ignored for property "isUnix"
+
+setToolWin:
+Skipped because property 'isWindows' not set.
+
+setToolUnix:
+Override ignored for property "APPCLIENT"
+Override ignored for property "ASADMIN"
+Override ignored for property "ASANT"
+Override ignored for property "CAPTURESCHEMA"
+Override ignored for property "CHECKPATCH"
+Override ignored for property "INSTALLPATCH"
+Override ignored for property "JSPC"
+Override ignored for property "LISTPATCH"
+Override ignored for property "PACKAGE-APPCLIENT"
+Override ignored for property "VERIFIER"
+Override ignored for property "RMIC"
+Override ignored for property "TNAMESERV"
+Override ignored for property "WSCOMPILE"
+Override ignored for property "WSIMPORT"
+Override ignored for property "pb.start.server"
+Override ignored for property "pb.start.server1"
+Override ignored for property "IMQDBMGR"
+Override ignored for property "ld.library.path"
+
+setS1ASclassPath:
+Skipped because property 's1as.classpath' set.
+
+init-common:
+     [echo] Loading props from file /export/work/workspaces/gfv3/appserv-tests/config.properties
+Override ignored for property "pe"
+ [property] Loading /export/work/workspaces/gfv3/appserv-tests/config.properties
+Override ignored for property "instance.https.port"
+Override ignored for property "admin.domain"
+Override ignored for property "admin.password"
+Override ignored for property "http.address"
+Override ignored for property "http.alternate.port"
+Override ignored for property "ssl.password"
+Override ignored for property "instance.http.port"
+Override ignored for property "resources.dottedname.prefix"
+Override ignored for property "results.mailer"
+Override ignored for property "admin.domain.dir"
+Override ignored for property "admin.user"
+Override ignored for property "config.dottedname.prefix"
+Override ignored for property "instance.name"
+Override ignored for property "precompilejsp"
+Override ignored for property "admin.password.file"
+Override ignored for property "http.port"
+Override ignored for property "https.port"
+Override ignored for property "results.mailee"
+Override ignored for property "appserver.instance.name"
+Override ignored for property "master.password"
+Override ignored for property "http.host"
+Override ignored for property "instance.http.port.3"
+Override ignored for property "instance.http.port.2"
+Override ignored for property "admin.port"
+Override ignored for property "cluster.name"
+Override ignored for property "appserver.instance.dir"
+Override ignored for property "autodeploy.dir"
+Override ignored for property "orb.port"
+Override ignored for property "admin.host"
+Override ignored for property "instance.name.3"
+Override ignored for property "instance.name.2"
+Override ignored for property "results.mailhost"
+     [echo] admin.domain domain1
+     [echo] admin.user admin
+     [echo] admin.port 4848
+     [echo] http.port 8080
+     [echo] http.host localhost
+Override ignored for property "as.props"
+Override ignored for property "authrealmname"
+Override ignored for property "apptype"
+Override ignored for property "db.root"
+Override ignored for property "db.dir"
+Override ignored for property "db.classpath"
+ [property] Loading /export/work/workspaces/gfv3/appserv-tests/config/derby.properties
+Override ignored for property "db.host"
+Override ignored for property "db.url"
+Override ignored for property "db.xaclass"
+Override ignored for property "db.name"
+Override ignored for property "db.driver"
+Override ignored for property "db.port"
+Override ignored for property "db.port.2"
+Override ignored for property "db.class"
+Override ignored for property "db.user"
+Override ignored for property "db.pwd"
+Override ignored for property "db.type"
+Property "env.JAVKE_HOME" has not been set
+Override ignored for property "javke.home"
+Override ignored for property "dest.type"
+Override ignored for property "dest.name"
+Override ignored for property "jms.factory.name"
+Override ignored for property "jms.factory.type"
+Override ignored for property "jms.resource.name"
+Override ignored for property "jms.resource.type"
+Override ignored for property "jdbc.conpool.name"
+Override ignored for property "jdbc.resource.name"
+Override ignored for property "jdbc.resource.type"
+Override ignored for property "pm.resource.name"
+Override ignored for property "pm.factory.class"
+Override ignored for property "appclient.application.args"
+Override ignored for property "build.base.dir"
+Override ignored for property "build.webapps.dir"
+Override ignored for property "build.classes.dir"
+Override ignored for property "assemble.dir"
+Override ignored for property "results.dir"
+Property "Derby.classpath" has not been set
+Override ignored for property "s1astest.classpath"
+Override ignored for property "ejbjar.classes"
+Override ignored for property "appclientjar.classes"
+Override ignored for property "webclient.war.files"
+Override ignored for property "webclient.war.classes"
+Override ignored for property "test.name"
+Override ignored for property "test.description"
+Override ignored for property "test.count"
+Override ignored for property "cluster.name"
+Override ignored for property "clustered.server.name"
+Override ignored for property "clustered.server.name.two"
+Override ignored for property "nodeagent.name"
+Override ignored for property "das.host"
+Override ignored for property "das.jmx.port"
+Override ignored for property "http.listener1.port"
+Override ignored for property "http.listener2.port"
+Override ignored for property "orb.listener1.port"
+Override ignored for property "ssl.port"
+Override ignored for property "ssl.mutualauth.port"
+Override ignored for property "jmx.system.connector.port"
+Override ignored for property "http.listener1.port.two"
+Override ignored for property "http.listener2.port.two"
+Override ignored for property "orb.listener1.port.two"
+Override ignored for property "ssl.port.two"
+Override ignored for property "ssl.mutualauth.port.two"
+Override ignored for property "jmx.system.connector.port.two"
+Override ignored for property "cert.nickname"
+  [antcall] Exiting /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml.
+  [antcall] Exiting /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml.
+
+compile:
+Project base dir set to: /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans
+  [antcall] calling target(s) [compile-common] in build file /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml
+parsing buildfile /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml with URI = file:/export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml
+Project base dir set to: /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/properties.xml
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/common.xml
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.properties
+resolving systemId: file:/export/work/workspaces/gfv3/appserv-tests/config/run.xml
+ [property] Loading Environment env.
+Override ignored for property "env.SESSION_MANAGER"
+Override ignored for property "env.LESSOPEN"
+Override ignored for property "env.NORMBGCOLOR"
+Override ignored for property "env.CVSROOT"
+Override ignored for property "env.MY_ANT_HOME"
+Override ignored for property "env.PWD"
+Override ignored for property "env.XDG_SESSION_COOKIE"
+Override ignored for property "env.LANG"
+Override ignored for property "env.WS"
+Override ignored for property "env.AWT_TOOLKIT"
+Override ignored for property "env.DEFAULTS_PATH"
+Override ignored for property "env.HISTSIZE"
+Override ignored for property "env.INSTALL_ROOT"
+Override ignored for property "env.DISPLAY"
+Override ignored for property "env._"
+Override ignored for property "env.USER"
+Override ignored for property "env.HISTCONTROL"
+Override ignored for property "env.SHELL"
+Override ignored for property "env.NLSPATH"
+Override ignored for property "env.XDG_DATA_DIRS"
+Override ignored for property "env.DESKTOP_SESSION"
+Override ignored for property "env.HISTFILESIZE"
+Override ignored for property "env.APS_HOME"
+Override ignored for property "env.WIDTH"
+Override ignored for property "env.JAVANETCVSROOT"
+Override ignored for property "env.PATH"
+Override ignored for property "env.no_proxy"
+Override ignored for property "env.NORMFGCOLOR"
+Override ignored for property "env.LC_CTYPE"
+Override ignored for property "env.DBUS_SESSION_BUS_ADDRESS"
+Override ignored for property "env.REALPLAYER_HOME"
+Override ignored for property "env.SSH_AGENT_PID"
+Override ignored for property "env.SHLVL"
+Override ignored for property "env.GDMSESSION"
+Override ignored for property "env.GNOME_DESKTOP_SESSION_ID"
+Override ignored for property "env.GDM_KEYBOARD_LAYOUT"
+Override ignored for property "env.GNOME_KEYRING_PID"
+Override ignored for property "env.OS"
+Override ignored for property "env.LOGNAME"
+Override ignored for property "env.ALSA_OUTPUT_PORTS"
+Override ignored for property "env.SCUMMVM_PORT"
+Override ignored for property "env.JAVA_HOME"
+Override ignored for property "env.TERM"
+Override ignored for property "env.QLTESTRES"
+Override ignored for property "env.NO_PROXY"
+Override ignored for property "env.GDM_LANG"
+Override ignored for property "env.DTACH_HOME"
+Override ignored for property "env.OLDPWD"
+Override ignored for property "env.DEBUG"
+Override ignored for property "env.GCONF_LOCAL_LOCKS"
+Override ignored for property "env.M2_HOME"
+Override ignored for property "env.EC2_CERT"
+Override ignored for property "env.WINDOWID"
+Override ignored for property "env.EC2_PRIVATE_KEY"
+Override ignored for property "env.REDCVSROOT"
+Override ignored for property "env.MOZ_DISABLE_PANGO"
+Override ignored for property "env.XFILESEARCHPATH"
+Override ignored for property "env.HOME"
+Override ignored for property "env.ANT_HOME"
+Override ignored for property "env.LD_LIBRARY_PATH"
+Override ignored for property "env.MAVEN_OPTS"
+Override ignored for property "env.SSH_AUTH_SOCK"
+Override ignored for property "env.RBARWIDTH"
+Override ignored for property "env.S1AS_HOME"
+Property "BASH_SOURCE" has not been set
+Property "LINENO" has not been set
+Property "FUNCNAME[0]" has not been set
+Override ignored for property "env.PS4"
+Override ignored for property "env.MAVEN_HOME"
+Override ignored for property "env.XAUTHORITY"
+Property "NEW_PWD" has not been set
+Override ignored for property "env.PS1"
+Override ignored for property "env.MANDATORY_PATH"
+Override ignored for property "env.SPEECHD_PORT"
+Override ignored for property "env.GTK_MODULES"
+Override ignored for property "env.WINDOW_MANAGER"
+Override ignored for property "env.DTRX_HOME"
+Override ignored for property "env.COLORTERM"
+Override ignored for property "env.EDITOR"
+Override ignored for property "env.MALLOC_CHECK_"
+Override ignored for property "env.ORBIT_SOCKETDIR"
+Override ignored for property "env.WP_INSTALL_ROOT"
+Override ignored for property "env.USERNAME"
+Override ignored for property "env.SCALA_HOME"
+Override ignored for property "env.COPE_PATH"
+Override ignored for property "env.QL_HOME"
+Override ignored for property "env.AS_ADMIN_READTIMEOUT"
+Override ignored for property "env.MY_SCRIPT_DIR"
+Override ignored for property "env.GNOME_KEYRING_CONTROL"
+Override ignored for property "env.XDG_CONFIG_DIRS"
+Override ignored for property "env.TODOTXT_HOME"
+Override ignored for property "env.LESSCLOSE"
+Override ignored for property "module"
+Override ignored for property "appname"
+Override ignored for property "assemble"
+Override ignored for property "contextroot"
+Override ignored for property "beans.xml"
+Override ignored for property "target-to-run"
+ [macrodef] creating macro  run-test
+Build sequence for target(s) `compile-common' is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, compile-common]
+Complete build sequence is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, compile-common, restart-instance-common, execute-sql-common, deploy-rar-common, undeploy, deploy-jdbc-common, undeploy-rar-common, set-derby-connpool-props, create-sql-common, deploy-war-no-context-root-pe, verifier-common, start-server-unix, test-tagfiles-exist, create-PermSize, execute-ejb-sql-common, undeploy-client-common, prepare-keystore-common, deploy-verify-common-ee, startDerby, confirmMissingReport-common, create-connector-resource-common, asadmin-common, create-connector-connpool, delete-connector-connpool-common, verifier, start-clean-server, runwebclient-common, deploy-common-ee, startDerbyNonMac, webclient-war-common, flush-connpool-common, stopDerby, clean-webapps-common, delete-jdbc-connpool-common, prepare-truststore-common, deploy-verify-common, run, test-tlds-exist, deploy-verify-common-pe, undeploy-common, undeploy-jar-common, deploy-client-common, enterprise-common, create-javamail-resource-common, package-persistence-common, deploy-war-commonee, startDomainWindows, set-derby-driver-connpool-props, deploy-war-no-context-root, undeploy-jdbc-common, deploy-common-pe, clear, copy-tagfiles, clean, compile, build, deploy, restart-server-instance-common, deploy-jar-common, delete-domain-common, stopPB, compile-common-with-endorsed-dir, import-wsdl, deploy-war-commonpe, restart-server, runclient-common, package-appclientjar-common, ee-common, copy-tlds, delete-persistence-resource-common, undeploy-jms-common, asadmin-common-ignore-fail, startDomainUnix, startDomain, fixFiles, ejb-jar-common, appclient-jar-common, build-ear-common, publish-war-common, build-publish-war, stop-server-unix, clean-classes-common, clean-common, create-jdbc-connpool-common, dev-report, startDerbyMac, deploy-jms-common, package-war-common, package-ejbjar-common, delete-connector-resource-common, deploy-jsp-common, unsetupTimer, undeploy-war-common, change-orb-port, delete-javamail-resource-common, deploy-common, create-jms-resource-common, setup-mq-common, delete-jdbc-resource-common, start-server-windows, dumpThreadStack, setupTimer, deploy-war-common, start-server, ee, checkReporting-common, testTimer, stop-server, create-jdbc-driver-connpool-common, all, platform-common, create-jms-connection-common, undeploy-war-name, cleanAS, deploy-dir, preparePB, stop-server-windows, confirmReportPresent-common, delete-jms-resource-common, pb, runtest, create-jvm-options, clean-jars-common, restart-instance, stopDomain, create-connector-connpool-common, set-pointbase-driver-connpool-props, delete-sql-common, deploy-jdbc-driver-common, create-domain-common, delete-jvm-options, create-jdbc-resource-common, prepare-truststore-certutil-common, create-user-common, asadmin-batch-common, delete-user-common, prepare-truststore-keytool-common, convWin, create-persistence-resource-common, get-version-common, startPB, delete-jms-connection-common, usage-common, deploy-war-no-context-root-ee, set-pointbase-connpool-props, usage, convUnix, staticCheck-common, ear-common, deploy-war-name, ]
+  [antcall] Entering /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml...
+Build sequence for target(s) `compile-common' is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, compile-common]
+Complete build sequence is [setOSConditions, setToolWin, setToolUnix, setToolProperty, setS1ASclassPath, init-common, compile-common, restart-instance-common, execute-sql-common, deploy-rar-common, undeploy, deploy-jdbc-common, undeploy-rar-common, set-derby-connpool-props, create-sql-common, deploy-war-no-context-root-pe, verifier-common, start-server-unix, test-tagfiles-exist, create-PermSize, execute-ejb-sql-common, undeploy-client-common, prepare-keystore-common, deploy-verify-common-ee, startDerby, confirmMissingReport-common, create-connector-resource-common, asadmin-common, create-connector-connpool, delete-connector-connpool-common, verifier, start-clean-server, runwebclient-common, deploy-common-ee, startDerbyNonMac, webclient-war-common, flush-connpool-common, stopDerby, clean-webapps-common, delete-jdbc-connpool-common, prepare-truststore-common, deploy-verify-common, run, test-tlds-exist, deploy-verify-common-pe, undeploy-common, undeploy-jar-common, deploy-client-common, enterprise-common, create-javamail-resource-common, package-persistence-common, deploy-war-commonee, startDomainWindows, set-derby-driver-connpool-props, deploy-war-no-context-root, undeploy-jdbc-common, deploy-common-pe, clear, copy-tagfiles, clean, compile, build, deploy, restart-server-instance-common, deploy-jar-common, delete-domain-common, stopPB, compile-common-with-endorsed-dir, import-wsdl, deploy-war-commonpe, restart-server, runclient-common, package-appclientjar-common, ee-common, copy-tlds, delete-persistence-resource-common, undeploy-jms-common, asadmin-common-ignore-fail, startDomainUnix, startDomain, fixFiles, ejb-jar-common, appclient-jar-common, build-ear-common, publish-war-common, build-publish-war, stop-server-unix, clean-classes-common, clean-common, create-jdbc-connpool-common, dev-report, startDerbyMac, deploy-jms-common, package-war-common, package-ejbjar-common, delete-connector-resource-common, deploy-jsp-common, unsetupTimer, undeploy-war-common, change-orb-port, delete-javamail-resource-common, deploy-common, create-jms-resource-common, setup-mq-common, delete-jdbc-resource-common, start-server-windows, dumpThreadStack, setupTimer, deploy-war-common, start-server, ee, checkReporting-common, testTimer, stop-server, create-jdbc-driver-connpool-common, all, platform-common, create-jms-connection-common, undeploy-war-name, cleanAS, deploy-dir, preparePB, stop-server-windows, confirmReportPresent-common, delete-jms-resource-common, pb, runtest, create-jvm-options, clean-jars-common, restart-instance, stopDomain, create-connector-connpool-common, set-pointbase-driver-connpool-props, delete-sql-common, deploy-jdbc-driver-common, create-domain-common, delete-jvm-options, create-jdbc-resource-common, prepare-truststore-certutil-common, create-user-common, asadmin-batch-common, delete-user-common, prepare-truststore-keytool-common, convWin, create-persistence-resource-common, get-version-common, startPB, delete-jms-connection-common, usage-common, deploy-war-no-context-root-ee, set-pointbase-connpool-props, usage, convUnix, staticCheck-common, ear-common, deploy-war-name, ]
+
+setOSConditions:
+Override ignored for property "isUnix"
+
+setToolWin:
+Skipped because property 'isWindows' not set.
+
+setToolUnix:
+Override ignored for property "APPCLIENT"
+Override ignored for property "ASADMIN"
+Override ignored for property "ASANT"
+Override ignored for property "CAPTURESCHEMA"
+Override ignored for property "CHECKPATCH"
+Override ignored for property "INSTALLPATCH"
+Override ignored for property "JSPC"
+Override ignored for property "LISTPATCH"
+Override ignored for property "PACKAGE-APPCLIENT"
+Override ignored for property "VERIFIER"
+Override ignored for property "RMIC"
+Override ignored for property "TNAMESERV"
+Override ignored for property "WSCOMPILE"
+Override ignored for property "WSIMPORT"
+Override ignored for property "pb.start.server"
+Override ignored for property "pb.start.server1"
+Override ignored for property "IMQDBMGR"
+Override ignored for property "ld.library.path"
+
+setS1ASclassPath:
+Skipped because property 's1as.classpath' set.
+
+init-common:
+     [echo] Loading props from file /export/work/workspaces/gfv3/appserv-tests/config.properties
+Override ignored for property "pe"
+ [property] Loading /export/work/workspaces/gfv3/appserv-tests/config.properties
+Override ignored for property "instance.https.port"
+Override ignored for property "admin.domain"
+Override ignored for property "admin.password"
+Override ignored for property "http.address"
+Override ignored for property "http.alternate.port"
+Override ignored for property "ssl.password"
+Override ignored for property "instance.http.port"
+Override ignored for property "resources.dottedname.prefix"
+Override ignored for property "results.mailer"
+Override ignored for property "admin.domain.dir"
+Override ignored for property "admin.user"
+Override ignored for property "config.dottedname.prefix"
+Override ignored for property "instance.name"
+Override ignored for property "precompilejsp"
+Override ignored for property "admin.password.file"
+Override ignored for property "http.port"
+Override ignored for property "https.port"
+Override ignored for property "results.mailee"
+Override ignored for property "appserver.instance.name"
+Override ignored for property "master.password"
+Override ignored for property "http.host"
+Override ignored for property "instance.http.port.3"
+Override ignored for property "instance.http.port.2"
+Override ignored for property "admin.port"
+Override ignored for property "cluster.name"
+Override ignored for property "appserver.instance.dir"
+Override ignored for property "autodeploy.dir"
+Override ignored for property "orb.port"
+Override ignored for property "admin.host"
+Override ignored for property "instance.name.3"
+Override ignored for property "instance.name.2"
+Override ignored for property "results.mailhost"
+     [echo] admin.domain domain1
+     [echo] admin.user admin
+     [echo] admin.port 4848
+     [echo] http.port 8080
+     [echo] http.host localhost
+Override ignored for property "as.props"
+Override ignored for property "authrealmname"
+Override ignored for property "apptype"
+Override ignored for property "db.root"
+Override ignored for property "db.dir"
+Override ignored for property "db.classpath"
+ [property] Loading /export/work/workspaces/gfv3/appserv-tests/config/derby.properties
+Override ignored for property "db.host"
+Override ignored for property "db.url"
+Override ignored for property "db.xaclass"
+Override ignored for property "db.name"
+Override ignored for property "db.driver"
+Override ignored for property "db.port"
+Override ignored for property "db.port.2"
+Override ignored for property "db.class"
+Override ignored for property "db.user"
+Override ignored for property "db.pwd"
+Override ignored for property "db.type"
+Property "env.JAVKE_HOME" has not been set
+Override ignored for property "javke.home"
+Override ignored for property "dest.type"
+Override ignored for property "dest.name"
+Override ignored for property "jms.factory.name"
+Override ignored for property "jms.factory.type"
+Override ignored for property "jms.resource.name"
+Override ignored for property "jms.resource.type"
+Override ignored for property "jdbc.conpool.name"
+Override ignored for property "jdbc.resource.name"
+Override ignored for property "jdbc.resource.type"
+Override ignored for property "pm.resource.name"
+Override ignored for property "pm.factory.class"
+Override ignored for property "appclient.application.args"
+Override ignored for property "build.base.dir"
+Override ignored for property "build.webapps.dir"
+Override ignored for property "build.classes.dir"
+Override ignored for property "assemble.dir"
+Override ignored for property "results.dir"
+Property "Derby.classpath" has not been set
+Override ignored for property "s1astest.classpath"
+Override ignored for property "ejbjar.classes"
+Override ignored for property "appclientjar.classes"
+Override ignored for property "webclient.war.files"
+Override ignored for property "webclient.war.classes"
+Override ignored for property "test.name"
+Override ignored for property "test.description"
+Override ignored for property "test.count"
+Override ignored for property "cluster.name"
+Override ignored for property "clustered.server.name"
+Override ignored for property "clustered.server.name.two"
+Override ignored for property "nodeagent.name"
+Override ignored for property "das.host"
+Override ignored for property "das.jmx.port"
+Override ignored for property "http.listener1.port"
+Override ignored for property "http.listener2.port"
+Override ignored for property "orb.listener1.port"
+Override ignored for property "ssl.port"
+Override ignored for property "ssl.mutualauth.port"
+Override ignored for property "jmx.system.connector.port"
+Override ignored for property "http.listener1.port.two"
+Override ignored for property "http.listener2.port.two"
+Override ignored for property "orb.listener1.port.two"
+Override ignored for property "ssl.port.two"
+Override ignored for property "ssl.mutualauth.port.two"
+Override ignored for property "jmx.system.connector.port.two"
+Override ignored for property "cert.nickname"
+
+compile-common:
+    [mkdir] Created dir: /export/work/workspaces/gfv3/appserv-tests/build/module/classes
+     [echo] common.xml: Compiling test source files
+    [mkdir] Skipping /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet because it already exists.
+    [javac] ClassUnavailableAtRuntime.java added as ClassUnavailableAtRuntime.class doesn't exist.
+    [javac] OptionalService.java added as OptionalService.class doesn't exist.
+    [javac] TestBean.java added as TestBean.class doesn't exist.
+    [javac] TestLoggerProducer.java added as TestLoggerProducer.class doesn't exist.
+    [javac] TestServlet.java added as TestServlet.class doesn't exist.
+    [javac] Compiling 5 source files to /export/work/workspaces/gfv3/appserv-tests/build/module/classes
+    [javac] Using modern compiler
+dropping /export/work/workspaces/gfv3/appserv-tests/sqetests/connector/lib/cci-derby-proc.jar from path as it doesn't exist
+dropping /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/${Derby.classpath} from path as it doesn't exist
+    [javac] Compilation arguments:
+    [javac] '-d'
+    [javac] '/export/work/workspaces/gfv3/appserv-tests/build/module/classes'
+    [javac] '-classpath'
+    [javac] '/export/work/workspaces/gfv3/appserv-tests/build/module/classes:/export/work/workspaces/gfv3/appserv-tests/lib/reporter.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/acc-config.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/admin-cli.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/admin-core.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/admin-util.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/amx-all.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/annotation-framework.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/ant.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/antlr-repackaged.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/api-exporter.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/appclient-connector.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/appclient-server-core.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/appclient.security.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/asm-all-repackaged.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/auto-depends.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/org.apache.felix.bundlerepository.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/org.apache.felix.eventadmin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/org.apache.felix.scr.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/osgi-cdi.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/osgi-ee-resources.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/osgi-ejb-container.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/osgi-javaee-base.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/osgi-jdbc.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/osgi-jpa.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/osgi-jta.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/autostart/osgi-web-container.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/backup.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/bean-validator.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/branding.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/class-model.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cli-optional.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cluster-admin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cluster-cli.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cluster-common.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cluster-ssh.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cmp-ejb-mapping.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cmp-enhancer.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cmp-generator-database.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cmp-internal-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cmp-model.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cmp-support-ejb.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cmp-support-sqlstore.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/cmp-utility.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/common-util.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/config-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/config-types.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/config.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/connectors-admin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/connectors-inbound-runtime.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/connectors-internal-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/connectors-runtime.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-cluster-plugin-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-cluster-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-common-full-plugin-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-common-full-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-common-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-common.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-community-branding-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-corba-plugin-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-corba-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-ejb-lite-plugin-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-ejb-lite-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-ejb-plugin-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-ejb-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-jca-plugin-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-jca-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-jdbc-plugin-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-jdbc-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-jms-plugin-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-jms-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-jts-plugin-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-jts-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-plugin-service.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-updatecenter-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-web-plugin-help.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/console-web-plugin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/container-common.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/dataprovider.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/dbschema-repackaged.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/deployment-admin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/deployment-autodeploy.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/deployment-client.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/deployment-common.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/deployment-javaee-core.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/deployment-javaee-full.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/dol.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/ejb-container.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/ejb-internal-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/ejb.security.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/el-impl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/endorsed/javax.annotation.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/endorsed/jaxb-api-osgi.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/endorsed/webservices-api-osgi.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/flashlight-extra-jdk-packages.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/flashlight-framework.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/gf-client-module.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/gf-connectors-connector.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/gf-ejb-connector.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/gf-web-connector.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-corba-asm.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-corba-codegen.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-corba-csiv2-idl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-corba-internal-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-corba-newtimer.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-corba-omgapi.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-corba-orb.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-corba-orbgeneric.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-ee-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-extra-jre-packages.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-mbeanserver.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-naming.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-oracle-jdbc-driver-packages.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish-registration.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/glassfish.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/gmbal-api-only.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/gmbal.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/gms-adapter.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/gms-bootstrap.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-comet.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-config.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-container.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-framework-tests.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-framework.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-http-ajp.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-http-server.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-http-servlet.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-http.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-portunif.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-rcm.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/grizzly-websockets.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/ha-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/ha-file-store.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/ha-shoal-cache-bootstrap.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/ha-shoal-cache-store.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/hk2-core.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/hk2.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/inmemory.jacc.provider.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/internal-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jackson-core-asl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jackson-jaxrs.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jackson-mapper-asl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jackson-xc.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jaspic.provider.framework.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javaee-kernel.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.ejb.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.enterprise.deploy.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.jms.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.mail.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.management.j2ee.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.persistence.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.resource.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.security.auth.message.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.security.jacc.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.servlet.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.servlet.jsp.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.servlet.jsp.jstl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/javax.transaction.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jaxb-osgi.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jaxrpc-api-osgi.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jdbc-admin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jersey-client.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jersey-core.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jersey-gf-server.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jersey-gf-statsproviders.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jersey-grizzly2.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jersey-json.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jersey-multipart.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jettison.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jms-admin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jms-core.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jmxremote_optional-repackaged.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jpa-connector.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jsf-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jsf-connector.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jsf-impl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jsftemplating.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jsp-impl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jspcaching-connector.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jsr109-impl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jstl-connector.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jstl-impl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jta.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/jts.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/kernel.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/launcher.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/ldapbp-repackaged.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/libpam4j-repackaged.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/libvirt.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/load-balancer-admin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/logging.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/management-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/metro-glue.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/mimepull.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/monitoring-core.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/orb-connector.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/orb-enabler.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/orb-iiop.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.apache.felix.configadmin.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.apache.felix.fileinstall.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.apache.felix.gogo.command.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.apache.felix.gogo.runtime.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.apache.felix.gogo.shell.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.apache.felix.shell.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.apache.felix.shell.remote.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.apache.felix.shell.tui.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.eclipse.persistence.antlr.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.eclipse.persistence.asm.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.eclipse.persistence.core.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.eclipse.persistence.jpa.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.eclipse.persistence.jpa.modelgen.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/org.eclipse.persistence.oracle.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/osgi-adapter.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/osgi-container.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/osgi-jpa-extension.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/osgi-main.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/osgi-resource-locator.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/persistence-common.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/pkg-client.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/registration-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/registration-impl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/rest-service.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/scattered-archive-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/schema2beans-repackaged.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/security.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/server-mgmt.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/shoal-cache.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/shoal-gms-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/shoal-gms-impl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/simple-glassfish-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/soap-tcp.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/ssl-impl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/stats77.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/transaction-internal-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/trilead-ssh2-repackaged.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/virt-core.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/war-util.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/web-cli.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/web-core.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/web-embed-api.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/web-embed-impl.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/web-glue.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/web-gui-plugin-common.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/web-ha.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/web-naming.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/websecurity.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/webservices-connector.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/webservices-extra-jdk-packages.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/webservices-osgi.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/webservices.security.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/weld-integration-fragment.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/weld-integration.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/weld-osgi-bundle.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/woodstox-osgi.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/glassfish/modules/work-management.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/javadb/lib/derby.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/javadb/lib/derbyclient.jar:/export/work/workspaces/gfv3/v3/distributions/glassfish/target/glassfish5/javadb/lib/derbynet.jar:/space/apps/apache-ant-1.7.1/lib/ant-launcher.jar:/space/apps/apache-ant-1.7.1/lib/ant-jai.jar:/space/apps/apache-ant-1.7.1/lib/ant-antlr.jar:/space/apps/apache-ant-1.7.1/lib/ant-starteam.jar:/space/apps/apache-ant-1.7.1/lib/ant-jdepend.jar:/space/apps/apache-ant-1.7.1/lib/ant-apache-oro.jar:/space/apps/apache-ant-1.7.1/lib/ant-trax.jar:/space/apps/apache-ant-1.7.1/lib/ant-apache-regexp.jar:/space/apps/apache-ant-1.7.1/lib/ant-jmf.jar:/space/apps/apache-ant-1.7.1/lib/ant-jsch.jar:/space/apps/apache-ant-1.7.1/lib/ant-apache-bsf.jar:/space/apps/apache-ant-1.7.1/lib/ant-netrexx.jar:/space/apps/apache-ant-1.7.1/lib/ant-swing.jar:/space/apps/apache-ant-1.7.1/lib/xercesImpl.jar:/space/apps/apache-ant-1.7.1/lib/ant-apache-bcel.jar:/space/apps/apache-ant-1.7.1/lib/ant-stylebook.jar:/space/apps/apache-ant-1.7.1/lib/ant-javamail.jar:/space/apps/apache-ant-1.7.1/lib/ant-junit.jar:/space/apps/apache-ant-1.7.1/lib/ant-commons-net.jar:/space/apps/apache-ant-1.7.1/lib/ant-commons-logging.jar:/space/apps/apache-ant-1.7.1/lib/ant-weblogic.jar:/space/apps/apache-ant-1.7.1/lib/ant-apache-log4j.jar:/space/apps/apache-ant-1.7.1/lib/ant.jar:/space/apps/apache-ant-1.7.1/lib/xml-apis.jar:/space/apps/apache-ant-1.7.1/lib/ant-nodeps.jar:/space/apps/apache-ant-1.7.1/lib/ant-testutil.jar:/space/apps/apache-ant-1.7.1/lib/ant-apache-resolver.jar:/space/apps/jdk1.6.0_22/lib/tools.jar'
+    [javac] '-sourcepath'
+    [javac] '/export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet'
+    [javac] '-g'
+    [javac] 
+    [javac] The ' characters around the executable and arguments are
+    [javac] not part of the command.
+    [javac] Files to be compiled:
+    [javac]     /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/ClassUnavailableAtRuntime.java
+    [javac]     /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/OptionalService.java
+    [javac]     /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestBean.java
+    [javac]     /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestLoggerProducer.java
+    [javac]     /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestServlet.java
+  [antcall] Exiting /export/work/workspaces/gfv3/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/build.xml.
+   [delete] Deleting: /export/work/workspaces/gfv3/appserv-tests/build/module/classes/ClassUnavailableAtRuntime.class
+
+BUILD SUCCESSFUL
+Total time: 3 seconds
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/lib/slf4j-api-1.7.25.jar b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/lib/slf4j-api-1.7.25.jar
new file mode 100644
index 0000000..0143c09
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/lib/slf4j-api-1.7.25.jar
Binary files differ
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/lib/slf4j-simple-1.7.25.jar b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/lib/slf4j-simple-1.7.25.jar
new file mode 100644
index 0000000..a7260f3
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/lib/slf4j-simple-1.7.25.jar
Binary files differ
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/ClassUnavailableAtRuntime.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/ClassUnavailableAtRuntime.java
new file mode 100644
index 0000000..3bae9d7
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/ClassUnavailableAtRuntime.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+//A Test parent Bean class that is available 
+//during compilation but is not packaged at runtime
+public class ClassUnavailableAtRuntime extends TestService {
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/OptionalService.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/OptionalService.java
new file mode 100644
index 0000000..1e123a6
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/OptionalService.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+//An optional service that extends ClassUnavailableAtRuntime
+//This optional service bean is not used
+//and the superclass of this bean is unavailable at runtime
+
+public class OptionalService extends ClassUnavailableAtRuntime{
+    public OptionalService(){
+        System.out.println("OptionalService instantiated");
+    }
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestBean.java
new file mode 100644
index 0000000..6d059e2
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestBean.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+//Simple TestBean to test CDI. 
+//This bean implements Serializable as it needs to be placed into a Stateful Bean
+public class TestBean
+{}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestLoggerProducer.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestLoggerProducer.java
new file mode 100644
index 0000000..9c2e72e
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestLoggerProducer.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import javax.enterprise.inject.Produces;
+
+
+public class TestLoggerProducer {
+    @Produces
+    public org.jboss.logging.Logger getLogger(){
+        org.jboss.logging.Logger l = org.jboss.logging.Logger.getLogger(TestLoggerProducer.class);
+        System.out.println("getLogger:: " + l);
+        return l;
+    }
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestService.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestService.java
new file mode 100644
index 0000000..3a2ccc2
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestService.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+//A dummy Parent class that is used to test for Bean registration/availability
+//in TestServlet
+public class TestService {
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestServlet.java
new file mode 100644
index 0000000..7e438a7
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/optional-unbundled-beans/servlet/TestServlet.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.inject.Inject;
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.naming.InitialContext;
+
+@WebServlet(name="mytest",
+        urlPatterns={"/myurl"},
+        initParams={ @WebInitParam(name="n1", value="v1"), @WebInitParam(name="n2", value="v2") } )
+public class TestServlet extends HttpServlet {
+    @Inject TestBean tb;
+    @Inject BeanManager bm;
+    BeanManager bm1;
+    
+    @Inject 
+    private transient org.jboss.logging.Logger log;
+
+    public void service(HttpServletRequest req, HttpServletResponse res)
+            throws IOException, ServletException {
+
+        PrintWriter writer = res.getWriter();
+        writer.write("Hello from Servlet 3.0. ");
+        String msg = "n1=" + getInitParameter("n1") +
+            ", n2=" + getInitParameter("n2");
+        if (tb == null) msg += "Bean injection into Servlet failed";
+        if (bm == null) msg += "BeanManager Injection via @Inject failed";
+        try {
+            bm1 = (BeanManager)((new InitialContext()).lookup("java:comp/BeanManager"));
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            msg += "BeanManager Injection via component environment lookup failed";
+        }
+        if (bm1 == null) msg += "BeanManager Injection via component environment lookup failed";
+        
+        //Ensure that the OptionalService Bean is not registered.
+        Set<Bean<?>> optionalServiceBeans = bm.getBeans(TestService.class,new AnnotationLiteral<Any>() {});
+        boolean optionalServiceAvailable = false;
+        for (Iterator<Bean<?>> iterator = optionalServiceBeans.iterator(); iterator
+                .hasNext();) {
+            Bean<?> b =  iterator.next();
+            System.out.println("-----" + b + " " + b.getClass() + " " + b.getBeanClass().getCanonicalName());
+            if (b.getBeanClass().getCanonicalName().contains("Optional")) optionalServiceAvailable = true; 
+        }
+        
+        //The OptionalService Bean was not added to the WAR and hence must not available through the BM.
+        if (optionalServiceAvailable) msg += "OptionalServiceBean is registered, though it was not included in the WAR";
+        
+        System.out.println("BeanManager is " + bm);
+        System.out.println("BeanManager via lookup is " + bm1);
+        writer.write("initParams: " + msg + "\n");
+    }
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/build.properties
new file mode 100644
index 0000000..e8ca782
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/build.properties
@@ -0,0 +1,28 @@
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+ 
+
+<property name="module" value="cdi-full-ear"/>
+<property name="appname" value="${module}"/>         
+<property name="assemble" value="${build.classes.dir}/archive"/>
+<property name="se.client" value="com.acme.Client"/>
+<property name="app.type" value="application"/>
+<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
+<property name="application.xml" value="descriptor/application.xml"/>
+<property name="beans.xml" value="descriptor/beans.xml"/>
+<property name="contextroot" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/build.xml
new file mode 100644
index 0000000..1694525
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/build.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<!DOCTYPE project [
+<!ENTITY commonSetup SYSTEM "./../../../../config/properties.xml">
+<!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
+<!ENTITY testproperties SYSTEM "./build.properties">
+]>
+
+<project name="cdi-full-ear-App" default="usage" basedir=".">
+
+    &commonSetup;
+    &commonBuild;
+    &testproperties;
+
+    <target name="all" depends="clean,build,deploy,run,undeploy"/>
+
+    <target name="clean" depends="init-common">
+      <antcall  target="clean-common"/>
+    </target>
+ 
+    <target name="compile" depends="clean">
+        <antcall target="compile-common">
+            <param name="src" value="war"/>
+        </antcall>
+        <antcall target="webclient-war-common">
+          <param name="hasWebclient" value="true"/>
+        </antcall>
+        <antcall target="compile-common">
+            <param name="src" value="ejb"/>
+        </antcall>
+
+	<javac classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar" srcdir="client" destdir="${build.classes.dir}" debug="on" failonerror="true">
+          <compilerarg line="-endorseddirs ${env.S1AS_HOME}/modules/endorsed"/>
+	 
+        </javac>
+<!--
+        <antcall target="compile-common">
+            <param name="src" value="client"/>
+        </antcall>
+-->
+    </target>
+
+    <target name="build" depends="compile">
+        <mkdir dir="${assemble.dir}"/>
+        <antcall target="ejb-jar-common">
+          <param name="ejbjar.classes" value="**/Foo.class,**/Hello.class,**/HelloRemote.class,**/Singleton*.class,**/HelloStateless.class,**/HelloSingleton.class,**/FooManagedBean.class,**/BarManagedBean.class, **/FooBarManagedBean.class, **/ManagedSuper.class"/>
+        </antcall>
+        <antcall target="ear-common"/>
+    </target> 
+    
+    <target name="deploy" 
+            depends="init-common">
+        <antcall target="deploy-common"/>
+    </target>
+
+    <target name="run" depends="init-common">
+       <java  fork="on" 
+              failonerror="true"
+              classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
+              classname="${se.client}">
+           <arg line="${contextroot}"/>
+           <arg line="${http.host}"/>
+           <arg line="${http.port}"/>
+        </java>
+    </target>
+ 
+    <target name="undeploy" depends="init-common">
+        <antcall target="undeploy-common"/>
+    </target>   
+
+    <target name="usage">
+        <antcall target="usage-common"/>
+    </target>
+</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/client/Client.java
new file mode 100644
index 0000000..7517908
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/client/Client.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+
+import java.net.*;
+import java.io.*;
+import java.util.*;
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import javax.naming.InitialContext;
+
+import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
+
+public class Client {
+
+    private static SimpleReporterAdapter stat = 
+        new SimpleReporterAdapter("appserv-tests");
+
+    private static String appName;
+    private String host;
+    private String port;
+
+    @Resource(lookup="java:app/env/value1")
+    private static Integer appLevelViaLookup;
+
+    public static void main(String args[]) {
+	appName = args[0];
+	stat.addDescription(appName);
+	Client client = new Client(args);       
+        client.doTest();	
+        stat.printSummary(appName + "ID");
+	System.out.println("appLevelViaLookup = '" +
+			   appLevelViaLookup + "'");
+    }
+
+    public Client(String[] args) {
+	host = args[1];
+        port = args[2];
+    }
+
+   
+
+    public void doTest() {
+
+	try {
+
+	    String url = "http://" + host + ":" + port + 
+                "/" + appName + "/HelloServlet";
+
+            System.out.println("invoking webclient servlet at " + url);
+
+	    URL u = new URL(url);
+        
+	    HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
+	    int code = c1.getResponseCode();
+	    InputStream is = c1.getInputStream();
+	    BufferedReader input = new BufferedReader (new InputStreamReader(is));
+	    String line = null;
+	    while((line = input.readLine()) != null){
+            System.out.println("<response>:"+ line);
+            if (line.trim().length() > 0) {
+                stat.addStatus("local main", stat.FAIL);
+                return;
+            }
+        }
+	    if(code != 200) {
+            stat.addStatus("local main", stat.FAIL);
+            return;
+	    }
+	    stat.addStatus("local main", stat.PASS);
+
+	} catch(Exception e) {
+	    stat.addStatus("local main", stat.FAIL);
+	    e.printStackTrace();
+	}
+    }
+
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/descriptor/application.xml
new file mode 100644
index 0000000..d9378e7
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/descriptor/application.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<application xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="6" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd">
+  <display-name>ejb-ejb30-hello-session3App</display-name>
+  <module>
+    <ejb>cdi-full-ear-ejb.jar</ejb>
+  </module>
+  <module>
+    <web>
+      <web-uri>cdi-full-ear-web.war</web-uri>
+      <context-root>cdi-full-ear</context-root>
+    </web>
+  </module>
+  <env-entry>
+     <env-entry-name>java:app/env/value1</env-entry-name>
+     <env-entry-type>java.lang.Integer</env-entry-type>
+     <env-entry-value>18338</env-entry-value>
+  </env-entry>
+  <env-entry>
+    <env-entry-name>java:app/env/myString</env-entry-name>
+    <env-entry-type>java.lang.String</env-entry-type>
+    <env-entry-value>myString</env-entry-value>
+  </env-entry>
+</application>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/descriptor/beans.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/descriptor/beans.xml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/descriptor/beans.xml
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/BarManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/BarManagedBean.java
new file mode 100644
index 0000000..473e12b
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/BarManagedBean.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+import javax.annotation.*;
+import javax.ejb.EJB;
+import javax.annotation.Resource;
+import javax.sql.DataSource;
+
+@ManagedBean
+public class BarManagedBean {
+
+    @EJB Hello s;
+    @Resource(name="jdbc/__default") DataSource ds;
+
+    @PostConstruct
+    private void init() {
+	System.out.println("In BarManagedBean::init() " + this);
+    }
+
+   public void bar() {
+       System.out.println("In BarManagedBean::bar() ");
+    }
+
+
+    @PreDestroy
+    private void destroy() {
+	System.out.println("In BarManagedBean::destroy() ");
+    }
+
+    public String toString() {
+	return "BarManagedBean this = " + super.toString() + 
+	    " s = " + s + " , ds = " + ds;
+
+    }
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Foo.java
new file mode 100644
index 0000000..658d9d0
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Foo.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+
+public interface Foo {
+
+    public void foo();
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooBarManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooBarManagedBean.java
new file mode 100644
index 0000000..e45f3ee
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooBarManagedBean.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+import javax.annotation.*;
+
+@ManagedBean("foobarmanagedbean")
+public class FooBarManagedBean {
+
+    @PostConstruct
+    private void init() {
+	System.out.println("In FooBarManagedBean::init() " + this);
+    }
+    
+    @PreDestroy
+    private void destroy() {
+	System.out.println("In FooBarManagedBean::destroy() ");
+    }
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooManagedBean.java
new file mode 100644
index 0000000..4fcb3c4
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooManagedBean.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+import javax.annotation.*;
+
+import javax.ejb.EJB;
+import javax.annotation.Resource;
+import org.omg.CORBA.ORB;
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+
+@ManagedBean("somemanagedbean")
+public class FooManagedBean extends ManagedSuper implements Foo {
+
+    @EJB HelloRemote s;
+    @Resource ORB orb;
+    @Resource BarManagedBean bmb;
+    @PersistenceContext EntityManager em;
+
+    @PostConstruct
+    private void init() {
+	System.out.println("In FooManagedBean::init() " + this);
+    }
+    
+
+    public String getName() {
+	return "somemanagedbean";
+    }
+
+    public void foo() {
+	System.out.println("In FooManagedBean::foo() ");
+	bmb.bar();
+    }
+
+    public Object getThis() {
+	return this;
+    }
+
+    @PreDestroy
+    private void destroy() {
+	System.out.println("In FooManagedBean::destroy() ");
+    }
+
+
+    public String toString() {
+	return "FooManagedBean this = " + super.toString() + 
+			   " s = " + s + " , orb = " + orb + 
+	    " , bmb = " + bmb + " , em = " + em;
+    }
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Hello.java
new file mode 100644
index 0000000..2ad0681
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Hello.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+
+
+public interface Hello {
+
+    public String hello();
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloRemote.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloRemote.java
new file mode 100644
index 0000000..fc138ad
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloRemote.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+import javax.ejb.Remote;
+
+@Remote
+public interface HelloRemote {
+
+    public String hello();
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloSingleton.java
new file mode 100644
index 0000000..014cdd7
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloSingleton.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+import javax.ejb.*;
+import javax.annotation.*;
+
+import org.omg.CORBA.ORB;
+
+
+@Singleton
+@Startup
+    @EJB(name="java:app/env/AS2", beanName="HelloStateless", beanInterface=HelloRemote.class)
+    @DependsOn("Singleton2")
+public class HelloSingleton implements Hello {
+
+    @Resource SessionContext sessionCtx;
+
+    @Resource(mappedName="java:module/foobarmanagedbean")
+    private FooBarManagedBean fbmb;
+
+    @Resource
+    private FooBarManagedBean fbmb2;
+
+    @Resource(name="java:module/env/MORB2")
+    private ORB orb;
+
+    @Resource 
+    private FooManagedBean foo;
+    
+    @Resource(name="foo2ref", mappedName="java:module/somemanagedbean")
+    private FooManagedBean foo2;
+
+    @Resource(name="foo3ref", mappedName="java:module/somemanagedbean")
+    private Foo foo3;
+
+    private FooManagedBean foo4;
+    private FooManagedBean foo5;
+    private Foo foo6;
+    private FooManagedBean foo7;
+    private Foo foo8;
+
+    @Resource(name = "java:app/env/myString")
+    protected String myString;
+
+    @EJB(name="java:app/env/appLevelEjbRef")
+    private Hello hello;
+    
+    String appName;
+    String moduleName;
+
+    @PostConstruct    
+    private void init() {
+	System.out.println("HelloSingleton::init()");
+
+	System.out.println("myString = '" + myString + "'");
+	if( (myString == null) || !(myString.equals("myString") ) ) {
+	    throw new RuntimeException("Invalid value " + myString + " for myString");
+	}
+
+	appName = (String) sessionCtx.lookup("java:app/AppName");
+	moduleName = (String) sessionCtx.lookup("java:module/ModuleName");
+
+	ORB orb1 = (ORB) sessionCtx.lookup("java:module/MORB1");
+	ORB orb2 = (ORB) sessionCtx.lookup("java:module/env/MORB2");
+
+	System.out.println("AppName = " + appName);
+	System.out.println("ModuleName = " + moduleName);
+
+	foo4 = (FooManagedBean) sessionCtx.lookup("java:module/somemanagedbean");
+	foo5 = (FooManagedBean) sessionCtx.lookup("java:app/" + moduleName +
+						  "/somemanagedbean");
+	foo6 = (Foo) sessionCtx.lookup("java:app/" + moduleName +
+						  "/somemanagedbean");
+	foo7 = (FooManagedBean) sessionCtx.lookup("java:comp/env/foo2ref");
+	foo8 = (Foo) sessionCtx.lookup("java:comp/env/foo3ref");
+    }
+
+    public String hello() {
+	
+	System.out.println("HelloSingleton::hello()");
+
+
+	foo.foo();
+	foo2.foo();
+	foo3.foo();
+
+	foo4.foo();
+	foo5.foo();
+	foo6.foo();
+	foo7.foo();
+      	foo8.foo();
+
+	return "hello, world!\n";
+    }
+
+
+    @PreDestroy
+    private void destroy() {
+	System.out.println("HelloSingleton::destroy()");
+    }
+
+}
+
+
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloStateless.java
new file mode 100644
index 0000000..ecd8f11
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloStateless.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+import javax.ejb.*;
+import javax.annotation.*;
+
+import org.omg.CORBA.ORB;
+
+@Stateless
+    @EJB(name="java:global/GS1", beanName="HelloSingleton", beanInterface=Hello.class)
+public class HelloStateless implements HelloRemote {
+
+    @EJB(name="java:app/env/AS1", beanName="HelloSingleton")
+    private Hello h;
+
+    @Resource(name="java:module/MORB1")
+    private ORB orb;
+    
+    @EJB(name="lookupref1", lookup="java:app/env/AS1")
+    private Hello lookupref1;
+
+    @EJB(name="lookupref2", lookup="java:global/GS1")
+    private Hello lookupref2;
+
+    @EJB(name="lookupref3", lookup="java:module/HelloStateless!com.acme.HelloRemote")
+    private HelloRemote lookupref3;
+
+    // declare component-level dependency using fully-qualified
+    // java:comp/env form.  
+    @Resource(name="java:comp/env/foo") SessionContext sessionCtx;
+
+    @PostConstruct 
+    private void init() {
+	System.out.println("HelloStateless::init()");
+    }
+
+    public String hello() {
+	System.out.println("In HelloStateless::hello()");
+
+	String appName = (String) sessionCtx.lookup("java:app/AppName");
+	String moduleName = (String) sessionCtx.lookup("java:module/ModuleName");
+	System.out.println("AppName = " + appName);
+	System.out.println("ModuleName = " + moduleName);
+
+	ORB orb1 = (ORB) sessionCtx.lookup("java:module/MORB1");
+	ORB orb2 = (ORB) sessionCtx.lookup("java:module/env/MORB2");
+
+	Hello s1 = (Hello) sessionCtx.lookup("java:global/" +
+					   appName + "/" +
+					   moduleName + "/" +
+					   "HelloSingleton");
+
+	Hello s2 = (Hello) sessionCtx.lookup("java:app/" +
+							 moduleName + "/" +
+							 "HelloSingleton");
+
+	// Rely on default to resolve "java:comp/env/ declared resource
+	SessionContext sc1 = (SessionContext)
+	    sessionCtx.lookup("foo");
+
+	SessionContext sc2 = (SessionContext)
+	    sc1.lookup("java:comp/env/foo");
+
+	Integer envEntry = (Integer)
+	    sc1.lookup("java:app/env/value1");
+	System.out.println("java:ap/env/value1 = " + envEntry);
+
+	return "hello, world!\n";
+    }
+
+    @PreDestroy
+    private void destroy() {
+	System.out.println("HelloStateless::destroy()");
+    }
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/ManagedSuper.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/ManagedSuper.java
new file mode 100644
index 0000000..c52c898
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/ManagedSuper.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+import javax.annotation.*;
+import javax.ejb.EJB;
+import javax.annotation.Resource;
+import javax.sql.DataSource;
+
+public class ManagedSuper {
+
+    @EJB Hello s;
+    @Resource(name="jdbc/__default") DataSource ds;
+
+    @PostConstruct
+    private void init() {
+	System.out.println("In ManagedSuper::init() " + this);
+    }
+
+    @PreDestroy
+    private void destroy() {
+	System.out.println("In ManagedSuper::destroy() ");
+    }
+
+    public String toString() {
+	return "ManagedSuper this = " + super.toString() + 
+	    " s = " + s + " , ds = " + ds;
+
+    }
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton2.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton2.java
new file mode 100644
index 0000000..18dbb03
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton2.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+import javax.ejb.*;
+import javax.annotation.*;
+
+
+@Singleton
+@DependsOn("cdi-full-ear-ejb.jar#Singleton3")
+public class Singleton2 {
+
+    @PostConstruct
+    public void init() {
+        System.out.println("In SingletonBean2::init()");
+    }
+    
+    @PreDestroy
+    public void destroy() {
+        System.out.println("In SingletonBean2::destroy()");
+    }
+
+
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton3.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton3.java
new file mode 100644
index 0000000..364046b
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton3.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+import javax.ejb.*;
+import javax.annotation.*;
+
+
+@Singleton
+@DependsOn("./cdi-full-ear-ejb.jar#Singleton4")
+public class Singleton3 {
+
+    @PostConstruct
+    public void init() {
+        System.out.println("In SingletonBean3::init()");
+    }
+    
+    @PreDestroy
+    public void destroy() {
+        System.out.println("In SingletonBean3::destroy()");
+    }
+
+
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton4.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton4.java
new file mode 100644
index 0000000..9d3ff4a
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton4.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+import javax.ejb.*;
+import javax.annotation.*;
+
+
+@Singleton
+public class Singleton4 {
+
+    @PostConstruct
+    public void init() {
+        System.out.println("In SingletonBean4::init()");
+    }
+    
+    @PreDestroy
+    public void destroy() {
+        System.out.println("In SingletonBean4::destroy()");
+    }
+
+
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/manifest.mf b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/manifest.mf
new file mode 100644
index 0000000..328e8e5
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/manifest.mf
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+X-COMMENT: Main-Class will be added automatically by build
+
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo.java
new file mode 100644
index 0000000..658d9d0
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+
+public interface Foo {
+
+    public void foo();
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo2ManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo2ManagedBean.java
new file mode 100644
index 0000000..e3b9464
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo2ManagedBean.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+import javax.annotation.*;
+
+import javax.ejb.EJB;
+import javax.annotation.Resource;
+import org.omg.CORBA.ORB;
+import javax.persistence.PersistenceContext;
+import javax.persistence.EntityManager;
+
+@ManagedBean("somemanagedbean")
+public class Foo2ManagedBean {
+
+    @EJB HelloRemote s;
+    @Resource ORB orb;
+    @PersistenceContext EntityManager em;
+
+    @PostConstruct
+    private void init() {
+	System.out.println("In Foo2ManagedBean::init() " + this);
+    }
+    
+    public void foo() {
+	System.out.println("In Foo2ManagedBean::foo() ");
+    }
+
+    public Object getThis() {
+	return this;
+    }
+
+    @PreDestroy
+    private void destroy() {
+	System.out.println("In Foo2ManagedBean::destroy() ");
+    }
+
+
+    public String toString() {
+	return "Foo2ManagedBean this = " + 
+			   " s = " + s + " , orb = " + orb + 
+	    " , em = " + em;
+    }
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/FooBarManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/FooBarManagedBean.java
new file mode 100644
index 0000000..e45f3ee
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/FooBarManagedBean.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+import javax.annotation.*;
+
+@ManagedBean("foobarmanagedbean")
+public class FooBarManagedBean {
+
+    @PostConstruct
+    private void init() {
+	System.out.println("In FooBarManagedBean::init() " + this);
+    }
+    
+    @PreDestroy
+    private void destroy() {
+	System.out.println("In FooBarManagedBean::destroy() ");
+    }
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Hello.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Hello.java
new file mode 100644
index 0000000..d08c598
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Hello.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+import javax.ejb.Remote;
+
+public interface Hello {
+
+    public String hello();
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloRemote.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloRemote.java
new file mode 100644
index 0000000..fc138ad
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloRemote.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+import javax.ejb.Remote;
+
+@Remote
+public interface HelloRemote {
+
+    public String hello();
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloServlet.java
new file mode 100644
index 0000000..171d1f8
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloServlet.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+import javax.ejb.EJB;
+import java.io.IOException;
+import java.io.PrintWriter;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.annotation.WebServlet;
+import javax.annotation.Resource;
+import javax.naming.*;
+
+@WebServlet(urlPatterns = "/HelloServlet", loadOnStartup = 1)
+@EJB(name = "java:module/m1", beanName = "HelloSingleton", beanInterface = Hello.class)
+public class HelloServlet extends HttpServlet {
+
+    @Resource(mappedName = "java:module/foobarmanagedbean")
+    private FooBarManagedBean fbmb;
+    @Resource
+    private FooBarManagedBean fbmb2;
+
+    @EJB(name = "java:module/env/m2")
+    private Hello m1;
+    @EJB(name = "java:app/a1")
+    private HelloRemote a1;
+    @EJB(name = "java:app/env/a2")
+    private HelloRemote a2;
+    @Resource(name = "java:app/env/myString")
+    protected String myString;
+    private Hello singleton1;
+    private Hello singleton2;
+    private Hello singleton3;
+    private Hello singleton4;
+    private Hello singleton5;
+    private HelloRemote stateless1;
+    private HelloRemote stateless2;
+
+    @Resource
+    private Foo2ManagedBean foo;
+    @Resource(name = "foo2ref", mappedName = "java:module/somemanagedbean")
+    private Foo2ManagedBean foo2;
+    @Resource(name = "foo3ref", mappedName = "java:app/cdi-full-ear-ejb/somemanagedbean")
+    private Foo foo3;
+    private Foo2ManagedBean foo4;
+    private Foo2ManagedBean foo5;
+    private Foo foo6;
+    private Foo2ManagedBean foo7;
+    private Foo foo8;
+
+    private String msg = "";
+
+    @Override
+    public void init(ServletConfig config) throws ServletException {
+        super.init(config);
+
+        System.out.println("In HelloServlet::init");
+        System.out.println("myString = '" + myString + "'");
+        if ((myString == null) || !(myString.equals("myString"))) {
+            msg += "@Resource lookup of myString failed";
+            throw new RuntimeException("Invalid value " + myString + " for myString");
+        }
+
+    }
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+            throws ServletException, IOException {
+        System.out.println("In HelloServlet::doGet");
+        resp.setContentType("text/html");
+        checkForNull(foo, "@Resource lookup of ManagedBean failed");
+        checkForNull(foo2, "@Resource lookup of module-level ManagedBean failed");
+        checkForNull(foo3, "@Resource lookup of app-level ManagedBean through a super-interface failed");
+
+        PrintWriter out = resp.getWriter();
+        try {
+            InitialContext ic = new InitialContext();
+            String appName = (String) ic.lookup("java:app/AppName");
+            String moduleName = (String) ic.lookup("java:module/ModuleName");
+            checkForNull(appName, "AppName lookup returned null");
+            checkForNull(moduleName, "ModuleName lookup returned null");
+
+            // lookup via intermediate context
+            Context appCtx = (Context) ic.lookup("java:app");
+            Context appCtxEnv = (Context) appCtx.lookup("env");
+            stateless2 = (HelloRemote) appCtxEnv.lookup("AS2");
+            checkForNull(stateless2, "lookup of stateless EJB via java:app in intermediate context failed");
+            NamingEnumeration<Binding> bindings = appCtxEnv.listBindings("");
+            System.out.println("java:app/env/ bindings ");
+            while (bindings.hasMore()) {
+                System.out.println("binding : " + bindings.next().getName());
+            }
+
+
+            foo4 = (Foo2ManagedBean) ic.lookup("java:module/somemanagedbean");
+            checkForNull(foo4, "programmatic lookup of module-level managedbean failed");
+            foo5 = (Foo2ManagedBean) ic.lookup("java:app/" + moduleName
+                    + "/somemanagedbean");
+            checkForNull(foo5, "programmatic lookup of module-level managedbean through application context failed");
+            foo6 = (Foo) ic.lookup("java:app/cdi-full-ear-ejb/somemanagedbean");
+            checkForNull(foo6, "programmatic lookup of application-level managedbean failed");
+            foo7 = (Foo2ManagedBean) ic.lookup("java:comp/env/foo2ref");
+            checkForNull(foo7, "programmatic lookup of module-level managedbean through a component reference failed");
+            foo8 = (Foo) ic.lookup("java:comp/env/foo3ref");
+            checkForNull(foo8, "programmatic lookup of module-level managedbean through a component reference failed");
+
+            singleton1 = (Hello) ic.lookup("java:module/m1");
+            checkForNull(singleton1, "programmatic lookup of module-level singleton EJB failed");
+
+            // standard java:app name for ejb
+            singleton2 = (Hello) ic.lookup("java:app/cdi-full-ear-ejb/HelloSingleton");
+            checkForNull(singleton2, "programmatic lookup of module-level singleton EJB through app reference failed");
+
+            singleton3 = (Hello) ic.lookup("java:global/" + appName + "/cdi-full-ear-ejb/HelloSingleton");
+            checkForNull(singleton3, "programmatic lookup of module-level singleton EJB through global reference failed");
+
+            // lookup some java:app defined by ejb-jar
+            singleton4 = (Hello) ic.lookup("java:app/env/AS1");
+            checkForNull(singleton4, "programmatic lookup of module-level singleton EJB through EJB name failed");
+            // global dependency
+            singleton5 = (Hello) ic.lookup("java:global/GS1");
+            checkForNull(singleton5, "programmatic lookup of singleton EJB through global name failed");
+
+            stateless1 = (HelloRemote) ic.lookup("java:app/env/AS2");
+            checkForNull(stateless1, "programmatic lookup of app-level stateless EJB failed");
+
+            System.out.println("My AppName = "
+                    + ic.lookup("java:app/AppName"));
+
+            System.out.println("My ModuleName = "
+                    + ic.lookup("java:module/ModuleName"));
+
+
+
+            try {
+                org.omg.CORBA.ORB orb = (org.omg.CORBA.ORB) ic.lookup("java:module/MORB1");
+                msg += " Not getting naming exception when we try to see ejb-jar module-level dependency";
+                throw new RuntimeException("Should have gotten naming exception");
+            } catch (NamingException ne) {
+                System.out.println("Successfully was *not* able to see ejb-jar module-level dependency");
+            }
+
+        } catch (Exception e) {
+            msg += "Exception occurred during test Exception: " + e.getMessage();
+            e.printStackTrace();
+        }
+
+        foo.foo();
+        foo2.foo();
+        foo3.foo();
+
+        foo4.foo();
+        foo5.foo();
+        foo6.foo();
+        foo7.foo();
+        foo8.foo();
+
+        m1.hello();
+        a1.hello();
+        a2.hello();
+        singleton1.hello();
+        singleton2.hello();
+        singleton3.hello();
+        singleton4.hello();
+        singleton5.hello();
+
+        stateless1.hello();
+        stateless2.hello();
+
+        out.println(msg);
+
+    }
+
+    protected void checkForNull(Object o, String errorMessage){
+        if (o == null) msg += " " + errorMessage;
+    }
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/build.properties
new file mode 100644
index 0000000..e0533ab
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/build.properties
@@ -0,0 +1,38 @@
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+ 
+
+<property name="module" value="simple-ejb-cdi"/>
+<property name="appname" value="${module}"/>         
+<property name="assemble" value="${build.classes.dir}/archive"/>
+<property name="simple.client" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient"/>
+<property name="simple.client2" value="com.sun.s1asdev.ejb.ejb30.hello.session.client.StandaloneClient2"/>
+<property name="test.client" 
+	value="Client"/>
+<property name="application.xml" value="descriptor/application.xml"/>
+<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
+<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
+<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
+<property name="beans.xml" value="descriptor/beans.xml"/>
+<property name="application-client.xml" 
+	value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml" 
+	value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/>         
+<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
+<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/build.xml
new file mode 100644
index 0000000..2dc8d89
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/build.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<!DOCTYPE project [
+<!ENTITY commonSetup SYSTEM "./../../../../config/properties.xml">
+<!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
+<!ENTITY testproperties SYSTEM "./build.properties">
+]>
+
+<project name="simple-ejb-cdi" default="usage" basedir=".">
+
+    &commonSetup;
+    &commonBuild;
+    &testproperties;
+
+    <target name="all" depends="build,deploy,run,undeploy"/>
+
+    <target name="clean" depends="init-common">
+      <antcall  target="clean-common"/>
+      <delete file="client/Client.java"/>
+    </target>
+ 
+    <target name="compile" depends="clean">
+        <copy file="client/Client.java.token" tofile="client/Client.java"/>
+        <replace file="client/Client.java"
+          token="@ORB_PORT@" value="${orb.port}"/>
+
+        <antcall target="compile-common">
+            <param name="src" value="ejb"/>
+        </antcall>
+        <antcall target="compile-common">
+            <param name="src" value="client"/>
+        </antcall>
+    </target>
+
+    <target name="build" depends="compile">
+        <antcall target="build-ear-common">
+            <param name="ejbjar.classes" 
+              value="**/Sful*.class,**/Sless*.class, **/TestBean.class"/>
+            <param name="appclientjar.classes" 
+              value="**/Client.class,**/Sful.class,**/Sless.class"/>
+        </antcall>
+    </target> 
+    
+    <target name="deploy" 
+            depends="init-common">
+        <antcall target="deploy-common"/>
+    </target>
+
+    <target name="run" depends="init-common">
+        <antcall target="runclient-common"/>
+<!--
+        <antcall target="run_standaloneclient"/>
+        <antcall target="run_standaloneclient2"/>
+-->
+    </target>
+
+ 
+    <target name="run_standaloneclient" depends="init-common">
+       <java  fork="on" 
+              failonerror="true"
+              classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
+              classname="${simple.client}">
+        <sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
+        </java>
+    </target>
+
+    <target name="run_standaloneclient2" depends="init-common">
+       <java  fork="on" 
+              failonerror="true"
+              classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
+              classname="${simple.client2}">
+              <jvmarg
+                   value="-Djava.naming.factory.initial=com.sun.jndi.cosnaming.CNCtxFactory"/>
+              <jvmarg
+                   value="-Djava.naming.provider.url=iiop://localhost:${orb.port}"/>
+              <jvmarg
+                   value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
+
+        </java>
+    </target>
+
+    <target name="undeploy" depends="init-common">
+        <antcall target="undeploy-common"/>
+    </target>   
+
+    <target name="usage">
+        <antcall target="usage-common"/>
+    </target>
+</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/client/Client.java.token b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/client/Client.java.token
new file mode 100644
index 0000000..39f9798
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/client/Client.java.token
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2008, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.sun.s1asdev.cdi.ejb.hello.session.client;
+
+
+import java.io.*;
+import java.util.*;
+import javax.ejb.EJB;
+import javax.naming.InitialContext;
+import com.sun.s1asdev.cdi.ejb.hello.session.*;
+import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
+
+public class Client {
+
+    private static SimpleReporterAdapter stat = 
+        new SimpleReporterAdapter("appserv-tests");
+
+    public static void main (String[] args) {
+
+        stat.addDescription("simple-ejb-cdi");
+        Client client = new Client(args);
+        client.doTest();
+        stat.printSummary("simple-ejb-cdi");
+    }  
+    
+    public Client (String[] args) {
+    }
+
+    private static @EJB Sful sful;
+    
+    private static @EJB(mappedName="com.sun.s1asdev.cdi.ejb.hello.session.Sless") Sless sless;
+
+    //
+    // NOTE: Token @ORB_PORT@ will be replaced in @EJB annotations below 
+    // with the value of the port from config.properties during the build
+    //
+    private static @EJB(mappedName="corbaname:iiop:localhost:@ORB_PORT@#com.sun.s1asdev.cdi.ejb.hello.session.Sless") Sless sless2;
+
+    private static @EJB(mappedName="corbaname:iiop:localhost:@ORB_PORT@#java:global/simple-ejb-cdiApp/simple-ejb-cdi-ejb/SlessEJB!com.sun.s1asdev.cdi.ejb.hello.session.Sless") Sless sless3;
+
+    private static @EJB(mappedName="corbaname:iiop:localhost:@ORB_PORT@#java:global/simple-ejb-cdiApp/simple-ejb-cdi-ejb/SlessEJB") Sless sless4;
+
+    public void doTest() {
+
+        try {
+
+      System.out.println("Creating InitialContext()");
+	    InitialContext ic = new InitialContext();
+	    org.omg.CORBA.ORB orb = (org.omg.CORBA.ORB) ic.lookup("java:comp/ORB"); 
+	    Sful sful = (Sful) ic.lookup("com.sun.s1asdev.cdi.ejb.hello.session.Sful");
+	    Sless sless = (Sless) ic.lookup("com.sun.s1asdev.cdi.ejb.hello.session.Sless");
+
+            String response = null;
+
+            response = sful.hello();
+            testResponse("invoking stateful", response);
+
+            response = sless.hello();
+            testResponse("invoking stateless", response);
+
+	        response = sless2.hello();
+            testResponse("invoking stateless2", response);
+
+            System.out.println("ensuring that sless1 and sless2 are not equal");
+            if( !sless.equals(sless2) ) {
+                stat.addStatus("ensuring that sless1 and sless2 are not equal" , stat.FAIL);
+                throw new Exception("invalid equality checks on same " +
+                                    "sless session beans");
+            }
+
+
+	        response = sless3.hello();
+            testResponse("invoking stateless3", response);
+	        response = sless4.hello();
+            testResponse("invoking stateless4", response);
+
+            System.out.println("test complete");
+
+            stat.addStatus("local main", stat.PASS);
+
+        } catch(Exception e) {
+            e.printStackTrace();
+            stat.addStatus("local main" , stat.FAIL);
+        }
+        
+    	return;
+    }
+
+    private void testResponse(String testDescription, String response){
+        if(response.equals("hello")) 
+            stat.addStatus(testDescription, stat.PASS);
+        else
+            stat.addStatus(testDescription, stat.FAIL);
+    }
+
+}
+
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/client/MANIFEST.MF
new file mode 100644
index 0000000..0b2b85f
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/client/MANIFEST.MF
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+Created-By: 1.4.0-beta3 (Sun Microsystems Inc.)
+Main-Class: com.sun.s1asdev.cdi.ejb.hello.session.client.Client
+Class-Path: reporter.jar
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/descriptor/beans.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/descriptor/beans.xml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/descriptor/beans.xml
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sful.java
new file mode 100644
index 0000000..bd40dc3
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sful.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.sun.s1asdev.cdi.ejb.hello.session;
+
+import javax.ejb.Remote;
+	
+@Remote
+public interface Sful
+{
+    public String hello();
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SfulEJB.java
new file mode 100644
index 0000000..ded6d50
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SfulEJB.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.sun.s1asdev.cdi.ejb.hello.session;
+
+import javax.ejb.Stateful;
+import javax.inject.Inject;
+
+@Stateful
+public class SfulEJB implements Sful
+{
+    @Inject TestBean tb; // field injection
+
+/*
+@todo: check why constructor injection doesn't work
+    TestBean tb;
+    @Inject
+    public SfulEJB(TestBean tb){
+        this.tb = tb;
+        if (tb == null) throw new RuntimeException("tb is null");
+    }
+*/
+    public String hello() {
+        System.out.println("In SfulEJB:hello()");
+        if (tb != null) return "hello";
+        else return null;
+    }
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sless.java
new file mode 100644
index 0000000..97fe185
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sless.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.sun.s1asdev.cdi.ejb.hello.session;
+
+import javax.ejb.Remote;
+
+@Remote
+public interface Sless
+{
+    public String hello();
+
+    public org.glassfish.common.util.timer.TimerSchedule foo ();
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SlessEJB.java
new file mode 100644
index 0000000..dec52e0
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SlessEJB.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.sun.s1asdev.cdi.ejb.hello.session;
+
+import javax.ejb.Stateless;
+import javax.inject.Inject;
+
+@Stateless
+public class SlessEJB implements Sless
+{
+    @Inject TestBean tb; //Field Injection
+
+    public String hello() {
+        System.out.println("In SlessEJB:hello()");
+        if (tb != null) return "hello";
+        else return null;
+    }
+
+    public org.glassfish.common.util.timer.TimerSchedule foo () {return null;}
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/TestBean.java
new file mode 100644
index 0000000..3f97997
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/TestBean.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.sun.s1asdev.cdi.ejb.hello.session;
+
+
+//Simple TestBean to test CDI. This bean implements Serializable as it needs to be placed into a Stateful Bean
+public class TestBean implements java.io.Serializable
+{}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/readme.txt b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/readme.txt
new file mode 100644
index 0000000..bad16d6
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/readme.txt
@@ -0,0 +1 @@
+client/Client.java is created during build process from client/Client.java.token via copying it and replacing token @ORB_PORT@ with the ORB port number from config.properties (${orb.pprt}).
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/build.properties
new file mode 100644
index 0000000..982c344
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/build.properties
@@ -0,0 +1,27 @@
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+ 
+
+<property name="module" value="cdi-singleton-hello"/>
+<property name="appname" value="${module}"/> 
+<property name="jndiroot" value="${appname}-ejb"/>    
+<property name="assemble" value="${build.classes.dir}/archive"/>
+<property name="se.client" value="com.acme.Client"/>
+<property name="beans.xml" value="descriptor/beans.xml"/>
+	
+
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/build.xml
new file mode 100644
index 0000000..ad8c001
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/build.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<!DOCTYPE project [
+<!ENTITY commonSetup SYSTEM "./../../../../../config/properties.xml">
+<!ENTITY commonBuild SYSTEM "./../../../../../config/common.xml">
+<!ENTITY testproperties SYSTEM "./build.properties">
+]>
+
+<project name="cdi-singleton-hello-App" default="usage" basedir=".">
+
+    &commonSetup;
+    &commonBuild;
+    &testproperties;
+
+    <target name="all" depends="build,deploy,run,undeploy"/>
+
+    <target name="clean" depends="init-common">
+      <antcall  target="clean-common"/>
+    </target>
+ 
+    <target name="compile" depends="clean">
+        <antcall target="compile-common">
+            <param name="src" value="ejb"/>
+        </antcall>
+        <antcall target="compile-common">
+            <param name="src" value="client"/>
+        </antcall>
+    </target>
+
+    <target name="build" depends="compile">
+        <antcall target="ejb-jar-common">
+            <param name="ejbjar.classes" 
+              value="**/Foo*.class,**/Test*.class,**/Singleton*.class,**/Hello*.class"/>
+        </antcall>
+    </target> 
+    
+    <target name="deploy" 
+            depends="init-common">
+        <antcall target="deploy-jar-common"/>
+    </target>
+
+    <target name="run" depends="init-common">
+        <antcall target="run_se"/>
+    </target>
+ 
+    <target name="run_se" depends="init-common">
+       <java  fork="on" 
+              failonerror="true"
+              classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
+              classname="${se.client}">
+           <sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
+           <arg line="${jndiroot}"/>
+        </java>
+    </target>
+
+    <target name="undeploy" depends="init-common">
+        <antcall target="undeploy-jar-common"/>
+    </target>   
+
+    <target name="usage">
+        <antcall target="usage-common"/>
+    </target>
+</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/client/Client.java
new file mode 100644
index 0000000..cc27565
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/client/Client.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+
+import javax.ejb.*;
+import javax.annotation.*;
+
+import javax.naming.InitialContext;
+
+import javax.management.j2ee.ManagementHome;
+import javax.management.j2ee.Management;
+import javax.rmi.PortableRemoteObject;
+
+import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
+
+public class Client {
+
+    private static SimpleReporterAdapter stat = 
+        new SimpleReporterAdapter("appserv-tests");
+
+    private static String appName;
+
+    public static void main(String args[]) {
+
+	appName = args[0]; 
+	stat.addDescription(appName);
+	Client client = new Client(args);       
+        client.doTest();	
+        stat.printSummary(appName + "ID");
+    }
+
+    public Client(String[] args) {}
+
+    public void doTest() {
+
+	try {
+
+	    // Ensure that MEJB is registered under all three of its JNDI names
+	    System.out.println("Looking up MEJB Homes");
+	    ManagementHome mh1Obj = (ManagementHome) new InitialContext().lookup("ejb/mgmt/MEJB");
+	    ManagementHome mh2Obj = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean");
+	    ManagementHome mh3Obj = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean!javax.management.j2ee.ManagementHome");
+        addStatus("mejb relative lookup", (mh1Obj != null));
+        addStatus("mejb global lookup", (mh2Obj != null));
+        addStatus("mejb global lookup with explicit ManagedHome interface", (mh3Obj != null));
+
+	    Hello hello = (Hello) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
+        String response = hello.hello();
+        addStatus("Singleton bean response", response.equals("hello, world!\n"));
+
+	    try {
+    		hello.testError();
+            addStatus("Expected EJBException from Singleton.testError()", false);
+	    	throw new RuntimeException("Expected EJBException");
+	    } catch(EJBException e) {
+            addStatus("Expected EJBException from Singleton.testError()", true);
+	    }
+
+        String injectionStatus = hello.testInjection();
+        System.out.println("Injection tests in server response"+ injectionStatus);
+        addStatus("Testing Injection in EJB Singleton" , injectionStatus.trim().equals(""));
+
+	} catch(Exception e) {
+	    stat.addStatus("local main", stat.DID_NOT_RUN);
+	    e.printStackTrace();
+	}
+    }
+
+    private void addStatus(String message, boolean result){
+            stat.addStatus(message, (result ? stat.PASS: stat.FAIL));
+    }
+
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/descriptor/beans.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/descriptor/beans.xml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/descriptor/beans.xml
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Foo.java
new file mode 100644
index 0000000..1d87d9d
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Foo.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+import javax.ejb.*;
+
+public class Foo {
+
+    @EJB Hello hello;
+    @javax.inject.Inject TestBean tb;
+    
+    public boolean testInjection(){
+        return tb != null;
+    }
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Hello.java
new file mode 100644
index 0000000..23f4df7
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Hello.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+public interface Hello {
+
+    String hello();
+
+    void testError();
+    String testInjection();
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/SingletonBean.java
new file mode 100644
index 0000000..5493293
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/SingletonBean.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+import javax.ejb.*;
+import javax.annotation.*;
+import org.omg.CORBA.ORB;
+
+import javax.naming.InitialContext;
+
+import javax.management.j2ee.ManagementHome;
+import javax.inject.Inject;
+
+@Singleton
+@Remote(Hello.class)
+    @EJB(name="mejb", beanInterface=javax.management.j2ee.ManagementHome.class, mappedName="ejb/mgmt/MEJB")
+@Startup
+public class SingletonBean {
+
+    @Resource
+    private ORB orb;
+
+    @Inject Foo foo;
+    @Inject TestBean tb;
+
+    /*Object returned from IIOP_OBJECT_FACTORY is still ior
+    @EJB(mappedName="ejb/mgmt/MEJB")
+    ManagementHome mHome1;
+    */
+
+    /* Object returned from IIOP_OBJECT_FACTORY is still ior
+    @EJB(lookup="java:global/mejb/MEJBBean")
+    ManagementHome mHome2;
+    */
+
+    /* Doesn't work b/c actual MEJB app Home interface is new glassfish
+     * type, so actual type derived from field declaration is tacked
+     * onto mappedName and results in NameNotFound
+    @EJB(mappedName="java:global/mejb/MEJBBean")
+    ManagementHome mHome2;
+    */
+
+    
+
+
+    //MEJBHome mHome2;
+
+    @PostConstruct
+    public void init() {
+        System.out.println("In SingletonBean::init()");
+        System.out.println("orb = " + orb);
+	if( orb == null ) {
+	    throw new EJBException("null ORB");
+	}
+	try {
+	    // same problem ManagementHome mHomeL = (ManagementHome) new InitialContext().lookup("java:comp/env/mejb");
+	    // same problem ManagementHome mHomeL2 = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean");
+	    // System.out.println("mHomeL = " + mHomeL);
+	    // System.out.println("mHomeL2 = " + mHomeL2);
+	} catch(Exception e) {
+	    throw new EJBException(e);
+	}
+
+	// System.out.println("mHome1 = " + mHome1);
+	//	System.out.println("mHome2 = " + mHome2);
+
+    }
+    
+    public String hello() {
+	System.out.println("In SingletonBean::hello()");
+	return "hello, world!\n";
+    }
+
+    public void testError() {
+	throw new Error("test java.lang.Error");
+    }
+
+    public String testInjection(){
+        if (foo == null) return "foo is null";
+        if (tb == null) return "tb is null";
+        if (!foo.testInjection()) return "testInjection in Foo failed";
+        return "";
+    }
+        
+
+    @PreDestroy
+    public void destroy() {
+        System.out.println("In SingletonBean::destroy()");
+    }
+
+
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/TestBean.java
new file mode 100644
index 0000000..22e521a
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/TestBean.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+//Simple test bean to test injection
+public class TestBean {}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/README b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/README
new file mode 100644
index 0000000..f6d9f21
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/README
@@ -0,0 +1 @@
+ A modification of the simple managed bean intereceptor test that uses non-default packages for the Managed Beans to get around Issue WELD-728
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/WebTest.java
new file mode 100644
index 0000000..76b21c9
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/WebTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
+
+/*
+ * Unit test for @WebServlet
+ */
+public class WebTest {
+
+    private static SimpleReporterAdapter stat
+        = new SimpleReporterAdapter("appserv-tests");
+    private static final String TEST_NAME = "simple-managed-bean-interceptor-with-non-default-packaged-beans";
+    private static final String EXPECTED_RESPONSE = "Hello from Servlet 3.0. initParams: n1=v1, n2=v2";
+
+    private String host;
+    private String port;
+    private String contextRoot;
+
+    public WebTest(String[] args) {
+        host = args[0];
+        port = args[1];
+        contextRoot = args[2];
+    }
+    
+    public static void main(String[] args) {
+        stat.addDescription("Unit test for @WebServlet");
+        WebTest webTest = new WebTest(args);
+        webTest.doTest();
+        stat.printSummary(TEST_NAME);
+    }
+
+    public void doTest() {
+        try { 
+            invoke();
+        } catch (Exception ex) {
+            System.out.println(TEST_NAME + " test failed");
+            stat.addStatus(TEST_NAME, stat.FAIL);
+            ex.printStackTrace();
+        }
+    }
+
+    private void invoke() throws Exception {
+        
+        String url = "http://" + host + ":" + port + contextRoot
+                     + "/myurl";
+        System.out.println("opening connection to " + url);
+        HttpURLConnection conn = (HttpURLConnection)
+            (new URL(url)).openConnection();
+
+        int code = conn.getResponseCode();
+        if (code != 200) {
+            System.out.println("Unexpected return code: " + code);
+            stat.addStatus(TEST_NAME, stat.FAIL);
+        } else {
+            InputStream is = null;
+            BufferedReader input = null;
+            String line = null;
+            try {
+                is = conn.getInputStream();
+                input = new BufferedReader(new InputStreamReader(is));
+                line = input.readLine();
+                System.out.println("line = " + line);
+            } finally {
+                try {
+                    if (is != null) {
+                        is.close();
+                    }
+                } catch(IOException ioe) {
+                    // ignore
+                }
+                try {
+                    if (input != null) {
+                        input.close();
+                    }
+                } catch(IOException ioe) {
+                    // ignore
+                }
+            }
+            if (EXPECTED_RESPONSE.equals(line)) {
+                stat.addStatus(TEST_NAME, stat.PASS);
+            } else {
+                System.out.println("Wrong response. Expected: " + 
+                        EXPECTED_RESPONSE + ", received: " + line);
+                stat.addStatus(TEST_NAME, stat.FAIL);
+            }
+        }    
+    }
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/build.properties
new file mode 100644
index 0000000..a4d5078
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/build.properties
@@ -0,0 +1,24 @@
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+ 
+
+<property name="module" value="cdi"/>
+<property name="appname" value="${module}-simple-managed-bean-interceptor-with-non-default-packages"/>
+<property name="assemble" value="${build.classes.dir}/archive"/>
+<property name="contextroot" value="/${appname}"/>
+<property name="beans.xml" value="descriptor/beans.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/build.xml
new file mode 100644
index 0000000..83ad666
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/build.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<!DOCTYPE project [
+<!ENTITY commonSetup SYSTEM "./../../../../config/properties.xml">
+<!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
+<!ENTITY run SYSTEM "./../../../../config/run.xml">
+<!ENTITY testproperties SYSTEM "./build.properties">
+]>
+
+<project name="webcontainer_unittest" default="all" basedir=".">
+
+    &commonSetup;
+    &commonBuild;
+    &testproperties;
+    &run;
+
+    <target name="all" depends="build,deploy,run,undeploy"/>
+
+    <target name="clean" depends="init-common">
+        <antcall target="clean-common"/>
+        <delete>
+            <fileset dir="." includes="*.class"/>
+        </delete>
+    </target>
+       
+    <target name="compile" depends="clean">
+        <antcall target="compile-common">
+            <param name="src" value="servlet"/>
+        </antcall>
+    </target>
+
+    <target name="build" depends="compile">
+        <property name="hasWebclient" value="yes"/> 
+        <antcall target="webclient-war-common">
+            <param name="hasWebclient" value="yes"/>
+            <param name="webclient.war.classes" value="**/*.class"/> 
+        </antcall>
+
+        <javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
+               includes="WebTest.java"/>
+
+    </target> 
+
+    <target name="build-publish-war" depends="build, publish-war-common" />
+    
+    <target name="deploy" depends="init-common">
+        <antcall target="deploy-war-common"/>
+    </target>
+    
+    <target name="run" depends="init-common">
+        <java classname="WebTest">
+          <arg value="${http.host}"/>
+          <arg value="${http.port}"/>
+          <arg value="${contextroot}"/>
+          <classpath>
+           <pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
+           <pathelement location="."/>
+         </classpath>
+        </java>
+    </target>
+ 
+    <target name="undeploy" depends="init-common">
+        <antcall target="undeploy-war-common"/>
+    </target>   
+
+    <target name="usage">
+        <antcall target="usage-common"/>
+    </target>
+</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/descriptor/beans.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/descriptor/beans.xml
new file mode 100644
index 0000000..a52bc90
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/descriptor/beans.xml
@@ -0,0 +1,24 @@
+<!--
+
+    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<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.tests.TestAroundInvokeInterceptor</class>
+   </interceptors>
+</beans>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestAroundInvokeInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestAroundInvokeInterceptor.java
new file mode 100644
index 0000000..379dfbf
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestAroundInvokeInterceptor.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.tests;
+
+import javax.interceptor.*;
+
+@Tester @Interceptor
+public class TestAroundInvokeInterceptor {
+    public static int aroundInvokeCount = 0;
+
+    public static void reset(){
+        aroundInvokeCount = 0;
+    }
+
+   @AroundInvoke 
+   public Object testMethod(InvocationContext ctx) throws Exception {
+        System.out.println("TestAroundInvokeIntercetpr:: aroundInvoke called - target:" + ctx.getTarget() + " , params:"+ ctx.getParameters());
+        aroundInvokeCount ++;
+        ctx.proceed();
+        return null;
+   }
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestBean.java
new file mode 100644
index 0000000..8de8781
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestBean.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.tests;
+
+//Simple Bean to test injection into ManagedBeans
+public class TestBean {
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestManagedBean.java
new file mode 100644
index 0000000..b0b60ef
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestManagedBean.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.tests;
+
+//Simple TestBean to test CDI. 
+//This bean implements Serializable as it needs to be placed into a Stateful Bean
+@javax.annotation.ManagedBean
+public class TestManagedBean {
+    TestBean tb;
+    boolean postConstructCalled = false;
+
+
+    //A Managed Bean needs to have a no-arg constructor
+    public TestManagedBean() {}
+    @javax.inject.Inject //Constructor based Injection
+    public TestManagedBean(TestBean tb){
+        this.tb = tb;
+    }
+
+
+    @javax.annotation.PostConstruct
+    public void init(){
+        System.out.println("In ManagedBean:: PostConstruct");
+        postConstructCalled = true;
+    }
+
+    @Tester
+    public void foo(){
+        System.out.println("foo called");
+    }
+
+    public boolean testPostConstructCalled(){
+        return this.postConstructCalled;
+    }
+
+    public boolean testInjection(){
+        System.out.println("In ManagedBean:: tb=" + tb);
+        postConstructCalled = true;
+        return this.tb != null;
+    }
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestServlet.java
new file mode 100644
index 0000000..9fac0e4
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/TestServlet.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.tests;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Enumeration;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@WebServlet(name="mytest",
+        urlPatterns={"/myurl"},
+        initParams={ @WebInitParam(name="n1", value="v1"), @WebInitParam(name="n2", value="v2") } )
+public class TestServlet extends HttpServlet {
+    @javax.inject.Inject TestManagedBean tb1;
+    @javax.annotation.Resource TestManagedBean tb;
+
+    public void service(HttpServletRequest req, HttpServletResponse res)
+            throws IOException, ServletException {
+
+        PrintWriter writer = res.getWriter();
+        writer.write("Hello from Servlet 3.0. ");
+        String msg = "n1=" + getInitParameter("n1") +
+            ", n2=" + getInitParameter("n2");
+
+        //ManagedBean testing .. add additional messages in the "msg" string, so that the test will FAIL in the client
+        msg += testManagedBean(tb, " | TestManagedBean injected via @Resource");
+        msg += testManagedBean(tb1, " | TestManagedBean injected via @Inject");
+        msg += testInterceptors();
+
+        writer.write("initParams: " + msg + "\n");
+    }
+
+    private String testManagedBean(TestManagedBean tb, String info) {
+        String msg = "";
+        if (tb == null) msg += info + " is null!";
+        if (tb != null && !tb.testPostConstructCalled()) msg += info + " postConstruct not called";
+        if (tb != null && !tb.testInjection()) msg += info + "Bean Injection into ManagedBean failed";
+        return msg;
+    }
+
+    private String testInterceptors(){
+        // The interceptors should be invoked for both of these cases
+        System.out.println("calling foo on an @Resource injected Managed Bean");
+        tb.foo();
+        System.out.println("calling foo on an @Inject Managed Bean");
+        tb1.foo();
+
+        int count = TestAroundInvokeInterceptor.aroundInvokeCount;
+        System.out.println("TestAroundInvokeInterceptor called " + count + " times");
+        TestAroundInvokeInterceptor.reset();
+        if (count == 2) return "";
+            else return "Interceptor invocation count" + count + " invalid";
+   }
+
+ 
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/Tester.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/Tester.java
new file mode 100644
index 0000000..a966727
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor-nonnull-package/servlet/com/tests/Tester.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.tests;
+
+import javax.interceptor.*;
+import java.lang.annotation.*;
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.*;
+
+
+@InterceptorBinding
+@Target({METHOD, TYPE})
+@Retention(RUNTIME)
+public @interface Tester {}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/WebTest.java
new file mode 100644
index 0000000..343d171
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/WebTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import java.io.*;
+import java.net.*;
+import com.sun.ejte.ccl.reporter.*;
+
+/*
+ * Unit test for @WebServlet
+ */
+public class WebTest {
+
+    private static SimpleReporterAdapter stat
+        = new SimpleReporterAdapter("appserv-tests");
+    private static final String TEST_NAME = "simple-managed-bean-interceptor";
+    private static final String EXPECTED_RESPONSE = "Hello from Servlet 3.0. initParams: n1=v1, n2=v2";
+
+    private String host;
+    private String port;
+    private String contextRoot;
+
+    public WebTest(String[] args) {
+        host = args[0];
+        port = args[1];
+        contextRoot = args[2];
+    }
+    
+    public static void main(String[] args) {
+        stat.addDescription("Unit test for @WebServlet");
+        WebTest webTest = new WebTest(args);
+        webTest.doTest();
+        stat.printSummary(TEST_NAME);
+    }
+
+    public void doTest() {
+        try { 
+            invoke();
+        } catch (Exception ex) {
+            System.out.println(TEST_NAME + " test failed");
+            stat.addStatus(TEST_NAME, stat.FAIL);
+            ex.printStackTrace();
+        }
+    }
+
+    private void invoke() throws Exception {
+        
+        String url = "http://" + host + ":" + port + contextRoot
+                     + "/myurl";
+        System.out.println("opening connection to " + url);
+        HttpURLConnection conn = (HttpURLConnection)
+            (new URL(url)).openConnection();
+
+        int code = conn.getResponseCode();
+        if (code != 200) {
+            System.out.println("Unexpected return code: " + code);
+            stat.addStatus(TEST_NAME, stat.FAIL);
+        } else {
+            InputStream is = null;
+            BufferedReader input = null;
+            String line = null;
+            try {
+                is = conn.getInputStream();
+                input = new BufferedReader(new InputStreamReader(is));
+                line = input.readLine();
+                System.out.println("line = " + line);
+            } finally {
+                try {
+                    if (is != null) {
+                        is.close();
+                    }
+                } catch(IOException ioe) {
+                    // ignore
+                }
+                try {
+                    if (input != null) {
+                        input.close();
+                    }
+                } catch(IOException ioe) {
+                    // ignore
+                }
+            }
+            if (EXPECTED_RESPONSE.equals(line)) {
+                stat.addStatus(TEST_NAME, stat.PASS);
+            } else {
+                System.out.println("Wrong response. Expected: " + 
+                        EXPECTED_RESPONSE + ", received: " + line);
+                stat.addStatus(TEST_NAME, stat.FAIL);
+            }
+        }    
+    }
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/build.properties
new file mode 100644
index 0000000..4809e75
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/build.properties
@@ -0,0 +1,24 @@
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+ 
+
+<property name="module" value="cdi"/>
+<property name="appname" value="${module}-simple-managed-bean-interceptor"/>
+<property name="assemble" value="${build.classes.dir}/archive"/>
+<property name="contextroot" value="/${appname}"/>
+<property name="beans.xml" value="descriptor/beans.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/build.xml
new file mode 100644
index 0000000..83ad666
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/build.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<!DOCTYPE project [
+<!ENTITY commonSetup SYSTEM "./../../../../config/properties.xml">
+<!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
+<!ENTITY run SYSTEM "./../../../../config/run.xml">
+<!ENTITY testproperties SYSTEM "./build.properties">
+]>
+
+<project name="webcontainer_unittest" default="all" basedir=".">
+
+    &commonSetup;
+    &commonBuild;
+    &testproperties;
+    &run;
+
+    <target name="all" depends="build,deploy,run,undeploy"/>
+
+    <target name="clean" depends="init-common">
+        <antcall target="clean-common"/>
+        <delete>
+            <fileset dir="." includes="*.class"/>
+        </delete>
+    </target>
+       
+    <target name="compile" depends="clean">
+        <antcall target="compile-common">
+            <param name="src" value="servlet"/>
+        </antcall>
+    </target>
+
+    <target name="build" depends="compile">
+        <property name="hasWebclient" value="yes"/> 
+        <antcall target="webclient-war-common">
+            <param name="hasWebclient" value="yes"/>
+            <param name="webclient.war.classes" value="**/*.class"/> 
+        </antcall>
+
+        <javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
+               includes="WebTest.java"/>
+
+    </target> 
+
+    <target name="build-publish-war" depends="build, publish-war-common" />
+    
+    <target name="deploy" depends="init-common">
+        <antcall target="deploy-war-common"/>
+    </target>
+    
+    <target name="run" depends="init-common">
+        <java classname="WebTest">
+          <arg value="${http.host}"/>
+          <arg value="${http.port}"/>
+          <arg value="${contextroot}"/>
+          <classpath>
+           <pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
+           <pathelement location="."/>
+         </classpath>
+        </java>
+    </target>
+ 
+    <target name="undeploy" depends="init-common">
+        <antcall target="undeploy-war-common"/>
+    </target>   
+
+    <target name="usage">
+        <antcall target="usage-common"/>
+    </target>
+</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/descriptor/beans.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/descriptor/beans.xml
new file mode 100644
index 0000000..173bc72
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/descriptor/beans.xml
@@ -0,0 +1,24 @@
+<!--
+
+    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<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>TestAroundInvokeInterceptor</class>
+   </interceptors>
+</beans>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestAroundInvokeInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestAroundInvokeInterceptor.java
new file mode 100644
index 0000000..8b2414e
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestAroundInvokeInterceptor.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import javax.interceptor.*;
+
+@Tester @Interceptor
+public class TestAroundInvokeInterceptor {
+    public static int aroundInvokeCount = 0;
+
+    public static void reset(){
+        aroundInvokeCount = 0;
+    }
+
+   @AroundInvoke 
+   public Object testMethod(InvocationContext ctx) throws Exception {
+        System.out.println("TestAroundInvokeIntercetpr:: aroundInvoke called - target:" + ctx.getTarget() + " , params:"+ ctx.getParameters());
+        aroundInvokeCount ++;
+        ctx.proceed();
+        return null;
+   }
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestBean.java
new file mode 100644
index 0000000..3dd49b9
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestBean.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+//Simple Bean to test injection into ManagedBeans
+public class TestBean {
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestManagedBean.java
new file mode 100644
index 0000000..4905710
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestManagedBean.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+//Simple TestBean to test CDI. 
+//This bean implements Serializable as it needs to be placed into a Stateful Bean
+@javax.annotation.ManagedBean
+public class TestManagedBean {
+    TestBean tb;
+    boolean postConstructCalled = false;
+
+
+    //A Managed Bean needs to have a no-arg constructor
+    public TestManagedBean() {}
+    @javax.inject.Inject //Constructor based Injection
+    public TestManagedBean(TestBean tb){
+        this.tb = tb;
+    }
+
+
+    @javax.annotation.PostConstruct
+    public void init(){
+        System.out.println("In ManagedBean:: PostConstruct");
+        postConstructCalled = true;
+    }
+
+    @Tester
+    public void foo(){
+        System.out.println("foo called");
+    }
+
+    public boolean testPostConstructCalled(){
+        return this.postConstructCalled;
+    }
+
+    public boolean testInjection(){
+        System.out.println("In ManagedBean:: tb=" + tb);
+        postConstructCalled = true;
+        return this.tb != null;
+    }
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestServlet.java
new file mode 100644
index 0000000..431cdfc
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/TestServlet.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Enumeration;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@WebServlet(name="mytest",
+        urlPatterns={"/myurl"},
+        initParams={ @WebInitParam(name="n1", value="v1"), @WebInitParam(name="n2", value="v2") } )
+public class TestServlet extends HttpServlet {
+    @javax.inject.Inject TestManagedBean tb1;
+    @javax.annotation.Resource TestManagedBean tb;
+
+    public void service(HttpServletRequest req, HttpServletResponse res)
+            throws IOException, ServletException {
+
+        PrintWriter writer = res.getWriter();
+        writer.write("Hello from Servlet 3.0. ");
+        String msg = "n1=" + getInitParameter("n1") +
+            ", n2=" + getInitParameter("n2");
+
+        //ManagedBean testing .. add additional messages in the "msg" string, so that the test will FAIL in the client
+        msg += testManagedBean(tb, " | TestManagedBean injected via @Resource");
+        msg += testManagedBean(tb1, " | TestManagedBean injected via @Inject");
+        msg += testInterceptors();
+
+        writer.write("initParams: " + msg + "\n");
+    }
+
+    private String testManagedBean(TestManagedBean tb, String info) {
+        String msg = "";
+        if (tb == null) msg += info + " is null!";
+        if (tb != null && !tb.testPostConstructCalled()) msg += info + " postConstruct not called";
+        if (tb != null && !tb.testInjection()) msg += info + "Bean Injection into ManagedBean failed";
+        return msg;
+    }
+
+    private String testInterceptors(){
+        System.out.println("calling foo on an @Resource injected Managed Bean");
+        tb.foo();
+        System.out.println("calling foo on an @Inject Managed Bean");
+        tb1.foo(); //TestAroundInvokeInterceptor is not called in this case
+
+        int count = TestAroundInvokeInterceptor.aroundInvokeCount;
+        System.out.println("TestAroundInvokeInterceptor called " + count + " times");
+        TestAroundInvokeInterceptor.reset();
+        if (count == 1) return ""; 
+            else return "Interceptor invocation count" + count + " invalid";
+   }
+
+ 
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/Tester.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/Tester.java
new file mode 100644
index 0000000..0555ac6
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean-interceptor/servlet/Tester.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import javax.interceptor.*;
+import java.lang.annotation.*;
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.*;
+
+
+@InterceptorBinding
+@Target({METHOD, TYPE})
+@Retention(RUNTIME)
+public @interface Tester {}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/WebTest.java
new file mode 100644
index 0000000..ff40c2c
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/WebTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import java.io.*;
+import java.net.*;
+import com.sun.ejte.ccl.reporter.*;
+
+/*
+ * Unit test for @WebServlet
+ */
+public class WebTest {
+
+    private static SimpleReporterAdapter stat
+        = new SimpleReporterAdapter("appserv-tests");
+    private static final String TEST_NAME = "simple-managed-bean";
+    private static final String EXPECTED_RESPONSE = "Hello from Servlet 3.0. initParams: n1=v1, n2=v2";
+
+    private String host;
+    private String port;
+    private String contextRoot;
+
+    public WebTest(String[] args) {
+        host = args[0];
+        port = args[1];
+        contextRoot = args[2];
+    }
+    
+    public static void main(String[] args) {
+        stat.addDescription("Unit test for @WebServlet");
+        WebTest webTest = new WebTest(args);
+        webTest.doTest();
+        stat.printSummary(TEST_NAME);
+    }
+
+    public void doTest() {
+        try { 
+            invoke();
+        } catch (Exception ex) {
+            System.out.println(TEST_NAME + " test failed");
+            stat.addStatus(TEST_NAME, stat.FAIL);
+            ex.printStackTrace();
+        }
+    }
+
+    private void invoke() throws Exception {
+        
+        String url = "http://" + host + ":" + port + contextRoot
+                     + "/myurl";
+        System.out.println("opening connection to " + url);
+        HttpURLConnection conn = (HttpURLConnection)
+            (new URL(url)).openConnection();
+
+        int code = conn.getResponseCode();
+        if (code != 200) {
+            System.out.println("Unexpected return code: " + code);
+            stat.addStatus(TEST_NAME, stat.FAIL);
+        } else {
+            InputStream is = null;
+            BufferedReader input = null;
+            String line = null;
+            try {
+                is = conn.getInputStream();
+                input = new BufferedReader(new InputStreamReader(is));
+                line = input.readLine();
+                System.out.println("line = " + line);
+            } finally {
+                try {
+                    if (is != null) {
+                        is.close();
+                    }
+                } catch(IOException ioe) {
+                    // ignore
+                }
+                try {
+                    if (input != null) {
+                        input.close();
+                    }
+                } catch(IOException ioe) {
+                    // ignore
+                }
+            }
+            if (EXPECTED_RESPONSE.equals(line)) {
+                stat.addStatus(TEST_NAME, stat.PASS);
+            } else {
+                System.out.println("Wrong response. Expected: " + 
+                        EXPECTED_RESPONSE + ", received: " + line);
+                stat.addStatus(TEST_NAME, stat.FAIL);
+            }
+        }    
+    }
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/build.properties
new file mode 100644
index 0000000..712ba4a
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/build.properties
@@ -0,0 +1,24 @@
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+ 
+
+<property name="module" value="cdi"/>
+<property name="appname" value="${module}-simple-managed-bean"/>
+<property name="assemble" value="${build.classes.dir}/archive"/>
+<property name="contextroot" value="/${appname}"/>
+<property name="beans.xml" value="descriptor/beans.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/build.xml
new file mode 100644
index 0000000..83ad666
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/build.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<!DOCTYPE project [
+<!ENTITY commonSetup SYSTEM "./../../../../config/properties.xml">
+<!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
+<!ENTITY run SYSTEM "./../../../../config/run.xml">
+<!ENTITY testproperties SYSTEM "./build.properties">
+]>
+
+<project name="webcontainer_unittest" default="all" basedir=".">
+
+    &commonSetup;
+    &commonBuild;
+    &testproperties;
+    &run;
+
+    <target name="all" depends="build,deploy,run,undeploy"/>
+
+    <target name="clean" depends="init-common">
+        <antcall target="clean-common"/>
+        <delete>
+            <fileset dir="." includes="*.class"/>
+        </delete>
+    </target>
+       
+    <target name="compile" depends="clean">
+        <antcall target="compile-common">
+            <param name="src" value="servlet"/>
+        </antcall>
+    </target>
+
+    <target name="build" depends="compile">
+        <property name="hasWebclient" value="yes"/> 
+        <antcall target="webclient-war-common">
+            <param name="hasWebclient" value="yes"/>
+            <param name="webclient.war.classes" value="**/*.class"/> 
+        </antcall>
+
+        <javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
+               includes="WebTest.java"/>
+
+    </target> 
+
+    <target name="build-publish-war" depends="build, publish-war-common" />
+    
+    <target name="deploy" depends="init-common">
+        <antcall target="deploy-war-common"/>
+    </target>
+    
+    <target name="run" depends="init-common">
+        <java classname="WebTest">
+          <arg value="${http.host}"/>
+          <arg value="${http.port}"/>
+          <arg value="${contextroot}"/>
+          <classpath>
+           <pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
+           <pathelement location="."/>
+         </classpath>
+        </java>
+    </target>
+ 
+    <target name="undeploy" depends="init-common">
+        <antcall target="undeploy-war-common"/>
+    </target>   
+
+    <target name="usage">
+        <antcall target="usage-common"/>
+    </target>
+</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/descriptor/beans.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/descriptor/beans.xml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/descriptor/beans.xml
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestBean.java
new file mode 100644
index 0000000..3dd49b9
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestBean.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+//Simple Bean to test injection into ManagedBeans
+public class TestBean {
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestManagedBean.java
new file mode 100644
index 0000000..009ac36
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestManagedBean.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+//Simple TestBean to test CDI. 
+//This bean implements Serializable as it needs to be placed into a Stateful Bean
+@javax.annotation.ManagedBean
+public class TestManagedBean {
+    TestBean tb;
+    boolean postConstructCalled = false;
+    
+    public TestManagedBean(){}
+
+    @javax.inject.Inject //Constructor based Injection
+    public TestManagedBean(TestBean tb){
+        this.tb = tb;
+    }
+
+
+    @javax.annotation.PostConstruct
+    public void init(){
+        System.out.println("In ManagedBean:: PostConstruct");
+        postConstructCalled = true;
+    }
+
+    public boolean testPostConstructCalled(){
+        return this.postConstructCalled;
+    }
+
+    public boolean testInjection(){
+        System.out.println("In ManagedBean:: tb=" + tb);
+        postConstructCalled = true;
+        return this.tb != null;
+    }
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestServlet.java
new file mode 100644
index 0000000..f22bd89
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-managed-bean/servlet/TestServlet.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Enumeration;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@WebServlet(name="mytest",
+        urlPatterns={"/myurl"},
+        initParams={ @WebInitParam(name="n1", value="v1"), @WebInitParam(name="n2", value="v2") } )
+public class TestServlet extends HttpServlet {
+    @javax.inject.Inject TestManagedBean tb1;
+    @javax.annotation.Resource TestManagedBean tb;
+
+    public void service(HttpServletRequest req, HttpServletResponse res)
+            throws IOException, ServletException {
+
+        PrintWriter writer = res.getWriter();
+        writer.write("Hello from Servlet 3.0. ");
+        String msg = "n1=" + getInitParameter("n1") +
+            ", n2=" + getInitParameter("n2");
+
+        //ManagedBean testing .. add additional messages in the "msg" string, so that the test will FAIL in the client
+        msg += testManagedBean(tb, " | TestManagedBean injected via @Resource");
+        msg += testManagedBean(tb1, " | TestManagedBean injected via @Inject");
+
+        writer.write("initParams: " + msg + "\n");
+    }
+
+    private String testManagedBean(TestManagedBean tb, String info) {
+        String msg = "";
+        if (tb == null) msg += info + " is null!";
+        if (tb != null && !tb.testPostConstructCalled()) msg += info + " postConstruct not called";
+        if (tb != null && !tb.testInjection()) msg += info + "Bean Injection into ManagedBean failed";
+        return msg;
+    }
+ 
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/build.properties
new file mode 100644
index 0000000..d64848e
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/build.properties
@@ -0,0 +1,37 @@
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+ 
+
+<property name="module" value="cdi-hello-mdb"/>
+<property name="appname" value="${module}"/>         
+<property name="assemble" value="${build.classes.dir}/archive"/>
+<property name="test.client" 
+	value="Client"/>
+<property name="simple.client" value="com.sun.s1asdev.cdi.hello.mdb.client.Client"/>
+<property name="application.xml" value="descriptor/application.xml"/>
+<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
+<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
+<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
+<property name="beans.xml" value="descriptor/beans.xml"/>
+<property name="application-client.xml" 
+	value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml" 
+	value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/>         
+<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
+<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/build.xml
new file mode 100644
index 0000000..e71984d
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/build.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<!DOCTYPE project [
+<!ENTITY commonSetup SYSTEM "./../../../../config/properties.xml">
+<!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
+<!ENTITY testproperties SYSTEM "./build.properties">
+]>
+
+<project name="cdi-hello-mdbApp" default="usage" basedir=".">
+
+    &commonSetup;
+    &commonBuild;
+    &testproperties;
+
+    <target name="all" depends="clean,build,create-resources,deploy,run,undeploy,delete-resources"/>
+
+    <target name="clean" depends="init-common">
+      <antcall  target="clean-common"/>
+    </target>
+ 
+    <target name="compile" depends="clean">
+        <antcall target="compile-common">
+            <param name="src" value="ejb"/>
+        </antcall>
+        <antcall target="compile-common">
+            <param name="src" value="client"/>
+        </antcall>
+    </target>
+
+    <target name="build" depends="compile">
+        <antcall target="build-ear-common">
+            <param name="ejbjar.classes" 
+              value="**/*Bean*.class,**/*Hello*" />
+            <param name="appclientjar.classes" 
+              value="**/*Client*.class" />
+        </antcall>
+    </target> 
+    
+    <target name="deploy" 
+            depends="init-common">
+        <antcall target="deploy-common"/>
+    </target>
+
+    <target name="create-resources" depends="init-common">
+        <antcall target="asadmin-batch-common">
+          <param name="asadmin.file" value="create_resources.asadmin"/>
+        </antcall>
+    </target>
+    
+    <target name="delete-resources" depends="init-common">
+        <antcall target="asadmin-batch-common">
+          <param name="asadmin.file" value="delete_resources.asadmin"/>
+        </antcall>
+    </target>
+
+    <target name="run" depends="init-common">
+        <antcall target="runclient-common">
+          <param name="appclient.application.args" value="1"/>
+        </antcall>
+    </target>
+
+    <target name="run_standaloneclient" depends="init-common">
+       <java  fork="on" 
+              failonerror="true"
+              classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/javax.jms.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
+              classname="${simple.client}">
+        </java>
+    </target>
+ 
+    <target name="undeploy" depends="init-common">
+        <antcall target="undeploy-common"/>
+    </target>   
+
+    <target name="usage">
+        <antcall target="usage-common"/>
+        <echo>         
+          ant create-resources Create all destinations and connection factories
+          ant delete-resources Delete all destinations and connection factories
+        </echo>
+    </target>
+</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/client/Client.java
new file mode 100644
index 0000000..a9ba3f0
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/client/Client.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.sun.s1asdev.cdi.hello.mdb.client;
+import java.io.*;
+import java.util.*;
+import javax.ejb.EJBHome;
+import javax.jms.*;
+import javax.annotation.Resource;
+import javax.naming.InitialContext;
+
+import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
+
+public class Client {
+
+    // in milli-seconds
+    private static long TIMEOUT = 90000;
+
+    private static SimpleReporterAdapter stat =
+        new SimpleReporterAdapter("appserv-tests");
+
+    public static void main (String[] args) {
+        Client client = new Client(args);
+
+        stat.addDescription("cdi-hello-mdb");
+        client.doTest();
+        stat.printSummary("cdi-hello-mdbID");
+        System.exit(0);
+    }
+
+
+    @Resource(name="FooCF", mappedName="jms/cdi_hello_mdb_QCF") 
+    private static QueueConnectionFactory queueConFactory;
+
+    @Resource(name="MsgBeanQueue", mappedName="jms/cdi_hello_mdb_InQueue")
+    private static javax.jms.Queue msgBeanQueue;
+
+    @Resource(name="ClientQueue", mappedName="foo")
+    private static javax.jms.Queue clientQueue;
+
+    private QueueConnection queueCon;
+    private QueueSession queueSession;
+    private QueueSender queueSender;
+    private QueueReceiver queueReceiver;
+
+
+    private int numMessages = 2;
+    public Client(String[] args) {
+        
+        if( args.length == 1 ) {
+            numMessages = new Integer(args[0]).intValue();
+        }
+
+    }
+
+    public void doTest() {
+        try {
+	    if( queueConFactory == null ) {
+
+		System.out.println("Java SE mode...");
+		InitialContext ic = new InitialContext();
+		queueConFactory = (javax.jms.QueueConnectionFactory) ic.lookup("jms/cdi_hello_mdb_QCF");
+		msgBeanQueue = (javax.jms.Queue) ic.lookup("jms/cdi_hello_mdb_InQueue");
+		clientQueue = (javax.jms.Queue) ic.lookup("jms/cdi_hello_mdb_OutQueue");
+		
+	    }
+
+            setup();
+            doTest(numMessages);
+            stat.addStatus("cmt main", stat.PASS);
+        } catch(Throwable t) {
+            stat.addStatus("cmt main", stat.FAIL);
+            t.printStackTrace();
+        } finally {
+            cleanup();
+        }
+    }
+
+    public void setup() throws Exception {
+        
+        queueCon = queueConFactory.createQueueConnection();
+
+        queueSession = queueCon.createQueueSession
+            (false, Session.AUTO_ACKNOWLEDGE); 
+
+        // Producer will be specified when actual msg is sent.
+        queueSender = queueSession.createSender(null);        
+
+        queueReceiver = queueSession.createReceiver(clientQueue);
+
+        queueCon.start();
+
+    }
+
+    public void cleanup() {
+        try {
+            if( queueCon != null ) {
+                queueCon.close();
+            }
+        } catch(Throwable t) {
+            t.printStackTrace();
+        }
+    }
+
+    public void sendMsgs(javax.jms.Queue queue, Message msg, int num) 
+        throws JMSException {
+        for(int i = 0; i < num; i++) {
+            System.out.println("Sending message " + i + " to " + queue + 
+                               " at time " + System.currentTimeMillis());
+            queueSender.send(queue, msg);
+            System.out.println("Sent message " + i + " to " + queue + 
+                               " at time " + System.currentTimeMillis());
+        }
+    }
+
+    public void doTest(int num) 
+        throws Exception {
+
+        Destination dest = msgBeanQueue;
+
+        Message message = queueSession.createTextMessage("foo");
+
+        message.setBooleanProperty("flag", true);
+        message.setIntProperty("num", 2);
+        sendMsgs((javax.jms.Queue) dest, message, num);
+
+        System.out.println("Waiting for queue message");
+        Message recvdmessage = queueReceiver.receive(TIMEOUT);
+        if( recvdmessage != null ) {
+            System.out.println("Received message : " + 
+                                   ((TextMessage)recvdmessage).getText());
+        } else {
+            System.out.println("timeout after " + TIMEOUT + " seconds");
+            throw new JMSException("timeout" + TIMEOUT + " seconds");
+        }
+    }
+}
+
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/client/MANIFEST.MF
new file mode 100644
index 0000000..1ed692b
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/client/MANIFEST.MF
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+Created-By: 1.4.0-beta3 (Sun Microsystems Inc.)
+Main-Class: com.sun.s1asdev.cdi.hello.mdb.client.Client
+Class-Path: reporter.jar
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/create_resources.asadmin b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/create_resources.asadmin
new file mode 100644
index 0000000..78a6f43
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/create_resources.asadmin
@@ -0,0 +1,5 @@
+create-jms-resource --restype javax.jms.QueueConnectionFactory jms/cdi_hello_mdb_QCF
+create-jmsdest --desttype queue cdi_hello_mdb_InQueue 
+create-jms-resource --restype javax.jms.Queue --property imqDestinationName=cdi_hello_mdb_InQueue jms/cdi_hello_mdb_InQueue
+create-jmsdest --desttype queue cdi_hello_mdb_OutQueue 
+create-jms-resource --restype javax.jms.Queue --property imqDestinationName=cdi_hello_mdb_OutQueue jms/cdi_hello_mdb_OutQueue
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/delete_resources.asadmin b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/delete_resources.asadmin
new file mode 100644
index 0000000..69af651
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/delete_resources.asadmin
@@ -0,0 +1,5 @@
+delete-jms-resource jms/cdi_hello_mdb_QCF
+delete-jms-resource jms/cdi_hello_mdb_InQueue
+delete-jmsdest --desttype queue cdi_hello_mdb_InQueue
+delete-jms-resource jms/cdi_hello_mdb_OutQueue
+delete-jmsdest --desttype queue cdi_hello_mdb_OutQueue
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/descriptor/application.xml
new file mode 100644
index 0000000..448b864
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/descriptor/application.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<application xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd">
+  <display-name>cdi-hello-mdbApp</display-name>
+  <module>
+    <ejb>cdi-hello-mdb-ejb.jar</ejb>
+  </module>
+  <module>
+    <java>cdi-hello-mdb-client.jar</java>
+  </module>
+</application>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/descriptor/beans.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/descriptor/beans.xml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/descriptor/beans.xml
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/descriptor/sun-application-client.xml
new file mode 100644
index 0000000..3cb8ad5
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/descriptor/sun-application-client.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Application Client 5.0//EN" "http://www.sun.com/software/appserver/dtds/sun-application-client_5_0-0.dtd">
+<sun-application-client>
+  <message-destination-ref>
+      <message-destination-ref-name>ClientQueue</message-destination-ref-name>
+      <jndi-name>jms/cdi_hello_mdb_OutQueue</jndi-name>
+  </message-destination-ref>
+</sun-application-client>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/Hello1.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/Hello1.java
new file mode 100644
index 0000000..55f1d9f
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/Hello1.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.sun.s1asdev.cdi.hello.mdb;
+
+public interface Hello1 {
+
+    public void hello(String s);
+    
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/Hello2.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/Hello2.java
new file mode 100644
index 0000000..dce0861
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/Hello2.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.sun.s1asdev.cdi.hello.mdb;
+
+public interface Hello2 extends java.io.Serializable {
+
+    public void hello(String s);
+
+    public void removeMethod();
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateful.java
new file mode 100644
index 0000000..daef982
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateful.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.sun.s1asdev.cdi.hello.mdb;
+
+import javax.ejb.Stateful;
+import javax.ejb.Remove;
+import javax.annotation.PreDestroy;
+
+// Hello1 interface is not annotated with @Local. If the
+// bean only implements one interface it is assumed to be
+// a local business interface.
+@Stateful(description="my stateful bean description")
+public class HelloStateful implements Hello2 {
+
+    private String msg;
+
+    public void hello(String s) {
+        msg = s;
+        System.out.println("HelloStateful: " + s);
+    }
+
+    @Remove public void removeMethod() {
+        System.out.println("Business method marked with @Remove called in " +
+                           msg);
+    }
+    @PreDestroy public void myPreDestroyMethod() {
+        System.out.println("PRE-DESTROY callback received in " + msg);        
+    }
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateless.java
new file mode 100644
index 0000000..fa86bc5
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateless.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.sun.s1asdev.cdi.hello.mdb;
+
+import javax.ejb.Stateless;
+
+// Hello1 interface is not annotated with @Local. If the
+// bean only implements one interface it is assumed to be
+// a local business interface.
+@Stateless(description="my stateless bean description") 
+public class HelloStateless implements Hello1 {
+
+    public void hello(String s) {
+        System.out.println("HelloStateless: " + s);
+    }
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/MessageBean.java
new file mode 100644
index 0000000..cdc7786
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/MessageBean.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.sun.s1asdev.cdi.hello.mdb;
+
+import javax.ejb.MessageDriven;
+import javax.ejb.EJBException;
+import javax.ejb.NoSuchEJBException;
+import javax.ejb.EJB;
+import javax.ejb.TransactionManagement;
+import javax.ejb.TransactionManagementType;
+import javax.ejb.ActivationConfigProperty;
+
+import javax.jms.MessageListener;
+import javax.jms.Message;
+import javax.jms.Queue;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueConnection;
+import javax.jms.QueueSession;
+import javax.jms.QueueSender;
+import javax.jms.TextMessage;
+import javax.jms.Session;
+
+import javax.annotation.Resource;
+
+@TransactionManagement(TransactionManagementType.BEAN)
+@MessageDriven(mappedName="jms/cdi_hello_mdb_InQueue", description="mymessagedriven bean description")
+ public class MessageBean implements MessageListener {
+
+    @EJB private Hello1 hello1;
+    @EJB private Hello2 hello2;
+
+    @Resource(name="jms/MyQueueConnectionFactory", 
+              mappedName="jms/cdi_hello_mdb_QCF") 
+    QueueConnectionFactory qcFactory;
+
+    @Resource(mappedName="jms/cdi_hello_mdb_OutQueue") Queue clientQueue;
+
+    @javax.inject.Inject com.sun.s1asdev.cdi.hello.bean.TestBean tb;
+
+
+    public void onMessage(Message message) {
+        System.out.println("Got message!!! tb=" + tb );
+
+        QueueConnection connection = null;
+        try {
+            
+            System.out.println("Calling hello1 stateless bean");
+            hello1.hello("local ejb3.0 stateless");
+            System.out.println("Calling hello2 stateful bean");
+            hello2.hello("local ejb3.0 stateful");
+            hello2.removeMethod();
+            try {
+                hello2.hello("this call should not go through");
+                throw new Exception("bean should have been removed " +
+                                    "after removeMethod()");
+            } catch(NoSuchEJBException e) {
+                System.out.println("Successfully caught EJBException after " +
+                                   " accessing removed SFSB");
+            }
+
+            if (tb == null) throw new Exception("Injection of Bean in MDB failed");
+
+            connection = qcFactory.createQueueConnection();
+            QueueSession session = connection.createQueueSession(false,
+                                   Session.AUTO_ACKNOWLEDGE);
+            QueueSender sender = session.createSender(clientQueue);
+            TextMessage tmessage = session.createTextMessage();
+            tmessage.setText("mdb() invoked");
+            System.out.println("Sending message");
+            sender.send(tmessage);
+            System.out.println("message sent");
+
+        } catch(Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if(connection != null) {
+                    connection.close();
+                }
+            } catch(Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+    }
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/TestBean.java
new file mode 100644
index 0000000..0dd4102
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/TestBean.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.sun.s1asdev.cdi.hello.bean;
+
+
+
+//Simple TestBean to test CDI. 
+public class TestBean
+{}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/README b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/README
new file mode 100644
index 0000000..117389b
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/README
@@ -0,0 +1,3 @@
+Test
+- Simple WAB (Web Application Bundle) that is CDI enabled.
+- Test injection of beans, access to BeanManager within WAB
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/WebTest.java
new file mode 100644
index 0000000..09cdfca
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/WebTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
+
+/*
+ * Unit test for @WebServlet
+ */
+public class WebTest {
+
+    private static SimpleReporterAdapter stat
+        = new SimpleReporterAdapter("appserv-tests");
+    private static final String TEST_NAME = "cdi-wab";
+    private static final String EXPECTED_RESPONSE = "Hello from Servlet 3.0";
+
+    private String host;
+    private String port;
+    private String contextRoot;
+
+    public WebTest(String[] args) {
+        host = args[0];
+        port = args[1];
+        contextRoot = args[2];
+    }
+    
+    public static void main(String[] args) {
+        stat.addDescription("Unit test for @WebServlet");
+        WebTest webTest = new WebTest(args);
+        webTest.doTest();
+        stat.printSummary(TEST_NAME);
+    }
+
+    public void doTest() {
+        try { 
+            invoke();
+        } catch (Exception ex) {
+            System.out.println(TEST_NAME + " test failed");
+            stat.addStatus(TEST_NAME, stat.FAIL);
+            ex.printStackTrace();
+        }
+    }
+
+    private void invoke() throws Exception {
+        
+        Thread.sleep(2000); //WORKAROUND @XXX
+        String url = "http://" + host + ":" + port + contextRoot;
+        System.out.println("opening connection to " + url);
+        HttpURLConnection conn = (HttpURLConnection)
+            (new URL(url)).openConnection();
+
+        int code = conn.getResponseCode();
+        if (code != 200) {
+            System.out.println("Unexpected return code: " + code);
+            stat.addStatus(TEST_NAME, stat.FAIL);
+        } else {
+            InputStream is = null;
+            BufferedReader input = null;
+            String line = null;
+            try {
+                is = conn.getInputStream();
+                input = new BufferedReader(new InputStreamReader(is));
+                line = input.readLine();
+                System.out.println("line = " + line);
+            } finally {
+                try {
+                    if (is != null) {
+                        is.close();
+                    }
+                } catch(IOException ioe) {
+                    // ignore
+                }
+                try {
+                    if (input != null) {
+                        input.close();
+                    }
+                } catch(IOException ioe) {
+                    // ignore
+                }
+            }
+            if (EXPECTED_RESPONSE.equals(line)) {
+                stat.addStatus(TEST_NAME, stat.PASS);
+            } else {
+                System.out.println("Wrong response. Expected: " + 
+                        EXPECTED_RESPONSE + ", received: " + line);
+                stat.addStatus(TEST_NAME, stat.FAIL);
+            }
+        }    
+    }
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/build.properties
new file mode 100644
index 0000000..38d97bd
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/build.properties
@@ -0,0 +1,26 @@
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+ 
+
+<property name="module" value="cdi"/>
+<property name="appname" value="${module}-wab"/>
+<property name="assemble" value="${build.classes.dir}/archive"/>
+<property name="contextroot" value="/test"/>
+<property name="beans.xml" value="descriptor/beans.xml"/>
+<property name="web.xml" value="descriptor/web.xml"/>
+<property name="bundle.descriptor" value="descriptor/MANIFEST.MF"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/build.xml
new file mode 100644
index 0000000..a276cda
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/build.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<!DOCTYPE project [
+<!ENTITY commonSetup SYSTEM "./../../../../config/properties.xml">
+<!--
+<!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
+-->
+<!ENTITY commonBuild SYSTEM "./common.xml">
+<!ENTITY run SYSTEM "./../../../../config/run.xml">
+<!ENTITY testproperties SYSTEM "./build.properties">
+]>
+
+<project name="webcontainer_unittest" default="all" basedir=".">
+
+    &commonSetup;
+    &commonBuild;
+    &testproperties;
+    &run;
+
+    <target name="all" depends="build,deploy,run,undeploy"/>
+
+    <target name="clean" depends="init-common">
+        <antcall target="clean-common"/>
+        <delete>
+            <fileset dir="." includes="*.class"/>
+        </delete>
+    </target>
+       
+    <target name="compile" depends="clean">
+        <antcall target="compile-common">
+            <param name="src" value="servlet"/>
+        </antcall>
+    </target>
+
+    <target name="build" depends="compile">
+        <property name="hasWebclient" value="yes"/> 
+        <antcall target="webclient-wab-common">
+            <param name="hasWebclient" value="yes"/>
+            <param name="webclient.war.classes" value="**/*.class"/> 
+        </antcall>
+
+        <javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
+               includes="WebTest.java"/>
+
+    </target> 
+
+    <target name="build-publish-war" depends="build, publish-war-common" />
+   
+    <target name="deploy" depends="init-common">
+        <antcall target="deploy-wab-common"/>
+    </target>
+    
+    <target name="run" depends="init-common">
+        <sleep seconds="25"/>
+        <java classname="WebTest">
+          <arg value="${http.host}"/>
+          <arg value="${http.port}"/>
+          <arg value="${contextroot}"/>
+          <classpath>
+           <pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
+           <pathelement location="."/>
+         </classpath>
+        </java>
+    </target>
+ 
+    <target name="undeploy" depends="init-common">
+        <antcall target="undeploy-war-common"/>
+    </target>   
+
+    <target name="usage">
+        <antcall target="usage-common"/>
+    </target>
+</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/common.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/common.xml
new file mode 100644
index 0000000..f396e66
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/common.xml
@@ -0,0 +1,1946 @@
+<!--
+
+    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<!--
+    This is the top level build file that should be 
+    imported into all the leaf level build files 
+-->
+
+<!-- ================================================================ -->
+<!-- Targets to clean class files and jars files -->
+<!-- 
+Variables used: 
+    ${build.classes.dir} 
+    ${assemble.dir}
+-->
+<!-- ================================================================ -->
+<target name="clean-classes-common" depends="init-common">
+    <echo message="common.xml: Cleaning test source files: ${build.base.dir}" 
+        level="verbose"/>
+  <delete dir="${build.base.dir}"/>
+</target>
+    
+<target name="clean-jars-common" depends="init-common">
+  <delete dir="${assemble.dir}"/>
+</target>
+
+<target name="clean-common" depends="init-common">
+  <antcall target="clean-classes-common"/>
+  <antcall target="clean-jars-common"/>
+</target>
+
+<!-- ================================================================ -->
+<!-- Target to compile the java source files -->
+<!-- 
+Variables used: 
+    ${build.classes.dir} 
+    ${s1astest.classpath}
+    ${src}
+-->
+<!-- ================================================================ -->
+<target name="compile-common" depends="init-common">
+  <mkdir dir="${build.classes.dir}"/>
+  <echo message="common.xml: Compiling test source files" level="verbose"/>
+  <mkdir dir="${src}"/>
+  <javac srcdir="${src}"
+    destdir="${build.classes.dir}"
+    classpath="${s1astest.classpath}"
+    debug="on"
+    failonerror="true"/>
+</target>
+
+<!-- ================================================================ -->
+<!-- This is the external target war-common to be called up build files
+usage:
+<antcall target="war-common">
+<param name="war.classes" value="MyServlet.class,MyOtherServlet.class"/>
+</antcall>
+Assumption: All the static content is placed in webcontent directory
+
+Variables Used:
+    ${war.file}
+    ${build.classes.dir}
+    ${appname}    
+    ${assemble.dir}
+    ${web.xml}
+    ${beans.xml}
+    ${tlds}
+    ${tagfiles}
+    ${APS_HOME}
+    ${webclient.war.files}
+    ${webclient.war.classes}
+-->
+<!-- ================================================================ -->
+
+<target name="webclient-war-common" if="hasWebclient" depends="init-common">
+  <mkdir dir="${assemble.dir}"/>
+  <antcall target="package-war-common">
+    <param name="war.classes" value="${build.classes.dir}"/>
+    <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
+  </antcall>
+</target>
+
+<target name="webclient-wab-common" if="hasWebclient" depends="init-common">
+  <mkdir dir="${assemble.dir}"/>
+  <antcall target="package-wab-common">
+    <param name="war.classes" value="${build.classes.dir}"/>
+    <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
+  </antcall>
+</target>
+
+
+<target name="publish-war-common" depends="init-common">
+  <mkdir dir="${build.webapps.dir}"/>
+  <copy file="${assemble.dir}/${appname}-web.war" 
+        tofile="${build.webapps.dir}/${appname}.war" 
+        overwrite="true" />
+</target>
+
+<target name="clean-webapps-common" depends="init-common">
+    <delete dir="${build.webapps.dir}" quiet="true" />  
+</target>
+
+<target name="clear">
+    <delete file="${war.file}"/>  
+</target>
+
+<target name="copy-tlds" if="tlds-exist" depends="clear,test-tlds-exist">
+  <mkdir dir="${build.classes.dir}/tmp/WEB-INF/tlds"/>
+  <copy todir="${build.classes.dir}/tmp/WEB-INF/tlds" failonerror="false">
+      <fileset dir="${tlds}">
+          <include name="**/*.tld"/>
+      </fileset>
+  </copy>
+</target>
+
+<target name="copy-tagfiles" if="tagfiles-exist" depends="clear,test-tagfiles-exist">
+  <mkdir dir="${build.classes.dir}/tmp/WEB-INF/tags"/>
+  <copy todir="${build.classes.dir}/tmp/WEB-INF/tags" failonerror="false">
+      <fileset dir="${tagfiles}">
+          <include name="**/*.tag"/>
+          <include name="**/*.tagx"/>
+      </fileset>
+  </copy>
+</target>
+
+<target name="package-war-common" depends="copy-tlds,copy-tagfiles">
+  <echo message="my build classes dir is:${build.classes.dir}" level="verbose"/>
+  <mkdir dir="${build.classes.dir}/tmp"/>
+  <mkdir dir="${build.classes.dir}/tmp/WEB-INF"/>
+  <mkdir dir="${build.classes.dir}/tmp/WEB-INF/classes"/>
+  <mkdir dir="${build.classes.dir}/tmp/WEB-INF/lib"/>
+  <mkdir dir="lib"/>
+  <copy file="${glassfish-web.xml}" 
+      tofile="${build.classes.dir}/tmp/WEB-INF/glassfish-web.xml" failonerror="false"/>
+  <copy file="${sun-web.xml}" 
+      tofile="${build.classes.dir}/tmp/WEB-INF/sun-web.xml" failonerror="false"/>
+  <copy file="${weblogic.xml}" 
+      tofile="${build.classes.dir}/tmp/WEB-INF/weblogic.xml" failonerror="false"/>
+  <copy file="${glassfish-resources.xml}" 
+      tofile="${build.classes.dir}/tmp/WEB-INF/glassfish-resources.xml" failonerror="false"/>
+  <copy todir="${build.classes.dir}/tmp/WEB-INF/lib" failonerror="false">
+      <fileset dir="lib">
+          <include name="**/*.jar"/>
+          <include name="**/*.zip"/>
+      </fileset>
+  </copy>
+  <copy file="${webservices.xml}" 
+        tofile="${build.classes.dir}/tmp/WEB-INF/webservices.xml"
+        failonerror="false"/>
+  <copy file="${mappingfile.location}/${mappingfile.name}" 
+        tofile="${build.classes.dir}/tmp/${mappingfile.name}"
+        failonerror="false"/>
+  <copy file="${wsdlfile.location}/${wsdlfile.name}" 
+        tofile="${build.classes.dir}/tmp/WEB-INF/wsdl/${wsdlfile.name}"
+        failonerror="false"/>
+  <copy file="${tagPlugins.xml}" 
+        tofile="${build.classes.dir}/tmp/WEB-INF/tagPlugins.xml"
+        failonerror="false"/>
+  <copy file="${web.xml}" 
+      tofile="${build.classes.dir}/tmp/WEB-INF/web.xml"
+        failonerror="false"/>
+    <copy file="${persistence.xml}" 
+      tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/persistence.xml"
+        failonerror="false"/>
+   <copy file="${beans.xml}" 
+      tofile="${build.classes.dir}/tmp/WEB-INF/beans.xml"
+        failonerror="false"/>
+  <copy file="${context.xml}"
+      tofile="${build.classes.dir}/tmp/META-INF/context.xml" failonerror="false"/>
+  <copy file="${cdi-extension.service}"
+      tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension" failonerror="false"/>
+      
+  <copy todir="${build.classes.dir}/tmp/WEB-INF/classes">
+      <fileset dir="${war.classes}">
+          <include name="**/*.class"/>
+      </fileset>
+  </copy>
+  <echo message="Creating war file ${war.file}" level="verbose"/>
+  <mkdir dir="${basedir}/docroot"/>
+  <jar jarfile="${war.file}" update="true">
+    <fileset dir="${build.classes.dir}/tmp" casesensitive="yes">
+      <include name="**/*class*"/>
+    </fileset>
+    <fileset dir="${basedir}/docroot" casesensitive="yes">
+      <include name="**/*.html"/>
+      <include name="**/*.HTML"/>
+      <include name="**/*.xhtml"/>
+      <include name="**/*.jsp"/>
+      <include name="**/*.jspx"/>
+      <include name="**/*.jspf"/>
+      <include name="**/*.gif"/>
+      <include name="**/*.do"/>
+      <include name="**/*.txt"/>
+      <include name="**/*.shtml"/>
+      <include name="**/*.jar"/>
+      <exclude name="**/*.java,**/*.xml,**/*.properties"/>
+    </fileset>
+    <fileset dir="${build.classes.dir}/tmp/" casesensitive="true">
+      <include name="WEB-INF/web.xml"/>
+      <include name="WEB-INF/glassfish-web.xml"/>
+      <include name="WEB-INF/glassfish-resources.xml"/>
+      <include name="WEB-INF/sun-web.xml"/>
+      <include name="WEB-INF/beans.xml"/>
+      <include name="WEB-INF/weblogic.xml"/>
+      <include name="WEB-INF/webservices.xml"/>
+      <include name="WEB-INF/tagPlugins.xml"/>
+      <include name="WEB-INF/lib/*"/>
+      <include name="WEB-INF/lib/extra/*"/>
+      <include name="WEB-INF/tlds/*"/>
+      <include name="WEB-INF/tags/*"/>
+      <include name="WEB-INF/wsdl/${wsdlfile.name}"/>
+      <include name="${mappingfile.name}"/>
+      <include name="META-INF/context.xml"/>
+      <include name="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension"/>
+      <include name="WEB-INF/classes/META-INF/persistence.xml"/>
+    </fileset>
+  </jar>       
+  <echo message="created war file ${war.file}" level="verbose"/>
+  <delete dir="${build.classes.dir}/tmp/WEB-INF" failonerror="false"/> 
+  <echo message="my webclient war classes are:${webclient.war.classes}" 
+      level="verbose"/>
+</target>
+
+<target name="package-wab-common" depends="copy-tlds,copy-tagfiles">
+  <echo message="my build classes dir is:${build.classes.dir}" level="verbose"/>
+  <mkdir dir="${build.classes.dir}/tmp"/>
+  <mkdir dir="${build.classes.dir}/tmp/WEB-INF"/>
+  <mkdir dir="${build.classes.dir}/tmp/WEB-INF/classes"/>
+  <mkdir dir="${build.classes.dir}/tmp/WEB-INF/lib"/>
+  <mkdir dir="${build.classes.dir}/tmp/WEB-INF/META-INF"/>
+  <mkdir dir="lib"/>
+  <copy file="${glassfish-web.xml}" 
+      tofile="${build.classes.dir}/tmp/WEB-INF/glassfish-web.xml" failonerror="false"/>
+  <copy file="${sun-web.xml}" 
+      tofile="${build.classes.dir}/tmp/WEB-INF/sun-web.xml" failonerror="false"/>
+  <copy file="${weblogic.xml}" 
+      tofile="${build.classes.dir}/tmp/WEB-INF/weblogic.xml" failonerror="false"/>
+  <copy file="${glassfish-resources.xml}" 
+      tofile="${build.classes.dir}/tmp/WEB-INF/glassfish-resources.xml" failonerror="false"/>
+  <copy todir="${build.classes.dir}/tmp/WEB-INF/lib" failonerror="false">
+      <fileset dir="lib">
+          <include name="**/*.jar"/>
+          <include name="**/*.zip"/>
+      </fileset>
+  </copy>
+  <copy file="${webservices.xml}" 
+        tofile="${build.classes.dir}/tmp/WEB-INF/webservices.xml"
+        failonerror="false"/>
+  <copy file="${mappingfile.location}/${mappingfile.name}" 
+        tofile="${build.classes.dir}/tmp/${mappingfile.name}"
+        failonerror="false"/>
+  <copy file="${wsdlfile.location}/${wsdlfile.name}" 
+        tofile="${build.classes.dir}/tmp/WEB-INF/wsdl/${wsdlfile.name}"
+        failonerror="false"/>
+  <copy file="${tagPlugins.xml}" 
+        tofile="${build.classes.dir}/tmp/WEB-INF/tagPlugins.xml"
+        failonerror="false"/>
+  <copy file="${web.xml}" 
+      tofile="${build.classes.dir}/tmp/WEB-INF/web.xml"
+        failonerror="false"/>
+    <copy file="${persistence.xml}" 
+      tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/persistence.xml"
+        failonerror="false"/>
+   <copy file="${beans.xml}" 
+      tofile="${build.classes.dir}/tmp/WEB-INF/beans.xml"
+        failonerror="false"/>
+
+   <copy file="${bundle.descriptor}" 
+      tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/MANIFEST.MF"
+        failonerror="false"/>
+  <copy file="${context.xml}"
+      tofile="${build.classes.dir}/tmp/META-INF/context.xml" failonerror="false"/>
+  <copy file="${cdi-extension.service}"
+      tofile="${build.classes.dir}/tmp/WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension" failonerror="false"/>
+      
+  <copy todir="${build.classes.dir}/tmp/WEB-INF/classes">
+      <fileset dir="${war.classes}">
+          <include name="**/*.class"/>
+      </fileset>
+  </copy>
+  <echo message="Creating war file ${war.file}" level="verbose"/>
+  <mkdir dir="${basedir}/docroot"/>
+  <jar manifest="${bundle.descriptor}" jarfile="${war.file}" update="true">
+    <fileset dir="${build.classes.dir}/tmp" casesensitive="yes">
+      <include name="**/*class*"/>
+    </fileset>
+    <fileset dir="${basedir}/docroot" casesensitive="yes">
+      <include name="**/*.html"/>
+      <include name="**/*.HTML"/>
+      <include name="**/*.xhtml"/>
+      <include name="**/*.jsp"/>
+      <include name="**/*.jspx"/>
+      <include name="**/*.jspf"/>
+      <include name="**/*.gif"/>
+      <include name="**/*.do"/>
+      <include name="**/*.txt"/>
+      <include name="**/*.shtml"/>
+      <include name="**/*.jar"/>
+      <exclude name="**/*.java,**/*.xml,**/*.properties"/>
+    </fileset>
+    <fileset dir="${build.classes.dir}/tmp/" casesensitive="true">
+      <include name="WEB-INF/web.xml"/>
+      <include name="WEB-INF/glassfish-web.xml"/>
+      <include name="WEB-INF/glassfish-resources.xml"/>
+      <include name="WEB-INF/sun-web.xml"/>
+      <include name="WEB-INF/beans.xml"/>
+      <include name="WEB-INF/weblogic.xml"/>
+      <include name="WEB-INF/webservices.xml"/>
+      <include name="WEB-INF/tagPlugins.xml"/>
+      <include name="WEB-INF/lib/*"/>
+      <include name="WEB-INF/lib/extra/*"/>
+      <include name="WEB-INF/tlds/*"/>
+      <include name="WEB-INF/tags/*"/>
+      <include name="WEB-INF/wsdl/${wsdlfile.name}"/>
+      <include name="${mappingfile.name}"/>
+      <include name="META-INF/context.xml"/>
+      <include name="WEB-INF/classes/META-INF/services/javax.enterprise.inject.spi.Extension"/>
+      <include name="WEB-INF/classes/META-INF/persistence.xml"/>
+    </fileset>
+  </jar>       
+  <echo message="created WAB file ${war.file}" level="verbose"/>
+  <delete dir="${build.classes.dir}/tmp/WEB-INF" failonerror="false"/> 
+  <echo message="my webclient WAB classes are:${webclient.war.classes}" 
+      level="verbose"/>
+</target>
+
+
+<target name="test-tlds-exist">
+  <available file="${tlds}" property="tlds-exist"/>
+</target>
+
+<target name="test-tagfiles-exist">
+  <available file="${tagfiles}" property="tagfiles-exist"/>
+</target>
+
+<!-- ================================================================ -->
+<!-- Target to package the ejb application to jar file -->
+<!--
+Variables Used:
+    ${ejb.jar}
+    ${build.classes.dir}
+    ${ejb-jar.xml}    
+    ${beans.xml}
+    ${persistence-orm.xml}    
+    ${sun-ejb-jar.xml}    
+    ${glassfish-ejb-jar.xml}    
+    ${sun-cmp-mappings.xml}    
+    ${metainf.dir}    
+    ${ejbjar.files}
+    ${dbschema}
+-->
+<!-- ================================================================ -->
+<target name="package-ejbjar-common">
+  <delete file="${ejb.jar}"/>
+  <echo message="common.xml: Generating ejb-jar inside build directory" 
+      level="verbose"/>
+  <mkdir dir="${build.classes.dir}/META-INF"/>
+  <copy file="${ejb-jar.xml}" 
+    tofile="${build.classes.dir}/META-INF/ejb-jar.xml"
+    failonerror="false"/>
+  <copy file="${persistence-orm.xml}" 
+    tofile="${build.classes.dir}/META-INF/persistence-orm.xml"
+    failonerror="false"/>
+  <copy file="${webservices.xml}" 
+    tofile="${build.classes.dir}/META-INF/webservices.xml"
+    failonerror="false"/>
+  <copy file="${sun-ejb-jar.xml}" 
+    tofile="${build.classes.dir}/META-INF/sun-ejb-jar.xml"
+    failonerror="false"/>
+  <copy file="${glassfish-ejb-jar.xml}" 
+    tofile="${build.classes.dir}/META-INF/glassfish-ejb-jar.xml"
+    failonerror="false"/>
+  <copy file="${glassfish-resources.xml}"
+    tofile="${build.classes.dir}/META-INF/glassfish-resources.xml"
+    failonerror="false"/>
+  <copy file="${sun-cmp-mappings.xml}"
+    tofile="${build.classes.dir}/META-INF/sun-cmp-mappings.xml"
+    failonerror="false"/>
+  <copy file="${beans.xml}"
+    tofile="${build.classes.dir}/META-INF/beans.xml"
+    failonerror="false"/>
+  <copy file="${dbschema}" todir="${build.classes.dir}" failonerror="false"/>
+  <jar jarfile="${ejb.jar}" basedir="${ejbjar.files}" update="true"
+    includes ="${ejbjar.classes}">
+    <metainf dir="${build.classes.dir}/META-INF">
+      <include name="ejb-jar.xml"/>
+      <include name="persistence-orm.xml"/>
+      <include name="webservices.xml"/>
+      <include name="sun-ejb-jar.xml"/>
+      <include name="glassfish-resources.xml"/>
+      <include name="glassfish-ejb-jar.xml"/>
+      <include name="sun-cmp-mappings.xml"/>
+      <include name="beans.xml"/>
+    </metainf>
+  </jar>       
+  <delete dir="${build.classes.dir}/META-INF" failonerror="false"/>
+  <delete file="${build.classes.dir}/*.dbschema" failonerror="false"/>
+</target>  
+
+<!-- ================================================================ -->
+<!-- Target to package the appclient application to jar file -->
+<!--
+Variables Used:
+    ${appclient.jar}
+    ${appclientjar.classes}    
+    ${appclientjar.files}    
+    ${build.classes.dir}
+    ${application-client.xml}    
+    ${sun-application-client.xml}    
+-->
+<!-- ================================================================ -->
+<target name="package-appclientjar-common">
+  <delete file="${appclient.jar}"/>
+  <echo message="common.xml: Generating appclient-jar inside build directory" 
+      level="verbose"/>
+  <mkdir dir="${build.classes.dir}/META-INF"/>
+  <copy file="${application-client.xml}"
+        tofile="${build.classes.dir}/META-INF/application-client.xml" 
+        failonerror="false"/>
+  <copy file="${sun-application-client.xml}" tofile="${build.classes.dir}/META-INF/sun-application-client.xml"
+        failonerror="false"/>
+  <jar jarfile="${appclient.jar}" basedir="${appclientjar.files}" 
+    update="true" includes ="${appclientjar.classes}" 
+    manifest="./client/MANIFEST.MF">         
+    <metainf dir="${build.classes.dir}/META-INF">
+      <include name="application-client.xml"/>
+      <include name="sun-application-client.xml"/>
+    </metainf>
+  </jar>       
+</target> 
+
+<!-- ================================================================ -->
+<!-- Target to create the ejb application jar file -->
+<!-- ================================================================ -->
+<target name="ejb-jar-common" depends="init-common">
+  <mkdir dir="${assemble.dir}"/>
+  <antcall target="package-ejbjar-common">
+    <param name="ejbjar.files" value="${build.classes.dir}"/>
+    <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
+  </antcall>
+</target>     
+
+<!-- ================================================================ -->
+<!-- Target to create the appclient jar file -->
+<!-- ================================================================ -->
+<target name="appclient-jar-common" depends="init-common">
+  <mkdir dir="${assemble.dir}"/>
+  <antcall target="package-appclientjar-common">
+    <param name="appclientjar.files" 
+      value="${build.classes.dir}"/>
+    <param name="appclient.jar" 
+      value="${assemble.dir}/${appname}-client.jar"/>
+  </antcall>
+</target>
+
+<!-- ===== package par ===== -->
+<target name="package-persistence-common" depends="init-common" if="ejb30-persistence">
+    <echo message="CREATING Persistence archive: common.xml: ${build.classes.dir}, ${assemble.dir}"/>
+    <mkdir dir="${assemble.dir}"/>
+    <delete file="${assemble.dir}/${appname}-persistence.jar" failonerror="false"/>
+    <echo message="common.xml: Generating PAR inside build directory"/>
+    <mkdir dir="${build.classes.dir}/META-INF"/>
+    <copy file="${persistence.xml}" tofile="${build.classes.dir}/META-INF/persistence.xml" failonerror="false"/>
+    <copy file="${mapping.xml}" tofile="${build.classes.dir}/META-INF/entity-mapping.xml" failonerror="false"/>
+    <!-- make a jar  -->
+    <jar jarfile="${assemble.dir}/${appname}-persistence.jar" basedir="${build.classes.dir}" update="true" includes ="**/*.class" excludes="**/*Local*.class,**/*Remote*.class,**/*Home*.class,**/*Bean*.class,**/*EJB*.class,**/*Exception.class">
+       <metainf dir="${build.classes.dir}/META-INF">
+           <include name="**/*.xml"/>
+       </metainf>
+    </jar>
+    <delete dir="${build.classes.dir}/META-INF" failonerror="false"/>
+</target>
+
+<!-- ================================================================ -->
+<!-- Target to assemble the ejb application to ear file -->
+<!-- ================================================================ -->
+<target name="build-ear-common" depends="fixFiles,package-persistence-common,ejb-jar-common,appclient-jar-common,webclient-war-common">
+  <delete file="${assemble.dir}/${appname}.ear"/>
+  <mkdir dir="${assemble.dir}"/>
+  <mkdir dir="${build.classes.dir}/META-INF"/>   
+  <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml"  	failonerror="false"/> 
+  <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml"  	failonerror="false"/> 
+  <copy file="${glassfish-resources-ear.xml}" tofile="${build.classes.dir}/META-INF/glassfish-resources.xml" failonerror="false"  filtering="true"/>
+  <jar jarfile="${assemble.dir}/${appname}App.ear"> 
+    <fileset dir="${assemble.dir}">
+      <include name="*.jar"/>
+      <include name="*.war"/>
+    </fileset>
+    <fileset dir="${build.classes.dir}">
+	<include name="META-INF/sun-application.xml"/>
+	<include name="META-INF/application.xml"/>
+        <include name="META-INF/glassfish-resources.xml"/>
+    </fileset>
+    <fileset dir="${env.APS_HOME}" includes="lib/reporter.jar"/>
+  </jar>        
+</target>
+
+
+<!-- ================================================================ -->
+<!-- Target to assemble the ejb application to ear file -->
+<!-- ================================================================ -->
+<target name="ear-common" depends="fixFiles,init-common">
+  <delete file="${assemble.dir}/${appname}.ear"/>
+  <mkdir dir="${assemble.dir}"/>
+  <mkdir dir="${build.classes.dir}/META-INF"/>    
+  <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml"  	failonerror="false"/> 
+  <copy file="${glassfish-resources-ear.xml}" tofile="${build.classes.dir}/META-INF/glassfish-resources.xml" failonerror="false"  filtering="true"/>
+  <ear earfile="${assemble.dir}/${appname}App.ear" 
+    appxml="${application.xml}">
+    <fileset dir="${assemble.dir}">
+      <include name="*.jar"/>
+      <include name="*.war"/>
+    </fileset>
+    <fileset dir="${build.classes.dir}">
+	<include name="META-INF/sun-application.xml"/>
+        <include name="META-INF/glassfish-resources.xml"/>
+    </fileset>
+    <fileset dir="${env.APS_HOME}" includes="lib/reporter.jar"/>
+  </ear>        
+</target>
+
+
+<!-- run Verifier on the ear file -->
+<target name="verifier" depends="init-common">
+    <echo message="Running verifier
+        ear file ${assemble.dir}/${appname}App.ear " level="verbose"/>
+    <antcall target="verifier-common">
+        <param name="verifier.command" value=" -n -rw "/>
+        <param name="operand.props" value="${assemble.dir}/${appname}App.ear"/>
+    </antcall>
+    <echo message="Validate the static check results" level="verbose"/>
+</target>
+
+<target name="verifier-common">
+  <echo message="Operand ${operand.props}"  level="verbose"/>
+    <exec executable="${VERIFIER}" failonerror="true">
+        <arg line="${verifier.command} ${operand.props}" />
+    </exec>
+</target>
+
+<!-- ================================================================ -->
+<!-- Target to execute asadmin commands  -->
+<!-- ================================================================ -->
+<target name="asadmin-common">
+  <echo message="Doing admin task ${admin.command}" level="verbose"/>
+  <echo message="Operand ${operand.props}"  level="verbose"/>
+  <echo message="asadmin ${admin.command} ${as.props} ${operand.props}"/>
+    <exec executable="${ASADMIN}" failonerror="true">
+        <arg line="${admin.command} ${as.props} ${operand.props}" />        
+    </exec>
+</target>
+
+<target name="asadmin-common-ignore-fail">
+  <echo message="Doing admin task ${admin.command} (ignore failures)" 
+      level="verbose"/>
+  <echo message="Operand ${operand.props}"  level="verbose"/>
+  <echo message="asadmin ${admin.command} ${as.props} ${operand.props}"/>
+    <exec executable="${ASADMIN}" failonerror="false">
+        <arg line="${admin.command} ${as.props} ${operand.props}" />        
+    </exec>
+</target>
+
+
+<!-- Target to execute a batchfile of asadmin commands  -->
+<!-- ================================================================ -->
+<target name="asadmin-batch-common">
+  <echo message="Doing admin batch task ${admin.command} --file" 
+      level="verbose"/>
+<property name="user.password.file" value="asadminuserpassword.txt"/>
+<echo file="${user.password.file}" append="false">
+AS_ADMIN_USERPASSWORD=${password}
+AS_ADMIN_PASSWORD=${admin.password}
+AS_ADMIN_ADMINPASSWORD=${admin.password}
+AS_ADMIN_MASTERPASSWORD=${master.password}
+</echo>
+  <exec executable="${ASADMIN}" failonerror="true">
+     <arg line="--user ${admin.user} --passwordfile ${user.password.file} --host ${admin.host} --port ${admin.port} --echo=true --terse=true"/>
+     <arg line="multimode --file ${asadmin.file}" />        
+  </exec>
+  <delete file="${user.password.file}" failonerror="false"/>
+</target>
+ 
+<!-- ================================================================ -->
+
+<!-- ================================================================ -->
+<!-- Target to create the user in file realm the AppServ  -->
+<!-- ================================================================ -->
+<target name="create-user-common" depends="init-common">
+<property name="user.password.file" value="asadminuserpassword.txt"/>
+<echo file="${user.password.file}" append="false">
+AS_ADMIN_USERPASSWORD=${password}
+AS_ADMIN_PASSWORD=${admin.password}
+AS_ADMIN_ADMINPASSWORD=${admin.password}
+AS_ADMIN_MASTERPASSWORD=${master.password}
+</echo>
+  <exec executable="${ASADMIN}">
+    <arg line="create-file-user"/>
+    <arg line="--user ${admin.user} --passwordfile ${user.password.file} --host ${admin.host} --port ${admin.port} --echo=true --terse=true"/>
+    <arg line="--groups ${groups}"/>
+    <arg line="--authrealmname ${authrealmname}"/>
+    <arg line="--target ${appserver.instance.name}"/>
+    <arg line="${user}"/>
+  </exec>
+  <delete file="${user.password.file}" failonerror="false"/>
+</target>
+     
+<!-- ================================================================ -->
+<!-- Target to delete the user in file realm the AppServ  -->
+<!-- ================================================================ -->
+<target name="delete-user-common" depends="init-common">
+<echo message="Deleting user ${user} in file realm" level="verbose"/>
+<exec executable="${ASADMIN}">
+  <arg line="delete-file-user"/>
+  <arg line="${as.props}"/>
+  <arg line="--authrealmname ${authrealmname}"/>
+  <arg line="--target ${appserver.instance.name}"/>
+  <arg line="${user}"/>
+</exec>
+</target>
+
+<!-- ================================================================ -->
+<!-- J2EE Connector related targets 			     	  -->
+<!-- ================================================================ -->
+
+<target name="create-connector-connpool-common"
+        depends="init-common, create-connector-connpool"/>
+
+<target name="create-connector-connpool" depends="init-common">
+  <property name="failonerror" value="false"/>
+  <property name="extra-params" value=""/>
+  <echo message="asadmin create-connector-connection-pool ${as.props} --raname ${ra.name} --connectiondefinition ${connection.defname} --target ${appserver.instance.name} ${connector.conpool.name}"/>
+  <exec executable="${ASADMIN}" failonerror="${failonerror}">
+    <arg line="create-connector-connection-pool"/>
+    <arg line="${as.props}"/>
+    <arg line="--raname ${ra.name}"/>
+    <arg line="${extra-params}"/>
+    <arg line="--connectiondefinition ${connection.defname}"/>
+    <arg line="--target ${appserver.instance.name}"/>
+    <arg line="${connector.conpool.name}"/>
+  </exec>
+</target>
+
+<target name="delete-connector-connpool-common" depends="init-common">
+  <echo message="asadmin delete-connector-connection-pool ${as.props} --cascade=true ${connector.conpool.name}"/>
+  <exec executable="${ASADMIN}" failonerror="false">
+    <arg line="delete-connector-connection-pool"/>
+    <arg line="${as.props}"/>
+    <arg line="--cascade=true"/>
+    <arg line="${connector.conpool.name}"/>
+  </exec>
+</target>
+
+<!--  create/delete Connector resource  -->
+<target name="create-connector-resource-common" depends="init-common">
+  <property name="failonerror" value="false"/>
+  <echo message="asadmin create-connector-resource ${as.props} --poolname ${connector.conpool.name} --target ${appserver.instance.name} ${connector.jndi.name}"/>
+  <exec executable="${ASADMIN}" failonerror="${failonerror}">
+    <arg line="create-connector-resource"/>
+    <arg line="${as.props}"/>
+    <arg line="--poolname ${connector.conpool.name}"/>
+    <arg line="--target ${appserver.instance.name}"/>
+    <arg line="${connector.jndi.name}"/>
+  </exec>
+</target>
+
+<target name="delete-connector-resource-common" depends="init-common">
+  <echo message="asadmin delete-connector-resource ${as.props} ${connector.jndi.name}"/>
+  <exec executable="${ASADMIN}" failonerror="false">
+    <arg line="delete-connector-resource"/>
+    <arg line="${as.props}"/>
+    <arg line="${connector.jndi.name}"/>
+  </exec>
+</target>
+
+<!--  deploy/undeploy RAR files                     -->
+<target name="deploy-rar-common" depends="init-common">
+  <echo message="Deploying ${rarfile}" level="verbose"/>
+  <echo message="asadmin deploy ${as.props} --target ${appserver.instance.name} --force=${force} ${rarfile}"/>
+    <property name="force" value="false"/>
+    <property name="extra-params" value=""/>
+  <exec executable="${ASADMIN}" failonerror="false">
+    <arg line="deploy"/>
+    <arg line="${as.props}"/>
+    <arg line="${extra-params}"/>
+    <arg line="--force=${force}"/>
+    <arg line="--target ${appserver.instance.name}"/>
+    <arg line="${rarfile}"/>
+  </exec>
+  <echo message="Deploying ${rarfile} on ${appserver.instance.name}"/>
+</target>
+
+<target name="undeploy-rar-common" depends="init-common">
+  <echo message="Undeploying ${undeployrar}" level="verbose"/>
+  <echo message="asadmin undeploy ${as.props} --target ${appserver.instance.name} --cascade=${cascade} ${undeployrar}"/>
+    <property name="cascade" value="false"/>
+  <exec executable="${ASADMIN}" failonerror="false">
+    <arg line="undeploy"/>
+    <arg line="${as.props}"/>
+    <arg line="--cascade=${cascade}"/>
+    <arg line="--target ${appserver.instance.name}"/>
+    <arg line="${undeployrar}"/>
+  </exec>
+</target>
+
+<!-- ================================================================ -->
+<!-- Target to create JDBC connection pool  -->
+<!-- ================================================================ -->
+<target name="create-jdbc-connpool-common" depends="init-common">
+<echo message="created jdbc connection pool ${jdbc.conpool.name}" 
+    level="verbose"/>
+    <exec executable="${ASADMIN}" failonerror="false">
+        <arg line="create-jdbc-connection-pool"/>
+        <arg line="--datasourceclassname ${db.class}"/>
+        <arg line="--restype ${jdbc.resource.type}"/>
+        <arg line="--target ${appserver.instance.name}"/>
+        <arg line="${as.props}"/>
+        <arg line="${jdbc.conpool.name}"/>
+    </exec>
+    <antcall target="set-${db.type}-connpool-props"/>
+</target>
+
+<target name="create-jdbc-driver-connpool-common" depends="init-common">
+<echo message="created jdbc connection pool ${jdbc.conpool.name}" 
+    level="verbose"/>
+    <property name="extra-params" value=""/>
+    <exec executable="${ASADMIN}" failonerror="false">
+        <arg line="create-jdbc-connection-pool"/>
+        <arg line="--driverclassname ${db.class}"/>
+        <arg line="--restype ${jdbc.resource.type}"/>
+        <arg line="${extra-params}"/>
+        <arg line="--target ${appserver.instance.name}"/>
+        <arg line="${as.props}"/>
+        <arg line="${jdbc.conpool.name}"/>
+    </exec>
+    <antcall target="set-${db.type}-driver-connpool-props"/>
+</target>
+
+<target name="set-pointbase-connpool-props">
+  <antcall target="asadmin-common-ignore-fail">
+    <param name="admin.command" value="set" />
+    <param name="operand.props"
+      value="${resources.dottedname.prefix}.jdbc-connection-pool.${jdbc.conpool.name}.property.DatabaseName=${db.url}"/>
+  </antcall>
+  <antcall target="asadmin-common-ignore-fail">
+    <param name="admin.command" value="set" />
+    <param name="operand.props"
+      value="${resources.dottedname.prefix}.jdbc-connection-pool.${jdbc.conpool.name}.property.User=${db.user}" />
+  </antcall>
+  <antcall target="asadmin-common-ignore-fail">
+    <param name="admin.command" value="set" />
+    <param name="operand.props"
+      value="${resources.dottedname.prefix}.jdbc-connection-pool.${jdbc.conpool.name}.property.Password=${db.pwd}" />
+  </antcall>
+</target>
+
+<target name="set-pointbase-driver-connpool-props">
+  <antcall target="asadmin-common-ignore-fail">
+    <param name="admin.command" value="set" />
+    <param name="operand.props"
+	    value="${resources.dottedname.prefix}.jdbc-connection-pool.${jdbc.conpool.name}.property.URL=${db.url};user=${db.user};password=${db.pwd}"/>
+  </antcall>
+</target>
+
+<target name="set-derby-connpool-props">
+    <exec executable="${ASADMIN}" failonerror="false">
+      <arg line="set"/>
+      <arg line="${as.props}"/>
+      <arg line="domain.resources.jdbc-connection-pool.${jdbc.conpool.name}.property.User=${db.user}"/>
+    </exec>
+    <exec executable="${ASADMIN}" failonerror="false">
+      <arg line="set"/>
+      <arg line="${as.props}"/>
+      <arg line="domain.resources.jdbc-connection-pool.${jdbc.conpool.name}.property.Password=${db.pwd}"/>
+    </exec>
+    <exec executable="${ASADMIN}" failonerror="false">
+      <arg line="set"/>
+      <arg line="${as.props}"/>
+      <arg line="domain.resources.jdbc-connection-pool.${jdbc.conpool.name}.property.driverType=4"/>
+    </exec>
+    <exec executable="${ASADMIN}" failonerror="false">
+      <arg line="set"/>
+      <arg line="${as.props}"/>
+      <arg line="domain.resources.jdbc-connection-pool.${jdbc.conpool.name}.property.portNumber=${db.port}"/>
+    </exec>
+    <exec executable="${ASADMIN}" failonerror="false">
+      <arg line="set"/>
+      <arg line="${as.props}"/>
+      <arg line="domain.resources.jdbc-connection-pool.${jdbc.conpool.name}.property.dataBaseName=${db.name}"/>
+    </exec>
+    <exec executable="${ASADMIN}" failonerror="false">
+      <arg line="set"/>
+      <arg line="${as.props}"/>
+      <arg line="domain.resources.jdbc-connection-pool.${jdbc.conpool.name}.property.retrieveMessagesFromServerOnGetMessage=true"/>
+    </exec>
+    <exec executable="${ASADMIN}" failonerror="false">
+      <arg line="set"/>
+      <arg line="${as.props}"/>
+      <arg line="domain.resources.jdbc-connection-pool.${jdbc.conpool.name}.property.create=true"/>
+    </exec>
+    <exec executable="${ASADMIN}" failonerror="false">
+      <arg line="set"/>
+      <arg line="${as.props}"/>
+      <arg line="domain.resources.jdbc-connection-pool.${jdbc.conpool.name}.property.serverName=${db.host}"/>
+    </exec>
+</target>
+
+<target name="set-derby-driver-connpool-props">
+  <antcall target="asadmin-common-ignore-fail">
+    <param name="admin.command" value="set" />
+    <param name="operand.props"
+	    value="${resources.dottedname.prefix}.jdbc-connection-pool.${jdbc.conpool.name}.property.URL=${db.url};user=${db.user};password=${db.pwd}"/>
+  </antcall>
+</target>
+
+<!-- ================================================================ -->
+<!-- Target to delete JDBC connection-pool  -->
+<!-- ================================================================ -->
+<target name="delete-jdbc-connpool-common" depends="init-common">
+<echo message="asadmin delete-jdbc-connection-pool ${as.props} --cascade=true --target ${appserver.instance.name} ${jdbc.conpool.name}"/>
+<exec executable="${ASADMIN}" failonerror="false">
+        <arg line="delete-jdbc-connection-pool"/>
+        <arg line="${as.props}"/>
+        <arg line="--cascade=true"/>
+        <arg line="--target ${appserver.instance.name}"/>
+        <arg line="${jdbc.conpool.name}"/>
+    </exec>
+    <echo message="cmd executed for ${appserver.instance.name}"/>  
+</target>
+
+<!-- ================================================================ -->
+<!-- Target to create JDBC resource  -->
+<!-- ================================================================ -->
+<target name="create-jdbc-resource-common" depends="init-common">
+<echo message="Creating jdbc resource pool ${jdbc.resource.name}" 
+    level="verbose"/>
+  <echo message="asadmin create-jdbc-resource ${as.props} --connectionpoolid ${jdbc.conpool.name} --target ${appserver.instance.name} ${jdbc.resource.name}"/>
+  <exec executable="${ASADMIN}" failonerror="false">
+        <arg line="create-jdbc-resource"/>
+        <arg line="${as.props}"/>
+        <arg line="--connectionpoolid ${jdbc.conpool.name}"/>
+        <arg line="--target ${appserver.instance.name}"/>
+        <arg line="${jdbc.resource.name}"/>
+    </exec>
+    <echo message="cmd executed for ${appserver.instance.name}"/>
+</target>
+
+<!-- ================================================================ -->
+<!-- Target to delete JDBC resource  -->
+<!-- ================================================================ -->
+<target name="delete-jdbc-resource-common" depends="init-common">
+<echo message="asadmin delete-jdbc-resource ${as.props} --target ${appserver.instance.name} ${jdbc.resource.name}"/>
+  <exec executable="${ASADMIN}" failonerror="false">
+        <arg line="delete-jdbc-resource"/>
+        <arg line="${as.props}"/>
+        <arg line="--target ${appserver.instance.name}"/>
+        <arg line="${jdbc.resource.name}"/>
+    </exec>
+    <echo message="cmd executed for ${appserver.instance.name}"/>
+</target>
+
+<!-- ================================================================ -->
+<!-- Target to deploy JDBC resources  -->
+<!-- ================================================================ -->
+<target name="deploy-jdbc-common" depends="init-common">
+    <antcall target="create-jdbc-connpool-common" />
+    <antcall target="create-jdbc-resource-common" />
+</target>
+
+<target name="deploy-jdbc-driver-common" depends="init-common">
+    <antcall target="create-jdbc-driver-connpool-common" />
+    <antcall target="create-jdbc-resource-common" />
+</target>
+
+<!-- ================================================================ -->
+<!-- Target to undeploy JDBC resources  -->
+<!-- ================================================================ -->
+<target name="undeploy-jdbc-common" depends="init-common">
+  <antcall target="delete-jdbc-resource-common" />
+  <antcall target="delete-jdbc-connpool-common" />
+</target>
+
+<!-- ================================================================ -->
+<!-- Target to create persistence resource  -->
+<!-- ================================================================ -->
+<target name="create-persistence-resource-common" depends="init-common">
+<echo message="Creating pm resource at ${pm.resource.name}" 
+    level="verbose"/>
+    <echo message="asadmin create-persistence-resource ${as.props} --target ${appserver.instance.name} ${pm.resource.name}"/>
+    <exec executable="${ASADMIN}" failonerror="false">
+        <arg line="create-persistence-resource"/>
+        <arg line="${as.props}"/>
+        <arg line="--port ${admin.port}"/>
+        <arg line="--target ${appserver.instance.name}"/>
+        <arg line="${pm.resource.name}"/>
+    </exec>
+    <echo message="Created ${pm.resource.name} --target ${appserver.instance.name}"/> 
+  <antcall target="asadmin-common-ignore-fail">
+    <param name="admin.command" value="set"/>
+    <param name="operand.props"
+      value="${resources.dottedname.prefix}.persistence-manager-factory-resource.${pm.resource.name}.factory_class=${pm.factory.class}"/>
+  </antcall>
+  <antcall target="asadmin-common-ignore-fail">
+    <param name="admin.command" value="set" />
+    <param name="operand.props"
+      value="${resources.dottedname.prefix}.persistence-manager-factory-resource.${pm.resource.name}.jdbc_resource_jndi_name=${jdbc.resource.name}" />
+  </antcall>
+</target>
+
+<!-- ================================================================ -->
+<!-- Target to delete persistence resource  -->
+<!-- ================================================================ -->
+<target name="delete-persistence-resource-common" depends="init-common">
+  <antcall target="asadmin-common-ignore-fail">
+    <param name="admin.command"
+      value="delete-persistence-resource 
+        --target ${appserver.instance.name}" />
+    <param name="operand.props" value="${pm.resource.name}" />
+  </antcall>
+</target>
+
+<target name="execute-sql-common" depends="init-common">
+<echo message="Executing sql statement at ${basedir} from ${sql.file}" 
+    level="verbose"/>
+  <sql
+    driver="${db.driver}"
+    url="${db.url}"
+    userid="${db.user}"
+    password="${db.pwd}"
+    src="${sql.file}"
+    onerror="continue"
+    print="yes"
+    classpath="${s1astest.classpath}"/>
+</target>
+
+
+<target name="execute-ejb-sql-common" depends="init-common">
+<echo message="Executing sql statement at ${basedir} from ${sql.file}" 
+    level="verbose"/>
+  <sql
+    driver="${db.driver}"
+    url="jdbc:derby://localhost:1527/sun-appserv-samples;create=true;"
+    userid="APP"
+    password="APP"
+    src="${sql.file}"
+    onerror="continue"
+    print="yes"
+    output="${build.classes.dir}/setupDBTables.out"
+    classpath="${s1astest.classpath}" />
+</target>
+
+<!-- ================================================================ -->
+<!-- Target to create/delete javamail resources  -->
+<!-- 
+    Properties required: 
+    mailhost
+    fromaddress
+    debug
+    enabled
+    javamail.resource.name (e.g. mail/MySession)
+-->
+<!-- ================================================================ -->
+<target name="create-javamail-resource-common">
+  <exec executable="${ASADMIN}">
+    <arg line="create-javamail-resource"/>
+    <arg line="--port ${admin.port}"/>
+    <arg line="--mailhost ${mailhost}"/>
+    <arg line="--mailuser ${mailuser}"/>
+    <arg line="--fromaddress ${fromaddress}"/>
+    <arg line="--storeprotocol=imap"/>
+    <arg line="--storeprotocolclass=com.sun.mail.imap.IMAPStore"/>
+    <arg line="--transprotocol=smtp"/>
+    <arg line="--transprotocolclass=com.sun.mail.smtp.SMTPTransport"/>
+    <arg line="--debug=${debug}"/>
+    <arg line="--enabled=${enabled}"/>
+    <arg line="--target ${appserver.instance.name}"/>
+    <arg line="${as.props}"/>
+    <arg line="${javamail.resource.name}"/>
+  </exec>
+</target>
+
+<target name="delete-javamail-resource-common">
+  <exec executable="${ASADMIN}">
+    <arg line="delete-javamail-resource"/>
+    <arg line="--port ${admin.port}"/>
+    <arg line="--target ${appserver.instance.name}"/>
+    <arg line="${as.props}"/>
+    <arg line="${javamail.resource.name}"/>
+  </exec>
+</target>
+
+<!-- ================================================================ -->
+<!-- Target to create database table through SQL file  -->
+<!-- ================================================================ -->
+<target name="create-sql-common" depends="init-common">
+<echo message="creating tables from ${basedir}/sql/${db.create}" 
+    level="verbose"/>
+  <sql
+    driver="${db.driver}"
+    url="${db.url}"
+    userid="${db.user}"
+    password="${db.pwd}"
+    src="sql/${db.create}"
+    onerror="continue"
+    print="yes"
+    output="${build.classes.dir}/setupDBTables.out"
+    classpath="${s1astest.classpath}"
+  />
+</target>
+
+<!-- ================================================================ -->
+<!-- Target to delete database table through SQL file  -->
+<!-- ================================================================ -->
+<target name="delete-sql-common" depends="init-common">
+<echo message="dropping tables from ${basedir}/sql/${db.drop}" 
+    level="verbose"/>
+  <sql
+    driver="${db.driver}"
+    url="${db.url}"
+    userid="${db.user}"
+    password="${db.pwd}"
+    src="sql/${db.drop}"
+    onerror="continue"
+    print="yes"
+    output="${build.classes.dir}/setupDBTables.out"
+    classpath="${s1astest.classpath}"
+  />
+</target>
+
+<!-- ======================================================= -->
+<!-- Taget to create JMS Connection      -->
+<!-- ======================================================= -->
+<target name="create-jms-connection-common" depends="init-common">
+  <echo message="Creating JMS connection factory with name ${jms.factory.name}" 
+      level="verbose"/>
+  <exec executable="${ASADMIN}">
+    <arg line="create-jms-resource "/>
+    <arg line="--restype ${jms.factory.type}"/>    
+    <arg line="${as.props}"/>
+    <arg line="--target ${appserver.instance.name}"/>
+    <arg line="${jms.factory.name}" />
+  </exec>
+</target>
+
+<!-- ======================================================= -->
+<!-- Taget to delete JMS Connection      -->
+<!-- ======================================================= -->
+<target name="delete-jms-connection-common" depends="init-common">
+  <echo message="Delete JMS connection factory with name ${jms.factory.name}" 
+      level="verbose"/>
+  <exec executable="${ASADMIN}">
+    <arg line="delete-jms-resource "/>    
+    <arg line="${as.props}"/>
+    <arg line="--target ${appserver.instance.name}"/>    
+    <arg line="${jms.factory.name}"/>
+  </exec>
+</target>
+
+<!-- JMS: create/delete Destination Resource Targets -->
+<target name="create-jms-resource-common" depends="init-common">
+  <echo message="Creating JMS resource with name ${jms.resource.name}" 
+      level="verbose"/>
+
+  <exec executable="${ASADMIN}">
+    <arg line="create-jmsdest --desttype ${dest.type} "/>    
+    <arg line="${as.props}"/>
+    <arg line="${dest.name}"/>
+  </exec>
+
+  <exec executable="${ASADMIN}">
+    <arg line="create-jms-resource "/>
+    <arg line="--restype ${jms.resource.type}"/>
+    <arg line="--property imqDestinationName=${dest.name}"/>
+    <arg line="--target ${appserver.instance.name}"/>    
+    <arg line="${as.props}"/>
+    <arg line="${jms.resource.name}"/>
+  </exec>
+</target>
+
+<target name="delete-jms-resource-common" depends="init-common">
+  <echo message="Delete JMS resource with name ${jms.resource.name}" 
+      level="verbose"/>
+
+  <exec executable="${ASADMIN}">
+    <arg line="delete-jms-resource "/>
+    <arg line="--target ${appserver.instance.name}"/>    
+    <arg line="${as.props} ${jms.resource.name}"/>
+  </exec>
+
+  <exec executable="${ASADMIN}">
+    <arg line="delete-jmsdest --desttype ${dest.type} "/>    
+    <arg line="${as.props} ${dest.name}"/>
+  </exec>
+</target>
+
+<!-- deploy/undeploy JMS resources  -->
+<target name="deploy-jms-common" depends="init-common">
+  <antcall target="create-jms-connection-common" />
+  <antcall target="create-jms-resource-common" />
+</target>
+
+<target name="undeploy-jms-common" depends="init-common">
+  <antcall target="delete-jms-connection-common" />
+  <antcall target="delete-jms-resource-common" />
+</target>
+
+
+<!-- run StaticCheck on the ear file -->
+<target name="staticCheck-common" depends="init-common">
+    <echo message="Running StaticCheck -b on
+        ear file ${assemble.dir}/${appname}App.ear " level="verbose"/>
+    <antcall target="verifier-common">
+        <param name="static-check.command" value=" -b "/>
+        <param name="operand.props" value="${assemble.dir}/${appname}App.ear"/>
+    </antcall>
+    <echo message="Validate the static check results" level="verbose"/>
+</target>
+
+<target name="deploy-dir" depends="init-common">
+    <echo message="Deploying files: ${assemble.dir}" level="verbose"/>
+        <exec executable="${ASADMIN}" failonerror="false">
+            <arg line="deploy"/>
+            <arg line="${as.props}"/>
+            <arg line="--contextroot ${contextroot}"/>
+            <arg line="--target ${appserver.instance.name}"/>
+            <arg line="--name ${appname}-web"/>
+            <arg line="${assemble.dir}"/>
+        </exec>
+</target>
+
+<!-- deploy the applications in AppServ  -->
+<target name="deploy-common" depends="init-common">
+    <antcall target="deploy-common-pe"/>
+    <antcall target="deploy-common-ee"/>
+</target>       
+
+<target name="deploy-verify-common" depends="init-common">
+    <antcall target="deploy-verify-common-pe"/>
+    <antcall target="deploy-verify-common-ee"/>
+</target>       
+
+<target name="deploy-common-pe" depends="init-common" unless="ee">
+  <property name="deployed.app" value="${assemble.dir}/${appname}App.ear"/>
+   <property name="extra-params" value=""/>
+  <exec executable="${ASADMIN}" failonerror="false">
+    <arg line="deploy"/>
+    <arg line="${as.props}"/>    
+    <arg line="${extra-params}"/>    
+    <arg line="--target ${appserver.instance.name}"/>
+    <arg line="--retrieve ${assemble.dir}"/>
+    <arg line="--libraries ${libraries}"/>
+<!-- deployed.app defaults to ${assemble.dir}/${appname}App.ear defined in properties.xml-->
+    <arg line="${deployed.app}"/>
+  </exec>
+  <echo message="Deployment on target server ${appserver.instance.name} successful"/>
+   </target>
+
+<target name="deploy-common-ee" depends="init-common" if="ee">      
+  <echo message="Deploying in EE..."/>
+  <property name="deployed.app" value="${assemble.dir}/${appname}App.ear"/>
+  <exec executable="${ASADMIN}" failonerror="false">
+    <arg line="deploy"/>
+    <arg line="${as.props}"/>
+    <arg line="--target ${appserver.instance.name}"/>
+    <arg line="--retrieve ${assemble.dir}"/>
+    <arg line="--libraries ${libraries}"/>
+<!-- deployed.app defaults to ${assemble.dir}/${appname}App.ear defined in properties.xml-->
+    <arg line="${deployed.app}"/>
+  </exec>
+  <echo message="Deployment on target server ${appserver.instance.name} successful"/>
+</target>
+
+<target name="deploy-verify-common-pe" depends="init-common" unless="ee">
+  <property name="deployed.app" value="${assemble.dir}/${appname}App.ear"/>
+  <exec executable="${ASADMIN}" failonerror="false">
+    <arg line="deploy"/>
+    <arg line="${as.props}"/>
+    <arg line="--verify=true"/>
+    <arg line="--target ${appserver.instance.name}"/>
+    <arg line="--retrieve ${assemble.dir}"/>
+    <arg line="${deployed.app}"/>
+  </exec>
+  <echo message="Deployment on target server ${appserver.instance.name} successful"/>
+   </target>
+
+<target name="deploy-verify-common-ee" depends="init-common" if="ee">
+  <echo message="Deploying in EE..."/>
+  <property name="deployed.app" value="${assemble.dir}/${appname}App.ear"/>
+  <exec executable="${ASADMIN}" failonerror="false">
+    <arg line="deploy"/>
+    <arg line="${as.props}"/>
+    <arg line="--verify=true"/>
+    <arg line="--target ${appserver.instance.name}"/>
+    <arg line="--retrieve ${assemble.dir}"/>
+    <arg line="${deployed.app}"/>
+  </exec>
+  <echo message="Deployment on target server ${appserver.instance.name} successful"/>
+</target>
+
+<!-- deploy the web application in AppServ  -->
+<target name="deploy-jsp-common" depends="init-common">
+  <echo message="Deploying ${deploy.file} from ${basedir}." level="verbose"/>
+  <property name="precompilejsp" value="true"/>
+  <exec executable="${ASADMIN}" failonerror="true">
+    <arg line="deploy"/>
+    <arg line="${as.props}"/>
+    <arg line="--precompilejsp=${precompilejsp}"/>
+    <arg line="--upload true"/>
+    <arg line="--retrieve ${assemble.dir}"/>
+    <arg line="--target ${appserver.instance.name}"/>	
+  </exec>
+</target>    
+
+<target name="deploy-war-name" depends="init-common">
+  <echo message="Deploying ${warname} from ${basedir}."
+      level="verbose"/>
+  <property name="force" value="false"/>
+  <exec executable="${ASADMIN}" failonerror="false">
+    <arg line="deploy"/>
+    <arg line="${as.props}"/>
+    <arg line="--contextroot ${contextroot}"/>
+    <arg line="--precompilejsp=${precompilejsp}"/>
+    <arg line="--force=${force}"/>
+    <arg line="--upload=true"/>
+    <arg line="--target ${appserver.instance.name}"/>
+    <arg line="--libraries ${libraries}"/>
+    <arg line="${warname}.war"/>
+  </exec>
+</target>
+
+<!-- deploy the standalone war in AppServ  -->
+<target name="deploy-war-common">
+<antcall target ="deploy-war-commonpe"/>
+<antcall target ="deploy-war-commonee"/>
+</target>
+
+<target name="deploy-wab-common">
+<antcall target ="deploy-wab-commonpe"/>
+</target>
+
+<target name="deploy-wab-commonpe" depends="init-common" unless="ee">
+  <echo message="Deploying WAB ${assemble.dir}/${appname}-web.war from ${basedir}." 
+      level="verbose"/>
+  <property name="precompilejsp" value="true"/>
+  <property name="force" value="false"/>
+  <exec executable="${ASADMIN}" failonerror="false">
+    <arg line="deploy"/>
+    <arg line="${as.props}"/>
+    <arg line="--precompilejsp=${precompilejsp}"/>
+    <arg line="--force=${force}"/>
+    <arg line="--upload=true"/>
+    <arg line="--target ${appserver.instance.name}"/>	
+    <arg line="--libraries ${libraries}"/>
+    <arg line="--type=osgi"/>
+    <arg line="${assemble.dir}/${appname}-web.war"/>
+  </exec>
+</target> 
+
+
+
+<target name="deploy-war-commonpe" depends="init-common" unless="ee">
+  <echo message="Deploying ${assemble.dir}/${appname}-web.war from ${basedir}." 
+      level="verbose"/>
+  <property name="precompilejsp" value="true"/>
+  <property name="force" value="false"/>
+  <exec executable="${ASADMIN}" failonerror="false">
+    <arg line="deploy"/>
+    <arg line="${as.props}"/>
+    <arg line="--contextroot ${contextroot}"/>
+    <arg line="--precompilejsp=${precompilejsp}"/>
+    <arg line="--force=${force}"/>
+    <arg line="--upload=true"/>
+    <arg line="--target ${appserver.instance.name}"/>	
+    <arg line="--libraries ${libraries}"/>
+    <arg line="${assemble.dir}/${appname}-web.war"/>
+  </exec>
+</target> 
+
+<target name="deploy-war-commonee" if="ee">
+  <property name="precompilejsp" value="true"/>
+  <property name="force" value="false"/>
+  <exec executable="${ASADMIN}" failonerror="false">
+    <arg line="deploy"/>
+    <arg line="${as.props}"/>
+    <arg line="--type web"/>
+    <arg line="--contextroot ${contextroot}"/>
+    <arg line="--precompilejsp=${precompilejsp}"/>
+    <arg line="--force=${force}"/>
+    <arg line="--upload=true"/>
+    <arg line="--target ${appserver.instance.name}"/>	
+    <arg line="--libraries ${libraries}"/>
+    <arg line="${assemble.dir}/${appname}-web.war"/>
+  </exec>
+</target>
+
+<!-- deploy the standalone war in AppServ without specifying any
+     contextroot argument, so that the context-root specified in
+     sun-web.xml takes effect
+-->
+<target name="deploy-war-no-context-root" depends="init-common">
+    <antcall target ="deploy-war-no-context-root-pe"/>
+    <antcall target ="deploy-war-no-context-root-ee"/>
+</target>
+
+<target name="deploy-war-no-context-root-pe" unless="ee">
+    <exec executable="${ASADMIN}" failonerror="false">
+    <arg line="deploy"/>
+    <arg line="--user ${admin.user}"/>
+    <arg line="--passwordfile ${admin.password.file}"/>
+    <arg line="--host ${admin.host}"/>
+    <arg line="--port ${admin.port}"/>
+    <arg line="--upload=true"/>
+    <arg line="--target ${appserver.instance.name}"/>
+    <arg line="--libraries ${libraries}"/>
+    <arg line="${assemble.dir}/${appname}-web.war"/>
+    </exec>
+</target>
+
+<target name="deploy-war-no-context-root-ee" if="ee">
+    <exec executable="${ASADMIN}" failonerror="false">
+    <arg line="deploy"/>
+    <arg line="--user ${admin.user}"/>
+    <arg line="--passwordfile ${admin.password.file}"/>
+    <arg line="--host ${admin.host}"/>
+    <arg line="--port ${admin.port}"/>
+    <arg line="--type web"/>
+    <arg line="--upload=true"/>
+    <arg line="--target ${appserver.instance.name}"/>
+    <arg line="--libraries ${libraries}"/>
+    <arg line="${assemble.dir}/${appname}-web.war"/>
+    </exec>
+</target>
+
+<!-- deploy the standalone jar in AppServ  -->
+<target name="deploy-jar-common" depends="init-common">
+  <exec executable="${ASADMIN}" failonerror="true">
+    <arg line="deploy"/>
+    <arg line="${as.props}"/>
+    <arg line="--upload=true"/>
+    <arg line="--target ${appserver.instance.name}"/>	
+    <arg line="${assemble.dir}/${appname}-ejb.jar"/>
+  </exec>
+</target> 
+
+<!-- deploy the standalone jar in AppServ  -->
+<target name="deploy-client-common" depends="init-common">
+  <exec executable="${ASADMIN}" failonerror="true">
+    <arg line="deploy"/>
+    <arg line="${as.props}"/>
+    <arg line="--upload=true"/>
+    <arg line="--retrieve ${assemble.dir}"/>    
+    <arg line="--target ${appserver.instance.name}"/>	
+    <arg line="${assemble.dir}/${appname}-client.jar"/>
+  </exec>
+</target> 
+
+<target name="undeploy-war-name" depends="init-common">
+  <property name="deployedapp.name" value="${warname}"/>
+  <property name="extra-params" value=""/>
+  <exec executable="${ASADMIN}" failonerror="false">
+    <arg line="undeploy"/>
+    <arg line="${as.props}"/>
+    <arg line="--target ${appserver.instance.name}"/>
+    <arg line="${extra-params}"/>
+<!-- deployedapp.name defaults to {appname}App.declared in properties.xml-->
+    <arg line="${deployedapp.name}"/>
+  </exec>
+</target>
+
+<!--  undeploy the applications in AppServ  -->
+<target name="undeploy-common" depends="init-common">
+  <property name="deployedapp.name" value="${appname}App"/>
+  <property name="extra-params" value=""/>
+  <exec executable="${ASADMIN}" failonerror="false">
+    <arg line="undeploy"/>
+    <arg line="${as.props}"/>
+<!--    
+<arg line=type ${apptype}/> 
+-->
+    <arg line="--target ${appserver.instance.name}"/>	
+    <arg line="${extra-params}"/>
+<!-- deployedapp.name defaults to {appname}App.declared in properties.xml-->
+    <arg line="${deployedapp.name}"/>	
+  </exec>
+</target>
+
+<!--  undeploy the standalone war in AppServ  -->
+<target name="undeploy-war-common" depends="init-common">
+    <echo message="Undeploying warfile ${appname}-web from 
+        ${assemble.dir}/${appname}-web.war from ${basedir}." level="verbose"/>
+  <exec executable="${ASADMIN}" failonerror="false">
+    <arg line="undeploy"/>
+    <arg line="${as.props}"/>
+    <arg line="--target ${appserver.instance.name}"/>	
+    <arg line="${appname}-web"/>
+  </exec>
+</target> 
+
+
+<!--  undeploy the standalone war in AppServ  -->
+<target name="undeploy-jar-common" depends="init-common">
+  <exec executable="${ASADMIN}" failonerror="false">
+    <arg line="undeploy"/>
+    <arg line="${as.props}"/>
+    <arg line="--target ${appserver.instance.name}"/>	
+    <arg line="${appname}-ejb"/>
+  </exec>
+</target>
+
+<!--  undeploy the standalone client in AppServ  -->
+<target name="undeploy-client-common" depends="init-common">
+  <exec executable="${ASADMIN}" failonerror="false">
+    <arg line="undeploy"/>
+    <arg line="${as.props}"/>
+    <arg line="--target ${appserver.instance.name}"/>	
+    <arg line="${appname}-client"/>
+  </exec>
+</target>  
+
+
+<!-- run appclient in AppServ  -->
+<target name="runclient-common" depends="init-common">
+  <echo message="appclient -client ${assemble.dir}/${appname}AppClient.jar -name ${appname}Client -textauth -user j2ee -password j2ee -xml ${admin.domain.dir}/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}"/>
+  <exec executable="${APPCLIENT}" failonerror="false">
+    <!-- set APPCPATH to include reporter.jar so that all app clients
+         don't have to package the test framework in their apps -->
+    <env key="APPCPATH" file="${env.APS_HOME}/lib/reporter.jar"/>
+    <arg line="-client ${assemble.dir}/${appname}AppClient.jar"/>
+    <arg line="-name ${appname}Client"/>
+    <arg line="-textauth"/>
+    <arg line="-user j2ee"/>
+    <arg line="-password j2ee"/>
+    <arg line="-xml ${admin.domain.dir}/${admin.domain}/config/glassfish-acc.xml"/>
+    <arg line="${appclient.application.args}"/>
+  </exec>
+
+<!-- confirming report generation... -->
+    <antcall target="checkReporting-common">
+        <param name="test.name" value="${appname}"/>
+        <param name="test.description" value="${test.description}"/>
+        <param name="test.count" value="${test.count}"/>
+    </antcall>
+</target>
+
+<!-- run web client in AppServ  -->
+<target name="runwebclient-common" depends="init-common">
+  <echo message="Running Web Test from ${basedir}" level="verbose"/>
+  <echo message="http host: ${http.host}" level="verbose"/>
+  <echo message="http port: ${http.port}" level="verbose"/>
+  <java
+    fork="on" failonerror="false"
+    classpath="${env.APS_HOME}/lib/webtest.jar:${s1astest.classpath}"
+    classname="com.sun.ejte.ccl.webrunner.webtest.WebTest">
+    <arg value="script.txt"/>
+    <arg value="${http.host}"/>
+    <arg value="${http.port}"/>
+    <arg value="appserv-tests"/>
+    <arg value="${testsuite.id}"/>
+  </java>
+</target>
+  
+<!-- prepare Pointbase servers -->
+<target name="preparePB" depends="init-common">
+  <echo message="Starting Pointbase servers" level="verbose"/>
+  <copy file="${env.APS_HOME}/lib/pointbase.ini" 
+      tofile="${db.dir}/pointbase.ini"/>
+  <replace file="${db.dir}/pointbase.ini" token="@@@" value="${db.dir}"/>
+</target>
+
+<!-- start/stop Pointbase servers -->
+<target name="startPB" depends="preparePB">
+    <java classname="com.pointbase.net.netServer"
+        classpath="${db.classpath}" fork="true" spawn="true">
+      <arg line="/port:9092"/>
+      <arg line="/pointbase.ini=${db.dir}/pointbase.ini"/>
+      <arg line="/noconsole"/>
+    </java>
+    <java classname="com.pointbase.net.netServer"
+        classpath="${db.classpath}" fork="true" spawn="true">
+      <arg line="/port:9093"/>
+      <arg line="/pointbase.ini=${db.dir}/pointbase.ini"/>
+      <arg line="/noconsole"/>
+    </java>
+</target>
+
+<!-- target name="startPB" depends="preparePB">
+  <parallel>
+    <java classname="com.pointbase.net.netServer" 
+        classpath="${db.classpath}" failonerror="false" fork="true">
+      <arg line="/port:9092"/>
+      <arg line="/pointbase.ini=${db.dir}/pointbase.ini"/>
+    </java>
+    <java classname="com.pointbase.net.netServer" 
+        classpath="${db.classpath}" failonerror="true" fork="true">
+      <arg line="/port:9093"/>
+      <arg line="/pointbase.ini=${db.dir}/pointbase.ini"/>
+    </java>
+  </parallel>
+</target -->
+
+<!--  start Derby Database -->
+<target name="startDerby">
+  <condition property="darwin">
+	<os name="Mac OS X"/>
+  </condition>
+  <antcall target="startDerbyNonMac"/>
+  <antcall target="startDerbyMac"/>
+</target>
+
+<target name="startDerbyNonMac" depends="init-common" unless="darwin">
+        <echo message="StaRTing Derby DB servers in the Network Mode"/>
+  <parallel>
+    <java classname="org.apache.derby.drda.NetworkServerControl"
+      classpath="${db.classpath}" fork="true" spawn="true">
+      <arg line="-h localhost -p 1527 start"/>
+    </java>
+    <java classname="org.apache.derby.drda.NetworkServerControl"
+      classpath="${db.classpath}" fork="true" spawn="true">
+      <arg line="-h localhost -p 1528 start"/>
+    </java>
+  </parallel>     
+</target>
+
+<target name="startDerbyMac" depends="init-common" if="darwin">
+        <echo message="StaRTing Derby DB servers in the Network Mode"/>
+  <parallel>
+    <java classname="org.apache.derby.drda.NetworkServerControl"
+      classpath="${db.classpath}" fork="true" spawn="true">
+       <sysproperty key="derby.storage.fileSyncTransactionLog" value="true"/>
+      <arg line="-h localhost -p 1527 start"/>
+    </java>
+    <java classname="org.apache.derby.drda.NetworkServerControl"
+      classpath="${db.classpath}" fork="true" spawn="true">
+       <sysproperty key="derby.storage.fileSyncTransactionLog" value="true"/>     
+      <arg line="-h localhost -p 1528 start"/>
+    </java>
+  </parallel>
+</target>
+
+<!--  start Derby Database -->
+<target name="stopDerby" depends="init-common">
+        <echo message="Stopping Derby DB servers ..."/>
+  <parallel>
+    <java classname="org.apache.derby.drda.NetworkServerControl"
+      classpath="${db.classpath}" failonerror="true" fork="true">
+      <arg line="-h localhost -p 1527 shutdown"/>
+    </java>
+    <java classname="org.apache.derby.drda.NetworkServerControl"
+      classpath="${db.classpath}" failonerror="true" fork="true">
+      <arg line="-h localhost -p 1528 shutdown"/>
+    </java>
+  </parallel>
+</target>
+
+<target name="pb">
+  <echo message="So you are using pointbase ... !"/>
+  <property file="${env.APS_HOME}/config/pointbase.properties"/>
+</target>
+
+<!-- setup IMQ for RI Build -->
+<target name="setup-mq-common" depends="init-common">
+    <echo message="Executing Datastore setup for S1MQ. Required only for RI" 
+        level="verbose"/>
+    <echo message="${IMQDBMGR} -javahome ${java.home} 
+        -b ${admin.domain}_${appserver.instance.name} create all" 
+        level="verbose"/>
+  <exec executable="${IMQDBMGR}" failonerror="true">
+     <arg line="-javahome ${java.home} -b ${admin.domain}_${appserver.instance.name} create all" />
+  </exec>
+</target>
+
+<target name="import-wsdl" depends="init-common">
+    <mkdir dir="${build.classes.dir}"/>
+    <exec executable="${WSCOMPILE}">
+<!--
+        <arg line="-classpath ${s1astest.classpath}"/>
+-->
+        <arg line="-classpath ${build.classes.dir}"/>
+        <arg line="-import"/>
+        <arg line="-source 1.1.2"/>
+        <arg line="-keep"/>
+        <arg line="-d "/>
+        <arg path="${build.classes.dir}"/>
+        <!--
+        <arg line="-s "/>
+        <arg path="${basedir}/gensource"/>
+        -->
+        <arg line="-mapping ${build.classes.dir}/${mapping.file}"/>
+        <arg line="${config-wsdl.file}"/>
+    </exec>
+</target>
+
+<!-- Confirm Report Generation -->
+
+<target name="checkReporting-common">
+    <available file="RepRunConf.txt" type="file" property="isReported"/>
+    <antcall target="confirmReportPresent-common"/>
+    <antcall target="confirmMissingReport-common"/>
+</target>
+
+<target name="confirmReportPresent-common" if="isReported">
+    <echo message="file RepRunConf.txt is present."/>
+    <echo message="Test seems to be reported fine"/>
+    <delete file="RepRunConf.txt"/>
+</target>
+
+<target name="confirmMissingReport-common" unless="isReported">
+    <echo message="file RepRunConf.txt is missing!!!"/>
+    <echo message="Test does not seem to have been reported"/>
+    <echo message="Adding status 'did not run' into report..."/>
+    <java classname="com.sun.ejte.ccl.reporter.ReporterClient">
+        <classpath>
+            <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
+            <pathelement location="."/>
+        </classpath>
+        <arg value="${test.name}"/>
+        <arg value="${test.description}"/>
+        <arg value="${test.count}"/>
+    </java>
+    <delete file="RepRunConf.txt"/>
+</target>
+
+
+<!-- usage  -->
+<target name="usage-common">
+    <echo>         
+        ant clean           Remove all classes files
+        ant build           Build the application
+        ant deploy          Deploy the ear files to S1AS
+        ant run	            Run the application
+        ant undeploy        Undeploy the ear files from S1AS
+        ant usage           Display this message            
+    </echo>
+</target>
+
+
+<!-- EE Targets 8.1 -->
+<!--Added Feb 5th 2004 by Deepa Singh -->
+<target name="ee" depends="ee-common">
+    <echo message="So you are using Enterprise Edition"/>
+    <property name="ee" value="Enterprise Edition"/>
+    <property file="${env.APS_HOME}/eeconfig/ee-config.properties"/>
+    <loadfile property="target-server-port" srcFile="${admin.domain.dir}/${admin.domain}/config/glassfish-acc.xml"/>
+    <condition property="orbPortSet" value="true">
+        <contains string="${target-server-port}" substring="${orb.port}"/>
+    </condition>
+    <antcall target="change-orb-port"/>
+</target>
+
+<target name="change-orb-port" unless="orbPortSet">
+    <echo message="changing orb port from the default [3700] to ${orb.port}"/>
+    <replace file="${admin.domain.dir}/${admin.domain}/config/glassfish-acc.xml" token="3700" value="${orb.port}"/>
+</target>
+
+
+<target name="restart-instance">
+    <echo message="Restarting remote server instance,until this gets fixed"/>
+	<exec executable="${ASADMIN}" failonerror="false">
+        <arg line="stop-instance"/>
+        <arg line="${as.props}"/>
+        <arg line="${appserver.instance.name}"/>
+    </exec>
+    <sleep seconds="30"/>
+	<exec executable="${ASADMIN}" failonerror="false">
+        <arg line="start-instance"/>
+        <arg line="${as.props}"/>
+        <arg line="${appserver.instance.name}"/>
+    </exec>
+</target>
+
+<target name="testTimer" depends="init-common">
+
+<echo message="creating timer table from ${env.APS_HOME}/lib/ejbtimer_${db.type}.sql"/>
+    <sql
+    driver="${db.driver}"
+    url="${db.url}"
+    userid="${db.user}"
+    password="${db.pwd}"
+    src="${env.APS_HOME}/lib/ejbtimer_${db.type}.sql"
+    onerror="continue"
+    print="yes"
+    classpath="${s1astest.classpath}"/>
+
+</target>
+
+<target name="setupTimer" depends="init-common" if="ee">
+	<exec executable="${ASADMIN}" failonerror="false">
+        <arg line="create-resource-ref"/>
+        <arg line="${as.props}"/>
+        <arg line="--target server"/>
+        <arg line="${jdbc.resource.name}"/>
+    </exec>
+    <antcall target="asadmin-common-ignore-fail">
+        <param name="admin.command" value="set" />
+        <param name="operand.props"
+          value="${appserver.instance.name}-config.ejb-container.ejb-timer-service.timer-datasource=${jdbc.resource.name}"/>
+    </antcall>
+
+    <echo message="creating timer table from ${env.APS_HOME}/lib/ejbtimer_{db.type}.sql"/>
+    <sql
+        driver="${db.driver}"
+        url="${db.url}"
+        userid="${db.user}"
+        password="${db.pwd}"
+        src="${env.APS_HOME}/lib/ejbtimer_${db.type}.sql"
+        onerror="continue"
+        print="yes"
+        classpath="${s1astest.classpath}"/>
+
+    <antcall target="restart-instance"/>
+</target>
+
+<target name="unsetupTimer" depends="init-common" if="ee">
+	<exec executable="${ASADMIN}" failonerror="false">
+        <arg line="delete-resource-ref"/>
+        <arg line="${as.props}"/>
+        <arg line="--target server"/>
+        <arg line="${jdbc.resource.name}"/>
+    </exec>
+	<exec executable="${ASADMIN}" failonerror="false">
+        <arg line="unset"/>
+        <arg line="${appserver.instance.name}-config.ejb-container.ejb-timer-service.timer-datasource"/>
+    </exec>
+
+    <echo message="dropping timer table from ${env.APS_HOME}/lib/ejbtimer_${db.type}_drop.sql"/>
+    <sql
+        driver="${db.driver}"
+        url="${db.url}"
+        userid="${db.user}"
+        password="${db.pwd}"
+        src="${env.APS_HOME}/lib/ejbtimer_${db.type}_drop.sql"
+        onerror="continue"
+        print="yes"
+        classpath="${s1astest.classpath}"/>
+</target>
+
+<target name="prepare-truststore-common" depends="init-common">
+    <property name="truststore.db.file" location="${build.base.dir}/cacerts.jks"/>
+    <property name="cert.rfc.file" location="${build.base.dir}/${cert.nickname}.rfc"/>
+
+    <delete quiet="true" file="${truststore.db.file}"/>
+    <delete quiet="true" file="${cert.rfc.file}"/>
+
+    <!--
+      Determine if we need to use the certutil or the keytool command to
+      access the certificate keystore
+    -->
+    <property name="certutil.db.dir" location="${admin.domain.dir}/${admin.domain}/config"/>
+    <condition property="use.certutil">
+        <and>
+            <or>
+                <available file="${env.S1AS_HOME}/lib/certutil"/>
+                <available file="${env.S1AS_HOME}/lib/certutil.exe"/>
+            </or>
+            <available file="${certutil.db.dir}/cert8.db"/>
+            <available file="${certutil.db.dir}/key3.db"/>
+            <available file="${certutil.db.dir}/secmod.db"/>
+        </and>
+    </condition>
+    <antcall target="prepare-truststore-certutil-common"/>
+    <antcall target="prepare-truststore-keytool-common"/>
+</target>
+
+<target name="prepare-truststore-certutil-common" depends="init-common" if="use.certutil">
+    <exec executable="${env.S1AS_HOME}/lib/certutil" failonerror="true" output="${cert.rfc.file}">
+        <!--
+          LD_LIBRARY_PATH is needed on Unix platforms and should have no
+          effect on Windows
+        -->
+        <env key="LD_LIBRARY_PATH" path="${env.S1AS_HOME}/lib"/>
+        <arg line="-L -n '${cert.nickname}' -a"/>
+        <arg value="-d"/>
+        <arg file="${certutil.db.dir}"/>
+    </exec>
+    <exec executable="${java.home}/bin/keytool" failonerror="true">
+        <arg line="-import -trustcacerts -alias '${cert.nickname}' -storepass '${ssl.password}' -noprompt"/>
+        <arg value="-file"/>
+        <arg file="${cert.rfc.file}"/>
+        <arg value="-keystore"/>
+        <arg file="${truststore.db.file}"/>
+    </exec>
+</target>
+
+
+<target name="prepare-truststore-keytool-common" depends="init-common" unless="use.certutil">
+    <copy file="${admin.domain.dir}/${admin.domain}/config/cacerts.jks" tofile="${truststore.db.file}"/>
+</target>
+
+
+<target name="prepare-keystore-common" depends="init-common">
+    <property name="keystore.db.file" location="${build.base.dir}/keystore.jks"/>
+    <delete quiet="true" file="${keystore.db.file}"/>
+    <copy file="${admin.domain.dir}/${admin.domain}/config/keystore.jks" tofile="${keystore.db.file}" failonerror="false"/>
+</target>
+
+<target name="get-version-common" depends="init-common">
+    <exec executable="${ASADMIN}" failonerror="false" outputproperty="appserver.version">
+        <arg line="version"/>
+        <arg line="${as.props}"/>
+        <arg line="--verbose"/>
+    </exec>
+    <condition property="platform" value="true">
+        <contains string="${appserver.version}" substring="Platform" casesensitive="false"/>
+    </condition>
+    <condition property="enterprise" value="true">
+        <contains string="${appserver.version}" substring="Enterprise" casesensitive="false"/>
+    </condition>
+    <antcall target="platform-common"/>
+    <antcall target="enterprise-common"/>
+</target>
+
+<target name="platform-common" if="platform">
+    <echo message="This is Platform Version***"/>
+</target>
+
+<target name="enterprise-common" if="enterprise">
+    <echo message="This is Enterprise Version***"/>
+</target>
+
+<target name="create-PermSize" depends="init-common">
+  <echo message="asadmin create-jvm-options ${as.props} -- -XX:MaxPermSize=${jvm.maxpermsize}"/>
+  <exec executable="${ASADMIN}" failonerror="false">
+    <arg line="create-jvm-options"/>
+    <arg line="${as.props}"/>
+    <arg line="--target ${appserver.instance.name}"/>
+    <arg line="-- -XX\:MaxPermSize=${jvm.maxpermsize}"/>
+  </exec>
+</target>
+
+    <target name="restart-server">
+        <antcall target="stop-server"/>
+        <sleep seconds="5"/>
+        <antcall target="start-server"/>
+
+    </target>
+
+    <target name="stop-server" depends="setOSConditions">
+        <antcall target="stop-server-unix"/>
+        <antcall target="stop-server-windows"/>
+    </target>
+
+    <target name="stop-server-unix" if="isUnix">
+        <echo message="stopping server on unix ..."/>
+        <exec executable="${env.S1AS_HOME}/bin/asadmin">
+            <arg value="stop-domain"/>
+        </exec>
+        <sleep seconds="10"/>
+    </target>
+
+    <target name="stop-server-windows" if="isWindows">
+        <echo message="Stopping server on windows ..."/>
+        <exec executable="cmd">
+            <arg value="/c"/>
+            <arg value="${env.S1AS_HOME}\bin\asadmin.bat"/>
+            <arg value="stop-domain"/>
+        </exec>
+        <sleep seconds="5"/>
+    </target>
+
+    <target name="start-server" depends="setOSConditions">
+
+        <echo>+-----------------------------+</echo>
+        <echo>| |</echo>
+        <echo>| S T A R T I N G GLASSFISH |</echo>
+        <echo>| in Felix mode |</echo>
+        <echo>| |</echo>
+        <echo>+-----------------------------+</echo>
+
+        <antcall target="start-server-unix"/>
+        <antcall target="start-server-windows"/>
+    </target>
+
+    <target name="start-server-unix" if="isUnix">
+        <exec executable="${env.S1AS_HOME}/bin/asadmin">
+            <env key="GlassFish_Platform" value="Felix"/>
+            <arg value="start-domain"/>
+        </exec>
+        <sleep seconds="10"/>
+    </target>
+
+    <target name="start-server-windows" if="isWindows">
+        <exec executable="cmd" spawn="true">
+            <env key="GlassFish_Platform" value="Felix"/>
+            <arg value="/c"/>
+            <arg value="${env.S1AS_HOME}\bin\asadmin.bat"/>
+            <arg value="start-domain"/>
+        </exec>
+        <sleep seconds="5"/>
+    </target>
+
+    <target name="create-jvm-options" depends="init-common">
+        <exec executable="${ASADMIN}">
+            <arg line="create-jvm-options"/>
+            <arg line="--user ${admin.user} --host ${admin.host} --port ${admin.port} --echo=true --terse=true"/>
+            <arg line="${option}"/>
+        </exec>
+        <echo message="REQUIRED TO RESTART SERVER......."/>
+    </target>
+
+    <target name="delete-jvm-options" depends="init-common">
+        <exec executable="${ASADMIN}">
+            <arg line="delete-jvm-options"/>
+            <arg line="--user ${admin.user} --host ${admin.host} --port ${admin.port} --echo=true --terse=true"/>
+            <arg line="${option}"/>
+        </exec>
+        <echo message="REQUIRED TO RESTART SERVER......."/>
+    </target>
+
+<!-- ================================================================ -->
+<!-- Target to Flush connection pool  -->
+<!-- ================================================================ -->
+<target name="flush-connpool-common" depends="init-common">
+<echo message="Flush connection pool ${jdbc.conpool.name}" 
+    level="verbose"/>
+    <exec executable="${ASADMIN}" failonerror="false">
+        <arg line="flush-connection-pool"/>
+        <arg line="${as.props}"/>
+        <arg line="${jdbc.conpool.name}"/>
+    </exec>
+</target>
+
+<!-- ================================================================ -->
+<!-- Target to generate a neat Html report -->
+<!-- ================================================================ -->
+<target name="dev-report" depends="init-common">
+    <java classname="com.sun.appserv.test.util.results.HtmlReportProducer" fork="true" failonerror="false"
+          classpath="${env.APS_HOME}/lib/reportbuilder.jar">
+        <arg value="${env.APS_HOME}/test_results.xml"/>
+    </java>
+</target>
+
+
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/descriptor/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/descriptor/MANIFEST.MF
new file mode 100644
index 0000000..5b53761
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/descriptor/MANIFEST.MF
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Archiver-Version: Plexus Archiver
+Created-By: 1.6.0_20 (Sun Microsystems Inc.)
+Built-By: siva
+Build-Jdk: 1.6.0_20
+Extension-Name: simple-cdi-osgi-test
+Implementation-Title: simple-cdi-osgi-test
+Implementation-Version: 1.0
+Bundle-ClassPath: WEB-INF/classes/
+Private-Package: tests.cdi;version="1.0"
+Export-EJB: ALL
+Bundle-Version: 1.0
+Tool: Bnd-0.0.311
+Bundle-Name: Test CDI OSGI
+Bnd-LastModified: 1283184402694
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: tests.cdi.simple-cdi-osgi-test
+Web-ContextPath: /test
+Import-Package: javax.enterprise.context,javax.enterprise.inject,javax
+ .inject,javax.enterprise.inject.spi,javax.servlet,javax.servlet.annotation,javax.servlet.http,javax.naming
+
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/descriptor/beans.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/descriptor/beans.xml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/descriptor/beans.xml
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/descriptor/web.xml
new file mode 100644
index 0000000..4812478
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/descriptor/web.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<!-- IT's AN EMPTY FILE. Needed to satisfy maven-war-plugin.
+-->
+</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestBean.java
new file mode 100644
index 0000000..fad6896
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestBean.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package tests.cdi;
+
+//Simple TestBean to test CDI. 
+//This bean implements Serializable as it needs to be placed into a Stateful Bean
+public class TestBean
+{}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java
new file mode 100644
index 0000000..9e733d8
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/servlet/tests/cdi/TestServlet.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package tests.cdi;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Enumeration;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.inject.Inject;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.naming.InitialContext;
+
+@WebServlet(urlPatterns={"/*"})
+public class TestServlet extends HttpServlet {
+    @Inject TestBean tb;
+    @Inject BeanManager bm;
+    BeanManager bm1;
+
+    public void service(HttpServletRequest req, HttpServletResponse res)
+            throws IOException, ServletException {
+
+        PrintWriter writer = res.getWriter();
+        writer.write("Hello from Servlet 3.0");
+        String msg = "";
+        if (tb == null) msg += "Bean injection into Servlet failed";
+        if (bm == null) msg += "BeanManager Injection via @Inject failed";
+        try {
+            bm1 = (BeanManager)((new InitialContext()).lookup("java:comp/BeanManager"));
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            msg += "BeanManager Injection via component environment lookup failed";
+        }
+        if (bm1 == null) msg += "BeanManager Injection via component environment lookup failed";
+        
+        System.out.println("BeanManager is " + bm);
+        System.out.println("BeanManager via lookup is " + bm1);
+        writer.write(msg + "\n");
+    }
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/README b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/README
new file mode 100644
index 0000000..96001d0
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/README
@@ -0,0 +1 @@
+A Singleton Startup EJB using constructor based injection of CDI beans [issue 13072]
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/build.properties
new file mode 100644
index 0000000..982c344
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/build.properties
@@ -0,0 +1,27 @@
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+ 
+
+<property name="module" value="cdi-singleton-hello"/>
+<property name="appname" value="${module}"/> 
+<property name="jndiroot" value="${appname}-ejb"/>    
+<property name="assemble" value="${build.classes.dir}/archive"/>
+<property name="se.client" value="com.acme.Client"/>
+<property name="beans.xml" value="descriptor/beans.xml"/>
+	
+
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/build.xml
new file mode 100644
index 0000000..d29250d
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/build.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<!DOCTYPE project [
+<!ENTITY commonSetup SYSTEM "./../../../../../config/properties.xml">
+<!ENTITY commonBuild SYSTEM "./../../../../../config/common.xml">
+<!ENTITY testproperties SYSTEM "./build.properties">
+]>
+
+<project name="cdi-singleton-hello-App" default="usage" basedir=".">
+
+    &commonSetup;
+    &commonBuild;
+    &testproperties;
+
+    <target name="all" depends="build,deploy,run,undeploy"/>
+
+    <target name="clean" depends="init-common">
+      <antcall  target="clean-common"/>
+    </target>
+ 
+    <target name="compile" depends="clean">
+        <antcall target="compile-common">
+            <param name="src" value="ejb"/>
+        </antcall>
+        <antcall target="compile-common">
+            <param name="src" value="client"/>
+        </antcall>
+    </target>
+
+    <target name="build" depends="compile">
+        <antcall target="ejb-jar-common">
+            <param name="ejbjar.classes" 
+              value="com/acme/*.class"/>
+        </antcall>
+    </target> 
+    
+    <target name="deploy" 
+            depends="init-common">
+        <antcall target="deploy-jar-common"/>
+    </target>
+
+    <target name="run" depends="init-common">
+        <antcall target="run_se"/>
+    </target>
+ 
+    <target name="run_se" depends="init-common">
+       <java  fork="on" 
+              failonerror="true"
+              classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
+              classname="${se.client}">
+           <sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
+           <arg line="${jndiroot}"/>
+        </java>
+    </target>
+
+    <target name="undeploy" depends="init-common">
+        <antcall target="undeploy-jar-common"/>
+    </target>   
+
+    <target name="usage">
+        <antcall target="usage-common"/>
+    </target>
+</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/client/Client.java
new file mode 100644
index 0000000..4ec0022
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/client/Client.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+
+import javax.ejb.*;
+import javax.annotation.*;
+
+import javax.naming.InitialContext;
+
+import javax.management.j2ee.ManagementHome;
+import javax.management.j2ee.Management;
+import javax.rmi.PortableRemoteObject;
+
+import com.acme.Hello;
+import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
+
+public class Client {
+
+    private static SimpleReporterAdapter stat = 
+        new SimpleReporterAdapter("appserv-tests");
+
+    private static String appName;
+
+    public static void main(String args[]) {
+
+	appName = args[0]; 
+	stat.addDescription(appName);
+	Client client = new Client(args);       
+        client.doTest();	
+        stat.printSummary(appName + "ID");
+    }
+
+    public Client(String[] args) {}
+
+    public void doTest() {
+
+	try {
+
+	    // Ensure that MEJB is registered under all three of its JNDI names
+	    System.out.println("Looking up MEJB Homes");
+	    ManagementHome mh1Obj = (ManagementHome) new InitialContext().lookup("ejb/mgmt/MEJB");
+	    ManagementHome mh2Obj = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean");
+	    ManagementHome mh3Obj = (ManagementHome) new InitialContext().lookup("java:global/mejb/MEJBBean!javax.management.j2ee.ManagementHome");
+        addStatus("mejb relative lookup", (mh1Obj != null));
+        addStatus("mejb global lookup", (mh2Obj != null));
+        addStatus("mejb global lookup with explicit ManagedHome interface", (mh3Obj != null));
+
+	    Hello hello = (Hello) new InitialContext().lookup("java:global/" + appName + "/SingletonBean");
+        String response = hello.hello();
+        addStatus("Singleton bean response", response.equals("hello, world!\n"));
+
+	    try {
+    		hello.testError();
+            addStatus("Expected EJBException from Singleton.testError()", false);
+	    	throw new RuntimeException("Expected EJBException");
+	    } catch(EJBException e) {
+            addStatus("Expected EJBException from Singleton.testError()", true);
+	    }
+
+        String injectionStatus = hello.testInjection();
+        System.out.println("Injection tests in server response"+ injectionStatus);
+        addStatus("Testing Injection in EJB Singleton" , injectionStatus.trim().equals(""));
+
+	} catch(Exception e) {
+	    stat.addStatus("local main", stat.DID_NOT_RUN);
+	    e.printStackTrace();
+	}
+    }
+
+    private void addStatus(String message, boolean result){
+            stat.addStatus(message, (result ? stat.PASS: stat.FAIL));
+    }
+
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/descriptor/beans.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/descriptor/beans.xml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/descriptor/beans.xml
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Bar.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Bar.java
new file mode 100644
index 0000000..07a3880
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Bar.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+import javax.annotation.ManagedBean;
+
+@ManagedBean
+public class Bar implements IBar{
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Foo.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Foo.java
new file mode 100644
index 0000000..1d87d9d
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Foo.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+import javax.ejb.*;
+
+public class Foo {
+
+    @EJB Hello hello;
+    @javax.inject.Inject TestBean tb;
+    
+    public boolean testInjection(){
+        return tb != null;
+    }
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Hello.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Hello.java
new file mode 100644
index 0000000..23f4df7
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Hello.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+public interface Hello {
+
+    String hello();
+
+    void testError();
+    String testInjection();
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/IBar.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/IBar.java
new file mode 100644
index 0000000..172406e
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/IBar.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+public interface IBar {
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/SingletonBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/SingletonBean.java
new file mode 100644
index 0000000..784bb16
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/SingletonBean.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.annotation.Resource;
+import javax.ejb.EJBException;
+import javax.ejb.Singleton;
+import javax.ejb.Startup;
+import javax.inject.Inject;
+
+import org.omg.CORBA.ORB;
+
+@Singleton
+@Startup
+public class SingletonBean {
+
+    @Resource
+    private ORB orb;
+
+    @Inject
+    Foo foo;
+    @Inject
+    TestBean tb;
+    
+    Bar b;
+    
+    @Inject
+    public SingletonBean(Bar b){
+        this.b = b;
+    }
+
+    @PostConstruct
+    public void init() {
+        System.out.println("In SingletonBean::init()");
+        System.out.println("orb = " + orb);
+        if (orb == null) {
+            throw new EJBException("null ORB");
+        }
+    }
+
+    public String hello() {
+        System.out.println("In SingletonBean::hello()");
+        return "hello, world!\n";
+    }
+
+    public void testError() {
+        throw new Error("test java.lang.Error");
+    }
+
+    public String testInjection() {
+        if (foo == null)
+            return "foo is null";
+        if (tb == null)
+            return "tb is null";
+        if (!foo.testInjection())
+            return "testInjection in Foo failed";
+        if (b == null)
+            return "Constructor Injection of bean failed"; 
+        return "";
+    }
+
+    @PreDestroy
+    public void destroy() {
+        System.out.println("In SingletonBean::destroy()");
+    }
+
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/TestBean.java
new file mode 100644
index 0000000..22e521a
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/TestBean.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+//Simple test bean to test injection
+public class TestBean {}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/README b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/README
new file mode 100644
index 0000000..f274683
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/README
@@ -0,0 +1,5 @@
+test for issue GLASSFISH-11683
+
+The slf4j api and impl bundled with weld-osgi-bundle must not be exported 
+to applications and if an application bundles a custom slf4j api and an
+implementation bundle, then the bundled SLF4j implmentation must be used
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/WebTest.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/WebTest.java
new file mode 100644
index 0000000..511806f
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/WebTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
+
+/*
+ * Unit test for @WebServlet
+ */
+public class WebTest {
+
+    private static SimpleReporterAdapter stat
+        = new SimpleReporterAdapter("appserv-tests");
+    private static final String TEST_NAME = "slf4j-visibility";
+
+    private String host;
+    private String port;
+    private String contextRoot;
+
+    public WebTest(String[] args) {
+        host = args[0];
+        port = args[1];
+        contextRoot = args[2];
+    }
+    
+    public static void main(String[] args) {
+        stat.addDescription("Unit test for @WebServlet");
+        WebTest webTest = new WebTest(args);
+        webTest.doTest();
+        stat.printSummary(TEST_NAME);
+    }
+
+    public void doTest() {
+        try { 
+            invoke();
+        } catch (Exception ex) {
+            System.out.println(TEST_NAME + " test failed");
+            stat.addStatus(TEST_NAME, stat.FAIL);
+            ex.printStackTrace();
+        }
+    }
+
+    private void invoke() throws Exception {
+        
+        String url = "http://" + host + ":" + port + contextRoot
+                     + "/myurl";
+        System.out.println("opening connection to " + url);
+        HttpURLConnection conn = (HttpURLConnection)
+            (new URL(url)).openConnection();
+
+        int code = conn.getResponseCode();
+        if (code != 200) {
+            System.out.println("Unexpected return code: " + code);
+            stat.addStatus(TEST_NAME, stat.FAIL);
+        } else {
+            InputStream is = null;
+            BufferedReader input = null;
+            String line = null;
+            try {
+                is = conn.getInputStream();
+                input = new BufferedReader(new InputStreamReader(is));
+                line = input.readLine();
+                System.out.println("line = " + line);
+            } finally {
+                try {
+                    if (is != null) {
+                        is.close();
+                    }
+                } catch(IOException ioe) {
+                    // ignore
+                }
+                try {
+                    if (input != null) {
+                        input.close();
+                    }
+                } catch(IOException ioe) {
+                    // ignore
+                }
+            }
+            if (isExpectedResponse(line)) {
+                stat.addStatus(TEST_NAME, stat.PASS);
+            } else {
+                System.out.println("Wrong response. Expected: org.jboss.logging.JDKLogger and org.jboss.logging.jboss-logging in output" + 
+                          ", received: " + line);
+                stat.addStatus(TEST_NAME, stat.FAIL);
+            }
+        }    
+    }
+
+    private boolean isExpectedResponse(String line) {
+        return line.contains("org.jboss.logging.JDKLogger") && line.contains("org.jboss.logging.jboss-logging");
+    }
+}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/build.properties b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/build.properties
new file mode 100644
index 0000000..14467fd
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/build.properties
@@ -0,0 +1,24 @@
+<!--
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+ 
+
+<property name="module" value="cdi"/>
+<property name="appname" value="${module}-slf4j-visibility"/>
+<property name="assemble" value="${build.classes.dir}/archive"/>
+<property name="contextroot" value="/${appname}"/>
+<property name="beans.xml" value="descriptor/beans.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/build.xml
new file mode 100644
index 0000000..83ad666
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/build.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<!DOCTYPE project [
+<!ENTITY commonSetup SYSTEM "./../../../../config/properties.xml">
+<!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
+<!ENTITY run SYSTEM "./../../../../config/run.xml">
+<!ENTITY testproperties SYSTEM "./build.properties">
+]>
+
+<project name="webcontainer_unittest" default="all" basedir=".">
+
+    &commonSetup;
+    &commonBuild;
+    &testproperties;
+    &run;
+
+    <target name="all" depends="build,deploy,run,undeploy"/>
+
+    <target name="clean" depends="init-common">
+        <antcall target="clean-common"/>
+        <delete>
+            <fileset dir="." includes="*.class"/>
+        </delete>
+    </target>
+       
+    <target name="compile" depends="clean">
+        <antcall target="compile-common">
+            <param name="src" value="servlet"/>
+        </antcall>
+    </target>
+
+    <target name="build" depends="compile">
+        <property name="hasWebclient" value="yes"/> 
+        <antcall target="webclient-war-common">
+            <param name="hasWebclient" value="yes"/>
+            <param name="webclient.war.classes" value="**/*.class"/> 
+        </antcall>
+
+        <javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
+               includes="WebTest.java"/>
+
+    </target> 
+
+    <target name="build-publish-war" depends="build, publish-war-common" />
+    
+    <target name="deploy" depends="init-common">
+        <antcall target="deploy-war-common"/>
+    </target>
+    
+    <target name="run" depends="init-common">
+        <java classname="WebTest">
+          <arg value="${http.host}"/>
+          <arg value="${http.port}"/>
+          <arg value="${contextroot}"/>
+          <classpath>
+           <pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
+           <pathelement location="."/>
+         </classpath>
+        </java>
+    </target>
+ 
+    <target name="undeploy" depends="init-common">
+        <antcall target="undeploy-war-common"/>
+    </target>   
+
+    <target name="usage">
+        <antcall target="usage-common"/>
+    </target>
+</project>
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/descriptor/beans.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/descriptor/beans.xml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/descriptor/beans.xml
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/lib/slf4j-api-1.7.25.jar b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/lib/slf4j-api-1.7.25.jar
new file mode 100644
index 0000000..0143c09
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/lib/slf4j-api-1.7.25.jar
Binary files differ
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/lib/slf4j-simple-1.7.25.jar b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/lib/slf4j-simple-1.7.25.jar
new file mode 100644
index 0000000..a7260f3
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/lib/slf4j-simple-1.7.25.jar
Binary files differ
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/servlet/TestBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/servlet/TestBean.java
new file mode 100644
index 0000000..6d059e2
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/servlet/TestBean.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+//Simple TestBean to test CDI. 
+//This bean implements Serializable as it needs to be placed into a Stateful Bean
+public class TestBean
+{}
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/servlet/TestServlet.java
new file mode 100644
index 0000000..bc1c99f
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/slf4j-visibility/servlet/TestServlet.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import javax.naming.InitialContext;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jboss.logging.Logger;
+//import org.slf4j.LoggerFactory;
+
+@WebServlet(name="mytest",
+        urlPatterns={"/myurl"},
+        initParams={ @WebInitParam(name="n1", value="v1"), @WebInitParam(name="n2", value="v2") } )
+public class TestServlet extends HttpServlet {
+    @Inject TestBean tb;
+    @Inject BeanManager bm;
+    BeanManager bm1;
+
+    public void service(HttpServletRequest req, HttpServletResponse res)
+            throws IOException, ServletException {
+
+        PrintWriter writer = res.getWriter();
+        String msg = "";
+        if (tb == null) msg += "Bean injection into Servlet failed";
+        if (bm == null) msg += "BeanManager Injection via @Inject failed";
+        try {
+            bm1 = (BeanManager)((new InitialContext()).lookup("java:comp/BeanManager"));
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            msg += "BeanManager Injection via component environment lookup failed";
+        }
+        if (bm1 == null) msg += "BeanManager Injection via component environment lookup failed";
+
+        
+        System.out.println("BeanManager is " + bm);
+        System.out.println("BeanManager via lookup is " + bm1);
+        
+        Logger l = Logger.getLogger(getClass());
+        String s = "[ Hello World is logged by an instance of " + l.getClass() + ", which is loaded by " + l.getClass().getClassLoader() + "]";
+        msg += s;
+        l.info(s);
+        
+        writer.write(msg + "\n");
+    }
+}